From 02ab5a687d54e07003c7569f877ad9d6903083b2 Mon Sep 17 00:00:00 2001 From: Shawn Iwinski Date: Fri, 4 Sep 2020 21:50:16 -0400 Subject: [PATCH 01/12] allow phpunit8 and phpunit9 --- php-mnapoli-phpunit-easymock.spec | 34 ++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index a46bbed..c433758 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -21,15 +21,23 @@ %global php_min_ver 7.3 # "phpunit/phpunit": "^8.5|^9.0" %global phpunit8_min_ver 8.5 +%global phpunit9_min_ver 9.0 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} +# Rich dependencies supported? +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +%global with_rich_dependencies 1 +%else +%global with_rich_dependencies 0 +%endif + %{!?phpdir: %global phpdir %{_datadir}/php} Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -45,7 +53,9 @@ BuildArch: noarch %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} +# test suite run with all allowed versions BuildRequires: phpunit8 >= %{phpunit8_min_ver} +BuildRequires: phpunit9 >= %{phpunit9_min_ver} ## phpcompatinfo (computed from version 1.3.0) BuildRequires: php-reflection ## Autoloader @@ -54,7 +64,11 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} -Requires: phpunit8 >= %{phpunit8_min_ver} +# +%if %{with_rich_dependencies} +# Single version required at runtime +Requires: (phpunit8 >= %{phpunit8_min_ver} or phpunit9 >= %{phpunit9_min_ver}) +%endif # phpcompatinfo (computed from version 1.3.0) # # Autoloader @@ -85,10 +99,6 @@ cat <<'AUTOLOAD' | tee src/autoload.php require_once '%{phpdir}/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('EasyMock\\', __DIR__); - -\Fedora\Autoloader\Dependencies::required([ - '%{phpdir}/PHPUnit8/autoload.php', -]); AUTOLOAD @@ -109,7 +119,14 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit8) -for PHP_EXEC in "" php74; do +for PHP_EXEC in "" php73 php74; do + if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then + $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ + || RETURN_CODE=1 + fi +done +PHPUNIT=$(which phpunit9) +for PHP_EXEC in "" php73 php74 php80; do if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -130,6 +147,9 @@ exit $RETURN_CODE %changelog +* Mon Aug 24 2020 Remi Collet -1.3.0-2 +- allow phpunit8 and phpunit9 + * Fri Aug 21 2020 Shawn Iwinski - 1.3.0-1 - Update to 1.3.0 (RHBZ #1784948) From 90596556af2b0478835f3ba7aed7487ea257f676 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:10:17 +0000 Subject: [PATCH 02/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index c433758..6ea2a33 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 2%{?github_release}%{?dist} +Release: 3%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Aug 24 2020 Remi Collet -1.3.0-2 - allow phpunit8 and phpunit9 From d5bf29f550295a69cf4c24eeeca9af497c83e88a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 02:30:32 +0000 Subject: [PATCH 03/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index 6ea2a33..c646c75 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 3%{?github_release}%{?dist} +Release: 4%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From f67f3d64e9b6c24f3da6783190a11fa7d3a44553 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 07:53:26 +0000 Subject: [PATCH 04/12] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index c646c75..b90da4f 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 4%{?github_release}%{?dist} +Release: 5%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1367371ff42363090927cc548dc26af783407e57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:46:57 +0000 Subject: [PATCH 05/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index b90da4f..c620f2d 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 5%{?github_release}%{?dist} +Release: 6%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 1.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 2d67f99df2b27e307f16baa3b2084e78a006729b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 08:48:47 +0000 Subject: [PATCH 06/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index c620f2d..456bdf7 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 6%{?github_release}%{?dist} +Release: 7%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1.3.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d3fb1c9fa04f89acb7ea12b1c1eda356afe944b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 04:27:36 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index 456bdf7..e236d86 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 7%{?github_release}%{?dist} +Release: 8%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.3.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 1.3.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0454434e6b850b482dfa700f661330816349d77c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 20:57:57 +0000 Subject: [PATCH 08/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index e236d86..b7ee1df 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 8%{?github_release}%{?dist} +Release: 9%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 1.3.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From d7eda9203aa9a43474dba8d0585b82a4c9953b0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:44:44 +0000 Subject: [PATCH 09/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index b7ee1df..803aebe 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 9%{?github_release}%{?dist} +Release: 10%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.3.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.3.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 322882e2d1e4b0ab2b5ed6766fe48abed513a4e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 06:58:49 +0000 Subject: [PATCH 10/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index 803aebe..352dc5e 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 10%{?github_release}%{?dist} +Release: 11%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 1.3.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From bb0f9ab3d37e74746ed7931b9700db238fa02c81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:09:50 +0000 Subject: [PATCH 11/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index 352dc5e..313a944 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 11%{?github_release}%{?dist} +Release: 12%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.3.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 1.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 06c94458059ef0335a50c94288d6bd72551deedc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:15:03 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-mnapoli-phpunit-easymock.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-mnapoli-phpunit-easymock.spec b/php-mnapoli-phpunit-easymock.spec index 313a944..aad7f2a 100644 --- a/php-mnapoli-phpunit-easymock.spec +++ b/php-mnapoli-phpunit-easymock.spec @@ -37,7 +37,7 @@ Name: php-%{composer_vendor}-%{composer_project} Version: %{github_version} -Release: 12%{?github_release}%{?dist} +Release: 13%{?github_release}%{?dist} Summary: Helpers to build PHPUnit mocks License: MIT @@ -147,6 +147,9 @@ exit $RETURN_CODE %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.3.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 1.3.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild