From c9a7b38851e5cc69957cb38edbf9da28e584d664 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:29:05 +0000 Subject: [PATCH 01/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- phpunit9.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpunit9.spec b/phpunit9.spec index 27c8a40..dd4ad46 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -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 @@ -254,6 +254,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 9.6.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Jul 10 2023 Remi Collet - 9.6.10-1 - update to 9.6.10 From d7c31635dbf5f5282c4b4cdd52aa2cd7e92488b6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Aug 2023 11:13:56 +0200 Subject: [PATCH 02/24] v9.6.11 --- .gitignore | 1 + phpunit9.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b2ecda5..be53553 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /phpunit9-9.6.8-17d621b.tgz /phpunit9-9.6.9-a9aceaf.tgz /phpunit9-9.6.10-a6d3516.tgz +/phpunit9-9.6.11-810500e.tgz diff --git a/phpunit9.spec b/phpunit9.spec index dd4ad46..638ddd8 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -8,10 +8,8 @@ # Please, preserve the changelog entries # -# For compatibility with SCL -%undefine __brp_mangle_shebangs -%global gh_commit a6d351645c3fe5a30f5e86be6577d946af65a328 +%global gh_commit 810500e92855eba8a7a5319ae913be2da6f957b0 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,12 +23,12 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.10 +%global upstream_version 9.6.11 #global upstream_prever dev Name: %{pk_project}%{ver_major} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause @@ -237,7 +235,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 php80 php81 php82; do +for cmd in php php80 php81 php82 php83; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -254,6 +252,9 @@ exit $ret %changelog +* Sun Aug 20 2023 Remi Collet - 9.6.11-1 +- update to 9.6.11 + * Fri Jul 21 2023 Fedora Release Engineering - 9.6.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 1f32953..9c56c51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.10-a6d3516.tgz) = 63ac6facc5082dfee7f02ca3c25d3ec107f12cebf52a05cea09dc1175f4ef172a4de2ec44ffc11458f5d72806c0409f702c9c592ae05542825a13a3275eaee80 +SHA512 (phpunit9-9.6.11-810500e.tgz) = e08b83b84420eeb2bd4e0da86b85d8212ba3a7332fdc0593fe6baf2a9ed973b5f2fda322ec65f37aba42fe1c1ce0352162ebcbb73c82d315bc1332592f513d48 From ea3eda18ed40187e3393cc12655069c499bd9ce7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Sep 2023 09:17:05 +0200 Subject: [PATCH 03/24] update to 9.6.12 raise dependency on phpunit/php-code-coverage 9.2.28 --- .gitignore | 1 + phpunit9.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index be53553..b391497 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /phpunit9-9.6.9-a9aceaf.tgz /phpunit9-9.6.10-a6d3516.tgz /phpunit9-9.6.11-810500e.tgz +/phpunit9-9.6.12-a122c2e.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 638ddd8..42d7ff5 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,7 +9,7 @@ # -%global gh_commit 810500e92855eba8a7a5319ae913be2da6f957b0 +%global gh_commit a122c2ebd469b751d774aa0f613dc0d67697653f #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -23,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.11 +%global upstream_version 9.6.12 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -83,7 +83,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "myclabs/deep-copy": "^1.10.1", # "phar-io/manifest": "^2.0.3", # "phar-io/version": "^3.0.2", -# "phpunit/php-code-coverage": "^9.2.13", +# "phpunit/php-code-coverage": "^9.2.28", # "phpunit/php-file-iterator": "^3.0.5", # "phpunit/php-invoker": "^3.1.1", # "phpunit/php-text-template": "^2.0.3", @@ -112,7 +112,7 @@ Requires: (php-composer(myclabs/deep-copy) >= 1.10.1 with php-c Requires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) Requires: (php-composer(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 9.2.13 with php-composer(phpunit/php-code-coverage) < 10) +Requires: (php-composer(phpunit/php-code-coverage) >= 9.2.28 with php-composer(phpunit/php-code-coverage) < 10) Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) Requires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4) Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) @@ -252,6 +252,10 @@ exit $ret %changelog +* Wed Sep 13 2023 Remi Collet - 9.6.12-1 +- update to 9.6.12 +- raise dependency on phpunit/php-code-coverage 9.2.28 + * Sun Aug 20 2023 Remi Collet - 9.6.11-1 - update to 9.6.11 diff --git a/sources b/sources index 9c56c51..bcd937d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.11-810500e.tgz) = e08b83b84420eeb2bd4e0da86b85d8212ba3a7332fdc0593fe6baf2a9ed973b5f2fda322ec65f37aba42fe1c1ce0352162ebcbb73c82d315bc1332592f513d48 +SHA512 (phpunit9-9.6.12-a122c2e.tgz) = 5a303f901b122d3d752c0b1aa59e857103e3fd1b0d67c8068d52c30a8010f776fed70a6d0104fcb1ae83020ceb090a86ae9a67fbca82f6b5b4fc13888ffbf97e From 55903c3bfb95c58279fc9103cd26792df66012e9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Sep 2023 10:26:37 +0200 Subject: [PATCH 04/24] v9.6.13 --- .gitignore | 1 + phpunit9.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b391497..5066159 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /phpunit9-9.6.10-a6d3516.tgz /phpunit9-9.6.11-810500e.tgz /phpunit9-9.6.12-a122c2e.tgz +/phpunit9-9.6.13-f3d767f.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 42d7ff5..87b40d0 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,7 +9,7 @@ # -%global gh_commit a122c2ebd469b751d774aa0f613dc0d67697653f +%global gh_commit f3d767f7f9e191eab4189abe41ab37797e30b1be #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -23,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.12 +%global upstream_version 9.6.13 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -252,6 +252,9 @@ exit $ret %changelog +* Tue Sep 19 2023 Remi Collet - 9.6.13-1 +- update to 9.6.13 + * Wed Sep 13 2023 Remi Collet - 9.6.12-1 - update to 9.6.12 - raise dependency on phpunit/php-code-coverage 9.2.28 diff --git a/sources b/sources index bcd937d..d4bde64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.12-a122c2e.tgz) = 5a303f901b122d3d752c0b1aa59e857103e3fd1b0d67c8068d52c30a8010f776fed70a6d0104fcb1ae83020ceb090a86ae9a67fbca82f6b5b4fc13888ffbf97e +SHA512 (phpunit9-9.6.13-f3d767f.tgz) = 964c90ef08cd50034992b958e2c32f832ea02c00447ab01016e02df83235bffc234d5795eae255a6f0ad35685b31751a2a3ff23a133feec896a9865106a25885 From ea354af6bcb715f3088e2a29c6daca88d4fd62e1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Dec 2023 10:27:24 +0100 Subject: [PATCH 05/24] v9.6.14 --- .gitignore | 1 + phpunit9.spec | 14 +++++++++++--- sources | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5066159..67e2faf 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /phpunit9-9.6.11-810500e.tgz /phpunit9-9.6.12-a122c2e.tgz /phpunit9-9.6.13-f3d767f.tgz +/phpunit9-9.6.14-43653e6.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 87b40d0..1f0657e 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,7 +9,7 @@ # -%global gh_commit f3d767f7f9e191eab4189abe41ab37797e30b1be +%global gh_commit 43653e6ad7adc22e7b667dd561bf8fcb74c10cf0 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -23,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.13 +%global upstream_version 9.6.14 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -145,6 +145,11 @@ Requires: php-pcre Requires: php-phar Requires: php-spl +%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 +Provides: php-composer(phpunit/phpunit) = %{version} +Provides: phpunit = %{version}-%{release} +%endif + %description PHPUnit is a programmer-oriented testing framework for PHP. @@ -235,7 +240,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 php80 php81 php82 php83; do +for cmd in php php81 php82 php83; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -252,6 +257,9 @@ exit $ret %changelog +* Fri Dec 1 2023 Remi Collet - 9.6.14-1 +- update to 9.6.14 (no change) + * Tue Sep 19 2023 Remi Collet - 9.6.13-1 - update to 9.6.13 diff --git a/sources b/sources index d4bde64..1971ef4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.13-f3d767f.tgz) = 964c90ef08cd50034992b958e2c32f832ea02c00447ab01016e02df83235bffc234d5795eae255a6f0ad35685b31751a2a3ff23a133feec896a9865106a25885 +SHA512 (phpunit9-9.6.14-43653e6.tgz) = f09239bfaf3ed65dd346f268c84fa4abd887577d76e3654810e87c0d9dab92884eddee79d0c3fb3e658d99ce8244edc3b3fde3987a9f69e459e5e28d7334e9fd From 8011a9b571641f2a14fb2efd4c415f0528b8dcb0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Dec 2023 10:41:05 +0100 Subject: [PATCH 06/24] update to 9.6.15 --- .gitignore | 1 + phpunit9.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 67e2faf..284b801 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /phpunit9-9.6.12-a122c2e.tgz /phpunit9-9.6.13-f3d767f.tgz /phpunit9-9.6.14-43653e6.tgz +/phpunit9-9.6.15-05017b8.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 1f0657e..ddbe663 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,7 +9,7 @@ # -%global gh_commit 43653e6ad7adc22e7b667dd561bf8fcb74c10cf0 +%global gh_commit 05017b80304e0eb3f31d90194a563fd53a6021f1 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -23,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.14 +%global upstream_version 9.6.15 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -257,6 +257,9 @@ exit $ret %changelog +* Sat Dec 2 2023 Remi Collet - 9.6.15-1 +- update to 9.6.15 + * Fri Dec 1 2023 Remi Collet - 9.6.14-1 - update to 9.6.14 (no change) diff --git a/sources b/sources index 1971ef4..82a9a3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.14-43653e6.tgz) = f09239bfaf3ed65dd346f268c84fa4abd887577d76e3654810e87c0d9dab92884eddee79d0c3fb3e658d99ce8244edc3b3fde3987a9f69e459e5e28d7334e9fd +SHA512 (phpunit9-9.6.15-05017b8.tgz) = 44fe992cd9b90231774fa88efafbe47097463c223ea8383856f458c14b755eafbdaa28b3f64805130fe4822a7bf04dc5e7b633c5634d7d4abb7422fe078f00a5 From 5adb848777bd59d6e618c12cdb3111bfcf2d32b7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Jan 2024 09:39:47 +0100 Subject: [PATCH 07/24] v9.6.16 --- .gitignore | 1 + makesrc.sh | 5 +++-- phpunit9.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 284b801..131768b 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /phpunit9-9.6.13-f3d767f.tgz /phpunit9-9.6.14-43653e6.tgz /phpunit9-9.6.15-05017b8.tgz +/phpunit9-9.6.16-3767b2c.tgz diff --git a/makesrc.sh b/makesrc.sh index 3580b58..2b84cb1 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -1,6 +1,7 @@ #!/bin/bash NAME=$(basename $PWD) +DATE=$(sed -n '/^%global gh_date/{s/.* //;p}' $NAME.spec) OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) @@ -10,11 +11,11 @@ SHORT=${COMMIT:0:7} if [ -f $NAME-$VERSION-$SHORT.tgz ]; then echo "$NAME-$VERSION-$SHORT.tgz already there" else - echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Date=$DATE\n" echo "Cloning..." rm -rf $PROJECT-$COMMIT - git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + git clone --jobs 8 https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 echo "Getting commit..." pushd $PROJECT-$COMMIT diff --git a/phpunit9.spec b/phpunit9.spec index ddbe663..b0c25e2 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,8 +9,8 @@ # -%global gh_commit 05017b80304e0eb3f31d90194a563fd53a6021f1 -#global gh_date 20150927 +%global gh_commit 3767b2c56ce02d01e3491046f33466a1ae60a37f +%global gh_date 2024-01-19 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.15 +%global upstream_version 9.6.16 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -190,7 +190,6 @@ if (PHP_VERSION_ID > 80100) { '%{php_home}/SebastianBergmann/Template2/autoload.php', '%{php_home}/SebastianBergmann/Timer5/autoload.php', $inst, - '%{php_home}/Prophecy/autoload.php', '%{php_home}/SebastianBergmann/CliParser/autoload.php', '%{php_home}/SebastianBergmann/CodeUnit/autoload.php', '%{php_home}/SebastianBergmann/Invoker3/autoload.php', @@ -207,6 +206,8 @@ 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( @@ -257,6 +258,9 @@ exit $ret %changelog +* Fri Jan 19 2024 Remi Collet - 9.6.16-1 +- update to 9.6.16 + * Sat Dec 2 2023 Remi Collet - 9.6.15-1 - update to 9.6.15 diff --git a/sources b/sources index 82a9a3a..58d8ff6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.15-05017b8.tgz) = 44fe992cd9b90231774fa88efafbe47097463c223ea8383856f458c14b755eafbdaa28b3f64805130fe4822a7bf04dc5e7b633c5634d7d4abb7422fe078f00a5 +SHA512 (phpunit9-9.6.16-3767b2c.tgz) = 315ab73ffcb1e071eb2d4adc3debc206835e85484e9cd8d3c3f2a00649c8184dafdde95deb3afe7d67f3c0ca2b5e27146a92754def54200ae03ddb2ba87a010e From 4609046f225117da9fa469a86901d1dd3d31517a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:40:07 +0000 Subject: [PATCH 08/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- phpunit9.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpunit9.spec b/phpunit9.spec index b0c25e2..50e9af3 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -28,7 +28,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 @@ -258,6 +258,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 9.6.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Remi Collet - 9.6.16-1 - update to 9.6.16 From f456e5d8cf624433752bdb514507727e060325ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:27:31 +0000 Subject: [PATCH 09/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- phpunit9.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpunit9.spec b/phpunit9.spec index 50e9af3..3d5f647 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -28,7 +28,7 @@ Name: %{pk_project}%{ver_major} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause @@ -258,6 +258,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 9.6.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 9.6.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9cb7c80fab3cb0c62cf2d305b82ae9f7ff4de483 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Feb 2024 10:01:53 +0100 Subject: [PATCH 10/24] v9.6.17 --- .gitignore | 1 + phpunit9.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 131768b..b4f39c3 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /phpunit9-9.6.14-43653e6.tgz /phpunit9-9.6.15-05017b8.tgz /phpunit9-9.6.16-3767b2c.tgz +/phpunit9-9.6.17-1a15698.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 3d5f647..44911c8 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phpunit9 # -# Copyright (c) 2010-2023 Remi Collet +# Copyright (c) 2010-2024 Remi Collet # # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ @@ -9,8 +9,8 @@ # -%global gh_commit 3767b2c56ce02d01e3491046f33466a1ae60a37f -%global gh_date 2024-01-19 +%global gh_commit 1a156980d78a6666721b7e8e8502fe210b587fcd +%global gh_date 2024-02-23 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,12 +23,12 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.16 +%global upstream_version 9.6.17 #global upstream_prever dev Name: %{pk_project}%{ver_major} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 3%{?dist} +Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause @@ -135,6 +135,10 @@ Suggests: php-soap Suggests: php-xdebug # recommends latest versions Recommends: phpunit10 +# Fedora 38+ only until 8.1 EOL +%if 0%{?fedora} >= 38 +Recommends: phpunit11 +%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 @@ -258,6 +262,9 @@ exit $ret %changelog +* Mon Feb 26 2024 Remi Collet - 9.6.17-1 +- update to 9.6.17 + * Thu Jan 25 2024 Fedora Release Engineering - 9.6.16-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 58d8ff6..5f8374c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.16-3767b2c.tgz) = 315ab73ffcb1e071eb2d4adc3debc206835e85484e9cd8d3c3f2a00649c8184dafdde95deb3afe7d67f3c0ca2b5e27146a92754def54200ae03ddb2ba87a010e +SHA512 (phpunit9-9.6.17-1a15698.tgz) = 4b2a614588c01dbbd85b6aa47a981b3c803094a92ff16dee7ba3495029c5ce3984eed91448bab6483300fc1bdbfb671a22f78ac3ee38d762590df7b0dff35536 From 885250f83e5cdef113ce1a04350b72b891f70951 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Mar 2024 13:54:06 +0100 Subject: [PATCH 11/24] v9.6.18 --- .gitignore | 1 + makesrc.sh | 6 ++++-- phpunit9-rpm.patch | 46 +++++++++++++++++++++++++++++++++++++--------- phpunit9.spec | 9 ++++++--- sources | 2 +- 5 files changed, 49 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index b4f39c3..63ff9d6 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /phpunit9-9.6.15-05017b8.tgz /phpunit9-9.6.16-3767b2c.tgz /phpunit9-9.6.17-1a15698.tgz +/phpunit9-9.6.18-32c2c2d.tgz diff --git a/makesrc.sh b/makesrc.sh index 2b84cb1..c85b319 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -8,6 +8,8 @@ VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} +DATE=$(date -d "$DATE -4 days" +%Y-%m-%d) + if [ -f $NAME-$VERSION-$SHORT.tgz ]; then echo "$NAME-$VERSION-$SHORT.tgz already there" else @@ -15,11 +17,11 @@ else echo "Cloning..." rm -rf $PROJECT-$COMMIT - git clone --jobs 8 https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 echo "Getting commit..." pushd $PROJECT-$COMMIT - git checkout $COMMIT || exit1 + git checkout $COMMIT || exit 1 cp composer.json ../composer.json popd diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index be09111..e9698bf 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,7 +1,7 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-12-30 09:04:15.000000000 +0100 -+++ ./phpunit 2021-12-30 09:05:07.774778660 +0100 -@@ -62,27 +62,11 @@ if (isset($GLOBALS['_composer_autoload_p +--- ./phpunit.rpm 2024-02-26 09:34:48.000000000 +0100 ++++ ./phpunit 2024-03-06 10:19:22.109376592 +0100 +@@ -71,27 +71,11 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); unset($GLOBALS['_composer_autoload_path']); @@ -33,7 +33,7 @@ diff -up ./phpunit.rpm ./phpunit } $options = getopt('', array('prepend:')); -@@ -95,4 +79,13 @@ unset($options); +@@ -104,4 +88,13 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; @@ -48,10 +48,38 @@ diff -up ./phpunit.rpm ./phpunit + // PHPUnit v6 to v9 + PHPUnit\TextUI\Command::main(); +} +diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php +--- ./src/TextUI/Command.php.rpm 2024-03-06 10:19:26.914560422 +0100 ++++ ./src/TextUI/Command.php 2024-03-06 10:19:32.787785106 +0100 +@@ -600,7 +600,7 @@ class Command + $this->printVersionString(); + + $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit'); +- $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . explode('.', Version::series())[0]); ++ $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=explode('.', Version::series())[0]); + + $notLatest = version_compare($latestVersion, Version::id(), '>'); + $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>'); +@@ -617,6 +617,7 @@ class Command + Version::id(), + $latestCompatibleVersion, + ); ++ printf('Try a system update for new phpunit%s package.' . PHP_EOL, $major); + } + + if ($notLatest) { +@@ -624,6 +625,7 @@ class Command + 'The latest version is PHPUnit %s.' . PHP_EOL, + $latestVersion, + ); ++ printf('Try to install and use the phpunit%s command.' . PHP_EOL, explode('.', $latestVersion)[0]); + } + + exit(TestRunner::SUCCESS_EXIT); diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php ---- ./src/Util/Xml/SchemaFinder.php.rpm 2021-12-30 09:04:15.000000000 +0100 -+++ ./src/Util/Xml/SchemaFinder.php 2021-12-30 09:04:21.186910890 +0100 -@@ -48,6 +48,6 @@ final class SchemaFinder +--- ./src/Util/Xml/SchemaFinder.php.rpm 2024-02-26 09:34:48.000000000 +0100 ++++ ./src/Util/Xml/SchemaFinder.php 2024-03-06 10:19:22.109376592 +0100 +@@ -75,6 +75,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -60,8 +88,8 @@ diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php } } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2021-12-30 09:04:15.000000000 +0100 -+++ ./tests/bootstrap.php 2021-12-30 09:04:21.186910890 +0100 +--- ./tests/bootstrap.php.rpm 2024-02-26 09:34:48.000000000 +0100 ++++ ./tests/bootstrap.php 2024-03-06 10:19:22.109376592 +0100 @@ -9,8 +9,8 @@ */ const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; diff --git a/phpunit9.spec b/phpunit9.spec index 44911c8..564fd7a 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,8 +9,8 @@ # -%global gh_commit 1a156980d78a6666721b7e8e8502fe210b587fcd -%global gh_date 2024-02-23 +%global gh_commit 32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04 +%global gh_date 2024-03-21 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.17 +%global upstream_version 9.6.18 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -262,6 +262,9 @@ exit $ret %changelog +* Thu Mar 21 2024 Remi Collet - 9.6.18-1 +- update to 9.6.18 + * Mon Feb 26 2024 Remi Collet - 9.6.17-1 - update to 9.6.17 diff --git a/sources b/sources index 5f8374c..1e7ea3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.17-1a15698.tgz) = 4b2a614588c01dbbd85b6aa47a981b3c803094a92ff16dee7ba3495029c5ce3984eed91448bab6483300fc1bdbfb671a22f78ac3ee38d762590df7b0dff35536 +SHA512 (phpunit9-9.6.18-32c2c2d.tgz) = fd507fcc71ae2a927515dd2c088fe3714ca6d83bf97568d81e9f5334aa1cc2f205a09eeb02da33d6d1f222ab145c472664264bfaf80bbf67eaf555d1294fe529 From 5c0f9308413d069d5678f54fbf9fb7d5c20aa485 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Apr 2024 09:35:52 +0200 Subject: [PATCH 12/24] update to 9.6.19 (no change) --- .gitignore | 1 + phpunit9-rpm.patch | 33 ++++++++++++++++++++------------- phpunit9.spec | 9 ++++++--- sources | 2 +- 4 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 63ff9d6..00e3018 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /phpunit9-9.6.16-3767b2c.tgz /phpunit9-9.6.17-1a15698.tgz /phpunit9-9.6.18-32c2c2d.tgz +/phpunit9-9.6.19-a1a54a4.tgz diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index e9698bf..7e082fe 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2024-02-26 09:34:48.000000000 +0100 -+++ ./phpunit 2024-03-06 10:19:22.109376592 +0100 +--- ./phpunit.rpm 2024-03-21 13:50:22.000000000 +0100 ++++ ./phpunit 2024-03-21 13:59:15.659377103 +0100 @@ -71,27 +71,11 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); @@ -49,9 +49,9 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); +} diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php ---- ./src/TextUI/Command.php.rpm 2024-03-06 10:19:26.914560422 +0100 -+++ ./src/TextUI/Command.php 2024-03-06 10:19:32.787785106 +0100 -@@ -600,7 +600,7 @@ class Command +--- ./src/TextUI/Command.php.rpm 2024-03-21 13:50:22.000000000 +0100 ++++ ./src/TextUI/Command.php 2024-03-21 13:59:59.517211974 +0100 +@@ -601,13 +601,13 @@ class Command $this->printVersionString(); $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit'); @@ -60,25 +60,32 @@ diff -up ./src/TextUI/Command.php.rpm ./src/TextUI/Command.php $notLatest = version_compare($latestVersion, Version::id(), '>'); $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>'); -@@ -617,6 +617,7 @@ class Command + + if ($notLatest || $notLatestCompatible) { +- print 'You are not using the latest version of PHPUnit.' . PHP_EOL; ++ print 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL; + } else { + print 'You are using the latest version of PHPUnit.' . PHP_EOL; + } +@@ -618,6 +618,7 @@ class Command Version::id(), $latestCompatibleVersion, ); -+ printf('Try a system update for new phpunit%s package.' . PHP_EOL, $major); ++ printf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); } if ($notLatest) { -@@ -624,6 +625,7 @@ class Command +@@ -625,6 +626,7 @@ class Command 'The latest version is PHPUnit %s.' . PHP_EOL, $latestVersion, ); -+ printf('Try to install and use the phpunit%s command.' . PHP_EOL, explode('.', $latestVersion)[0]); ++ printf('Try to install and use the phpunit%s command.' . PHP_EOL . PHP_EOL, explode('.', $latestVersion)[0]); } exit(TestRunner::SUCCESS_EXIT); diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php ---- ./src/Util/Xml/SchemaFinder.php.rpm 2024-02-26 09:34:48.000000000 +0100 -+++ ./src/Util/Xml/SchemaFinder.php 2024-03-06 10:19:22.109376592 +0100 +--- ./src/Util/Xml/SchemaFinder.php.rpm 2024-03-21 13:50:22.000000000 +0100 ++++ ./src/Util/Xml/SchemaFinder.php 2024-03-21 13:59:15.659377103 +0100 @@ -75,6 +75,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -88,8 +95,8 @@ diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php } } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2024-02-26 09:34:48.000000000 +0100 -+++ ./tests/bootstrap.php 2024-03-06 10:19:22.109376592 +0100 +--- ./tests/bootstrap.php.rpm 2024-03-21 13:50:22.000000000 +0100 ++++ ./tests/bootstrap.php 2024-03-21 13:59:15.659377103 +0100 @@ -9,8 +9,8 @@ */ const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; diff --git a/phpunit9.spec b/phpunit9.spec index 564fd7a..f2b5727 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,8 +9,8 @@ # -%global gh_commit 32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04 -%global gh_date 2024-03-21 +%global gh_commit a1a54a473501ef4cdeaae4e06891674114d79db8 +%global gh_date 2024-04-05 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.18 +%global upstream_version 9.6.19 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -262,6 +262,9 @@ exit $ret %changelog +* Fri Apr 5 2024 Remi Collet - 9.6.19-1 +- update to 9.6.19 (no change) + * Thu Mar 21 2024 Remi Collet - 9.6.18-1 - update to 9.6.18 diff --git a/sources b/sources index 1e7ea3e..4246c50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.18-32c2c2d.tgz) = fd507fcc71ae2a927515dd2c088fe3714ca6d83bf97568d81e9f5334aa1cc2f205a09eeb02da33d6d1f222ab145c472664264bfaf80bbf67eaf555d1294fe529 +SHA512 (phpunit9-9.6.19-a1a54a4.tgz) = ec1830102ec0c5212968b6a20c5b2efaeda616bbd6d2a4c4750e10bc4cfe9960ffdad82cd9595f2f1934cc9b16c43e70b0abbd1b4899d8657d3a5901061ac9c3 From 9db5ae6fdb1c4d3676d8f467eb1e6bc70ebcae35 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 11 Jul 2024 07:47:36 +0200 Subject: [PATCH 13/24] update to 9.6.20 (no change) raise dependencies --- .gitignore | 1 + phpunit9.spec | 112 ++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 60 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 00e3018..ec131eb 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /phpunit9-9.6.17-1a15698.tgz /phpunit9-9.6.18-32c2c2d.tgz /phpunit9-9.6.19-a1a54a4.tgz +/phpunit9-9.6.20-49d7820.tgz diff --git a/phpunit9.spec b/phpunit9.spec index f2b5727..555590e 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,8 +9,8 @@ # -%global gh_commit a1a54a473501ef4cdeaae4e06891674114d79db8 -%global gh_date 2024-04-05 +%global gh_commit 49d7820565836236411f5dc002d16dd689cde42f +%global gh_date 2024-07-10 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.19 +%global upstream_version 9.6.20 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -41,26 +41,26 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 -BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 3) -BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.1 with php-composer(myclabs/deep-copy) < 2) -BuildRequires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) -BuildRequires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) +BuildRequires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) +BuildRequires: (php-composer(myclabs/deep-copy) >= 1.12.0 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(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.2.13 with php-composer(phpunit/php-code-coverage) < 10) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.2.31 with php-composer(phpunit/php-code-coverage) < 10) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.6 with php-composer(phpunit/php-file-iterator) < 4) BuildRequires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4) -BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) -BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6) -BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) -BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) +BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.4 with php-composer(phpunit/php-text-template) < 3) +BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.3 with php-composer(phpunit/php-timer) < 6) +BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0.2 with php-composer(sebastian/cli-parser) < 2) +BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.8 with php-composer(sebastian/code-unit) < 2) BuildRequires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) -BuildRequires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5) -BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -BuildRequires: (php-composer(sebastian/exporter) >= 4.0.5 with php-composer(sebastian/exporter) < 5) -BuildRequires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) -BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5) -BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4) -BuildRequires: (php-composer(sebastian/type) >= 3.2 with php-composer(sebastian/type) < 4) +BuildRequires: (php-composer(sebastian/diff) >= 4.0.6 with php-composer(sebastian/diff) < 5) +BuildRequires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) +BuildRequires: (php-composer(sebastian/exporter) >= 4.0.6 with php-composer(sebastian/exporter) < 5) +BuildRequires: (php-composer(sebastian/global-state) >= 5.0.7 with php-composer(sebastian/global-state) < 6) +BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.4 with php-composer(sebastian/object-enumerator) < 5) +BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) < 4) +BuildRequires: (php-composer(sebastian/type) >= 3.2.1 with php-composer(sebastian/type) < 4) BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) BuildRequires: php-dom BuildRequires: php-json @@ -79,25 +79,25 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.3.1 || ^2", -# "myclabs/deep-copy": "^1.10.1", -# "phar-io/manifest": "^2.0.3", -# "phar-io/version": "^3.0.2", -# "phpunit/php-code-coverage": "^9.2.28", -# "phpunit/php-file-iterator": "^3.0.5", +# "doctrine/instantiator": "^1.5.0 || ^2", +# "myclabs/deep-copy": "^1.12.0", +# "phar-io/manifest": "^2.0.4", +# "phar-io/version": "^3.2.1", +# "phpunit/php-code-coverage": "^9.2.31", +# "phpunit/php-file-iterator": "^3.0.6", # "phpunit/php-invoker": "^3.1.1", -# "phpunit/php-text-template": "^2.0.3", -# "phpunit/php-timer": "^5.0.2", -# "sebastian/cli-parser": "^1.0.1", -# "sebastian/code-unit": "^1.0.6", +# "phpunit/php-text-template": "^2.0.4", +# "phpunit/php-timer": "^5.0.3", +# "sebastian/cli-parser": "^1.0.2", +# "sebastian/code-unit": "^1.0.8", # "sebastian/comparator": "^4.0.8", -# "sebastian/diff": "^4.0.3", -# "sebastian/environment": "^5.1.3", -# "sebastian/exporter": "^4.0.5", -# "sebastian/global-state": "^5.0.1", -# "sebastian/object-enumerator": "^4.0.3", -# "sebastian/resource-operations": "^3.0.3", -# "sebastian/type": "^3.2", +# "sebastian/diff": "^4.0.6", +# "sebastian/environment": "^5.1.5", +# "sebastian/exporter": "^4.0.6", +# "sebastian/global-state": "^5.0.7", +# "sebastian/object-enumerator": "^4.0.4", +# "sebastian/resource-operations": "^3.0.4", +# "sebastian/type": "^3.2.1", # "sebastian/version": "^3.0.2" Requires: php(language) >= 7.3 Requires: php-cli @@ -107,26 +107,26 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 3) -Requires: (php-composer(myclabs/deep-copy) >= 1.10.1 with php-composer(myclabs/deep-copy) < 2) -Requires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) -Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) +Requires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) +Requires: (php-composer(myclabs/deep-copy) >= 1.12.0 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) -Requires: (php-composer(phpunit/php-code-coverage) >= 9.2.28 with php-composer(phpunit/php-code-coverage) < 10) -Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) +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) -Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3) -Requires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6) -Requires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) -Requires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2) +Requires: (php-composer(phpunit/php-text-template) >= 2.0.4 with php-composer(phpunit/php-text-template) < 3) +Requires: (php-composer(phpunit/php-timer) >= 5.0.3 with php-composer(phpunit/php-timer) < 6) +Requires: (php-composer(sebastian/cli-parser) >= 1.0.2 with php-composer(sebastian/cli-parser) < 2) +Requires: (php-composer(sebastian/code-unit) >= 1.0.8 with php-composer(sebastian/code-unit) < 2) Requires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) -Requires: (php-composer(sebastian/diff) >= 4.0.2 with php-composer(sebastian/diff) < 5) -Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6) -Requires: (php-composer(sebastian/exporter) >= 4.0.5 with php-composer(sebastian/exporter) < 5) -Requires: (php-composer(sebastian/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) -Requires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5) -Requires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4) -Requires: (php-composer(sebastian/type) >= 3.2 with php-composer(sebastian/type) < 4) +Requires: (php-composer(sebastian/diff) >= 4.0.6 with php-composer(sebastian/diff) < 5) +Requires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) +Requires: (php-composer(sebastian/exporter) >= 4.0.6 with php-composer(sebastian/exporter) < 5) +Requires: (php-composer(sebastian/global-state) >= 5.0.7 with php-composer(sebastian/global-state) < 6) +Requires: (php-composer(sebastian/object-enumerator) >= 4.0.4 with php-composer(sebastian/object-enumerator) < 5) +Requires: (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) < 4) +Requires: (php-composer(sebastian/type) >= 3.2.1 with php-composer(sebastian/type) < 4) Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4) # From composer.json, "suggest": { # "ext-soap": "*", @@ -262,6 +262,10 @@ exit $ret %changelog +* Thu Jul 11 2024 Remi Collet - 9.6.20-1 +- update to 9.6.20 (no change) +- raise dependencies + * Fri Apr 5 2024 Remi Collet - 9.6.19-1 - update to 9.6.19 (no change) diff --git a/sources b/sources index 4246c50..232766c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.19-a1a54a4.tgz) = ec1830102ec0c5212968b6a20c5b2efaeda616bbd6d2a4c4750e10bc4cfe9960ffdad82cd9595f2f1934cc9b16c43e70b0abbd1b4899d8657d3a5901061ac9c3 +SHA512 (phpunit9-9.6.20-49d7820.tgz) = 89cc9d6f4e01ec211ad43752a160a1b0646ac22ec1013d788c9b3aad75a795a18f1dec732b6f2b00e193dd3247e025fd69b5f78033cda720a65b28e74d3b3bb1 From 22d4cc39b00aefc529fc6b9cae096bc1265484b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:43:38 +0000 Subject: [PATCH 14/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- phpunit9.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpunit9.spec b/phpunit9.spec index 555590e..d91d0f5 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -28,7 +28,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 @@ -262,6 +262,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 9.6.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jul 11 2024 Remi Collet - 9.6.20-1 - update to 9.6.20 (no change) - raise dependencies From 16b9d47b450f8c2c2f4022646c8f9158ce9eedb5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Sep 2024 15:07:55 +0200 Subject: [PATCH 15/24] v9.6.21 --- .gitignore | 1 + phpunit9.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ec131eb..ae71c9b 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /phpunit9-9.6.18-32c2c2d.tgz /phpunit9-9.6.19-a1a54a4.tgz /phpunit9-9.6.20-49d7820.tgz +/phpunit9-9.6.21-de6abf3.tgz diff --git a/phpunit9.spec b/phpunit9.spec index d91d0f5..50ac26b 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,8 +9,8 @@ # -%global gh_commit 49d7820565836236411f5dc002d16dd689cde42f -%global gh_date 2024-07-10 +%global gh_commit de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa +%global gh_date 2024-09-19 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,12 +23,12 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.20 +%global upstream_version 9.6.21 #global upstream_prever dev Name: %{pk_project}%{ver_major} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause @@ -245,7 +245,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 php81 php82 php83; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -262,6 +262,9 @@ exit $ret %changelog +* Thu Sep 19 2024 Remi Collet - 9.6.21-1 +- update to 9.6.21 + * Fri Jul 19 2024 Fedora Release Engineering - 9.6.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 232766c..4f7f6f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.20-49d7820.tgz) = 89cc9d6f4e01ec211ad43752a160a1b0646ac22ec1013d788c9b3aad75a795a18f1dec732b6f2b00e193dd3247e025fd69b5f78033cda720a65b28e74d3b3bb1 +SHA512 (phpunit9-9.6.21-de6abf3.tgz) = 192171cf1686e171d74264de84666423c506440f2ee790260e88e79c9bb497d394f334f62a1e3175907a98ef41cb8a7770fa6853f61e56efb8eba88f4ad0df4e From bcbdd309c959c184f734c382e222ea9a6a450740 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Dec 2024 09:28:44 +0100 Subject: [PATCH 16/24] update to 9.6.22 (no change) raise dependency on myclabs/deep-copy 1.12.1 --- .gitignore | 1 + phpunit9.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ae71c9b..561ef68 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /phpunit9-9.6.19-a1a54a4.tgz /phpunit9-9.6.20-49d7820.tgz /phpunit9-9.6.21-de6abf3.tgz +/phpunit9-9.6.22-f80235c.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 50ac26b..7f162eb 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -9,8 +9,8 @@ # -%global gh_commit de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa -%global gh_date 2024-09-19 +%global gh_commit f80235cb4d3caa59ae09be3adf1ded27521d1a9c +%global gh_date 2024-12-05 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,7 +23,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.21 +%global upstream_version 9.6.22 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -42,7 +42,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 BuildRequires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) -BuildRequires: (php-composer(myclabs/deep-copy) >= 1.12.0 with php-composer(myclabs/deep-copy) < 2) +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(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) @@ -80,7 +80,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-xml": "*", # "ext-xmlwriter": "*", # "doctrine/instantiator": "^1.5.0 || ^2", -# "myclabs/deep-copy": "^1.12.0", +# "myclabs/deep-copy": "^1.12.1", # "phar-io/manifest": "^2.0.4", # "phar-io/version": "^3.2.1", # "phpunit/php-code-coverage": "^9.2.31", @@ -108,7 +108,7 @@ Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter Requires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) -Requires: (php-composer(myclabs/deep-copy) >= 1.12.0 with php-composer(myclabs/deep-copy) < 2) +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(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) @@ -262,6 +262,10 @@ exit $ret %changelog +* Thu Dec 5 2024 Remi Collet - 9.6.22-1 +- update to 9.6.22 (no change) +- raise dependency on myclabs/deep-copy 1.12.1 + * Thu Sep 19 2024 Remi Collet - 9.6.21-1 - update to 9.6.21 diff --git a/sources b/sources index 4f7f6f7..74f2f50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.21-de6abf3.tgz) = 192171cf1686e171d74264de84666423c506440f2ee790260e88e79c9bb497d394f334f62a1e3175907a98ef41cb8a7770fa6853f61e56efb8eba88f4ad0df4e +SHA512 (phpunit9-9.6.22-f80235c.tgz) = f978a77a71bc4df9ef8e2edeb842f9358441c908ef7fbf86b75a174c5a9c2f873ba396cfb5883a07f87b4d56e101145bd7ac51824d14b670581184987d6c34d8 From 3be63a5755273c38fe13f395b2f2b38be228bbc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 10:02:21 +0000 Subject: [PATCH 17/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- phpunit9.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpunit9.spec b/phpunit9.spec index 7f162eb..fba2dab 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -28,7 +28,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 @@ -262,6 +262,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 9.6.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Dec 5 2024 Remi Collet - 9.6.22-1 - update to 9.6.22 (no change) - raise dependency on myclabs/deep-copy 1.12.1 From 422fd3dc66449dfec57b13f0e0c550ed4f1819cc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 May 2025 15:36:32 +0200 Subject: [PATCH 18/24] v9.6.23 --- .gitignore | 1 + phpunit9.spec | 30 +++++++++++++++--------------- sources | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 561ef68..aeb8a0d 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /phpunit9-9.6.20-49d7820.tgz /phpunit9-9.6.21-de6abf3.tgz /phpunit9-9.6.22-f80235c.tgz +/phpunit9-9.6.23-43d2cb1.tgz diff --git a/phpunit9.spec b/phpunit9.spec index fba2dab..468b852 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -1,16 +1,15 @@ # remirepo/fedora spec file for phpunit9 # -# Copyright (c) 2010-2024 Remi Collet -# -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2010-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global gh_commit f80235cb4d3caa59ae09be3adf1ded27521d1a9c -%global gh_date 2024-12-05 +%global gh_commit 43d2cb18d0675c38bd44982a5d1d88f6d53d8d95 +%global gh_date 2025-05-02 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -23,12 +22,12 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.22 +%global upstream_version 9.6.23 #global upstream_prever dev Name: %{pk_project}%{ver_major} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause @@ -42,7 +41,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 BuildRequires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) -BuildRequires: (php-composer(myclabs/deep-copy) >= 1.12.1 with php-composer(myclabs/deep-copy) < 2) +BuildRequires: (php-composer(myclabs/deep-copy) >= 1.13.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(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) @@ -80,7 +79,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-xml": "*", # "ext-xmlwriter": "*", # "doctrine/instantiator": "^1.5.0 || ^2", -# "myclabs/deep-copy": "^1.12.1", +# "myclabs/deep-copy": "^1.13.1", # "phar-io/manifest": "^2.0.4", # "phar-io/version": "^3.2.1", # "phpunit/php-code-coverage": "^9.2.31", @@ -108,7 +107,7 @@ Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter Requires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) -Requires: (php-composer(myclabs/deep-copy) >= 1.12.1 with php-composer(myclabs/deep-copy) < 2) +Requires: (php-composer(myclabs/deep-copy) >= 1.13.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(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) @@ -142,12 +141,9 @@ Recommends: phpunit11 # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 -Requires: php-reflection Requires: php-openssl Requires: php-pcntl -Requires: php-pcre Requires: php-phar -Requires: php-spl %if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 Provides: php-composer(phpunit/phpunit) = %{version} @@ -162,7 +158,7 @@ It is an instance of the xUnit architecture for unit testing frameworks. This package provides the version %{ver_major} of PHPUnit, available using the %{name} command. -Documentation: https://phpunit.readthedocs.io/ +Documentation: https://phpunit.de/documentation.html %prep @@ -262,6 +258,10 @@ exit $ret %changelog +* Sun May 4 2025 Remi Collet - 9.6.23-1 +- update to 9.6.23 +- raise dependency on myclabs/deep-copy 1.13.1 + * Sat Jan 18 2025 Fedora Release Engineering - 9.6.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 74f2f50..03ca351 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.22-f80235c.tgz) = f978a77a71bc4df9ef8e2edeb842f9358441c908ef7fbf86b75a174c5a9c2f873ba396cfb5883a07f87b4d56e101145bd7ac51824d14b670581184987d6c34d8 +SHA512 (phpunit9-9.6.23-43d2cb1.tgz) = d9e36e4ab35b3eea0c2fbc210ac5474e4236b263e84981fce30876e71d5fb81e65333706f2d514f7ccad90348ab93c00623e7e9cdbb0cabf399932f2ff2ca624 From 6ef8612a1dce3d042218dece87f429a4934d6781 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:43:03 +0000 Subject: [PATCH 19/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- phpunit9.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpunit9.spec b/phpunit9.spec index 468b852..b8ad9cb 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -27,7 +27,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 @@ -258,6 +258,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 9.6.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun May 4 2025 Remi Collet - 9.6.23-1 - update to 9.6.23 - raise dependency on myclabs/deep-copy 1.13.1 From 54cbbfc878f344f5b04fa0f04df6f97cce466c81 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Aug 2025 14:04:12 +0200 Subject: [PATCH 20/24] v9.6.25 --- .gitignore | 1 + phpunit9.spec | 35 ++++++++++++++++++----------------- sources | 2 +- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index aeb8a0d..6feeb96 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /phpunit9-9.6.21-de6abf3.tgz /phpunit9-9.6.22-f80235c.tgz /phpunit9-9.6.23-43d2cb1.tgz +/phpunit9-9.6.25-049c011.tgz diff --git a/phpunit9.spec b/phpunit9.spec index b8ad9cb..bc8f4c5 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -8,8 +8,8 @@ # -%global gh_commit 43d2cb18d0675c38bd44982a5d1d88f6d53d8d95 -%global gh_date 2025-05-02 +%global gh_commit 049c011e01be805202d8eebedef49f769a8ec7b7 +%global gh_date 2025-08-20 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -22,12 +22,12 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.23 +%global upstream_version 9.6.25 #global upstream_prever dev Name: %{pk_project}%{ver_major} Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause @@ -41,7 +41,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 BuildRequires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) -BuildRequires: (php-composer(myclabs/deep-copy) >= 1.13.1 with php-composer(myclabs/deep-copy) < 2) +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) BuildRequires: (php-composer(phpspec/prophecy) >= 1.12.1 with php-composer(phpspec/prophecy) < 2) @@ -52,11 +52,11 @@ BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.4 with php-c BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.3 with php-composer(phpunit/php-timer) < 6) BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0.2 with php-composer(sebastian/cli-parser) < 2) BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.8 with php-composer(sebastian/code-unit) < 2) -BuildRequires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) +BuildRequires: (php-composer(sebastian/comparator) >= 4.0.9 with php-composer(sebastian/comparator) < 5) BuildRequires: (php-composer(sebastian/diff) >= 4.0.6 with php-composer(sebastian/diff) < 5) BuildRequires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) BuildRequires: (php-composer(sebastian/exporter) >= 4.0.6 with php-composer(sebastian/exporter) < 5) -BuildRequires: (php-composer(sebastian/global-state) >= 5.0.7 with php-composer(sebastian/global-state) < 6) +BuildRequires: (php-composer(sebastian/global-state) >= 5.0.8 with php-composer(sebastian/global-state) < 6) BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.4 with php-composer(sebastian/object-enumerator) < 5) BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) < 4) BuildRequires: (php-composer(sebastian/type) >= 3.2.1 with php-composer(sebastian/type) < 4) @@ -79,7 +79,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-xml": "*", # "ext-xmlwriter": "*", # "doctrine/instantiator": "^1.5.0 || ^2", -# "myclabs/deep-copy": "^1.13.1", +# "myclabs/deep-copy": "^1.13.4", # "phar-io/manifest": "^2.0.4", # "phar-io/version": "^3.2.1", # "phpunit/php-code-coverage": "^9.2.31", @@ -89,11 +89,11 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-timer": "^5.0.3", # "sebastian/cli-parser": "^1.0.2", # "sebastian/code-unit": "^1.0.8", -# "sebastian/comparator": "^4.0.8", +# "sebastian/comparator": "^4.0.9", # "sebastian/diff": "^4.0.6", # "sebastian/environment": "^5.1.5", # "sebastian/exporter": "^4.0.6", -# "sebastian/global-state": "^5.0.7", +# "sebastian/global-state": "^5.0.8", # "sebastian/object-enumerator": "^4.0.4", # "sebastian/resource-operations": "^3.0.4", # "sebastian/type": "^3.2.1", @@ -107,7 +107,7 @@ Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter Requires: (php-composer(doctrine/instantiator) >= 1.5.0 with php-composer(doctrine/instantiator) < 3) -Requires: (php-composer(myclabs/deep-copy) >= 1.13.1 with php-composer(myclabs/deep-copy) < 2) +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) @@ -118,11 +118,11 @@ Requires: (php-composer(phpunit/php-text-template) >= 2.0.4 with php-c Requires: (php-composer(phpunit/php-timer) >= 5.0.3 with php-composer(phpunit/php-timer) < 6) Requires: (php-composer(sebastian/cli-parser) >= 1.0.2 with php-composer(sebastian/cli-parser) < 2) Requires: (php-composer(sebastian/code-unit) >= 1.0.8 with php-composer(sebastian/code-unit) < 2) -Requires: (php-composer(sebastian/comparator) >= 4.0.8 with php-composer(sebastian/comparator) < 5) +Requires: (php-composer(sebastian/comparator) >= 4.0.9 with php-composer(sebastian/comparator) < 5) Requires: (php-composer(sebastian/diff) >= 4.0.6 with php-composer(sebastian/diff) < 5) Requires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) Requires: (php-composer(sebastian/exporter) >= 4.0.6 with php-composer(sebastian/exporter) < 5) -Requires: (php-composer(sebastian/global-state) >= 5.0.7 with php-composer(sebastian/global-state) < 6) +Requires: (php-composer(sebastian/global-state) >= 5.0.8 with php-composer(sebastian/global-state) < 6) Requires: (php-composer(sebastian/object-enumerator) >= 4.0.4 with php-composer(sebastian/object-enumerator) < 5) Requires: (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) < 4) Requires: (php-composer(sebastian/type) >= 3.2.1 with php-composer(sebastian/type) < 4) @@ -134,10 +134,8 @@ Suggests: php-soap Suggests: php-xdebug # recommends latest versions Recommends: phpunit10 -# Fedora 38+ only until 8.1 EOL -%if 0%{?fedora} >= 38 Recommends: phpunit11 -%endif +Recommends: phpunit12 # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 @@ -241,7 +239,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 php81 php82 php83 php84; do +for cmd in php php81 php82 php83 php84 php85; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -258,6 +256,9 @@ exit $ret %changelog +* Wed Aug 20 2025 Remi Collet - 9.6.25-1 +- update to 9.6.25 + * Fri Jul 25 2025 Fedora Release Engineering - 9.6.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 03ca351..4e6c948 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.23-43d2cb1.tgz) = d9e36e4ab35b3eea0c2fbc210ac5474e4236b263e84981fce30876e71d5fb81e65333706f2d514f7ccad90348ab93c00623e7e9cdbb0cabf399932f2ff2ca624 +SHA512 (phpunit9-9.6.25-049c011.tgz) = 31a1c23019ab47c717bd0c525d3a1228a30c538fe9bd0122d1cd4d070ec2c1a7eb64853d65cda09b3bb2516e46e1a5948b3690fa3d2a102a09d1c1ecc8932f77 From 7460d1bb7070bb9e9fa45280735618506caaa171 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 11 Sep 2025 09:16:53 +0200 Subject: [PATCH 21/24] v9.6.26 --- .gitignore | 1 + phpunit9.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6feeb96..b94d6df 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /phpunit9-9.6.22-f80235c.tgz /phpunit9-9.6.23-43d2cb1.tgz /phpunit9-9.6.25-049c011.tgz +/phpunit9-9.6.26-a0139ea.tgz diff --git a/phpunit9.spec b/phpunit9.spec index bc8f4c5..182e9e5 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -8,8 +8,8 @@ # -%global gh_commit 049c011e01be805202d8eebedef49f769a8ec7b7 -%global gh_date 2025-08-20 +%global gh_commit a0139ea157533454f611038326f3020b3051f129 +%global gh_date 2025-09-11 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -22,7 +22,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.25 +%global upstream_version 9.6.26 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -256,6 +256,9 @@ exit $ret %changelog +* Thu Sep 11 2025 Remi Collet - 9.6.26-1 +- update to 9.6.26 + * Wed Aug 20 2025 Remi Collet - 9.6.25-1 - update to 9.6.25 diff --git a/sources b/sources index 4e6c948..1206424 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.25-049c011.tgz) = 31a1c23019ab47c717bd0c525d3a1228a30c538fe9bd0122d1cd4d070ec2c1a7eb64853d65cda09b3bb2516e46e1a5948b3690fa3d2a102a09d1c1ecc8932f77 +SHA512 (phpunit9-9.6.26-a0139ea.tgz) = 2b56b7d5a80c80128b1344891fb8344ac8a611ce0781736c7ad82962a0f7dcfbb97571e13180fb37a630f82b3e0d5eb31afa7b1d1c8e6d134bdd1118bc01db63 From 2c863bc25e7c81a97b2dcc53c2bfc9c033b855b2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Sep 2025 08:00:26 +0200 Subject: [PATCH 22/24] v9.6.27 --- .gitignore | 1 + phpunit9.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b94d6df..a5d3b0a 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /phpunit9-9.6.23-43d2cb1.tgz /phpunit9-9.6.25-049c011.tgz /phpunit9-9.6.26-a0139ea.tgz +/phpunit9-9.6.27-0a9aa44.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 182e9e5..bce3bcd 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -8,8 +8,8 @@ # -%global gh_commit a0139ea157533454f611038326f3020b3051f129 -%global gh_date 2025-09-11 +%global gh_commit 0a9aa4440b6a9528cf360071502628d717af3e0a +%global gh_date 2025-09-14 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -22,7 +22,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.26 +%global upstream_version 9.6.27 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -256,6 +256,9 @@ exit $ret %changelog +* Mon Sep 15 2025 Remi Collet - 9.6.27-1 +- update to 9.6.27 + * Thu Sep 11 2025 Remi Collet - 9.6.26-1 - update to 9.6.26 diff --git a/sources b/sources index 1206424..5a8e0c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.26-a0139ea.tgz) = 2b56b7d5a80c80128b1344891fb8344ac8a611ce0781736c7ad82962a0f7dcfbb97571e13180fb37a630f82b3e0d5eb31afa7b1d1c8e6d134bdd1118bc01db63 +SHA512 (phpunit9-9.6.27-0a9aa44.tgz) = bdddaf2807ae8d7eeaa77388257754d86a78cba950bba494ab2007bc47c2689978c2b9fd61be94c1403c57177e13996a413ffc330ced2cec76da601a0ffc15c6 From dc49b10604818b3f515980f3b98b577a36b74014 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 26 Sep 2025 10:52:53 +0200 Subject: [PATCH 23/24] update to 9.6.29 (no change) raise dependency on sebastian/exporter 4.0.8 --- .gitignore | 1 + phpunit9.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a5d3b0a..6512d52 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /phpunit9-9.6.25-049c011.tgz /phpunit9-9.6.26-a0139ea.tgz /phpunit9-9.6.27-0a9aa44.tgz +/phpunit9-9.6.29-9ecfec5.tgz diff --git a/phpunit9.spec b/phpunit9.spec index bce3bcd..98469a2 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -8,8 +8,8 @@ # -%global gh_commit 0a9aa4440b6a9528cf360071502628d717af3e0a -%global gh_date 2025-09-14 +%global gh_commit 9ecfec57835a5581bc888ea7e13b51eb55ab9dd3 +%global gh_date 2025-09-24 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -22,7 +22,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.27 +%global upstream_version 9.6.29 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -55,7 +55,7 @@ BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.8 with php-c BuildRequires: (php-composer(sebastian/comparator) >= 4.0.9 with php-composer(sebastian/comparator) < 5) BuildRequires: (php-composer(sebastian/diff) >= 4.0.6 with php-composer(sebastian/diff) < 5) BuildRequires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) -BuildRequires: (php-composer(sebastian/exporter) >= 4.0.6 with php-composer(sebastian/exporter) < 5) +BuildRequires: (php-composer(sebastian/exporter) >= 4.0.8 with php-composer(sebastian/exporter) < 5) BuildRequires: (php-composer(sebastian/global-state) >= 5.0.8 with php-composer(sebastian/global-state) < 6) BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.4 with php-composer(sebastian/object-enumerator) < 5) BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) < 4) @@ -92,7 +92,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "sebastian/comparator": "^4.0.9", # "sebastian/diff": "^4.0.6", # "sebastian/environment": "^5.1.5", -# "sebastian/exporter": "^4.0.6", +# "sebastian/exporter": "^4.0.8", # "sebastian/global-state": "^5.0.8", # "sebastian/object-enumerator": "^4.0.4", # "sebastian/resource-operations": "^3.0.4", @@ -121,7 +121,7 @@ Requires: (php-composer(sebastian/code-unit) >= 1.0.8 with php-c Requires: (php-composer(sebastian/comparator) >= 4.0.9 with php-composer(sebastian/comparator) < 5) Requires: (php-composer(sebastian/diff) >= 4.0.6 with php-composer(sebastian/diff) < 5) Requires: (php-composer(sebastian/environment) >= 5.1.5 with php-composer(sebastian/environment) < 6) -Requires: (php-composer(sebastian/exporter) >= 4.0.6 with php-composer(sebastian/exporter) < 5) +Requires: (php-composer(sebastian/exporter) >= 4.0.8 with php-composer(sebastian/exporter) < 5) Requires: (php-composer(sebastian/global-state) >= 5.0.8 with php-composer(sebastian/global-state) < 6) Requires: (php-composer(sebastian/object-enumerator) >= 4.0.4 with php-composer(sebastian/object-enumerator) < 5) Requires: (php-composer(sebastian/resource-operations) >= 3.0.4 with php-composer(sebastian/resource-operations) < 4) @@ -256,6 +256,10 @@ exit $ret %changelog +* Wed Sep 24 2025 Remi Collet - 9.6.29-1 +- update to 9.6.29 (no change) +- raise dependency on sebastian/exporter 4.0.8 + * Mon Sep 15 2025 Remi Collet - 9.6.27-1 - update to 9.6.27 diff --git a/sources b/sources index 5a8e0c4..ecf691b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.27-0a9aa44.tgz) = bdddaf2807ae8d7eeaa77388257754d86a78cba950bba494ab2007bc47c2689978c2b9fd61be94c1403c57177e13996a413ffc330ced2cec76da601a0ffc15c6 +SHA512 (phpunit9-9.6.29-9ecfec5.tgz) = 133af75404686128ab63ed359d0321cc0cd361fe39f1a4dac28eb67a164e30940503e409a354d6786fe5035eb223396235027920dc62822503b86dcb21eba33f From f26ab5aa03d14f18af9a17051cf902cecf928571 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Dec 2025 11:23:16 +0100 Subject: [PATCH 24/24] update to 9.6.30 (no change) --- .gitignore | 1 + phpunit9.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6512d52..1f7de30 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /phpunit9-9.6.26-a0139ea.tgz /phpunit9-9.6.27-0a9aa44.tgz /phpunit9-9.6.29-9ecfec5.tgz +/phpunit9-9.6.30-b69489b.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 98469a2..d0a6635 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -8,8 +8,8 @@ # -%global gh_commit 9ecfec57835a5581bc888ea7e13b51eb55ab9dd3 -%global gh_date 2025-09-24 +%global gh_commit b69489b312503bf8fa6d75a76916919d7d2fa6d4 +%global gh_date 2025-12-01 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -22,7 +22,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.29 +%global upstream_version 9.6.30 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -256,6 +256,9 @@ exit $ret %changelog +* Tue Dec 2 2025 Remi Collet - 9.6.30-1 +- update to 9.6.30 (no change) + * Wed Sep 24 2025 Remi Collet - 9.6.29-1 - update to 9.6.29 (no change) - raise dependency on sebastian/exporter 4.0.8 diff --git a/sources b/sources index ecf691b..775c187 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.29-9ecfec5.tgz) = 133af75404686128ab63ed359d0321cc0cd361fe39f1a4dac28eb67a164e30940503e409a354d6786fe5035eb223396235027920dc62822503b86dcb21eba33f +SHA512 (phpunit9-9.6.30-b69489b.tgz) = 5609599ea75cb7c455c12137acc26e20e940b81c75d8a9033c32fb6ea7ff6ddeb0bead70f801aa75d7b75033cc9c67f7eeca6be83c672222f0445cc940ab6037