diff options
| -rw-r--r-- | composer.json | 29 | ||||
| -rw-r--r-- | phpunit12-rpm.patch | 3 | ||||
| -rw-r--r-- | phpunit12.spec | 105 |
3 files changed, 67 insertions, 70 deletions
diff --git a/composer.json b/composer.json index 5698c7d..0c4d7fe 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy" }, - "minimum-stability": "dev", "prefer-stable": true, "require": { "php": ">=8.3", @@ -33,20 +32,20 @@ "myclabs/deep-copy": "^1.12.1", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", - "phpunit/php-code-coverage": "^12.0-dev", - "phpunit/php-file-iterator": "^6.0-dev", - "phpunit/php-invoker": "^6.0-dev", - "phpunit/php-text-template": "^5.0-dev", - "phpunit/php-timer": "^8.0-dev", - "sebastian/cli-parser": "^4.0-dev", - "sebastian/comparator": "^7.0-dev", - "sebastian/diff": "^7.0-dev", - "sebastian/environment": "^8.0-dev", - "sebastian/exporter": "^7.0-dev", - "sebastian/global-state": "^8.0-dev", - "sebastian/object-enumerator": "^7.0-dev", - "sebastian/type": "^6.0-dev", - "sebastian/version": "^6.0-dev", + "phpunit/php-code-coverage": "^12.0.0", + "phpunit/php-file-iterator": "^6.0.0", + "phpunit/php-invoker": "^6.0.0", + "phpunit/php-text-template": "^5.0.0", + "phpunit/php-timer": "^8.0.0", + "sebastian/cli-parser": "^4.0.0", + "sebastian/comparator": "^7.0.0", + "sebastian/diff": "^7.0.0", + "sebastian/environment": "^8.0.0", + "sebastian/exporter": "^7.0.0", + "sebastian/global-state": "^8.0.0", + "sebastian/object-enumerator": "^7.0.0", + "sebastian/type": "^6.0.0", + "sebastian/version": "^6.0.0", "staabm/side-effects-detector": "^1.0.5" }, "config": { diff --git a/phpunit12-rpm.patch b/phpunit12-rpm.patch index 3ed6d6a..7d4df55 100644 --- a/phpunit12-rpm.patch +++ b/phpunit12-rpm.patch @@ -118,7 +118,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; -@@ -28,10 +28,15 @@ if (!$composer && !$phar) { +@@ -28,10 +28,14 @@ if (!$composer && !$phar) { if ($composer) { if (!defined('PHPUNIT_COMPOSER_INSTALL')) { @@ -128,7 +128,6 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php - require_once __DIR__ . '/../vendor/autoload.php'; + require_once PHPUNIT_COMPOSER_INSTALL; -+ require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; + require_once __DIR__ . '/_files/CoveredFunction.php'; + require_once __DIR__ . '/_files/Generator.php'; + require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; diff --git a/phpunit12.spec b/phpunit12.spec index 6620706..bf3454f 100644 --- a/phpunit12.spec +++ b/phpunit12.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for phpunit11 +# remirepo/fedora spec file for phpunit12 # # SPDX-FileCopyrightText: Copyright 2010-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 @@ -13,14 +13,14 @@ %bcond_without tests -%if 0%{?fedora} == 41 +%if 0%{?fedora} >= 42 || 0%{?rhel} >= 10 %bcond_without defcmd %else %bcond_with defcmd %endif -%global gh_commit 9f2ebaf18f7741a5ee587f80a42632edaa42d424 -%global gh_date 2025-02-04 +%global gh_commit 24b58d4900e2a45dd2172e865b9c15ccee66c3e1 +%global gh_date 2025-02-07 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -28,17 +28,17 @@ %global pk_vendor phpunit %global pk_project phpunit # Namespace -%global ns_vendor PHPUnit11 +%global ns_vendor PHPUnit12 %global php_home %{_datadir}/php %global ver_major 12 %global ver_minor 0 -%global upstream_version 12.0.0 +%global upstream_version 12.0.1 #global upstream_prever dev Name: %{pk_project}%{ver_major} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 0%{?dist} +Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause @@ -55,20 +55,20 @@ BuildRequires: php(language) >= 8.3 BuildRequires: (php-composer(myclabs/deep-copy) >= 1.12.1 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 with php-composer(phpunit/php-code-coverage) < 13) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 6 with php-composer(phpunit/php-file-iterator) < 7) -BuildRequires: (php-composer(phpunit/php-invoker) >= 6 with php-composer(phpunit/php-invoker) < 7) -BuildRequires: (php-composer(phpunit/php-text-template) >= 5 with php-composer(phpunit/php-text-template) < 6) -BuildRequires: (php-composer(phpunit/php-timer) >= 8 with php-composer(phpunit/php-timer) < 9) -BuildRequires: (php-composer(sebastian/cli-parser) >= 4 with php-composer(sebastian/cli-parser) < 5) -BuildRequires: (php-composer(sebastian/comparator) >= 7 with php-composer(sebastian/comparator) < 8) -BuildRequires: (php-composer(sebastian/diff) >= 7 with php-composer(sebastian/diff) < 8) -BuildRequires: (php-composer(sebastian/environment) >= 8 with php-composer(sebastian/environment) < 9) -BuildRequires: (php-composer(sebastian/exporter) >= 7 with php-composer(sebastian/exporter) < 8) -BuildRequires: (php-composer(sebastian/global-state) >= 8 with php-composer(sebastian/global-state) < 9) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 7 with php-composer(sebastian/object-enumerator) < 8) -BuildRequires: (php-composer(sebastian/type) >= 6 with php-composer(sebastian/type) < 7) -BuildRequires: (php-composer(sebastian/version) >= 6 with php-composer(sebastian/version) < 7) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 12.0.0 with php-composer(phpunit/php-code-coverage) < 13) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 6.0.0 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.0.0 with php-composer(sebastian/cli-parser) < 5) +BuildRequires: (php-composer(sebastian/comparator) >= 7.0.0 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.0 with php-composer(sebastian/environment) < 9) +BuildRequires: (php-composer(sebastian/exporter) >= 7.0.0 with php-composer(sebastian/exporter) < 8) +BuildRequires: (php-composer(sebastian/global-state) >= 8.0.0 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/type) >= 6.0.0 with php-composer(sebastian/type) < 7) +BuildRequires: (php-composer(sebastian/version) >= 6.0.0 with php-composer(sebastian/version) < 7) BuildRequires: (php-composer(staabm/side-effects-detector) >= 1.0.5 with php-composer(staabm/side-effects-detector) < 2) BuildRequires: php-dom BuildRequires: php-json @@ -90,20 +90,20 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "myclabs/deep-copy": "^1.12.1", # "phar-io/manifest": "^2.0.4", # "phar-io/version": "^3.2.1", -# "phpunit/php-code-coverage": "^12.0", -# "phpunit/php-file-iterator": "^6.0", -# "phpunit/php-invoker": "^6.0", -# "phpunit/php-text-template": "^5.0", -# "phpunit/php-timer": "^8.0", -# "sebastian/cli-parser": "^4.0", -# "sebastian/comparator": "^7.0", -# "sebastian/diff": "^7.0", -# "sebastian/environment": "^8.0", -# "sebastian/exporter": "^7.0", -# "sebastian/global-state": "^8.0", -# "sebastian/object-enumerator": "^7.0", -# "sebastian/type": "^6.0", -# "sebastian/version": "^6.0", +# "phpunit/php-code-coverage": "^12.0.0", +# "phpunit/php-file-iterator": "^6.0.0", +# "phpunit/php-invoker": "^6.0.0", +# "phpunit/php-text-template": "^5.0.0", +# "phpunit/php-timer": "^8.0.0", +# "sebastian/cli-parser": "^4.0.0", +# "sebastian/comparator": "^7.0.0", +# "sebastian/diff": "^7.0.0", +# "sebastian/environment": "^8.0.0", +# "sebastian/exporter": "^7.0.0", +# "sebastian/global-state": "^8.0.0", +# "sebastian/object-enumerator": "^7.0.0", +# "sebastian/type": "^6.0.0", +# "sebastian/version": "^6.0.0", # "staabm/side-effects-detector": "^1.0.5" Requires: php(language) >= 8.3 Requires: php-cli @@ -116,20 +116,20 @@ Requires: php-xmlwriter Requires: (php-composer(myclabs/deep-copy) >= 1.12.1 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 with php-composer(phpunit/php-code-coverage) < 13) -Requires: (php-composer(phpunit/php-file-iterator) >= 6 with php-composer(phpunit/php-file-iterator) < 7) -Requires: (php-composer(phpunit/php-invoker) >= 6 with php-composer(phpunit/php-invoker) < 7) -Requires: (php-composer(phpunit/php-text-template) >= 5 with php-composer(phpunit/php-text-template) < 6) -Requires: (php-composer(phpunit/php-timer) >= 8 with php-composer(phpunit/php-timer) < 9) -Requires: (php-composer(sebastian/cli-parser) >= 4 with php-composer(sebastian/cli-parser) < 5) -Requires: (php-composer(sebastian/comparator) >= 7 with php-composer(sebastian/comparator) < 8) -Requires: (php-composer(sebastian/diff) >= 7 with php-composer(sebastian/diff) < 8) -Requires: (php-composer(sebastian/environment) >= 8 with php-composer(sebastian/environment) < 9) -Requires: (php-composer(sebastian/exporter) >= 7 with php-composer(sebastian/exporter) < 8) -Requires: (php-composer(sebastian/global-state) >= 8 with php-composer(sebastian/global-state) < 9) -Requires: (php-composer(sebastian/object-enumerator) >= 7 with php-composer(sebastian/object-enumerator) < 8) -Requires: (php-composer(sebastian/type) >= 6 with php-composer(sebastian/type) < 7) -Requires: (php-composer(sebastian/version) >= 6 with php-composer(sebastian/version) < 7) +Requires: (php-composer(phpunit/php-code-coverage) >= 12.0.0 with php-composer(phpunit/php-code-coverage) < 13) +Requires: (php-composer(phpunit/php-file-iterator) >= 6.0.0 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.0.0 with php-composer(sebastian/cli-parser) < 5) +Requires: (php-composer(sebastian/comparator) >= 7.0.0 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.0 with php-composer(sebastian/environment) < 9) +Requires: (php-composer(sebastian/exporter) >= 7.0.0 with php-composer(sebastian/exporter) < 8) +Requires: (php-composer(sebastian/global-state) >= 8.0.0 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/type) >= 6.0.0 with php-composer(sebastian/type) < 7) +Requires: (php-composer(sebastian/version) >= 6.0.0 with php-composer(sebastian/version) < 7) Requires: (php-composer(staabm/side-effects-detector) >= 1.0.5 with php-composer(staabm/side-effects-detector) < 2) # recommends latest versions # none @@ -138,7 +138,6 @@ Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 12.0.0 Requires: php-openssl Requires: php-pcntl -Requires: php-pcre Requires: php-phar %if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 @@ -265,7 +264,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 php82 php83 php84; do +for cmd in php php83 php84; do if which $cmd; then $cmd ./phpunit $OPT || ret=1 fi @@ -286,8 +285,8 @@ exit $ret %changelog -* Tue Feb 4 2025 Remi Collet <remi@remirepo.net> - 12.0.0-0 -- update to 12.0.0 (git snapshot) +* Fri Feb 7 2025 Remi Collet <remi@remirepo.net> - 12.0.1-1 +- update to 12.0.1 - raise dependency on PHP 8.3 - raise dependency on phpunit/php-code-coverage 12 - raise dependency on phpunit/php-file-iterator 6 |