summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-07-14 08:05:21 +0200
committerRemi Collet <remi@remirepo.net>2020-07-14 08:05:21 +0200
commit9fa634e6cdbe696d0fa7b5170221a251063ee733 (patch)
tree9c74d1e635d59c2a3db697afb31cc98cff992488
parent7351e1a50bf1054afda39994817ddf9106a85cc4 (diff)
update to 9.2.6
raise dependency on latest minor version available for all libraries
-rw-r--r--composer.json34
-rw-r--r--phpunit9-rpm.patch16
-rw-r--r--phpunit9.spec186
3 files changed, 121 insertions, 115 deletions
diff --git a/composer.json b/composer.json
index 3593800..d138fd0 100644
--- a/composer.json
+++ b/composer.json
@@ -28,26 +28,26 @@
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "doctrine/instantiator": "^1.2.0",
- "myclabs/deep-copy": "^1.9.1",
+ "doctrine/instantiator": "^1.3.1",
+ "myclabs/deep-copy": "^1.9.5",
"phar-io/manifest": "^1.0.3",
"phar-io/version": "^2.0.1",
- "phpspec/prophecy": "^1.8.1",
- "phpunit/php-code-coverage": "^8.0.1",
- "phpunit/php-file-iterator": "^3.0",
- "phpunit/php-invoker": "^3.0",
- "phpunit/php-text-template": "^2.0",
- "phpunit/php-timer": "^5.0",
- "sebastian/code-unit": "^1.0.2",
- "sebastian/comparator": "^4.0",
- "sebastian/diff": "^4.0",
- "sebastian/environment": "^5.0.1",
- "sebastian/exporter": "^4.0",
+ "phpspec/prophecy": "^1.10.3",
+ "phpunit/php-code-coverage": "^8.0.2",
+ "phpunit/php-file-iterator": "^3.0.3",
+ "phpunit/php-invoker": "^3.0.2",
+ "phpunit/php-text-template": "^2.0.2",
+ "phpunit/php-timer": "^5.0.1",
+ "sebastian/code-unit": "^1.0.5",
+ "sebastian/comparator": "^4.0.3",
+ "sebastian/diff": "^4.0.1",
+ "sebastian/environment": "^5.1.2",
+ "sebastian/exporter": "^4.0.2",
"sebastian/global-state": "^4.0",
- "sebastian/object-enumerator": "^4.0",
- "sebastian/resource-operations": "^3.0",
- "sebastian/type": "^2.1",
- "sebastian/version": "^3.0"
+ "sebastian/object-enumerator": "^4.0.2",
+ "sebastian/resource-operations": "^3.0.2",
+ "sebastian/type": "^2.1.1",
+ "sebastian/version": "^3.0.1"
},
"require-dev": {
"ext-PDO": "*",
diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch
index 62091a4..5984d82 100644
--- a/phpunit9-rpm.patch
+++ b/phpunit9-rpm.patch
@@ -1,6 +1,6 @@
diff -up ./phpunit.rpm ./phpunit
---- ./phpunit.rpm 2020-02-07 07:56:17.000000000 +0100
-+++ ./phpunit 2020-02-07 16:20:53.817753399 +0100
+--- ./phpunit.rpm 2020-07-14 07:50:32.000000000 +0200
++++ ./phpunit 2020-07-14 07:59:08.950883697 +0200
@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) {
ini_set('date.timezone', 'UTC');
}
@@ -44,9 +44,9 @@ diff -up ./phpunit.rpm ./phpunit
+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
+}
diff -up ./src/TextUI/Configuration/Loader.php.rpm ./src/TextUI/Configuration/Loader.php
---- ./src/TextUI/Configuration/Loader.php.rpm 2020-02-07 07:56:17.000000000 +0100
-+++ ./src/TextUI/Configuration/Loader.php 2020-02-07 16:20:53.818753394 +0100
-@@ -194,7 +194,7 @@ final class Loader
+--- ./src/TextUI/Configuration/Loader.php.rpm 2020-07-14 07:59:08.950883697 +0200
++++ ./src/TextUI/Configuration/Loader.php 2020-07-14 08:00:39.167509659 +0200
+@@ -195,7 +195,7 @@ final class Loader
private function validate(\DOMDocument $document): array
{
$original = \libxml_use_internal_errors(true);
@@ -54,10 +54,10 @@ diff -up ./src/TextUI/Configuration/Loader.php.rpm ./src/TextUI/Configuration/Lo
+ $xsdFilename = __DIR__ . '/../../phpunit.xsd';
if (\defined('__PHPUNIT_PHAR_ROOT__')) {
- $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
+ $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
---- ./tests/bootstrap.php.rpm 2020-02-07 16:21:18.097630840 +0100
-+++ ./tests/bootstrap.php 2020-02-07 16:22:12.237357522 +0100
+--- ./tests/bootstrap.php.rpm 2020-07-14 07:50:32.000000000 +0200
++++ ./tests/bootstrap.php 2020-07-14 07:59:08.950883697 +0200
@@ -14,4 +14,8 @@ if (!\defined('TEST_FILES_PATH')) {
\ini_set('precision', '14');
\ini_set('serialize_precision', '14');
diff --git a/phpunit9.spec b/phpunit9.spec
index ab7c45f..3f3dc37 100644
--- a/phpunit9.spec
+++ b/phpunit9.spec
@@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit ad7cc5ec3ab2597b329880e30442d9054526023b
+%global gh_commit 1c6a9e4312e209e659f1fce3ce88dd197c2448f6
#global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
@@ -24,10 +24,10 @@
%global php_home %{_datadir}/php
%global ver_major 9
%global ver_minor 2
-%global specrel 2
+%global specrel 1
Name: %{pk_project}%{ver_major}
-Version: 9.2.5
+Version: 9.2.6
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}
@@ -43,48 +43,48 @@ BuildArch: noarch
BuildRequires: php(language) >= 7.3
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(doctrine/instantiator) >= 1.2.0 with php-composer(doctrine/instantiator) < 2)
-BuildRequires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-composer(myclabs/deep-copy) < 2)
+BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
+BuildRequires: (php-composer(myclabs/deep-copy) >= 1.9.5 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(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2)
-BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-composer(phpunit/php-code-coverage) < 9)
-BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4)
-BuildRequires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4)
-BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3)
-BuildRequires: (php-composer(phpunit/php-timer) >= 5.0 with php-composer(phpunit/php-timer) < 6)
-BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.2 with php-composer(sebastian/code-unit) < 2)
-BuildRequires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5)
-BuildRequires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5)
-BuildRequires: (php-composer(sebastian/environment) >= 5.0.1 with php-composer(sebastian/environment) < 6)
-BuildRequires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5)
+BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2)
+BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0.2 with php-composer(phpunit/php-code-coverage) < 9)
+BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4)
+BuildRequires: (php-composer(phpunit/php-invoker) >= 3.0.2 with php-composer(phpunit/php-invoker) < 4)
+BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3)
+BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6)
+BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2)
+BuildRequires: (php-composer(sebastian/comparator) >= 4.0.3 with php-composer(sebastian/comparator) < 5)
+BuildRequires: (php-composer(sebastian/diff) >= 4.0.1 with php-composer(sebastian/diff) < 5)
+BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6)
+BuildRequires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5)
BuildRequires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5)
-BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5)
-BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0 with php-composer(sebastian/resource-operations) < 4)
-BuildRequires: (php-composer(sebastian/type) >= 2.1 with php-composer(sebastian/type) < 3)
-BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
+BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5)
+BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4)
+BuildRequires: (php-composer(sebastian/type) >= 2.1.1 with php-composer(sebastian/type) < 3)
+BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4)
# remirepo:22
%else
-BuildRequires: php-doctrine-instantiator >= 1.2.0
-BuildRequires: php-myclabs-deep-copy >= 1.9.1
+BuildRequires: php-doctrine-instantiator >= 1.3.1
+BuildRequires: php-myclabs-deep-copy >= 1.9.5
BuildRequires: php-phar-io-manifest >= 1.0.3
BuildRequires: php-phar-io-version >= 2.0.1
-BuildRequires: php-phpspec-prophecy >= 1.8.1
-BuildRequires: php-phpunit-php-code-coverage8 >= 8.0.1
-BuildRequires: php-phpunit-php-file-iterator3
-BuildRequires: php-phpunit-php-invoker3
-BuildRequires: php-phpunit-php-text-template2
-BuildRequires: php-phpunit-php-timer5
-BuildRequires: php-sebastian-code-unit >= 1.0.2
-BuildRequires: php-sebastian-comparator4
-BuildRequires: php-sebastian-diff4
-BuildRequires: php-sebastian-environment5 >= 5.0.1
-BuildRequires: php-sebastian-exporter4
-BuildRequires: php-sebastian-global-state4
-BuildRequires: php-sebastian-object-enumerator4
-BuildRequires: php-sebastian-resource-operations3
-BuildRequires: php-sebastian-type2 >= 2.1
-BuildRequires: php-sebastian-version3
+BuildRequires: php-phpspec-prophecy >= 1.10.3
+BuildRequires: php-phpunit-php-code-coverage8 >= 8.0.2
+BuildRequires: php-phpunit-php-file-iterator3 >= 3.0.3
+BuildRequires: php-phpunit-php-invoker3 >= 3.0.2
+BuildRequires: php-phpunit-php-text-template2 >= 2.0.2
+BuildRequires: php-phpunit-php-timer5 >= 5.0.1
+BuildRequires: php-sebastian-code-unit >= 1.0.5
+BuildRequires: php-sebastian-comparator4 >= 4.0.3
+BuildRequires: php-sebastian-diff4 >= 4.0.1
+BuildRequires: php-sebastian-environment5 >= 5.1.2
+BuildRequires: php-sebastian-exporter4 >= 4.0.2
+BuildRequires: php-sebastian-global-state4 >= 4.0
+BuildRequires: php-sebastian-object-enumerator4 >= 4.0.2
+BuildRequires: php-sebastian-resource-operations3 >= 3.0.2
+BuildRequires: php-sebastian-type2 >= 2.1.1
+BuildRequires: php-sebastian-version3 >= 3.0.1
%endif
BuildRequires: php-dom
BuildRequires: php-json
@@ -103,26 +103,26 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "ext-mbstring": "*",
# "ext-xml": "*",
# "ext-xmlwriter": "*",
-# "doctrine/instantiator": "^1.2.0",
-# "myclabs/deep-copy": "^1.9.1",
+# "doctrine/instantiator": "^1.3.1",
+# "myclabs/deep-copy": "^1.9.5",
# "phar-io/manifest": "^1.0.3",
# "phar-io/version": "^2.0.1",
-# "phpspec/prophecy": "^1.8.1",
-# "phpunit/php-code-coverage": "^8.0.1",
-# "phpunit/php-file-iterator": "^3.0",
-# "phpunit/php-invoker": "^3.0",
-# "phpunit/php-text-template": "^2.0",
-# "phpunit/php-timer": "^5.0",
-# "sebastian/code-unit": "^1.0.2",
-# "sebastian/comparator": "^4.0",
-# "sebastian/diff": "^4.0",
-# "sebastian/environment": "^5.0.1",
-# "sebastian/exporter": "^4.0",
+# "phpspec/prophecy": "^1.10.3",
+# "phpunit/php-code-coverage": "^8.0.2",
+# "phpunit/php-file-iterator": "^3.0.3",
+# "phpunit/php-invoker": "^3.0.2",
+# "phpunit/php-text-template": "^2.0.2",
+# "phpunit/php-timer": "^5.0.1",
+# "sebastian/code-unit": "^1.0.5",
+# "sebastian/comparator": "^4.0.3",
+# "sebastian/diff": "^4.0.1",
+# "sebastian/environment": "^5.1.2",
+# "sebastian/exporter": "^4.0.2",
# "sebastian/global-state": "^4.0",
-# "sebastian/object-enumerator": "^4.0",
-# "sebastian/resource-operations": "^3.0",
-# "sebastian/type": "^2.1",
-# "sebastian/version": "^3.0"
+# "sebastian/object-enumerator": "^4.0.2",
+# "sebastian/resource-operations": "^3.0.2",
+# "sebastian/type": "^2.1.1",
+# "sebastian/version": "^3.0.1"
Requires: php(language) >= 7.3
Requires: php-cli
Requires: php-dom
@@ -133,26 +133,26 @@ Requires: php-xml
Requires: php-xmlwriter
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(doctrine/instantiator) >= 1.2.0 with php-composer(doctrine/instantiator) < 2)
-Requires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-composer(myclabs/deep-copy) < 2)
+Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
+Requires: (php-composer(myclabs/deep-copy) >= 1.9.6 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(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2)
-Requires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-composer(phpunit/php-code-coverage) < 9)
-Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4)
-Requires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4)
-Requires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3)
-Requires: (php-composer(phpunit/php-timer) >= 5.0 with php-composer(phpunit/php-timer) < 6)
-Requires: (php-composer(sebastian/code-unit) >= 1.0.2 with php-composer(sebastian/code-unit) < 2)
-Requires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5)
-Requires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5)
-Requires: (php-composer(sebastian/environment) >= 5.0.1 with php-composer(sebastian/environment) < 6)
-Requires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5)
+Requires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2)
+Requires: (php-composer(phpunit/php-code-coverage) >= 8.0.2 with php-composer(phpunit/php-code-coverage) < 9)
+Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4)
+Requires: (php-composer(phpunit/php-invoker) >= 3.0.2 with php-composer(phpunit/php-invoker) < 4)
+Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3)
+Requires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6)
+Requires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2)
+Requires: (php-composer(sebastian/comparator) >= 4.0.3 with php-composer(sebastian/comparator) < 5)
+Requires: (php-composer(sebastian/diff) >= 4.0.1 with php-composer(sebastian/diff) < 5)
+Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6)
+Requires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5)
Requires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5)
-Requires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5)
-Requires: (php-composer(sebastian/resource-operations) >= 3.0 with php-composer(sebastian/resource-operations) < 4)
-Requires: (php-composer(sebastian/type) >= 2.1 with php-composer(sebastian/type) < 3)
-Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
+Requires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5)
+Requires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4)
+Requires: (php-composer(sebastian/type) >= 2.1.1 with php-composer(sebastian/type) < 3)
+Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4)
# From composer.json, "suggest": {
# "ext-soap": "*",
# "ext-xdebug": "*"
@@ -160,26 +160,26 @@ Suggests: php-soap
Suggests: php-xdebug
# remirepo:22
%else
-Requires: php-doctrine-instantiator >= 1.2.0
-Requires: php-myclabs-deep-copy >= 1.9.1
+Requires: php-doctrine-instantiator >= 1.3.1
+Requires: php-myclabs-deep-copy >= 1.9.5
Requires: php-phar-io-manifest >= 1.0.3
Requires: php-phar-io-version >= 2.0.1
-Requires: php-phpspec-prophecy >= 1.8.1
-Requires: php-phpunit-php-code-coverage8 >= 8.0.1
-Requires: php-phpunit-php-file-iterator3
-Requires: php-phpunit-php-invoker3
-Requires: php-phpunit-php-text-template2
-Requires: php-phpunit-php-timer5
-Requires: php-sebastian-code-unit >= 1.0.2
-Requires: php-sebastian-comparator4
-Requires: php-sebastian-diff4
-Requires: php-sebastian-environment5 >= 5.0.1
-Requires: php-sebastian-exporter4
-Requires: php-sebastian-global-state4
-Requires: php-sebastian-object-enumerator4
-Requires: php-sebastian-resource-operations3
-Requires: php-sebastian-type2 >= 2.1.0
-Requires: php-sebastian-version3
+Requires: php-phpspec-prophecy >= 1.10.3
+Requires: php-phpunit-php-code-coverage8 >= 8.0.2
+Requires: php-phpunit-php-file-iterator3 >= 3.0.3
+Requires: php-phpunit-php-invoker3 >= 3.0.2
+Requires: php-phpunit-php-text-template2 >= 2.0.2
+Requires: php-phpunit-php-timer5 >= 5.0.1
+Requires: php-sebastian-code-unit >= 1.0.5
+Requires: php-sebastian-comparator4 >= 4.0.3
+Requires: php-sebastian-diff4 >= 4.0.1
+Requires: php-sebastian-environment5 >= 5.1.2
+Requires: php-sebastian-exporter4 >= 4.0.2
+Requires: php-sebastian-global-state4 >= 4.0
+Requires: php-sebastian-object-enumerator4 >= 4.0.2
+Requires: php-sebastian-resource-operations3 >= 3.0.2
+Requires: php-sebastian-type2 >= 2.1.1
+Requires: php-sebastian-version3 >= 3.0.1
%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -254,6 +254,7 @@ cat src/autoload.php
--exclude 'tests/end-to-end/regression/GitHub/3889/Issue3889Test.test.php' \
--exclude 'tests/end-to-end/regression/GitHub/3904/Issue3904Test.php' \
--exclude 'tests/end-to-end/force-covers-annotation/tests/Test.php' \
+ --exclude 'tests/end-to-end/regression/GitHub/2448/Test.php' \
tests
@@ -291,6 +292,11 @@ exit $ret
%changelog
+* Tue Jul 14 2020 Remi Collet <remi@remirepo.net> - 9.2.6-1
+- update to 9.2.6
+- raise dependency on latest minor version available
+ for all libraries
+
* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 9.2.5-2
- cleanup dependencies