diff options
| -rw-r--r-- | phpunit9.spec | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/phpunit9.spec b/phpunit9.spec index a021673..fa29fd4 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phpunit9 # -# SPDX-FileCopyrightText: Copyright 2010-2025 Remi Collet +# SPDX-FileCopyrightText: Copyright 2010-2026 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -11,8 +11,8 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b69489b312503bf8fa6d75a76916919d7d2fa6d4 -%global gh_date 2025-12-01 +%global gh_commit 945d0b7f346a084ce5549e95289962972c4272e5 +%global gh_date 2025-12-06 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -25,12 +25,12 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.30 +%global upstream_version 9.6.31 #global upstream_prever dev Name: %{pk_project}%{ver_major} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause @@ -43,7 +43,17 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 +# remirepo:1 +%if 0 BuildRequires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) +# remirepo:7 +%else +%if 0%{?fedora} >= 42 +BuildRequires: php-doctrine-instantiator2 +%else +BuildRequires: php-doctrine-instantiator >= 1.5 +%endif +%endif 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) @@ -109,11 +119,18 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter +# remirepo:1 +%if 0 Requires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) +# remirepo:4 +%else +Requires: php-doctrine-instantiator >= 1.5 +Recommends: php-doctrine-instantiator2 +%endif 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(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) +Recommends: (php-composer(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) Requires: (php-composer(phpunit/php-code-coverage) >= 9.2.31 with php-composer(phpunit/php-code-coverage) < 10) Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.6 with php-composer(phpunit/php-file-iterator) < 4) Requires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4) @@ -186,7 +203,7 @@ find . -name \*.rpm -delete -print cat << 'EOF' | tee -a src/autoload.php // Dependencies -if (PHP_VERSION_ID > 80100) { +if (PHP_VERSION_ID > 80400) { $inst = [ '%{php_home}/Doctrine/Instantiator2/autoload.php', '%{php_home}/Doctrine/Instantiator/autoload.php', @@ -216,10 +233,11 @@ if (PHP_VERSION_ID > 80100) { '%{php_home}/PharIo/Manifest2/autoload.php', '%{php_home}/PharIo/Version3/autoload.php', __DIR__ . '/Framework/Assert/Functions.php', - // May load Comparator/RecursionContext bad version - '%{php_home}/Prophecy/autoload.php', ]); // Extensions +\Fedora\Autoloader\Dependencies::optional([ + '%{php_home}/Prophecy/autoload.php', +]); \Fedora\Autoloader\Dependencies::optional( glob("%{php_home}/%{ns_vendor}/Extensions/*/autoload.php") ); @@ -268,6 +286,13 @@ exit $ret %changelog +* Mon Jan 12 2026 Remi Collet <remi@remirepo.net> - 9.6.31-2 +- use doctrine/instantiator v2 only with PHP 8.4+ +- phpspec/prophecy is optional + +* Tue Dec 9 2025 Remi Collet <remi@remirepo.net> - 9.6.31-1 +- update to 9.6.31 (no change) + * Tue Dec 2 2025 Remi Collet <remi@remirepo.net> - 9.6.30-1 - update to 9.6.30 (no change) |