v1.2.3

(cherry picked from commit 2a16bf5ae2)
(cherry picked from commit b015339725)

.gitignore

@@ -9,3 +9,6 @@
 /php-composer-ca-bundle-1.1.0-943b2c4.tgz
 /php-composer-ca-bundle-1.1.1-d2c0a83.tgz
 /php-composer-ca-bundle-1.1.2-46afded.tgz
+/php-composer-ca-bundle-1.1.3-8afa52c.tgz
+/php-composer-ca-bundle-1.1.4-558f321.tgz
+/php-composer-ca-bundle-1.2.3-f26a67e.tgz

php-composer-ca-bundle-rpm.patch

@@ -10,3 +10,15 @@ diff -up src/CaBundle.php.rpm src/CaBundle.php
  
          // cURL does not understand 'phar://' paths
          // see https://github.com/composer/ca-bundle/issues/10
+diff -up tests/CaBundleTest.php.rpm tests/CaBundleTest.php
+--- tests/CaBundleTest.php.rpm	2019-08-01 11:14:21.577672699 +0200
++++ tests/CaBundleTest.php	2019-08-01 11:14:31.322744408 +0200
+@@ -104,7 +104,7 @@ class CaBundleTest extends TestCase
+     public function testOpenBaseDir()
+     {
+         $oldValue = ini_get('open_basedir');
+-        ini_set('open_basedir', realpath(__DIR__ . '/../'));
++        ini_set('open_basedir', '/usr/share/php:' . realpath(__DIR__ . '/../'));
+         $certFilePath = CaBundle::getSystemCaRootBundlePath();
+         $validResult = CaBundle::validateCaFile($certFilePath, null);
+         $this->assertTrue($validResult);

php-composer-ca-bundle.spec

@@ -1,12 +1,12 @@
 # remirepo/fedora spec file for php-composer-ca-bundle
 #
-# Copyright (c) 2016-2018 Remi Collet
+# Copyright (c) 2016-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    46afded9720f40b9dc63542af4e3e43a1177acb0
+%global gh_commit    f26a67e397be0e5c00d7c52ec7b5010098e15ce5
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     composer
 %global gh_project   ca-bundle
@@ -14,7 +14,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-composer-ca-bundle
-Version:        1.1.2
+Version:        1.2.3
 Release:        1%{?dist}
 Summary:        Lets you find a path to the system CA
 
@@ -34,12 +34,12 @@ BuildRequires:  php-openssl
 BuildRequires:  php-pcre
 BuildRequires:  php-cli
 # From composer.json, "require": {
-#        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
+#        "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8",
 #        "psr/log": "^1.0",
 #        "symfony/process": "^2.5 || ^3.0 || ^4.0"
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires:  phpunit6
-%global phpunit %{_bindir}/phpunit6
+%global phpunit %{_bindir}/phpunit8
 BuildRequires: (php-composer(psr/log)         >= 1.0   with php-composer(psr/log)         < 2)
 BuildRequires: (php-composer(symfony/process) >= 2.5   with php-composer(symfony/process) < 5)
 %else
@@ -57,7 +57,7 @@ BuildRequires:  %{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 # From composer.json, "require": {
 #        "ext-openssl": "*",
 #        "ext-pcre": "*",
-#        "php": "^5.3.2 || ^7.0"
+#        "php": "^5.3.2 || ^7.0 || ^8.0"
 Requires:       php(language) >= 5.3.2
 Requires:       php-openssl
 Requires:       php-pcre
@@ -120,10 +120,10 @@ require_once '%{buildroot}%{php_home}/Composer/CaBundle/autoload.php';
 EOF
 
 ret=0
-for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72 php73; do
+for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70  %{_bindir}/phpunit6" "php71  %{_bindir}/phpunit7" php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
+    $1 ${2:-%{_bindir}/phpunit8} --verbose || ret=1
   fi
 done
 exit $ret
@@ -142,6 +142,9 @@ exit $ret
 
 
 %changelog
+* Sat Aug  3 2019 Remi Collet <remi@remirepo.net> - 1.2.3-1
+- update to 1.2.3
+
 * Thu Aug  9 2018 Remi Collet <remi@remirepo.net> - 1.1.2-1
 - update to 1.1.2 (no change)
 

sources

@@ -1 +1 @@
-SHA512 (php-composer-ca-bundle-1.1.2-46afded.tgz) = 1dd3085ead63babd881aba6df7890ac74c4249e744b4c00bf7b0e3fe8059c668d97fbb1a5f8a281b5d7fc265d0aaf5be50631d1a10de2a39db9a81aa41095c83
+SHA512 (php-composer-ca-bundle-1.2.3-f26a67e.tgz) = 39da8b9fa1605b64a14c553b6310147954f46b38985ab9ff908cd7171c2d6b633253083fefeb0d5fe50dcc7f13176c47004b21d2c44bf1ede6fa63b541248cb7