From ad7f95a4bb7c2523f3ba30bb071631d8d2749ada Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Feb 2025 11:52:23 +0100 Subject: [PATCH 1/5] enable tests --- php-sebastian-recursion-context7.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/php-sebastian-recursion-context7.spec b/php-sebastian-recursion-context7.spec index 40bfb29..fabbe5a 100644 --- a/php-sebastian-recursion-context7.spec +++ b/php-sebastian-recursion-context7.spec @@ -7,8 +7,7 @@ # Please, preserve the changelog entries # -# disabled until phpunit12 available -%bcond_with tests +%bcond_without tests %global gh_commit c405ae3a63e01b32eb71577f8ec1604e39858a7c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) @@ -26,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 7.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Recursively process PHP variables, version %{major} License: BSD-3-Clause @@ -103,6 +102,9 @@ exit $ret %changelog +* Mon Feb 10 2025 Remi Collet - 7.0.0-2 +- enable test suite + * Fri Feb 7 2025 Remi Collet - 7.0.0-1 - update to 7.0.0 - raise dependency on PHP 8.3 From 913a2abf7ae70d1c92682d620836c959b046ad24 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 26 Jun 2025 14:41:54 +0200 Subject: [PATCH 2/5] add upstream patch for test suite with phpunit 12.2 --- ...3c1e9e455d4c039cbbc4daf0bee85691729b.patch | 22 +++++++++++++++++++ php-sebastian-recursion-context7.spec | 8 ++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 31933c1e9e455d4c039cbbc4daf0bee85691729b.patch diff --git a/31933c1e9e455d4c039cbbc4daf0bee85691729b.patch b/31933c1e9e455d4c039cbbc4daf0bee85691729b.patch new file mode 100644 index 0000000..9759f92 --- /dev/null +++ b/31933c1e9e455d4c039cbbc4daf0bee85691729b.patch @@ -0,0 +1,22 @@ +From 31933c1e9e455d4c039cbbc4daf0bee85691729b Mon Sep 17 00:00:00 2001 +From: Sebastian Bergmann +Date: Thu, 26 Jun 2025 13:13:55 +0200 +Subject: [PATCH] Closes #31 + +--- + tests/ContextTest.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/ContextTest.php b/tests/ContextTest.php +index eec3f4f..b261f72 100644 +--- a/tests/ContextTest.php ++++ b/tests/ContextTest.php +@@ -107,7 +107,7 @@ public function testContainsFound(array|object $value, int $key): void + * @param array|object $value + */ + #[DataProvider('valuesProvider')] +- public function testContainsNotFound(array|object $value): void ++ public function testContainsNotFound(array|object $value, int $key): void + { + $context = new Context; + diff --git a/php-sebastian-recursion-context7.spec b/php-sebastian-recursion-context7.spec index fabbe5a..75a8b31 100644 --- a/php-sebastian-recursion-context7.spec +++ b/php-sebastian-recursion-context7.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 7.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Recursively process PHP variables, version %{major} License: BSD-3-Clause @@ -34,6 +34,8 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +Patch0: https://github.com/sebastianbergmann/recursion-context/commit/31933c1e9e455d4c039cbbc4daf0bee85691729b.patch + BuildArch: noarch BuildRequires: php(language) >= 8.3 BuildRequires: php-fedora-autoloader-devel @@ -63,6 +65,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch -P0 -p1 %build @@ -102,6 +105,9 @@ exit $ret %changelog +* Thu Jun 26 2025 Remi Collet - 7.0.0-3 +- add upstream patch for test suite with phpunit 12.2 + * Mon Feb 10 2025 Remi Collet - 7.0.0-2 - enable test suite From 2d3ea498d61aceb72113e40adac8598ef6713d8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:36:53 +0000 Subject: [PATCH 3/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-sebastian-recursion-context7.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sebastian-recursion-context7.spec b/php-sebastian-recursion-context7.spec index 75a8b31..cb2206f 100644 --- a/php-sebastian-recursion-context7.spec +++ b/php-sebastian-recursion-context7.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 7.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Recursively process PHP variables, version %{major} License: BSD-3-Clause @@ -105,6 +105,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 7.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jun 26 2025 Remi Collet - 7.0.0-3 - add upstream patch for test suite with phpunit 12.2 From 7122b8bea805147fae24a1f762144d9a94940c21 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Aug 2025 12:40:03 +0200 Subject: [PATCH 4/5] v7.0.1 --- .gitignore | 1 + php-sebastian-recursion-context7.spec | 16 ++++++++-------- sources | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ea1779d..e7ebaf8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-sebastian-recursion-context7-7.0.0-c405ae3.tgz +/php-sebastian-recursion-context7-7.0.1-0b01998.tgz diff --git a/php-sebastian-recursion-context7.spec b/php-sebastian-recursion-context7.spec index cb2206f..74f500a 100644 --- a/php-sebastian-recursion-context7.spec +++ b/php-sebastian-recursion-context7.spec @@ -9,11 +9,11 @@ %bcond_without tests -%global gh_commit c405ae3a63e01b32eb71577f8ec1604e39858a7c +%global gh_commit 0b01998a7d5b1f122911a66bebcb8d46f0c82d8c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project recursion-context -%global gh_date 2025-02-07 +%global gh_date 2025-08-13 # Packagist %global pk_vendor sebastian %global pk_project %{gh_project} @@ -24,8 +24,8 @@ %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 7.0.0 -Release: 4%{?dist} +Version: 7.0.1 +Release: 1%{?dist} Summary: Recursively process PHP variables, version %{major} License: BSD-3-Clause @@ -34,8 +34,6 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -Patch0: https://github.com/sebastianbergmann/recursion-context/commit/31933c1e9e455d4c039cbbc4daf0bee85691729b.patch - BuildArch: noarch BuildRequires: php(language) >= 8.3 BuildRequires: php-fedora-autoloader-devel @@ -65,7 +63,6 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch -P0 -p1 %build @@ -85,7 +82,7 @@ touch vendor/autoload.php : Run upstream test suite ret=0 -for cmd in php php83 php84; do +for cmd in php php83 php84 php85; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit12 || ret=1 @@ -105,6 +102,9 @@ exit $ret %changelog +* Wed Aug 13 2025 Remi Collet - 7.0.1-1 +- update to 7.0.1 + * Fri Jul 25 2025 Fedora Release Engineering - 7.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index ab0dcd5..ea43036 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-recursion-context7-7.0.0-c405ae3.tgz) = 6883c67d748bc11bc5005c51afc4d2567bd708a0182d4bd3ff4e3472ddbadafb04a69ef05b53c6d249dd77e36ea0a591cf0f9389ab5348417d168af1abb5d9dd +SHA512 (php-sebastian-recursion-context7-7.0.1-0b01998.tgz) = 18a176f0ced415f41dcc698bf39ba73a25c70f2a072097cb46387281a947674beeaa9f44ee59bb34b23923ed4b4319018c7886f8088934828afe6c3b9a1cba66 From 84cacaa11f359e035f06d53d58cf51583f5cddcd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Aug 2025 12:40:03 +0200 Subject: [PATCH 5/5] v7.0.1 (cherry picked from commit 7122b8bea805147fae24a1f762144d9a94940c21) --- .gitignore | 1 + php-sebastian-recursion-context7.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ea1779d..e7ebaf8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-sebastian-recursion-context7-7.0.0-c405ae3.tgz +/php-sebastian-recursion-context7-7.0.1-0b01998.tgz diff --git a/php-sebastian-recursion-context7.spec b/php-sebastian-recursion-context7.spec index 40bfb29..b04048d 100644 --- a/php-sebastian-recursion-context7.spec +++ b/php-sebastian-recursion-context7.spec @@ -7,14 +7,13 @@ # Please, preserve the changelog entries # -# disabled until phpunit12 available -%bcond_with tests +%bcond_without tests -%global gh_commit c405ae3a63e01b32eb71577f8ec1604e39858a7c +%global gh_commit 0b01998a7d5b1f122911a66bebcb8d46f0c82d8c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project recursion-context -%global gh_date 2025-02-07 +%global gh_date 2025-08-13 # Packagist %global pk_vendor sebastian %global pk_project %{gh_project} @@ -25,7 +24,7 @@ %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 7.0.0 +Version: 7.0.1 Release: 1%{?dist} Summary: Recursively process PHP variables, version %{major} @@ -83,7 +82,7 @@ touch vendor/autoload.php : Run upstream test suite ret=0 -for cmd in php php83 php84; do +for cmd in php php83 php84 php85; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit12 || ret=1 @@ -103,6 +102,10 @@ exit $ret %changelog +* Wed Aug 13 2025 Remi Collet - 7.0.1-1 +- update to 7.0.1 +- enable test suite + * Fri Feb 7 2025 Remi Collet - 7.0.0-1 - update to 7.0.0 - raise dependency on PHP 8.3 diff --git a/sources b/sources index ab0dcd5..ea43036 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-sebastian-recursion-context7-7.0.0-c405ae3.tgz) = 6883c67d748bc11bc5005c51afc4d2567bd708a0182d4bd3ff4e3472ddbadafb04a69ef05b53c6d249dd77e36ea0a591cf0f9389ab5348417d168af1abb5d9dd +SHA512 (php-sebastian-recursion-context7-7.0.1-0b01998.tgz) = 18a176f0ced415f41dcc698bf39ba73a25c70f2a072097cb46387281a947674beeaa9f44ee59bb34b23923ed4b4319018c7886f8088934828afe6c3b9a1cba66