summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-07 09:58:07 +0200
committerRemi Collet <remi@remirepo.net>2019-06-07 09:58:07 +0200
commitab46f582c19dd1e15d709a664123fa67ca6998ec (patch)
tree4d85903ccf285728cf7030d5ce3760a768bdc630
parent4dfc3823af96109d55fa36d37d9de5bd41fe9bb3 (diff)
- update to 8.2.0
- add dependency on sebastian/type - raise dependency on doctrine/instantiator 1.2.0 - raise dependency on myclabs/deep-copy 1.9.1 - raise dependency on phar-io/manifest 1.0.3 - raise dependency on phar-io/version 2.0.1 - raise dependency on phpspec/prophecy 1.8.0 - raise dependency on phpunit/php-code-coverage 7.0.5 - raise dependency on phpunit/php-file-iterator 2.0.2 - raise dependency on phpunit/php-timer 2.1.2 - raise dependency on sebastian/comparator 3.0.2 - raise dependency on sebastian/diff 3.0.2 - raise dependency on sebastian/environment 4.2.2 - raise dependency on sebastian/resource-operations 2.0.1
-rw-r--r--composer.json33
-rw-r--r--phpunit8.spec186
2 files changed, 122 insertions, 97 deletions
diff --git a/composer.json b/composer.json
index c44cbc2..113c590 100644
--- a/composer.json
+++ b/composer.json
@@ -28,22 +28,23 @@
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
- "doctrine/instantiator": "^1.1",
- "myclabs/deep-copy": "^1.7",
- "phar-io/manifest": "^1.0.2",
- "phar-io/version": "^2.0",
- "phpspec/prophecy": "^1.7",
- "phpunit/php-code-coverage": "^7.0",
- "phpunit/php-file-iterator": "^2.0.1",
+ "doctrine/instantiator": "^1.2.0",
+ "myclabs/deep-copy": "^1.9.1",
+ "phar-io/manifest": "^1.0.3",
+ "phar-io/version": "^2.0.1",
+ "phpspec/prophecy": "^1.8.0",
+ "phpunit/php-code-coverage": "^7.0.5",
+ "phpunit/php-file-iterator": "^2.0.2",
"phpunit/php-text-template": "^1.2.1",
- "phpunit/php-timer": "^2.1",
- "sebastian/comparator": "^3.0",
- "sebastian/diff": "^3.0",
- "sebastian/environment": "^4.1",
- "sebastian/exporter": "^3.1",
- "sebastian/global-state": "^3.0",
+ "phpunit/php-timer": "^2.1.2",
+ "sebastian/comparator": "^3.0.2",
+ "sebastian/diff": "^3.0.2",
+ "sebastian/environment": "^4.2.2",
+ "sebastian/exporter": "^3.1.0",
+ "sebastian/global-state": "^3.0.0",
"sebastian/object-enumerator": "^3.0.3",
- "sebastian/resource-operations": "^2.0",
+ "sebastian/resource-operations": "^2.0.1",
+ "sebastian/type": "^1.0.0",
"sebastian/version": "^2.0.1"
},
"require-dev": {
@@ -57,7 +58,7 @@
"sort-packages": true
},
"suggest": {
- "phpunit/php-invoker": "^2.0",
+ "phpunit/php-invoker": "^2.0.0",
"ext-soap": "*",
"ext-xdebug": "*"
},
@@ -82,7 +83,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "8.1-dev"
+ "dev-master": "8.2-dev"
}
}
}
diff --git a/phpunit8.spec b/phpunit8.spec
index b619a39..1a79776 100644
--- a/phpunit8.spec
+++ b/phpunit8.spec
@@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit e3c9da6e645492c461e0a11eca117f83f4f4c840
+%global gh_commit b20b6db4bd6aceda2809ca00cb740149d726d8fb
#global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
@@ -23,8 +23,8 @@
%global ns_vendor PHPUnit8
%global php_home %{_datadir}/php
%global ver_major 8
-%global ver_minor 1
-%global ver_patch 6
+%global ver_minor 2
+%global ver_patch 0
%global specrel 1
Name: %{pk_project}%{ver_major}
@@ -43,42 +43,44 @@ BuildArch: noarch
BuildRequires: php(language) >= 7.2
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(doctrine/instantiator) >= 1.1 with php-composer(doctrine/instantiator) < 2)
-BuildRequires: (php-composer(myclabs/deep-copy) >= 1.7 with php-composer(myclabs/deep-copy) < 2)
-BuildRequires: (php-composer(phar-io/manifest) >= 1.0.1 with php-composer(phar-io/manifest) < 2)
-BuildRequires: (php-composer(phar-io/version) >= 1.0 with php-composer(phar-io/version) < 3)
-BuildRequires: (php-composer(phpspec/prophecy) >= 1.7 with php-composer(phpspec/prophecy) < 2)
-BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0 with php-composer(phpunit/php-code-coverage) < 8)
-BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.1 with php-composer(phpunit/php-file-iterator) < 3)
-BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
-BuildRequires: (php-composer(phpunit/php-timer) >= 2.1 with php-composer(phpunit/php-timer) < 3)
-BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 4)
-BuildRequires: (php-composer(sebastian/diff) >= 3.0 with php-composer(sebastian/diff) < 4)
-BuildRequires: (php-composer(sebastian/environment) >= 4.1 with php-composer(sebastian/environment) < 5)
-BuildRequires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4)
-BuildRequires: (php-composer(sebastian/global-state) >= 3.0 with php-composer(sebastian/global-state) < 4)
-BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
-BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0 with php-composer(sebastian/resource-operations) < 3)
-BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3)
-BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0 with php-composer(phpunit/php-invoker) < 3)
+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(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.0 with php-composer(phpspec/prophecy) < 2)
+BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.5 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)
+BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
+BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3)
+BuildRequires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4)
+BuildRequires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4)
+BuildRequires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5)
+BuildRequires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4)
+BuildRequires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4)
+BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
+BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3)
+BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3)
+BuildRequires: (php-composer(sebastian/type) >= 1.0.0 with php-composer(sebastian/type) < 2)
+BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3)
# remirepo:20
%else
-BuildRequires: php-doctrine-instantiator11
-BuildRequires: php-myclabs-deep-copy >= 1.7
-BuildRequires: php-phar-io-manifest >= 1.0.1
-BuildRequires: php-phar-io-version >= 1.0
-BuildRequires: php-phpspec-prophecy >= 1.7
-BuildRequires: php-phpunit-php-code-coverage7
-BuildRequires: php-phpunit-php-file-iterator2 >= 2.0.1
+BuildRequires: php-doctrine-instantiator11 >= 1.2.0
+BuildRequires: php-myclabs-deep-copy19 >= 1.9.1
+BuildRequires: php-phar-io-manifest >= 1.0.3
+BuildRequires: php-phar-io-version >= 2.0.1
+BuildRequires: php-phpspec-prophecy >= 1.8.0
+BuildRequires: php-phpunit-php-code-coverage7 >= 7.0.5
+BuildRequires: php-phpunit-php-file-iterator2 >= 2.0.2
BuildRequires: php-phpunit-Text-Template >= 1.2.1
-BuildRequires: php-phpunit-php-timer2 >= 2.1
-BuildRequires: php-sebastian-comparator3
-BuildRequires: php-sebastian-diff3
-BuildRequires: php-sebastian-environment4 >= 4.1
+BuildRequires: php-phpunit-php-timer2 >= 2.1.2
+BuildRequires: php-sebastian-comparator3 >= 3.0.2
+BuildRequires: php-sebastian-diff3 >= 3.0.2
+BuildRequires: php-sebastian-environment4 >= 4.2.2
BuildRequires: php-sebastian-exporter3 >= 3.1
BuildRequires: php-sebastian-global-state3
BuildRequires: php-sebastian-object-enumerator3 >= 3.0.3
-BuildRequires: php-sebastian-resource-operations2
+BuildRequires: php-sebastian-resource-operations2 >= 2.0.1
+BuildRequires: php-sebastian-type
BuildRequires: php-phpunit-Version >= 2.0.1
BuildRequires: php-phpunit-php-invoker2
%endif
@@ -99,23 +101,23 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "ext-mbstring": "*",
# "ext-xml": "*",
# "ext-xmlwriter": "*",
-# "doctrine/instantiator": "^1.1",
-# "myclabs/deep-copy": "^1.7",
-# ignore version range, test suite passes with manifest and version 1.0.1
-# "phar-io/manifest": "^1.0.1",
-# "phar-io/version": "^1.0",
-# "phpspec/prophecy": "^1.7",
-# "phpunit/php-code-coverage": "^7.0",
-# "phpunit/php-file-iterator": "^2.0.1",
+# "doctrine/instantiator": "^1.2.0",
+# "myclabs/deep-copy": "^1.9.1",
+# "phar-io/manifest": "^1.0.3",
+# "phar-io/version": "^2.0.1",
+# "phpspec/prophecy": "^1.8.0",
+# "phpunit/php-code-coverage": "^7.0.5",
+# "phpunit/php-file-iterator": "^2.0.2",
# "phpunit/php-text-template": "^1.2.1",
-# "phpunit/php-timer": "^2.1",
-# "sebastian/comparator": "^3.0",
-# "sebastian/diff": "^3.0",
-# "sebastian/environment": "^4.1",
+# "phpunit/php-timer": "^2.1.2",
+# "sebastian/comparator": "^3.0.2",
+# "sebastian/diff": "^3.0.2",
+# "sebastian/environment": "^4.2.2",
# "sebastian/exporter": "^3.1",
-# "sebastian/global-state": "^3.0",
+# "sebastian/global-state": "^3.0.0",
# "sebastian/object-enumerator": "^3.0.3",
-# "sebastian/resource-operations": "^2.0",
+# "sebastian/resource-operations": "^2.0.1",
+# "sebastian/type": "^1.0.0",
# "sebastian/version": "^2.0.1",
Requires: php(language) >= 7.2
Requires: php-cli
@@ -127,48 +129,50 @@ Requires: php-xml
Requires: php-xmlwriter
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(doctrine/instantiator) >= 1.1 with php-composer(doctrine/instantiator) < 2)
-Requires: (php-composer(myclabs/deep-copy) >= 1.7 with php-composer(myclabs/deep-copy) < 2)
-Requires: (php-composer(phar-io/manifest) >= 1.0.1 with php-composer(phar-io/manifest) < 2)
-Requires: (php-composer(phar-io/version) >= 1.0 with php-composer(phar-io/version) < 3)
-Requires: (php-composer(phpspec/prophecy) >= 1.7 with php-composer(phpspec/prophecy) < 2)
-Requires: (php-composer(phpunit/php-code-coverage) >= 7.0 with php-composer(phpunit/php-code-coverage) < 8)
-Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.1 with php-composer(phpunit/php-file-iterator) < 3)
-Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
-Requires: (php-composer(phpunit/php-timer) >= 2.1 with php-composer(phpunit/php-timer) < 3)
-Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 4)
-Requires: (php-composer(sebastian/diff) >= 3.0 with php-composer(sebastian/diff) < 4)
-Requires: (php-composer(sebastian/environment) >= 4.1 with php-composer(sebastian/environment) < 5)
-Requires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4)
-Requires: (php-composer(sebastian/global-state) >= 3.0 with php-composer(sebastian/global-state) < 4)
-Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
-Requires: (php-composer(sebastian/resource-operations) >= 2.0 with php-composer(sebastian/resource-operations) < 3)
-Requires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3)
+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(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.0 with php-composer(phpspec/prophecy) < 2)
+Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.5 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)
+Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
+Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3)
+Requires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4)
+Requires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4)
+Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5)
+Requires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4)
+Requires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4)
+Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
+Requires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3)
+Requires: (php-composer(sebastian/type) >= 1.0.0 with php-composer(sebastian/type) < 2)
+Requires: (php-composer(sebastian/version) >= 2.0.1 with php-composer(sebastian/version) < 3)
# From composer.json, "suggest": {
-# "phpunit/php-invoker": "^2.0",
+# "phpunit/php-invoker": "^2.0.0",
# "ext-soap": "*",
# "ext-xdebug": "*"
-Requires: (php-composer(phpunit/php-invoker) >= 2.0 with php-composer(phpunit/php-invoker) < 3)
+Requires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3)
Suggests: php-soap
Suggests: php-xdebug
# remirepo:20
%else
-Requires: php-doctrine-instantiator11
-Requires: php-myclabs-deep-copy >= 1.7
-Requires: php-phar-io-manifest >= 1.0.1
-Requires: php-phar-io-version >= 1.0
-Requires: php-phpspec-prophecy >= 1.7
-Requires: php-phpunit-php-code-coverage7
-Requires: php-phpunit-php-file-iterator2 >= 2.0.1
+Requires: php-doctrine-instantiator11 >= 1.2.0
+Requires: php-myclabs-deep-copy19 >= 1.9.1
+Requires: php-phar-io-manifest >= 1.0.3
+Requires: php-phar-io-version >= 2.0.1
+Requires: php-phpspec-prophecy >= 1.8.0
+Requires: php-phpunit-php-code-coverage7 >= 7.0.5
+Requires: php-phpunit-php-file-iterator2 >= 2.0.2
Requires: php-phpunit-Text-Template >= 1.2.1
-Requires: php-phpunit-php-timer2 >= 2.1
-Requires: php-sebastian-comparator3
-Requires: php-sebastian-diff3
-Requires: php-sebastian-environment4 >= 4.1
+Requires: php-phpunit-php-timer2 >= 2.1.2
+Requires: php-sebastian-comparator3 >= 3.0.2
+Requires: php-sebastian-diff3 >= 3.0.2
+Requires: php-sebastian-environment4 >= 4.2.2
Requires: php-sebastian-exporter3 >= 3.1
Requires: php-sebastian-global-state3
Requires: php-sebastian-object-enumerator3 >= 3.0.3
-Requires: php-sebastian-resource-operations2
+Requires: php-sebastian-resource-operations2 >= 2.0.1
+Requires: php-sebastian-type
Requires: php-phpunit-Version >= 2.0.1
Requires: php-phpunit-php-invoker2
%endif
@@ -219,12 +223,16 @@ cat << 'EOF' | tee -a src/autoload.php
'%{php_home}/SebastianBergmann/GlobalState3/autoload.php',
'%{php_home}/SebastianBergmann/ObjectEnumerator3/autoload.php',
'%{php_home}/SebastianBergmann/ResourceOperations2/autoload.php',
+ '%{php_home}/SebastianBergmann/Type/autoload.php',
'%{php_home}/SebastianBergmann/Version/autoload.php',
[
- '%{php_home}/Doctrine/Instantiator11/autoload.php',
- '%{php_home}/Doctrine/Instantiator/autoload.php',
+ '%{php_home}/Doctrine/Instantiator11/autoload.php',
+ '%{php_home}/Doctrine/Instantiator/autoload.php',
+ ],
+ [
+ '%{php_home}/DeepCopy19/autoload.php',
+ '%{php_home}/DeepCopy/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',
@@ -271,6 +279,22 @@ exit $ret
%changelog
+* Fri Jun 7 2019 Remi Collet <remi@remirepo.net> - 8.2.0-1
+- update to 8.2.0
+- add dependency on sebastian/type
+- raise dependency on doctrine/instantiator 1.2.0
+- raise dependency on myclabs/deep-copy 1.9.1
+- raise dependency on phar-io/manifest 1.0.3
+- raise dependency on phar-io/version 2.0.1
+- raise dependency on phpspec/prophecy 1.8.0
+- raise dependency on phpunit/php-code-coverage 7.0.5
+- raise dependency on phpunit/php-file-iterator 2.0.2
+- raise dependency on phpunit/php-timer 2.1.2
+- raise dependency on sebastian/comparator 3.0.2
+- raise dependency on sebastian/diff 3.0.2
+- raise dependency on sebastian/environment 4.2.2
+- raise dependency on sebastian/resource-operations 2.0.1
+
* Tue May 28 2019 Remi Collet <remi@remirepo.net> - 8.1.6-1
- update to 8.1.6