summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2026-01-12 09:06:49 +0100
committerRemi Collet <remi@php.net>2026-01-12 09:06:49 +0100
commit7dc541bfe7dcd6ae0d6c35992f09b95ea7fb14c2 (patch)
tree4fdd538c0ba5aca96973576f72f161870a3ee655
parent589caf14005ca0363b88aa41b749f411ebc76673 (diff)
use doctrine/instantiator v2 only with PHP 8.4+
-rw-r--r--phpunit9.spec26
1 files changed, 23 insertions, 3 deletions
diff --git a/phpunit9.spec b/phpunit9.spec
index a7e7da1..102e576 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
#
@@ -30,7 +30,7 @@
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
+%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,7 +119,14 @@ 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
+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)
@@ -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',
@@ -268,6 +285,9 @@ 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+
+
* Tue Dec 9 2025 Remi Collet <remi@remirepo.net> - 9.6.31-1
- update to 9.6.31 (no change)