diff options
-rw-r--r-- | composer.json | 42 | ||||
-rw-r--r-- | phpunit10-rpm.patch | 54 | ||||
-rw-r--r-- | phpunit10.spec | 272 |
3 files changed, 190 insertions, 178 deletions
diff --git a/composer.json b/composer.json index 38117ea..238d001 100644 --- a/composer.json +++ b/composer.json @@ -21,44 +21,42 @@ }, "prefer-stable": true, "require": { - "php": ">=7.3", + "php": ">=8.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "doctrine/instantiator": "^1.3.1 || ^2", "myclabs/deep-copy": "^1.10.1", "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", - "phpunit/php-code-coverage": "^9.2.13", - "phpunit/php-file-iterator": "^3.0.5", - "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", - "sebastian/version": "^3.0.2" + "phpunit/php-code-coverage": "^10.0", + "phpunit/php-file-iterator": "^4.0", + "phpunit/php-invoker": "^4.0", + "phpunit/php-text-template": "^3.0", + "phpunit/php-timer": "^6.0", + "sebastian/cli-parser": "^2.0", + "sebastian/code-unit": "^2.0", + "sebastian/comparator": "^5.0", + "sebastian/diff": "^5.0", + "sebastian/environment": "^6.0", + "sebastian/exporter": "^5.0", + "sebastian/global-state": "^6.0", + "sebastian/object-enumerator": "^5.0", + "sebastian/recursion-context": "^5.0", + "sebastian/type": "^4.0", + "sebastian/version": "^4.0" }, "config": { "platform": { - "php": "7.3.0" + "php": "8.1.0" }, "optimize-autoloader": true, "sort-packages": true }, "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "ext-soap": "*" }, "bin": [ "phpunit" @@ -83,7 +81,7 @@ }, "extra": { "branch-alias": { - "dev-master": "9.6-dev" + "dev-main": "10.0-dev" } } } diff --git a/phpunit10-rpm.patch b/phpunit10-rpm.patch index 0360db7..1ce77f1 100644 --- a/phpunit10-rpm.patch +++ b/phpunit10-rpm.patch @@ -1,14 +1,11 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-12-30 09:04:15.000000000 +0100 -+++ ./phpunit 2021-12-30 09:05:07.774778660 +0100 -@@ -62,27 +62,11 @@ if (isset($GLOBALS['_composer_autoload_p +--- ./phpunit.rpm 2023-02-03 16:32:47.889941148 +0100 ++++ ./phpunit 2023-02-03 16:41:15.850841011 +0100 +@@ -62,29 +62,25 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); unset($GLOBALS['_composer_autoload_path']); -+} else if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) { -+ echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n"; -+ define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php')); - } else { +-} else { - foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) { - if (file_exists($file)) { - define('PHPUNIT_COMPOSER_INSTALL', $file); @@ -19,7 +16,7 @@ diff -up ./phpunit.rpm ./phpunit - - unset($file); -} -- + -if (!defined('PHPUNIT_COMPOSER_INSTALL')) { - fwrite( - STDERR, @@ -27,25 +24,32 @@ diff -up ./phpunit.rpm ./phpunit - ' composer install' . PHP_EOL . PHP_EOL . - 'You can learn all about Composer on https://getcomposer.org/.' . PHP_EOL - ); -- ++} else if (file_exists('./vendor/phpunit/phpunit/phpunit') && file_exists('./vendor/autoload.php')) { ++ echo "\n==== Redirecting to composer installed version in vendor/phpunit ====\n\n"; ++ define ('PHPUNIT_COMPOSER_INSTALL', realpath('./vendor/autoload.php')); + - die(1); -+ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit9/autoload.php'); ++} else { ++ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit10/autoload.php'); } - $options = getopt('', array('prepend:')); -@@ -95,4 +79,8 @@ unset($options); - require PHPUNIT_COMPOSER_INSTALL; --PHPUnit\TextUI\Command::main(); -+if (class_exists('PHPUnit_TextUI_Command')) { -+ PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older +-exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv'])); ++ ++if (class_exists('PHPUnit\\TextUI\\Application')) { ++ // PHPUnit v10 or newer ++ exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv'])); ++} else if (class_exists('PHPUnit_TextUI_Command')) { ++ // PHPUnit v5 or older ++ PHPUnit_TextUI_Command::main(); +} else { -+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer ++ // PHPUnit v6 to v9 ++ PHPUnit\TextUI\Command::main(); +} diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php ---- ./src/Util/Xml/SchemaFinder.php.rpm 2021-12-30 09:04:15.000000000 +0100 -+++ ./src/Util/Xml/SchemaFinder.php 2021-12-30 09:04:21.186910890 +0100 +--- ./src/Util/Xml/SchemaFinder.php.rpm 2023-02-03 10:51:19.000000000 +0100 ++++ ./src/Util/Xml/SchemaFinder.php 2023-02-03 16:32:47.889941148 +0100 @@ -48,6 +48,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -55,11 +59,11 @@ diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php } } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2021-12-30 09:04:15.000000000 +0100 -+++ ./tests/bootstrap.php 2021-12-30 09:04:21.186910890 +0100 -@@ -9,8 +9,8 @@ - */ - const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; +--- ./tests/bootstrap.php.rpm 2023-02-03 10:51:19.000000000 +0100 ++++ ./tests/bootstrap.php 2023-02-03 16:42:03.557642693 +0100 +@@ -11,8 +11,8 @@ if (!defined('TEST_FILES_PATH')) { + define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR); + } -$composer = file_exists(__DIR__ . '/../vendor/autoload.php'); -$phar = file_exists(__DIR__ . '/autoload.php'); @@ -68,7 +72,7 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php if ($composer && $phar) { print 'More than one test fixture autoloader is available, exiting.' . PHP_EOL; -@@ -26,10 +26,14 @@ if (!$composer && !$phar) { +@@ -28,10 +28,14 @@ if (!$composer && !$phar) { if ($composer) { if (!defined('PHPUNIT_COMPOSER_INSTALL')) { diff --git a/phpunit10.spec b/phpunit10.spec index 8c4e647..e0b52cd 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for phpunit9 +# remirepo/fedora spec file for phpunit10 # # Copyright (c) 2010-2023 Remi Collet # @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 70fc8be1d0b9fad56a199a4df5f9cfabfc246f84 +%global gh_commit c4c60c34c0e92045afce938510f8878d7cd84f8a #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -20,12 +20,12 @@ %global pk_vendor phpunit %global pk_project phpunit # Namespace -%global ns_vendor PHPUnit9 +%global ns_vendor PHPUnit10 %global php_home %{_datadir}/php -%global ver_major 9 -%global ver_minor 6 +%global ver_major 10 +%global ver_minor 0 -%global upstream_version 9.6.0 +%global upstream_version 10.0 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -49,46 +49,43 @@ BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-c BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.1 with php-composer(myclabs/deep-copy) < 2) BuildRequires: (php-composer(phar-io/manifest) >= 2.0.3 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.12.1 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.2.13 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/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) -BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) -BuildRequires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 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.5 with php-composer(sebastian/exporter) < 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) >= 3.2 with php-composer(sebastian/type) < 4) -BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) -# remirepo:23 +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 10.0 with php-composer(phpunit/php-code-coverage) < 11) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) +BuildRequires: (php-composer(phpunit/php-invoker) >= 4.0 with php-composer(phpunit/php-invoker) < 5) +BuildRequires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) +BuildRequires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) +BuildRequires: (php-composer(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) +BuildRequires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) +BuildRequires: (php-composer(sebastian/comparator) >= 5.0 with php-composer(sebastian/comparator) < 6) +BuildRequires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) +BuildRequires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) +BuildRequires: (php-composer(sebastian/exporter) >= 5.0 with php-composer(sebastian/exporter) < 6) +BuildRequires: (php-composer(sebastian/global-state) >= 6.0 with php-composer(sebastian/global-state) < 7) +BuildRequires: (php-composer(sebastian/object-enumerator) >= 5.0 with php-composer(sebastian/object-enumerator) < 6) +BuildRequires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) +BuildRequires: (php-composer(sebastian/type) >= 4.0 with php-composer(sebastian/type) < 5) +BuildRequires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) +# remirepo:21 %else -BuildRequires: php-doctrine-instantiator >= 1.3.1 BuildRequires: php-myclabs-deep-copy >= 1.10.1 BuildRequires: php-phar-io-manifest2 >= 2.0.3 BuildRequires: php-phar-io-version3 >= 3.0.2 -BuildRequires: php-phpspec-prophecy >= 1.12.1 -BuildRequires: php-phpunit-php-code-coverage9 >= 9.2.13 -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-cli-parser >= 1.0 -BuildRequires: php-sebastian-code-unit >= 1.0.5 -BuildRequires: php-sebastian-comparator4 >= 4.0.8 -BuildRequires: php-sebastian-diff4 >= 4.0.2 -BuildRequires: php-sebastian-environment5 >= 5.1.2 -BuildRequires: php-sebastian-exporter4 >= 4.0.5 -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-type3 >= 3.2 -BuildRequires: php-sebastian-version3 >= 3.0.1 +BuildRequires: php-phpunit-php-code-coverage10 +BuildRequires: php-phpunit-php-file-iterator4 +BuildRequires: php-phpunit-php-invoker4 +BuildRequires: php-phpunit-php-text-template3 +BuildRequires: php-phpunit-php-timer6 +BuildRequires: php-sebastian-cli-parser2 +BuildRequires: php-sebastian-code-unit2 +BuildRequires: php-sebastian-comparator5 +BuildRequires: php-sebastian-diff5 +BuildRequires: php-sebastian-environment6 +BuildRequires: php-sebastian-exporter5 +BuildRequires: php-sebastian-global-state6 +BuildRequires: php-sebastian-object-enumerator5 +BuildRequires: php-sebastian-recursion-context5 +BuildRequires: php-sebastian-type4 +BuildRequires: php-sebastian-version4 %endif BuildRequires: php-dom BuildRequires: php-json @@ -107,26 +104,25 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.3.1 || ^2", # "myclabs/deep-copy": "^1.10.1", # "phar-io/manifest": "^2.0.3", # "phar-io/version": "^3.0.2", -# "phpunit/php-code-coverage": "^9.2.13", -# "phpunit/php-file-iterator": "^3.0.5", -# "phpunit/php-invoker": "^3.1.1", -# "phpunit/php-text-template": "^2.0.3", -# "phpunit/php-timer": "^5.0.2", -# "sebastian/cli-parser": "^1.0.1", -# "sebastian/code-unit": "^1.0.6", -# "sebastian/comparator": "^4.0.8", -# "sebastian/diff": "^4.0.3", -# "sebastian/environment": "^5.1.3", -# "sebastian/exporter": "^4.0.5", -# "sebastian/global-state": "^5.0.1", -# "sebastian/object-enumerator": "^4.0.3", -# "sebastian/resource-operations": "^3.0.3", -# "sebastian/type": "^3.2", -# "sebastian/version": "^3.0.2" +# "phpunit/php-code-coverage": "^10.0", +# "phpunit/php-file-iterator": "^4.0", +# "phpunit/php-invoker": "^4.0", +# "phpunit/php-text-template": "^3.0", +# "phpunit/php-timer": "^6.0", +# "sebastian/cli-parser": "^2.0", +# "sebastian/code-unit": "^2.0", +# "sebastian/comparator": "^5.0", +# "sebastian/diff": "^5.0", +# "sebastian/environment": "^6.0", +# "sebastian/exporter": "^5.0", +# "sebastian/global-state": "^6.0", +# "sebastian/object-enumerator": "^5.0", +# "sebastian/recursion-context": "^5.0", +# "sebastian/type": "^4.0", +# "sebastian/version": "^4.0" Requires: php(language) >= 7.3 Requires: php-cli Requires: php-dom @@ -137,59 +133,53 @@ Requires: php-xml 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) < 3) Requires: (php-composer(myclabs/deep-copy) >= 1.10.1 with php-composer(myclabs/deep-copy) < 2) Requires: (php-composer(phar-io/manifest) >= 2.0.3 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.12.1 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 9.2.13 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/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) -Requires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) -Requires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 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.5 with php-composer(sebastian/exporter) < 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) >= 3.2 with php-composer(sebastian/type) < 4) -Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) +Requires: (php-composer(phpunit/php-code-coverage) >= 10.0 with php-composer(phpunit/php-code-coverage) < 11) +Requires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) +Requires: (php-composer(phpunit/php-invoker) >= 4.0 with php-composer(phpunit/php-invoker) < 5) +Requires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) +Requires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) +Requires: (php-composer(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) +Requires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) +Requires: (php-composer(sebastian/comparator) >= 5.0 with php-composer(sebastian/comparator) < 6) +Requires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) +Requires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) +Requires: (php-composer(sebastian/exporter) >= 5.0 with php-composer(sebastian/exporter) < 6) +Requires: (php-composer(sebastian/global-state) >= 6.0 with php-composer(sebastian/global-state) < 7) +Requires: (php-composer(sebastian/object-enumerator) >= 5.0 with php-composer(sebastian/object-enumerator) < 6) +Requires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) +Requires: (php-composer(sebastian/type) >= 4.0 with php-composer(sebastian/type) < 5) +Requires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) # From composer.json, "suggest": { # "ext-soap": "*", -# "ext-xdebug": "*" Suggests: php-soap -Suggests: php-xdebug -# remirepo:23 +# remirepo:21 %else -Requires: php-doctrine-instantiator >= 1.3.1 Requires: php-myclabs-deep-copy >= 1.10.1 Requires: php-phar-io-manifest2 >= 2.0.3 Requires: php-phar-io-version3 >= 3.0.2 -Requires: php-phpspec-prophecy >= 1.12.1 -Requires: php-phpunit-php-code-coverage9 >= 9.2.13 -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-cli-parser >= 1.0 -Requires: php-sebastian-code-unit >= 1.0.5 -Requires: php-sebastian-comparator4 >= 4.0.8 -Requires: php-sebastian-diff4 >= 4.0.2 -Requires: php-sebastian-environment5 >= 5.1.2 -Requires: php-sebastian-exporter4 >= 4.0.5 -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-type3 >= 3.2 -Requires: php-sebastian-version3 >= 3.0.1 +Requires: php-phpunit-php-code-coverage10 +Requires: php-phpunit-php-file-iterator4 +Requires: php-phpunit-php-invoker4 +Requires: php-phpunit-php-text-template3 +Requires: php-phpunit-php-timer6 +Requires: php-sebastian-cli-parser2 +Requires: php-sebastian-code-unit2 +Requires: php-sebastian-comparator5 +Requires: php-sebastian-diff5 +Requires: php-sebastian-environment6 +Requires: php-sebastian-exporter5 +Requires: php-sebastian-global-state6 +Requires: php-sebastian-object-enumerator5 +Requires: php-sebastian-recursion-context5 +Requires: php-sebastian-type4 +Requires: php-sebastian-version4 %endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 8.0.0 +# From phpcompatinfo report for version 10.0.0 Requires: php-reflection Requires: php-openssl Requires: php-pcntl @@ -223,33 +213,23 @@ find . -name \*.rpm -delete -print cat << 'EOF' | tee -a src/autoload.php // Dependencies -if (PHP_VERSION_ID > 80100) { - $inst = [ - '%{php_home}/Doctrine/Instantiator2/autoload.php', - '%{php_home}/Doctrine/Instantiator/autoload.php', - ]; -} else { - $inst = '%{php_home}/Doctrine/Instantiator/autoload.php'; -} \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/SebastianBergmann/CodeCoverage9/autoload.php', - '%{php_home}/SebastianBergmann/FileIterator3/autoload.php', - '%{php_home}/SebastianBergmann/Template2/autoload.php', - '%{php_home}/SebastianBergmann/Timer5/autoload.php', - $inst, - '%{php_home}/Prophecy/autoload.php', - '%{php_home}/SebastianBergmann/CliParser/autoload.php', - '%{php_home}/SebastianBergmann/CodeUnit/autoload.php', - '%{php_home}/SebastianBergmann/Invoker3/autoload.php', - '%{php_home}/SebastianBergmann/Diff4/autoload.php', - '%{php_home}/SebastianBergmann/Comparator4/autoload.php', - '%{php_home}/SebastianBergmann/Environment5/autoload.php', - '%{php_home}/SebastianBergmann/Exporter4/autoload.php', - '%{php_home}/SebastianBergmann/GlobalState5/autoload.php', - '%{php_home}/SebastianBergmann/ObjectEnumerator4/autoload.php', - '%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php', - '%{php_home}/SebastianBergmann/Type3/autoload.php', - '%{php_home}/SebastianBergmann/Version3/autoload.php', + '%{php_home}/SebastianBergmann/CodeCoverage10/autoload.php', + '%{php_home}/SebastianBergmann/FileIterator4/autoload.php', + '%{php_home}/SebastianBergmann/Template3/autoload.php', + '%{php_home}/SebastianBergmann/Timer6/autoload.php', + '%{php_home}/SebastianBergmann/CliParser2/autoload.php', + '%{php_home}/SebastianBergmann/CodeUnit2/autoload.php', + '%{php_home}/SebastianBergmann/Invoker4/autoload.php', + '%{php_home}/SebastianBergmann/Diff5/autoload.php', + '%{php_home}/SebastianBergmann/Comparator5/autoload.php', + '%{php_home}/SebastianBergmann/Environment6/autoload.php', + '%{php_home}/SebastianBergmann/Exporter5/autoload.php', + '%{php_home}/SebastianBergmann/GlobalState6/autoload.php', + '%{php_home}/SebastianBergmann/ObjectEnumerator5/autoload.php', + '%{php_home}/SebastianBergmann/RecursionContext5/autoload.php', + '%{php_home}/SebastianBergmann/Type4/autoload.php', + '%{php_home}/SebastianBergmann/Version4/autoload.php', '%{php_home}/DeepCopy/autoload.php', '%{php_home}/PharIo/Manifest2/autoload.php', '%{php_home}/PharIo/Version3/autoload.php', @@ -264,10 +244,15 @@ cat src/autoload.php %{_bindir}/phpab \ --output tests/autoload.php \ - --exclude 'tests/end-to-end/regression/4376/tests/Test.php' \ - --exclude 'tests/end-to-end/regression/2448/Test.php' \ - --exclude 'tests/end-to-end/migration/_files/possibility-to-migrate-from-85-is-detected/src/Greeter.php' \ - --exclude 'tests/end-to-end/migration/_files/possibility-to-migrate-from-85-is-detected/tests/GreeterTest.php' \ + --exclude 'tests/end-to-end/regression/4376/tests/Test.php' \ + --exclude 'tests/end-to-end/regression/2448/Test.php' \ + --exclude 'tests/end-to-end/migration/_files/possibility-to-migrate-from-85-is-detected/src/Greeter.php' \ + --exclude 'tests/end-to-end/migration/_files/possibility-to-migrate-from-85-is-detected/tests/GreeterTest.php' \ + --exclude 'tests/end-to-end/_files/coverage-annotation-based-filter/src/AnnotationFilter.php' \ + --exclude 'tests/end-to-end/_files/coverage-annotation-based-filter/tests/AnnotationFilterTest.php' \ + --exclude 'tests/end-to-end/event/_files/extension-bootstrap/tests/Test.php' \ + --exclude 'tests/end-to-end/migration/_files/possibility-to-migrate-from-92-is-detected/src/Greeter.php' \ + --exclude 'tests/end-to-end/migration/_files/possibility-to-migrate-from-92-is-detected/tests/GreeterTest.php' \ tests @@ -287,9 +272,9 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit ret=0 -for cmd in php php80 php81 php82; do +for cmd in php php81 php82; do if which $cmd; then - $cmd ./phpunit $OPT --verbose || ret=1 + $cmd ./phpunit $OPT || ret=1 fi done exit $ret @@ -306,6 +291,31 @@ exit $ret %changelog +* Fri Feb 3 2023 Remi Collet <remi@remirepo.net> - 10.0.0-1 +- update to 10.0.0 +- raise dependency on PHP 8.1 +- add dependency on sebastian/recursion-context +- drop dependency on doctrine/instantiator +- drop dependency on sebastian/resource-operations +- drop dependency on phpspec/prophecy +- raise dependency on phpunit/php-code-coverage 10 +- raise dependency on phpunit/php-file-iterator 4 +- raise dependency on phpunit/php-invoker 4 +- raise dependency on phpunit/php-text-template 3 +- raise dependency on phpunit/php-timer 6 +- raise dependency on sebastian/cli-parser 2 +- raise dependency on sebastian/code-unit 2 +- raise dependency on sebastian/comparator 5 +- raise dependency on sebastian/diff 5 +- raise dependency on sebastian/environment 6 +- raise dependency on sebastian/exporter 5 +- raise dependency on sebastian/global-state 6 +- raise dependency on sebastian/object-enumerator 5 +- raise dependency on sebastian/type 4 +- raise dependency on sebastian/version 3 +- rename to phpunit10 +- move to /usr/share/php/PHPUnit10 + * Fri Feb 3 2023 Remi Collet <remi@remirepo.net> - 9.6.0-1 - update to 9.6.0 |