diff options
| -rw-r--r-- | composer.json | 26 | ||||
| -rw-r--r-- | phpunit9-rpm.patch | 29 | ||||
| -rw-r--r-- | phpunit9.spec | 135 |
3 files changed, 104 insertions, 86 deletions
diff --git a/composer.json b/composer.json index d138fd0..bffa7d1 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "prefer-stable": true, "require": { - "php": "^7.3", + "php": "^7.3 || ^8.0", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -29,29 +29,29 @@ "ext-xml": "*", "ext-xmlwriter": "*", "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.10.3", - "phpunit/php-code-coverage": "^8.0.2", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-invoker": "^3.0.2", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.1", + "phar-io/version": "^3.0.2", + "phpspec/prophecy": "^1.11.1", + "phpunit/php-code-coverage": "^9.1.1", + "phpunit/php-file-iterator": "^3.0.4", + "phpunit/php-invoker": "^3.1", "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/diff": "^4.0.2", "sebastian/environment": "^5.1.2", "sebastian/exporter": "^4.0.2", - "sebastian/global-state": "^4.0", + "sebastian/global-state": "^5.0", "sebastian/object-enumerator": "^4.0.2", "sebastian/resource-operations": "^3.0.2", - "sebastian/type": "^2.1.1", + "sebastian/type": "^2.2.1", "sebastian/version": "^3.0.1" }, "require-dev": { "ext-PDO": "*", - "phpspec/prophecy-phpunit": "^2.0" + "phpspec/prophecy-phpunit": "^2.0.1" }, "config": { "platform": { @@ -87,7 +87,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-master": "9.3-dev" } } } diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index 5984d82..b6ccbc5 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2020-07-14 07:50:32.000000000 +0200 -+++ ./phpunit 2020-07-14 07:59:08.950883697 +0200 +--- ./phpunit.rpm 2020-08-10 12:02:07.000000000 +0200 ++++ ./phpunit 2020-08-10 12:02:22.089870229 +0200 @@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -43,21 +43,20 @@ diff -up ./phpunit.rpm ./phpunit +} else { + 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-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); -- $xsdFilename = __DIR__ . '/../../../phpunit.xsd'; -+ $xsdFilename = __DIR__ . '/../../phpunit.xsd'; +diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php +--- ./src/Util/Xml/SchemaFinder.php.rpm 2020-08-10 12:02:22.089870229 +0200 ++++ ./src/Util/Xml/SchemaFinder.php 2020-08-10 12:06:11.098559995 +0200 +@@ -48,6 +48,6 @@ final class SchemaFinder + return __PHPUNIT_PHAR_ROOT__ . '/'; + } - if (\defined('__PHPUNIT_PHAR_ROOT__')) { - $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; +- return __DIR__ . '/../../../'; ++ return __DIR__ . '/../../'; + } + } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2020-07-14 07:50:32.000000000 +0200 -+++ ./tests/bootstrap.php 2020-07-14 07:59:08.950883697 +0200 +--- ./tests/bootstrap.php.rpm 2020-08-10 12:02:07.000000000 +0200 ++++ ./tests/bootstrap.php 2020-08-10 12:02:22.089870229 +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 3f3dc37..b9c560c 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1c6a9e4312e209e659f1fce3ce88dd197c2448f6 +%global gh_commit 7115b00b23bcd4f62a73855c9615694d2f206e71 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -23,11 +23,11 @@ %global ns_vendor PHPUnit9 %global php_home %{_datadir}/php %global ver_major 9 -%global ver_minor 2 +%global ver_minor 3 %global specrel 1 Name: %{pk_project}%{ver_major} -Version: 9.2.6 +Version: 9.3.5 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} @@ -44,46 +44,46 @@ BuildRequires: php(language) >= 7.3 # remirepo:1 %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.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.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(myclabs/deep-copy) >= 1.10.1 with php-composer(myclabs/deep-copy) < 2) +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.11.1 with php-composer(phpspec/prophecy) < 2) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.0 with php-composer(phpunit/php-code-coverage) < 10) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) +BuildRequires: (php-composer(phpunit/php-invoker) >= 3.1 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/diff) >= 4.0.2 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/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) 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/type) >= 2.2.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.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.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-myclabs-deep-copy >= 1.10.1 +BuildRequires: php-phar-io-manifest2 >= 2.0.1 +BuildRequires: php-phar-io-version3 >= 3.0.2 +BuildRequires: php-phpspec-prophecy >= 1.11.1 +BuildRequires: php-phpunit-php-code-coverage9 >= 9.0 +BuildRequires: php-phpunit-php-file-iterator3 >= 3.0.4 +BuildRequires: php-phpunit-php-invoker3 >= 3.1 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-diff4 >= 4.0.2 BuildRequires: php-sebastian-environment5 >= 5.1.2 BuildRequires: php-sebastian-exporter4 >= 4.0.2 -BuildRequires: php-sebastian-global-state4 >= 4.0 +BuildRequires: php-sebastian-global-state5 >= 5.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-type2 >= 2.2.1 BuildRequires: php-sebastian-version3 >= 3.0.1 %endif BuildRequires: php-dom @@ -96,7 +96,7 @@ BuildRequires: php-xmlwriter BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { -# "php": "^7.3", +# "php": "^7.3 || ^8.0", # "ext-dom": "*", # "ext-json": "*", # "ext-libxml": "*", @@ -104,24 +104,24 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-xml": "*", # "ext-xmlwriter": "*", # "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.10.3", -# "phpunit/php-code-coverage": "^8.0.2", -# "phpunit/php-file-iterator": "^3.0.3", -# "phpunit/php-invoker": "^3.0.2", +# "myclabs/deep-copy": "^1.10.1", +# "phar-io/manifest": "^2.0.1", +# "phar-io/version": "^3.0.2", +# "phpspec/prophecy": "^1.11.1", +# "phpunit/php-code-coverage": "^9.0", +# "phpunit/php-file-iterator": "^3.0.4", +# "phpunit/php-invoker": "^3.1", # "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/diff": "^4.0.2", # "sebastian/environment": "^5.1.2", # "sebastian/exporter": "^4.0.2", -# "sebastian/global-state": "^4.0", +# "sebastian/global-state": "^5.0", # "sebastian/object-enumerator": "^4.0.2", # "sebastian/resource-operations": "^3.0.2", -# "sebastian/type": "^2.1.1", +# "sebastian/type": "^2.2.1", # "sebastian/version": "^3.0.1" Requires: php(language) >= 7.3 Requires: php-cli @@ -134,24 +134,24 @@ Requires: php-xmlwriter # remirepo:1 %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.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.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(myclabs/deep-copy) >= 1.10.1 with php-composer(myclabs/deep-copy) < 2) +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.11.1 with php-composer(phpspec/prophecy) < 2) +Requires: (php-composer(phpunit/php-code-coverage) >= 9.0 with php-composer(phpunit/php-code-coverage) < 10) +Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) +Requires: (php-composer(phpunit/php-invoker) >= 3.1 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/diff) >= 4.0.2 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/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) 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/type) >= 2.2.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": "*", @@ -161,24 +161,24 @@ Suggests: php-xdebug # remirepo:22 %else 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.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-myclabs-deep-copy >= 1.10.1 +Requires: php-phar-io-manifest2 >= 2.0.1 +Requires: php-phar-io-version3 >= 3.0.2 +Requires: php-phpspec-prophecy >= 1.11.1 +Requires: php-phpunit-php-code-coverage9 >= 9.0 +Requires: php-phpunit-php-file-iterator3 >= 3.0.4 +Requires: php-phpunit-php-invoker3 >= 3.1 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-diff4 >= 4.0.2 Requires: php-sebastian-environment5 >= 5.1.2 Requires: php-sebastian-exporter4 >= 4.0.2 -Requires: php-sebastian-global-state4 >= 4.0 +Requires: php-sebastian-global-state5 >= 5.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-type2 >= 2.2.1 Requires: php-sebastian-version3 >= 3.0.1 %endif # Autoloader @@ -218,7 +218,7 @@ find . -name \*.rpm -delete -print cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/SebastianBergmann/CodeCoverage8/autoload.php', + '%{php_home}/SebastianBergmann/CodeCoverage9/autoload.php', '%{php_home}/SebastianBergmann/FileIterator3/autoload.php', '%{php_home}/SebastianBergmann/Template2/autoload.php', '%{php_home}/SebastianBergmann/Timer5/autoload.php', @@ -229,15 +229,15 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/SebastianBergmann/Comparator4/autoload.php', '%{php_home}/SebastianBergmann/Environment5/autoload.php', '%{php_home}/SebastianBergmann/Exporter4/autoload.php', - '%{php_home}/SebastianBergmann/GlobalState4/autoload.php', + '%{php_home}/SebastianBergmann/GlobalState5/autoload.php', '%{php_home}/SebastianBergmann/ObjectEnumerator4/autoload.php', '%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php', '%{php_home}/SebastianBergmann/Type2/autoload.php', '%{php_home}/SebastianBergmann/Version3/autoload.php', '%{php_home}/Doctrine/Instantiator/autoload.php', '%{php_home}/DeepCopy/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', __DIR__ . '/Framework/Assert/Functions.php', ]); // Extensions @@ -255,12 +255,15 @@ cat src/autoload.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' \ + --exclude 'tests/end-to-end/migration/possibility-to-migrate-from-85-is-detected/src/Greeter.php' \ + --exclude 'tests/end-to-end/migration/possibility-to-migrate-from-85-is-detected/tests/GreeterTest.php' \ tests %install mkdir -p %{buildroot}%{php_home} cp -pr src %{buildroot}%{php_home}/%{ns_vendor} +cp -pr schema %{buildroot}%{php_home}/%{ns_vendor}/schema mkdir %{buildroot}%{php_home}/%{ns_vendor}/Extensions install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name} @@ -292,6 +295,22 @@ exit $ret %changelog +* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 9.3.5-1 +- update to 9.3.5 + +* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 9.3.3-1 +- update to 9.3.3 +- raise dependency on myclabs/deep-copy 1.10.1 +- raise dependency on phar-io/manifest 2.0.1 +- raise dependency on phar-io/version 3.0.2 +- raise dependency on phpspec/prophecy 1.11.1 +- raise dependency on phpunit/php-code-coverage 9.0 +- raise dependency on phpunit/php-file-iterator 3.0.4 +- raise dependency on phpunit/php-invoker 3.1 +- raise dependency on sebastian/diff 4.0.2 +- raise dependency on sebastian/global-state 5.0 +- raise dependency on sebastian/type 2.2.1 + * 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 |