summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-06-01 09:31:50 +0200
committerRemi Collet <remi@remirepo.net>2018-06-01 09:31:50 +0200
commit3685d0649dcca1f8753bfb7a8e0165dcc69eb664 (patch)
treeefcd7e1dc2c3198ec0148701651f86533db96365
parent161bd432cf09d208ce55e689d6b3e6c2fab055fc (diff)
update to 7.2.0
add dependency on doctrine/instantiator 1.1 raise dependency on myclabs/deep-copy 1.7 raise dependency on phpunit/php-code-coverage 6.0.6 raise dependency on phpunit/php-file-iterator 2.0 phpunit/phpunit-mock-objects is merged open https://github.com/sebastianbergmann/phpunit/issues/3155 TypeError: Return value of PHPUnit\Framework\TestCase::getStatus()...
-rw-r--r--composer.json14
-rw-r--r--phpunit7-rpm.patch12
-rw-r--r--phpunit7.spec63
3 files changed, 59 insertions, 30 deletions
diff --git a/composer.json b/composer.json
index 48b15a6..583b972 100644
--- a/composer.json
+++ b/composer.json
@@ -27,15 +27,15 @@
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
- "myclabs/deep-copy": "^1.6.1",
+ "doctrine/instantiator": "^1.1",
+ "myclabs/deep-copy": "^1.7",
"phar-io/manifest": "^1.0.1",
"phar-io/version": "^1.0",
"phpspec/prophecy": "^1.7",
- "phpunit/php-code-coverage": "^6.0.1",
- "phpunit/php-file-iterator": "^1.4.3",
+ "phpunit/php-code-coverage": "^6.0.6",
+ "phpunit/php-file-iterator": "^2.0",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.0",
- "phpunit/phpunit-mock-objects": "^6.1.1",
"sebastian/comparator": "^3.0",
"sebastian/diff": "^3.0",
"sebastian/environment": "^3.1",
@@ -48,6 +48,9 @@
"require-dev": {
"ext-PDO": "*"
},
+ "conflict": {
+ "phpunit/phpunit-mock-objects": "*"
+ },
"config": {
"platform": {
"php": "7.1.0"
@@ -57,6 +60,7 @@
},
"suggest": {
"phpunit/php-invoker": "^2.0",
+ "ext-soap": "*",
"ext-xdebug": "*"
},
"bin": [
@@ -80,7 +84,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "7.1-dev"
+ "dev-master": "7.2-dev"
}
}
}
diff --git a/phpunit7-rpm.patch b/phpunit7-rpm.patch
index 48385bc..15cf866 100644
--- a/phpunit7-rpm.patch
+++ b/phpunit7-rpm.patch
@@ -57,3 +57,15 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
// TODO: Figure out why these are required (the classes should be autoloaded instead)
require_once TEST_FILES_PATH . 'BeforeAndAfterTest.php';
+diff -up src/Util/Configuration.php.rpm src/Util/Configuration.php
+--- src/Util/Configuration.php.rpm 2018-06-01 08:58:20.650603791 +0200
++++ src/Util/Configuration.php 2018-06-01 08:58:28.559655848 +0200
+@@ -979,7 +979,7 @@ final class Configuration
+ private function validateConfigurationAgainstSchema(): void
+ {
+ $original = \libxml_use_internal_errors(true);
+- $xsdFilename = __DIR__ . '/../../phpunit.xsd';
++ $xsdFilename = __DIR__ . '/../phpunit.xsd';
+
+ if (\defined('__PHPUNIT_PHAR_ROOT__')) {
+ $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
diff --git a/phpunit7.spec b/phpunit7.spec
index f0bd67c..1375f6f 100644
--- a/phpunit7.spec
+++ b/phpunit7.spec
@@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit ca64dba53b88aba6af32aebc6b388068db95c435
+%global gh_commit be2835aff47ce925b53bc8a693d49c2973bd5f67
#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 PHPUnit7
%global php_home %{_datadir}/php
%global ver_major 7
-%global ver_minor 1
-%global ver_patch 5
+%global ver_minor 2
+%global ver_patch 0
%global specrel 1
Name: %{pk_project}%{ver_major}
@@ -43,15 +43,15 @@ BuildArch: noarch
BuildRequires: php(language) >= 7.1
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(myclabs/deep-copy) >= 1.6.1 with php-composer(myclabs/deep-copy) < 2)
+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) < 2)
BuildRequires: (php-composer(phpspec/prophecy) >= 1.7 with php-composer(phpspec/prophecy) < 2)
-BuildRequires: (php-composer(phpunit/php-code-coverage) >= 6.0.1 with php-composer(phpunit/php-code-coverage) < 7)
-BuildRequires: (php-composer(phpunit/php-file-iterator) >= 1.4.3 with php-composer(phpunit/php-file-iterator) < 2)
+BuildRequires: (php-composer(phpunit/php-code-coverage) >= 6.0.6 with php-composer(phpunit/php-code-coverage) < 7)
+BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0 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.0 with php-composer(phpunit/php-timer) < 3)
-BuildRequires: (php-composer(phpunit/phpunit-mock-objects) >= 6.1.1 with php-composer(phpunit/phpunit-mock-objects) < 7)
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) >= 3.1 with php-composer(sebastian/environment) < 4)
@@ -63,15 +63,15 @@ BuildRequires: (php-composer(sebastian/version) >= 2.0.1 with php-co
BuildRequires: (php-composer(phpunit/php-invoker) >= 2.0 with php-composer(phpunit/php-invoker) < 3)
# remirepo:20
%else
-BuildRequires: php-myclabs-deep-copy >= 1.6.1
+BuildRequires: php-doctrine-instantiator >= 1.1
+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-coverage6 >= 6.0.1
-BuildRequires: php-phpunit-File-Iterator >= 1.4.3
+BuildRequires: php-phpunit-php-code-coverage6 >= 6.0.6
+BuildRequires: php-phpunit-php-file-iterator2
BuildRequires: php-phpunit-Text-Template >= 1.2.1
BuildRequires: php-phpunit-php-timer2
-BuildRequires: php-phpunit-mock-objects6 >= 6.1.1
BuildRequires: php-sebastian-comparator3
BuildRequires: php-sebastian-diff3
BuildRequires: php-sebastian-environment3 >= 3.1
@@ -97,15 +97,15 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "ext-libxml": "*",
# "ext-mbstring": "*",
# "ext-xml": "*",
-# "myclabs/deep-copy": "^1.6.1",
+# "doctrine/instantiator": "^1.1",
+# "myclabs/deep-copy": "^1.7",
# "phar-io/manifest": "^1.0.1",
# "phar-io/version": "^1.0",
# "phpspec/prophecy": "^1.7",
-# "phpunit/php-code-coverage": "^6.0.1",
-# "phpunit/php-file-iterator": "^1.4.3",
+# "phpunit/php-code-coverage": "^6.0.6",
+# "phpunit/php-file-iterator": "^2.0",
# "phpunit/php-text-template": "^1.2.1",
# "phpunit/php-timer": "^2.0",
-# "phpunit/phpunit-mock-objects": "^6.1.1",
# "sebastian/comparator": "^3.0",
# "sebastian/diff": "^3.0",
# "sebastian/environment": "^3.1",
@@ -123,15 +123,15 @@ Requires: php-mbstring
Requires: php-xml
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(myclabs/deep-copy) >= 1.6.1 with php-composer(myclabs/deep-copy) < 2)
+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) < 2)
Requires: (php-composer(phpspec/prophecy) >= 1.7 with php-composer(phpspec/prophecy) < 2)
-Requires: (php-composer(phpunit/php-code-coverage) >= 6.0.1 with php-composer(phpunit/php-code-coverage) < 7)
-Requires: (php-composer(phpunit/php-file-iterator) >= 1.4.3 with php-composer(phpunit/php-file-iterator) < 2)
+Requires: (php-composer(phpunit/php-code-coverage) >= 6.0.6 with php-composer(phpunit/php-code-coverage) < 7)
+Requires: (php-composer(phpunit/php-file-iterator) >= 2.0 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.0 with php-composer(phpunit/php-timer) < 3)
-Requires: (php-composer(phpunit/phpunit-mock-objects) >= 6.1.1 with php-composer(phpunit/phpunit-mock-objects) < 7)
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) >= 3.1 with php-composer(sebastian/environment) < 4)
@@ -146,15 +146,15 @@ Requires: (php-composer(sebastian/version) >= 2.0.1 with php-co
Requires: (php-composer(phpunit/php-invoker) >= 2.0 with php-composer(phpunit/php-invoker) < 3)
# remirepo:20
%else
-Requires: php-myclabs-deep-copy >= 1.6.1
+Requires: php-doctrine-instantiator >= 1.1
+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-coverage6 >= 6.0.1
-Requires: php-phpunit-File-Iterator >= 1.4.3
+Requires: php-phpunit-php-code-coverage6 >= 6.0.6
+Requires: php-phpunit-php-file-iterator2
Requires: php-phpunit-Text-Template >= 1.2.1
Requires: php-phpunit-php-timer2
-Requires: php-phpunit-mock-objects6 >= 6.1.1
Requires: php-sebastian-comparator3
Requires: php-sebastian-diff3
Requires: php-sebastian-environment3 >= 3.1
@@ -180,6 +180,8 @@ Recommends: php-phpunit-dbunit4
#Suggests: php-phpunit-selenium
# remirepo:1
%endif
+# projects have been merged
+Obsoletes: php-phpunit-mock-objects6 < 6.1.3
%description
@@ -201,11 +203,10 @@ It is an instance of the xUnit architecture for unit testing frameworks.
cat << 'EOF' | tee -a src/autoload.php
// Dependencies
\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/File/Iterator/Autoload.php',
+ '%{php_home}/SebastianBergmann/FileIterator2/autoload.php',
'%{php_home}/Text/Template/Autoload.php',
'%{php_home}/SebastianBergmann/CodeCoverage6/autoload.php',
'%{php_home}/SebastianBergmann/Timer/autoload.php',
- '%{ns_vendor}/Framework/MockObject6/autoload.php',
'%{php_home}/Prophecy/autoload.php',
'%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2
'%{php_home}/SebastianBergmann/Comparator3/autoload.php',
@@ -215,6 +216,7 @@ cat << 'EOF' | tee -a src/autoload.php
'%{php_home}/SebastianBergmann/ObjectEnumerator3/autoload.php',
'%{php_home}/SebastianBergmann/ResourceOperations/autoload.php',
'%{php_home}/SebastianBergmann/Version/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',
@@ -240,6 +242,7 @@ mkdir -p %{buildroot}%{php_home}
cp -pr src %{buildroot}%{php_home}/%{ns_vendor}
install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name}
+install -p -m 644 phpunit.xsd %{buildroot}%{php_home}/%{ns_vendor}/phpunit.xsd
%check
@@ -266,6 +269,16 @@ exit $ret
%changelog
+* Fri Jun 1 2018 Remi Collet <remi@remirepo.net> - 7.2.0-1
+- update to 7.2.0
+- add dependency on doctrine/instantiator 1.1
+- raise dependency on myclabs/deep-copy 1.7
+- raise dependency on phpunit/php-code-coverage 6.0.6
+- raise dependency on phpunit/php-file-iterator 2.0
+- phpunit/phpunit-mock-objects is merged
+- open https://github.com/sebastianbergmann/phpunit/issues/3155
+ TypeError: Return value of PHPUnit\Framework\TestCase::getStatus()...
+
* Wed May 2 2018 Remi Collet <remi@remirepo.net> - 7.1.5-1
- update to 7.1.5
- raise dependency on sebastian/comparator 3.0