summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json6
-rw-r--r--phpunit8.spec35
2 files changed, 23 insertions, 18 deletions
diff --git a/composer.json b/composer.json
index 2d70f26..86f7b21 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
},
"prefer-stable": true,
"require": {
- "php": "^7.2",
+ "php": ">=7.2",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
@@ -30,8 +30,8 @@
"ext-xmlwriter": "*",
"doctrine/instantiator": "^1.3.1",
"myclabs/deep-copy": "^1.10.0",
- "phar-io/manifest": "^1.0.3",
- "phar-io/version": "^2.0.1",
+ "phar-io/manifest": "^2.0.1",
+ "phar-io/version": "^3.0.2",
"phpspec/prophecy": "^1.10.3",
"phpunit/php-code-coverage": "^7.0.12",
"phpunit/php-file-iterator": "^2.0.2",
diff --git a/phpunit8.spec b/phpunit8.spec
index b490109..f6ee51f 100644
--- a/phpunit8.spec
+++ b/phpunit8.spec
@@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 3123601e3b29339b20129acc3f989cfec3274566
+%global gh_commit f40cf5be80a7d177494592ad1b2db3f64ea1dee3
#global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
@@ -27,7 +27,7 @@
%global specrel 1
Name: %{pk_project}%{ver_major}
-Version: 8.5.11
+Version: 8.5.12
Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: The PHP Unit Testing framework version %{ver_major}
@@ -45,8 +45,8 @@ BuildRequires: php(language) >= 7.2
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2)
-BuildRequires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2)
-BuildRequires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3)
+BuildRequires: (php-composer(phar-io/manifest) >= 2.0.1 with php-composer(phar-io/manifest) < 3)
+BuildRequires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4)
BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2)
BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8)
BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3)
@@ -66,8 +66,8 @@ BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-c
%else
BuildRequires: php-doctrine-instantiator >= 1.3.1
BuildRequires: php-myclabs-deep-copy >= 1.10.0
-BuildRequires: php-phar-io-manifest >= 1.0.3
-BuildRequires: php-phar-io-version >= 2.0.1
+BuildRequires: php-phar-io-manifest2 >= 2.0.1
+BuildRequires: php-phar-io-version3 >= 3.0.2
BuildRequires: php-phpspec-prophecy >= 1.10.3
BuildRequires: php-phpunit-php-code-coverage7 >= 7.0.12
BuildRequires: php-phpunit-php-file-iterator2 >= 2.0.2
@@ -94,7 +94,7 @@ BuildRequires: php-xmlwriter
BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# From composer.json, "require": {
-# "php": "^7.2",
+# "php": ">=7.2",
# "ext-dom": "*",
# "ext-json": "*",
# "ext-libxml": "*",
@@ -103,8 +103,8 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "ext-xmlwriter": "*",
# "doctrine/instantiator": "^1.3.1",
# "myclabs/deep-copy": "^1.10.0",
-# "phar-io/manifest": "^1.0.3",
-# "phar-io/version": "^2.0.1",
+# "phar-io/manifest": "^2.0.1",
+# "phar-io/version": "^3.0.2",
# "phpspec/prophecy": "^1.10.3",
# "phpunit/php-code-coverage": "^7.0.10",
# "phpunit/php-file-iterator": "^2.0.2",
@@ -131,8 +131,8 @@ Requires: php-xmlwriter
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
Requires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2)
-Requires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2)
-Requires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3)
+Requires: (php-composer(phar-io/manifest) >= 2.0.1 with php-composer(phar-io/manifest) < 3)
+Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4)
Requires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2)
Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8)
Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3)
@@ -158,8 +158,8 @@ Suggests: php-xdebug
%else
Requires: php-doctrine-instantiator >= 1.3.1
Requires: php-myclabs-deep-copy >= 1.10.0
-Requires: php-phar-io-manifest >= 1.0.3
-Requires: php-phar-io-version >= 2.0.1
+Requires: php-phar-io-manifest2 >= 2.0.1
+Requires: php-phar-io-version3 >= 3.0.2
Requires: php-phpspec-prophecy >= 1.10.3
Requires: php-phpunit-php-code-coverage7 >= 7.0.12
Requires: php-phpunit-php-file-iterator2 >= 2.0.2
@@ -228,8 +228,8 @@ cat << 'EOF' | tee -a src/autoload.php
'%{php_home}/Doctrine/Instantiator/autoload.php',
'%{php_home}/DeepCopy/autoload.php',
'%{php_home}/SebastianBergmann/Invoker/autoload.php',
- '%{php_home}/PharIo/Manifest/autoload.php',
- '%{php_home}/PharIo/Version/autoload.php',
+ '%{php_home}/PharIo/Manifest2/autoload.php',
+ '%{php_home}/PharIo/Version3/autoload.php',
]);
// Extensions
\Fedora\Autoloader\Dependencies::optional(
@@ -281,6 +281,11 @@ exit $ret
%changelog
+* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 8.5.12-1
+- update to 8.5.12
+- raise dependency on phar-io/manifest 2.0.1
+- raise dependency on phar-io/version 3.0.2
+
* Fri Nov 27 2020 Remi Collet <remi@remirepo.net> - 8.5.11-1
- update to 8.5.11
- raise dependency on phpunit/php-code-coverage 7.0.12