From 7ad4bd19b4b8de707f5fbc2bdf6c9f3625fe6c88 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Feb 2026 10:40:27 +0100 Subject: update to 13.0.0 raise dependency on PHP 8.4 raise dependency on phpunit/php-code-coverage 13 raise dependency on phpunit/php-file-iterator 7 raise dependency on phpunit/php-invoker 7 raise dependency on phpunit/php-text-template 6 raise dependency on phpunit/php-timer 9 raise dependency on sebastian/cli-parser 5 raise dependency on sebastian/comparator 8 raise dependency on sebastian/diff 8 raise dependency on sebastian/environment 9 raise dependency on sebastian/exporter 8 raise dependency on sebastian/global-state 9 raise dependency on sebastian/object-enumerator 8 raise dependency on sebastian/type 7 raise dependency on sebastian/version 7 rename to phpunit13 move to /usr/share/php/PHPUnit13 --- composer.json | 36 ++++++------ phpunit13-rpm.patch | 2 +- phpunit13.spec | 164 +++++++++++++++++++++++++++++----------------------- 3 files changed, 111 insertions(+), 91 deletions(-) diff --git a/composer.json b/composer.json index 6f538c9..601d34b 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "prefer-stable": true, "require": { - "php": ">=8.3", + "php": ">=8.4.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -32,26 +32,26 @@ "myclabs/deep-copy": "^1.13.4", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", - "phpunit/php-code-coverage": "^12.5.2", - "phpunit/php-file-iterator": "^6.0.1", - "phpunit/php-invoker": "^6.0.0", - "phpunit/php-text-template": "^5.0.0", - "phpunit/php-timer": "^8.0.0", - "sebastian/cli-parser": "^4.2.0", - "sebastian/comparator": "^7.1.4", - "sebastian/diff": "^7.0.0", - "sebastian/environment": "^8.0.3", - "sebastian/exporter": "^7.0.2", - "sebastian/global-state": "^8.0.2", - "sebastian/object-enumerator": "^7.0.0", - "sebastian/recursion-context": "^7.0.1", - "sebastian/type": "^6.0.3", - "sebastian/version": "^6.0.0", + "phpunit/php-code-coverage": "^13.0.0", + "phpunit/php-file-iterator": "^7.0.0", + "phpunit/php-invoker": "^7.0.0", + "phpunit/php-text-template": "^6.0.0", + "phpunit/php-timer": "^9.0.0", + "sebastian/cli-parser": "^5.0.0", + "sebastian/comparator": "^8.0.0", + "sebastian/diff": "^8.0.0", + "sebastian/environment": "^9.0.0", + "sebastian/exporter": "^8.0.0", + "sebastian/global-state": "^9.0.0", + "sebastian/object-enumerator": "^8.0.0", + "sebastian/recursion-context": "^8.0.0", + "sebastian/type": "^7.0.0", + "sebastian/version": "^7.0.0", "staabm/side-effects-detector": "^1.0.5" }, "config": { "platform": { - "php": "8.3.0" + "php": "8.4.1" }, "classmap-authoritative": true, "optimize-autoloader": true, @@ -114,7 +114,7 @@ }, "extra": { "branch-alias": { - "dev-main": "12.5-dev" + "dev-main": "13.0-dev" } } } diff --git a/phpunit13-rpm.patch b/phpunit13-rpm.patch index 7d4df55..8e56aa0 100644 --- a/phpunit13-rpm.patch +++ b/phpunit13-rpm.patch @@ -30,7 +30,7 @@ diff -up ./phpunit.rpm ./phpunit - die(1); +} else { -+ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit12/autoload.php'); ++ define ('PHPUNIT_COMPOSER_INSTALL', '/usr/share/php/PHPUnit13/autoload.php'); } require PHPUNIT_COMPOSER_INSTALL; diff --git a/phpunit13.spec b/phpunit13.spec index 74ca382..0cf9892 100644 --- a/phpunit13.spec +++ b/phpunit13.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for phpunit12 +# remirepo/fedora spec file for phpunit13 # # SPDX-FileCopyrightText: Copyright 2010-2026 Remi Collet # SPDX-License-Identifier: CECILL-2.1 @@ -13,14 +13,14 @@ %bcond_without tests -%if 0%{?fedora} == 42 || 0%{?fedora} == 43 || 0%{?rhel} == 10 +%if 0%{?fedora} >= 44 || 0%{?rhel} >= 11 %bcond_without defcmd %else %bcond_with defcmd %endif -%global gh_commit 83d4c158526c879b4c5cf7149d27958b6d912373 -%global gh_date 2026-02-05 +%global gh_commit e045b31f855d4511a2091aa707a2bb0bb5456632 +%global gh_date 2026-02-06 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -28,12 +28,12 @@ %global pk_vendor phpunit %global pk_project phpunit # Namespace -%global ns_vendor PHPUnit12 +%global ns_vendor PHPUnit13 %global php_home %{_datadir}/php -%global ver_major 12 -%global ver_minor 5 +%global ver_major 13 +%global ver_minor 0 -%global upstream_version 12.5.9 +%global upstream_version 13.0.0 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -51,25 +51,25 @@ Source1: makesrc.sh Patch0: %{name}-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 8.3 +BuildRequires: php(language) >= 8.4.1 BuildRequires: (php-composer(myclabs/deep-copy) >= 1.13.4 with php-composer(myclabs/deep-copy) < 2) BuildRequires: (php-composer(phar-io/manifest) >= 2.0.4 with php-composer(phar-io/manifest) < 3) BuildRequires: (php-composer(phar-io/version) >= 3.2.1 with php-composer(phar-io/version) < 4) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 12.5.2 with php-composer(phpunit/php-code-coverage) < 13) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 6.0.1 with php-composer(phpunit/php-file-iterator) < 7) -BuildRequires: (php-composer(phpunit/php-invoker) >= 6.0.0 with php-composer(phpunit/php-invoker) < 7) -BuildRequires: (php-composer(phpunit/php-text-template) >= 5.0.0 with php-composer(phpunit/php-text-template) < 6) -BuildRequires: (php-composer(phpunit/php-timer) >= 8.0.0 with php-composer(phpunit/php-timer) < 9) -BuildRequires: (php-composer(sebastian/cli-parser) >= 4.2.0 with php-composer(sebastian/cli-parser) < 5) -BuildRequires: (php-composer(sebastian/comparator) >= 7.1.4 with php-composer(sebastian/comparator) < 8) -BuildRequires: (php-composer(sebastian/diff) >= 7.0.0 with php-composer(sebastian/diff) < 8) -BuildRequires: (php-composer(sebastian/environment) >= 8.0.3 with php-composer(sebastian/environment) < 9) -BuildRequires: (php-composer(sebastian/exporter) >= 7.0.2 with php-composer(sebastian/exporter) < 8) -BuildRequires: (php-composer(sebastian/global-state) >= 8.0.2 with php-composer(sebastian/global-state) < 9) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 7.0.0 with php-composer(sebastian/object-enumerator) < 8) -BuildRequires: (php-composer(sebastian/recursion-context) >= 7.0.1 with php-composer(sebastian/recursion-context) < 8) -BuildRequires: (php-composer(sebastian/type) >= 6.0.3 with php-composer(sebastian/type) < 7) -BuildRequires: (php-composer(sebastian/version) >= 6.0.0 with php-composer(sebastian/version) < 7) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 13.0.0 with php-composer(phpunit/php-code-coverage) < 14) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 7.0.0 with php-composer(phpunit/php-file-iterator) < 8) +BuildRequires: (php-composer(phpunit/php-invoker) >= 7.0.0 with php-composer(phpunit/php-invoker) < 8) +BuildRequires: (php-composer(phpunit/php-text-template) >= 6.0.0 with php-composer(phpunit/php-text-template) < 7) +BuildRequires: (php-composer(phpunit/php-timer) >= 9.0.0 with php-composer(phpunit/php-timer) < 10) +BuildRequires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-composer(sebastian/cli-parser) < 6) +BuildRequires: (php-composer(sebastian/comparator) >= 8.0.0 with php-composer(sebastian/comparator) < 9) +BuildRequires: (php-composer(sebastian/diff) >= 8.0.0 with php-composer(sebastian/diff) < 9) +BuildRequires: (php-composer(sebastian/environment) >= 9.0.0 with php-composer(sebastian/environment) < 10) +BuildRequires: (php-composer(sebastian/exporter) >= 8.0.0 with php-composer(sebastian/exporter) < 9) +BuildRequires: (php-composer(sebastian/global-state) >= 9.0.0 with php-composer(sebastian/global-state) < 10) +BuildRequires: (php-composer(sebastian/object-enumerator) >= 8.0.0 with php-composer(sebastian/object-enumerator) < 9) +BuildRequires: (php-composer(sebastian/recursion-context) >= 8.0.0 with php-composer(sebastian/recursion-context) < 9) +BuildRequires: (php-composer(sebastian/type) >= 7.0.0 with php-composer(sebastian/type) < 8) +BuildRequires: (php-composer(sebastian/version) >= 7.0.0 with php-composer(sebastian/version) < 8) BuildRequires: (php-composer(staabm/side-effects-detector) >= 1.0.5 with php-composer(staabm/side-effects-detector) < 2) BuildRequires: php-dom BuildRequires: php-json @@ -81,7 +81,7 @@ BuildRequires: php-xmlwriter BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { -# "php": ">=8.3", +# "php": ">=8.4.1", # "ext-dom": "*", # "ext-json": "*", # "ext-libxml": "*", @@ -91,23 +91,23 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "myclabs/deep-copy": "^1.13.4", # "phar-io/manifest": "^2.0.4", # "phar-io/version": "^3.2.1", -# "phpunit/php-code-coverage": "^12.5.2", -# "phpunit/php-file-iterator": "^6.0.1", -# "phpunit/php-invoker": "^6.0.0", -# "phpunit/php-text-template": "^5.0.0", -# "phpunit/php-timer": "^8.0.0", -# "sebastian/cli-parser": "^4.2.0", -# "sebastian/comparator": "^7.1.4", -# "sebastian/diff": "^7.0.0", -# "sebastian/environment": "^8.0.3", -# "sebastian/exporter": "^7.0.2", -# "sebastian/global-state": "^8.0.2", -# "sebastian/object-enumerator": "^7.0.0", -# "sebastian/recursion-context": "^7.0.1", -# "sebastian/type": "^6.0.3", -# "sebastian/version": "^6.0.0", +# "phpunit/php-code-coverage": "^13.0.0", +# "phpunit/php-file-iterator": "^7.0.0", +# "phpunit/php-invoker": "^7.0.0", +# "phpunit/php-text-template": "^6.0.0", +# "phpunit/php-timer": "^9.0.0", +# "sebastian/cli-parser": "^5.0.0", +# "sebastian/comparator": "^8.0.0", +# "sebastian/diff": "^8.0.0", +# "sebastian/environment": "^9.0.0", +# "sebastian/exporter": "^8.0.0", +# "sebastian/global-state": "^9.0.0", +# "sebastian/object-enumerator": "^8.0.0", +# "sebastian/recursion-context": "^8.0.0", +# "sebastian/type": "^7.0.0", +# "sebastian/version": "^7.0.0", # "staabm/side-effects-detector": "^1.0.5" -Requires: php(language) >= 8.3 +Requires: php(language) >= 8.4.1 Requires: php-cli Requires: php-dom Requires: php-json @@ -118,21 +118,21 @@ Requires: php-xmlwriter Requires: (php-composer(myclabs/deep-copy) >= 1.13.4 with php-composer(myclabs/deep-copy) < 2) Requires: (php-composer(phar-io/manifest) >= 2.0.4 with php-composer(phar-io/manifest) < 3) Requires: (php-composer(phar-io/version) >= 3.2.1 with php-composer(phar-io/version) < 4) -Requires: (php-composer(phpunit/php-code-coverage) >= 12.5.2 with php-composer(phpunit/php-code-coverage) < 13) -Requires: (php-composer(phpunit/php-file-iterator) >= 6.0.1 with php-composer(phpunit/php-file-iterator) < 7) -Requires: (php-composer(phpunit/php-invoker) >= 6.0.0 with php-composer(phpunit/php-invoker) < 7) -Requires: (php-composer(phpunit/php-text-template) >= 5.0.0 with php-composer(phpunit/php-text-template) < 6) -Requires: (php-composer(phpunit/php-timer) >= 8.0.0 with php-composer(phpunit/php-timer) < 9) -Requires: (php-composer(sebastian/cli-parser) >= 4.2.0 with php-composer(sebastian/cli-parser) < 5) -Requires: (php-composer(sebastian/comparator) >= 7.1.4 with php-composer(sebastian/comparator) < 8) -Requires: (php-composer(sebastian/diff) >= 7.0.0 with php-composer(sebastian/diff) < 8) -Requires: (php-composer(sebastian/environment) >= 8.0.3 with php-composer(sebastian/environment) < 9) -Requires: (php-composer(sebastian/exporter) >= 7.0.2 with php-composer(sebastian/exporter) < 8) -Requires: (php-composer(sebastian/global-state) >= 8.0.2 with php-composer(sebastian/global-state) < 9) -Requires: (php-composer(sebastian/object-enumerator) >= 7.0.0 with php-composer(sebastian/object-enumerator) < 8) -Requires: (php-composer(sebastian/recursion-context) >= 7.0.1 with php-composer(sebastian/recursion-context) < 8) -Requires: (php-composer(sebastian/type) >= 6.0.3 with php-composer(sebastian/type) < 7) -Requires: (php-composer(sebastian/version) >= 6.0.0 with php-composer(sebastian/version) < 7) +Requires: (php-composer(phpunit/php-code-coverage) >= 13.0.0 with php-composer(phpunit/php-code-coverage) < 14) +Requires: (php-composer(phpunit/php-file-iterator) >= 7.0.0 with php-composer(phpunit/php-file-iterator) < 8) +Requires: (php-composer(phpunit/php-invoker) >= 7.0.0 with php-composer(phpunit/php-invoker) < 8) +Requires: (php-composer(phpunit/php-text-template) >= 6.0.0 with php-composer(phpunit/php-text-template) < 7) +Requires: (php-composer(phpunit/php-timer) >= 9.0.0 with php-composer(phpunit/php-timer) < 10) +Requires: (php-composer(sebastian/cli-parser) >= 5.0.0 with php-composer(sebastian/cli-parser) < 6) +Requires: (php-composer(sebastian/comparator) >= 8.0.0 with php-composer(sebastian/comparator) < 9) +Requires: (php-composer(sebastian/diff) >= 8.0.0 with php-composer(sebastian/diff) < 9) +Requires: (php-composer(sebastian/environment) >= 9.0.0 with php-composer(sebastian/environment) < 10) +Requires: (php-composer(sebastian/exporter) >= 8.0.0 with php-composer(sebastian/exporter) < 9) +Requires: (php-composer(sebastian/global-state) >= 9.0.0 with php-composer(sebastian/global-state) < 10) +Requires: (php-composer(sebastian/object-enumerator) >= 8.0.0 with php-composer(sebastian/object-enumerator) < 9) +Requires: (php-composer(sebastian/recursion-context) >= 8.0.0 with php-composer(sebastian/recursion-context) < 9) +Requires: (php-composer(sebastian/type) >= 7.0.0 with php-composer(sebastian/type) < 8) +Requires: (php-composer(sebastian/version) >= 7.0.0 with php-composer(sebastian/version) < 8) Requires: (php-composer(staabm/side-effects-detector) >= 1.0.5 with php-composer(staabm/side-effects-detector) < 2) # recommends latest versions # remirepo:2 @@ -182,21 +182,21 @@ find . -name \*.rpm -delete -print cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/SebastianBergmann/CodeCoverage12/autoload.php', - '%{php_home}/SebastianBergmann/FileIterator6/autoload.php', - '%{php_home}/SebastianBergmann/Template5/autoload.php', - '%{php_home}/SebastianBergmann/Timer8/autoload.php', - '%{php_home}/SebastianBergmann/CliParser4/autoload.php', - '%{php_home}/SebastianBergmann/Invoker6/autoload.php', - '%{php_home}/SebastianBergmann/Diff7/autoload.php', - '%{php_home}/SebastianBergmann/Comparator7/autoload.php', - '%{php_home}/SebastianBergmann/Environment8/autoload.php', - '%{php_home}/SebastianBergmann/Exporter7/autoload.php', - '%{php_home}/SebastianBergmann/GlobalState8/autoload.php', - '%{php_home}/SebastianBergmann/ObjectEnumerator7/autoload.php', - '%{php_home}/SebastianBergmann/RecursionContext7/autoload.php', - '%{php_home}/SebastianBergmann/Type6/autoload.php', - '%{php_home}/SebastianBergmann/Version6/autoload.php', + '%{php_home}/SebastianBergmann/CodeCoverage13/autoload.php', + '%{php_home}/SebastianBergmann/FileIterator7/autoload.php', + '%{php_home}/SebastianBergmann/Template6/autoload.php', + '%{php_home}/SebastianBergmann/Timer9/autoload.php', + '%{php_home}/SebastianBergmann/CliParser5/autoload.php', + '%{php_home}/SebastianBergmann/Invoker7/autoload.php', + '%{php_home}/SebastianBergmann/Diff8/autoload.php', + '%{php_home}/SebastianBergmann/Comparator8/autoload.php', + '%{php_home}/SebastianBergmann/Environment9/autoload.php', + '%{php_home}/SebastianBergmann/Exporter8/autoload.php', + '%{php_home}/SebastianBergmann/GlobalState9/autoload.php', + '%{php_home}/SebastianBergmann/ObjectEnumerator8/autoload.php', + '%{php_home}/SebastianBergmann/RecursionContext8/autoload.php', + '%{php_home}/SebastianBergmann/Type7/autoload.php', + '%{php_home}/SebastianBergmann/Version7/autoload.php', '%{php_home}/staabm/SideEffectsDetector/autoload.php', '%{php_home}/DeepCopy/autoload.php', '%{php_home}/PharIo/Manifest2/autoload.php', @@ -277,7 +277,7 @@ 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 php83 php84 php85; do +for cmd in php php84 php85; do if which $cmd; then $cmd ./phpunit $OPT || ret=1 fi @@ -298,6 +298,26 @@ exit $ret %changelog +* Fri Feb 6 2026 Remi Collet - 13.0.0-1 +- update to 13.0.0 +- raise dependency on PHP 8.4 +- raise dependency on phpunit/php-code-coverage 13 +- raise dependency on phpunit/php-file-iterator 7 +- raise dependency on phpunit/php-invoker 7 +- raise dependency on phpunit/php-text-template 6 +- raise dependency on phpunit/php-timer 9 +- raise dependency on sebastian/cli-parser 5 +- raise dependency on sebastian/comparator 8 +- raise dependency on sebastian/diff 8 +- raise dependency on sebastian/environment 9 +- raise dependency on sebastian/exporter 8 +- raise dependency on sebastian/global-state 9 +- raise dependency on sebastian/object-enumerator 8 +- raise dependency on sebastian/type 7 +- raise dependency on sebastian/version 7 +- rename to phpunit13 +- move to /usr/share/php/PHPUnit13 + * Thu Feb 5 2026 Remi Collet - 12.5.9-1 - update to 12.5.9 - raise dependency on phpunit/php-file-iterator 6.0.1 -- cgit