From 9462584ab5bcc1de36f756f240356b15a871154d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Jul 2024 09:37:59 +0200 Subject: [PATCH 01/19] v10.5.26 (cherry picked from commit 048dee0c3d5de686d0af3614095cc1302680efb6) --- .gitignore | 2 ++ phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cec7c75..e9852b6 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ /phpunit10-10.5.19-c726f0d.tgz /phpunit10-10.5.20-547d314.tgz /phpunit10-10.5.24-5f124e3.tgz +/phpunit10-10.5.25-831bf82.tgz +/phpunit10-10.5.26-42e2f13.tgz diff --git a/phpunit10.spec b/phpunit10.spec index b0a20dc..ef3c3d9 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 5f124e3e3e561006047b532fd0431bf5bb6b9015 -%global gh_date 2024-06-20 +%global gh_commit 42e2f13ceaa2e34461bc89bea75407550b40b2aa +%global gh_date 2024-07-08 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.24 +%global upstream_version 10.5.26 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Mon Jul 8 2024 Remi Collet - 10.5.26-1 +- update to 10.5.26 + * Tue Jul 2 2024 Remi Collet - 10.5.24-1 - update to 10.5.24 diff --git a/sources b/sources index 5d7e2dd..b34f0c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.24-5f124e3.tgz) = 4bd65da2357e12de60dbf40d504f001181f39c86f9e63603e9b0f34e18b40aa39e65a3fa0389298b25156d06afc724da172f7d6890cff10d01cd40c3887afc83 +SHA512 (phpunit10-10.5.26-42e2f13.tgz) = e7412f3003b08bdf01a0e2e7e528b46a06fa18bb53d4d589766b427e84a1d22dc91c47c319ff948acf94a77c4468f15b1e5d5cd404e7e03acacc6b6c5991ed1f From 65ce7de81f97638127515336339247c108cb196f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Jul 2024 08:27:06 +0200 Subject: [PATCH 02/19] v10.5.28 (cherry picked from commit 73c03d87593b937dd97bc1ac2982cbc9bd074602) --- .gitignore | 2 ++ phpunit10.spec | 11 +++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e9852b6..cd20502 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ /phpunit10-10.5.24-5f124e3.tgz /phpunit10-10.5.25-831bf82.tgz /phpunit10-10.5.26-42e2f13.tgz +/phpunit10-10.5.27-2425f71.tgz +/phpunit10-10.5.28-ff7fb85.tgz diff --git a/phpunit10.spec b/phpunit10.spec index ef3c3d9..f80adec 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 42e2f13ceaa2e34461bc89bea75407550b40b2aa -%global gh_date 2024-07-08 +%global gh_commit ff7fb85cdf88131b83e721fb2a327b664dbed275 +%global gh_date 2024-07-18 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.26 +%global upstream_version 10.5.28 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -249,7 +249,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 || ret=1 fi @@ -270,6 +270,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Remi Collet - 10.5.28-1 +- update to 10.5.28 + * Mon Jul 8 2024 Remi Collet - 10.5.26-1 - update to 10.5.26 diff --git a/sources b/sources index b34f0c0..f4d2557 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.26-42e2f13.tgz) = e7412f3003b08bdf01a0e2e7e528b46a06fa18bb53d4d589766b427e84a1d22dc91c47c319ff948acf94a77c4468f15b1e5d5cd404e7e03acacc6b6c5991ed1f +SHA512 (phpunit10-10.5.28-ff7fb85.tgz) = 2ae5c2432d2a5eaccbfa4d78d2c37b88c9c9ebc1140da1d2c37281d686cc3bc760dbb5a2f6718bc935f28aed24b36c9924241e01c72023701e799d2c261f8842 From f453bd202754c21dfb1f6c6acdfe2031f9d4fec1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 30 Jul 2024 15:30:28 +0200 Subject: [PATCH 03/19] v10.5.29 (cherry picked from commit c7d5888f6bffe90569f0bc86f6575e6fb7c18a46) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cd20502..cc47a33 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /phpunit10-10.5.26-42e2f13.tgz /phpunit10-10.5.27-2425f71.tgz /phpunit10-10.5.28-ff7fb85.tgz +/phpunit10-10.5.29-8e9e808.tgz diff --git a/phpunit10.spec b/phpunit10.spec index f80adec..2e8945e 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit ff7fb85cdf88131b83e721fb2a327b664dbed275 -%global gh_date 2024-07-18 +%global gh_commit 8e9e80872b4e8064401788ee8a32d40b4455318f +%global gh_date 2024-07-30 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.28 +%global upstream_version 10.5.29 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Tue Jul 30 2024 Remi Collet - 10.5.29-1 +- update to 10.5.29 + * Fri Jul 19 2024 Remi Collet - 10.5.28-1 - update to 10.5.28 diff --git a/sources b/sources index f4d2557..a918d66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.28-ff7fb85.tgz) = 2ae5c2432d2a5eaccbfa4d78d2c37b88c9c9ebc1140da1d2c37281d686cc3bc760dbb5a2f6718bc935f28aed24b36c9924241e01c72023701e799d2c261f8842 +SHA512 (phpunit10-10.5.29-8e9e808.tgz) = 2317f49a1cf67e2b0d2781ed6750762c321150f7c7a8ecf5be1203a1f97b825e5d48e239e3edc0ce2501b8675dc5d5aec50f5e87be63b8cf24cd9a8deee277bd From 493b698a0681427dc71f36c06554ae41eac03569 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 13 Aug 2024 11:09:06 +0200 Subject: [PATCH 04/19] update to 10.5.30 raise dependency on sebastian/comparator 5.0.2 (cherry picked from commit f5758afc495a610aedc7bf7ea0efa81ee0f58ba4) --- .gitignore | 1 + phpunit10.spec | 100 +++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 54 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index cc47a33..6537e72 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /phpunit10-10.5.27-2425f71.tgz /phpunit10-10.5.28-ff7fb85.tgz /phpunit10-10.5.29-8e9e808.tgz +/phpunit10-10.5.30-b15524f.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 2e8945e..c4b9a9a 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 8e9e80872b4e8064401788ee8a32d40b4455318f -%global gh_date 2024-07-30 +%global gh_commit b15524febac0153876b4ba9aab3326c2ee94c897 +%global gh_date 2024-08-13 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.29 +%global upstream_version 10.5.30 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -50,25 +50,25 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 8.1 -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(phpunit/php-code-coverage) >= 10.1.5 with php-composer(phpunit/php-code-coverage) < 11) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) +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(phpunit/php-code-coverage) >= 10.1.15 with php-composer(phpunit/php-code-coverage) < 11) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 4.1.0 with php-composer(phpunit/php-file-iterator) < 5) BuildRequires: (php-composer(phpunit/php-invoker) >= 4.0 with php-composer(phpunit/php-invoker) < 5) -BuildRequires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) +BuildRequires: (php-composer(phpunit/php-text-template) >= 3.0.1 with php-composer(phpunit/php-text-template) < 4) BuildRequires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) -BuildRequires: (php-composer(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) +BuildRequires: (php-composer(sebastian/cli-parser) >= 2.0.1 with php-composer(sebastian/cli-parser) < 3) BuildRequires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) -BuildRequires: (php-composer(sebastian/comparator) >= 5.0 with php-composer(sebastian/comparator) < 6) -BuildRequires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) -BuildRequires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) -BuildRequires: (php-composer(sebastian/exporter) >= 5.1 with php-composer(sebastian/exporter) < 6) -BuildRequires: (php-composer(sebastian/global-state) >= 6.0.1 with php-composer(sebastian/global-state) < 7) +BuildRequires: (php-composer(sebastian/comparator) >= 5.0.2 with php-composer(sebastian/comparator) < 6) +BuildRequires: (php-composer(sebastian/diff) >= 5.1.1 with php-composer(sebastian/diff) < 6) +BuildRequires: (php-composer(sebastian/environment) >= 6.1.0 with php-composer(sebastian/environment) < 7) +BuildRequires: (php-composer(sebastian/exporter) >= 5.1.2 with php-composer(sebastian/exporter) < 6) +BuildRequires: (php-composer(sebastian/global-state) >= 6.0.2 with php-composer(sebastian/global-state) < 7) BuildRequires: (php-composer(sebastian/object-enumerator) >= 5.0 with php-composer(sebastian/object-enumerator) < 6) BuildRequires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) BuildRequires: (php-composer(sebastian/type) >= 4.0 with php-composer(sebastian/type) < 5) -BuildRequires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) +BuildRequires: (php-composer(sebastian/version) >= 4.0.1 with php-composer(sebastian/version) < 5) BuildRequires: php-dom BuildRequires: php-json BuildRequires: php-mbstring @@ -86,25 +86,25 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "myclabs/deep-copy": "^1.10.1", -# "phar-io/manifest": "^2.0.3", -# "phar-io/version": "^3.0.2", -# "phpunit/php-code-coverage": "^10.1.5", -# "phpunit/php-file-iterator": "^4.0", -# "phpunit/php-invoker": "^4.0", -# "phpunit/php-text-template": "^3.0", -# "phpunit/php-timer": "^6.0", -# "sebastian/cli-parser": "^2.0", -# "sebastian/code-unit": "^2.0", -# "sebastian/comparator": "^5.0", -# "sebastian/diff": "^5.0", -# "sebastian/environment": "^6.0", -# "sebastian/exporter": "^5.1", -# "sebastian/global-state": "^6.0.1", -# "sebastian/object-enumerator": "^5.0", -# "sebastian/recursion-context": "^5.0", -# "sebastian/type": "^4.0", -# "sebastian/version": "^4.0" +# "myclabs/deep-copy": "^1.12.0", +# "phar-io/manifest": "^2.0.4", +# "phar-io/version": "^3.2.1", +# "phpunit/php-code-coverage": "^10.1.15", +# "phpunit/php-file-iterator": "^4.1.0", +# "phpunit/php-invoker": "^4.0.0", +# "phpunit/php-text-template": "^3.0.1", +# "phpunit/php-timer": "^6.0.0", +# "sebastian/cli-parser": "^2.0.1", +# "sebastian/code-unit": "^2.0.0", +# "sebastian/comparator": "^5.0.2", +# "sebastian/diff": "^5.1.1", +# "sebastian/environment": "^6.1.0", +# "sebastian/exporter": "^5.1.2", +# "sebastian/global-state": "^6.0.2", +# "sebastian/object-enumerator": "^5.0.0", +# "sebastian/recursion-context": "^5.0.0", +# "sebastian/type": "^4.0.0", +# "sebastian/version": "^4.0.1" Requires: php(language) >= 8.1 Requires: php-cli Requires: php-dom @@ -113,25 +113,25 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -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(phpunit/php-code-coverage) >= 10.1.5 with php-composer(phpunit/php-code-coverage) < 11) -Requires: (php-composer(phpunit/php-file-iterator) >= 4.0 with php-composer(phpunit/php-file-iterator) < 5) +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(phpunit/php-code-coverage) >= 10.1.15 with php-composer(phpunit/php-code-coverage) < 11) +Requires: (php-composer(phpunit/php-file-iterator) >= 4.1.0 with php-composer(phpunit/php-file-iterator) < 5) Requires: (php-composer(phpunit/php-invoker) >= 4.0 with php-composer(phpunit/php-invoker) < 5) -Requires: (php-composer(phpunit/php-text-template) >= 3.0 with php-composer(phpunit/php-text-template) < 4) +Requires: (php-composer(phpunit/php-text-template) >= 3.0.1 with php-composer(phpunit/php-text-template) < 4) Requires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) -Requires: (php-composer(sebastian/cli-parser) >= 2.0 with php-composer(sebastian/cli-parser) < 3) +Requires: (php-composer(sebastian/cli-parser) >= 2.0.1 with php-composer(sebastian/cli-parser) < 3) Requires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) -Requires: (php-composer(sebastian/comparator) >= 5.0 with php-composer(sebastian/comparator) < 6) -Requires: (php-composer(sebastian/diff) >= 5.0 with php-composer(sebastian/diff) < 6) -Requires: (php-composer(sebastian/environment) >= 6.0 with php-composer(sebastian/environment) < 7) -Requires: (php-composer(sebastian/exporter) >= 5.1 with php-composer(sebastian/exporter) < 6) -Requires: (php-composer(sebastian/global-state) >= 6.0.1 with php-composer(sebastian/global-state) < 7) +Requires: (php-composer(sebastian/comparator) >= 5.0.2 with php-composer(sebastian/comparator) < 6) +Requires: (php-composer(sebastian/diff) >= 5.1.1 with php-composer(sebastian/diff) < 6) +Requires: (php-composer(sebastian/environment) >= 6.1.0 with php-composer(sebastian/environment) < 7) +Requires: (php-composer(sebastian/exporter) >= 5.1.2 with php-composer(sebastian/exporter) < 6) +Requires: (php-composer(sebastian/global-state) >= 6.0.2 with php-composer(sebastian/global-state) < 7) Requires: (php-composer(sebastian/object-enumerator) >= 5.0 with php-composer(sebastian/object-enumerator) < 6) Requires: (php-composer(sebastian/recursion-context) >= 5.0 with php-composer(sebastian/recursion-context) < 6) Requires: (php-composer(sebastian/type) >= 4.0 with php-composer(sebastian/type) < 5) -Requires: (php-composer(sebastian/version) >= 4.0 with php-composer(sebastian/version) < 5) +Requires: (php-composer(sebastian/version) >= 4.0.1 with php-composer(sebastian/version) < 5) # From composer.json, "suggest": { # "ext-soap": "*", Suggests: php-soap @@ -270,6 +270,10 @@ exit $ret %changelog +* Tue Aug 13 2024 Remi Collet - 10.5.30-1 +- update to 10.5.30 +- raise dependency on sebastian/comparator 5.0.2 + * Tue Jul 30 2024 Remi Collet - 10.5.29-1 - update to 10.5.29 diff --git a/sources b/sources index a918d66..f909ddc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.29-8e9e808.tgz) = 2317f49a1cf67e2b0d2781ed6750762c321150f7c7a8ecf5be1203a1f97b825e5d48e239e3edc0ce2501b8675dc5d5aec50f5e87be63b8cf24cd9a8deee277bd +SHA512 (phpunit10-10.5.30-b15524f.tgz) = ad4766597e7c7b8c94448c7a09b0ff21afa2d4a2fd82dd157f2b3a4a54e27ee8126291fad821f28f94c77fa7264dfc6539f286d02c7fca4384fbfe5d3e3b6d26 From 69ee23d7b6cdebf7af19e1b5913678484efee390 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 3 Sep 2024 16:28:57 +0200 Subject: [PATCH 05/19] v10.5.31 (cherry picked from commit c2612023bfb4a7b583f0fbbcb1ab6c440e1dea40) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6537e72..76ffe65 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /phpunit10-10.5.28-ff7fb85.tgz /phpunit10-10.5.29-8e9e808.tgz /phpunit10-10.5.30-b15524f.tgz +/phpunit10-10.5.31-43e7c3e.tgz diff --git a/phpunit10.spec b/phpunit10.spec index c4b9a9a..fb38bbe 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit b15524febac0153876b4ba9aab3326c2ee94c897 -%global gh_date 2024-08-13 +%global gh_commit 43e7c3e6a484e538453f89dfa6a6f308c32792da +%global gh_date 2024-09-03 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.30 +%global upstream_version 10.5.31 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Tue Sep 3 2024 Remi Collet - 10.5.31-1 +- update to 10.5.31 + * Tue Aug 13 2024 Remi Collet - 10.5.30-1 - update to 10.5.30 - raise dependency on sebastian/comparator 5.0.2 diff --git a/sources b/sources index f909ddc..2f2f297 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.30-b15524f.tgz) = ad4766597e7c7b8c94448c7a09b0ff21afa2d4a2fd82dd157f2b3a4a54e27ee8126291fad821f28f94c77fa7264dfc6539f286d02c7fca4384fbfe5d3e3b6d26 +SHA512 (phpunit10-10.5.31-43e7c3e.tgz) = 4d93e923579fb5fc7ae523bfb624f166a457bb16308172702daf160b6f8f06cc0a327d6e699700feca2087d9335757b8f2d28cbd8bd9974704d68c2ca96fe8e2 From ba22c293736be48ded20d008dbf1188823fdab80 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Sep 2024 07:19:46 +0200 Subject: [PATCH 06/19] v10.5.32 (cherry picked from commit 49b6f5973ad168981e05399c025297cb0d9e6a01) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 76ffe65..b4c38f9 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /phpunit10-10.5.29-8e9e808.tgz /phpunit10-10.5.30-b15524f.tgz /phpunit10-10.5.31-43e7c3e.tgz +/phpunit10-10.5.32-f069f46.tgz diff --git a/phpunit10.spec b/phpunit10.spec index fb38bbe..449a2b7 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 43e7c3e6a484e538453f89dfa6a6f308c32792da -%global gh_date 2024-09-03 +%global gh_commit f069f46840445d37a4e6f0de8c5879598f9c4327 +%global gh_date 2024-09-04 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.31 +%global upstream_version 10.5.32 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Thu Sep 5 2024 Remi Collet - 10.5.32-1 +- update to 10.5.32 + * Tue Sep 3 2024 Remi Collet - 10.5.31-1 - update to 10.5.31 diff --git a/sources b/sources index 2f2f297..1af23b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.31-43e7c3e.tgz) = 4d93e923579fb5fc7ae523bfb624f166a457bb16308172702daf160b6f8f06cc0a327d6e699700feca2087d9335757b8f2d28cbd8bd9974704d68c2ca96fe8e2 +SHA512 (phpunit10-10.5.32-f069f46.tgz) = f8b85ee0d87478155f6f6f73db6182f18b3fe68142609673435774d1f9234763388fb3222d43d26ec19a4906eef5a8dace23ebdf3bceeee376a34e0a16be8adc From 913ee7489a7c5c6aca5e6e979b97d92c3ee2e790 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 9 Sep 2024 11:00:54 +0200 Subject: [PATCH 07/19] v10.5.33 (cherry picked from commit 8fa3a8f1ad36b70748e952579fbcf606d77aa9a8) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b4c38f9..6447270 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /phpunit10-10.5.30-b15524f.tgz /phpunit10-10.5.31-43e7c3e.tgz /phpunit10-10.5.32-f069f46.tgz +/phpunit10-10.5.33-4def7a9.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 449a2b7..7e4869c 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit f069f46840445d37a4e6f0de8c5879598f9c4327 -%global gh_date 2024-09-04 +%global gh_commit 4def7a9cda75af9c2bc179ed53a8e41313e7f7cf +%global gh_date 2024-09-09 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.32 +%global upstream_version 10.5.33 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Mon Sep 9 2024 Remi Collet - 10.5.33-1 +- update to 10.5.33 + * Thu Sep 5 2024 Remi Collet - 10.5.32-1 - update to 10.5.32 diff --git a/sources b/sources index 1af23b9..ed63edf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.32-f069f46.tgz) = f8b85ee0d87478155f6f6f73db6182f18b3fe68142609673435774d1f9234763388fb3222d43d26ec19a4906eef5a8dace23ebdf3bceeee376a34e0a16be8adc +SHA512 (phpunit10-10.5.33-4def7a9.tgz) = 80f2981ea77a5f28e4e94366422999a5b360f7341a51c90beca56c77833307d6358ad5b041aa2ba133f23e5eb3908aea635e44213a6e133c09a43f791da68742 From 6d5ed194473c5c2819a2b3b86e58b45581d5cff2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 13 Sep 2024 10:45:51 +0200 Subject: [PATCH 08/19] v10.5.34 (cherry picked from commit 56e95b580c2ba622251799d881b9a0f3421c00db) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6447270..a3ff94f 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /phpunit10-10.5.31-43e7c3e.tgz /phpunit10-10.5.32-f069f46.tgz /phpunit10-10.5.33-4def7a9.tgz +/phpunit10-10.5.34-3c69d31.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 7e4869c..9b62dff 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 4def7a9cda75af9c2bc179ed53a8e41313e7f7cf -%global gh_date 2024-09-09 +%global gh_commit 3c69d315bdf79080c8e115b69d1961c6905b0e18 +%global gh_date 2024-09-13 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.33 +%global upstream_version 10.5.34 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Fri Sep 13 2024 Remi Collet - 10.5.34-1 +- update to 10.5.34 + * Mon Sep 9 2024 Remi Collet - 10.5.33-1 - update to 10.5.33 diff --git a/sources b/sources index ed63edf..53e019e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.33-4def7a9.tgz) = 80f2981ea77a5f28e4e94366422999a5b360f7341a51c90beca56c77833307d6358ad5b041aa2ba133f23e5eb3908aea635e44213a6e133c09a43f791da68742 +SHA512 (phpunit10-10.5.34-3c69d31.tgz) = 82f9bd586e7584c56831f24eafbb36a4fd5821552c6ee7a548115d99a4616f375b4dddc46f4de14d55b2d4698095940088440affdef5c91d1d781c10cdf73440 From 98d0935c7c6e90d3558080f4c148468ec45fb4ad Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Sep 2024 15:16:52 +0200 Subject: [PATCH 09/19] v10.5.35 (cherry picked from commit 04950d7d41357a1e44af307c36d4d07dc1d54090) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a3ff94f..0593180 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /phpunit10-10.5.32-f069f46.tgz /phpunit10-10.5.33-4def7a9.tgz /phpunit10-10.5.34-3c69d31.tgz +/phpunit10-10.5.35-7ac8b4e.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 9b62dff..047a922 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 3c69d315bdf79080c8e115b69d1961c6905b0e18 -%global gh_date 2024-09-13 +%global gh_commit 7ac8b4e63f456046dcb4c9787da9382831a1874b +%global gh_date 2024-09-19 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.34 +%global upstream_version 10.5.35 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Thu Sep 19 2024 Remi Collet - 10.5.35-1 +- update to 10.5.35 + * Fri Sep 13 2024 Remi Collet - 10.5.34-1 - update to 10.5.34 diff --git a/sources b/sources index 53e019e..f5701e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.34-3c69d31.tgz) = 82f9bd586e7584c56831f24eafbb36a4fd5821552c6ee7a548115d99a4616f375b4dddc46f4de14d55b2d4698095940088440affdef5c91d1d781c10cdf73440 +SHA512 (phpunit10-10.5.35-7ac8b4e.tgz) = 0b3a1955b526f8098e9af8d41ce5b7e42ae97e8eb1c60549685538ba44b8184e54840946209a9e1e9780e5452e9c186b1880ecbcd1a8ecf875c3bcffb24ddfe2 From 7cb94deb8a386d5019a96070a41038a11415a814 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Oct 2024 11:20:56 +0200 Subject: [PATCH 10/19] v10.5.36 (cherry picked from commit a5b09ffa7e65cf34a1432a9bcb2cc993694eaf7f) --- .gitignore | 1 + phpunit10.spec | 20 ++++++++++++-------- sources | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 0593180..b58172a 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /phpunit10-10.5.33-4def7a9.tgz /phpunit10-10.5.34-3c69d31.tgz /phpunit10-10.5.35-7ac8b4e.tgz +/phpunit10-10.5.36-aa0a8ce.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 047a922..110e73e 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 7ac8b4e63f456046dcb4c9787da9382831a1874b -%global gh_date 2024-09-19 +%global gh_commit aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870 +%global gh_date 2024-10-08 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.35 +%global upstream_version 10.5.36 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -212,18 +212,19 @@ cat src/autoload.php %{_bindir}/phpab \ --output tests/autoload.php \ - --exclude 'tests/end-to-end/regression/4376/tests/Test.php' \ - --exclude 'tests/end-to-end/regression/2448/Test.php' \ - --exclude 'tests/*/_files/*.php' \ - tests + tests/_files cat << 'EOF' | tee -a tests/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ + __DIR__ . '/unit/Event/AbstractEventTestCase.php', + __DIR__ . '/unit/Framework/MockObject/TestDoubleTestCase.php', + __DIR__ . '/unit/Metadata/Parser/AnnotationParserTestCase.php', + __DIR__ . '/unit/Metadata/Parser/AttributeParserTestCase.php', __DIR__ . '/_files/CoverageNamespacedFunctionTest.php', __DIR__ . '/_files/CoveredFunction.php', + __DIR__ . '/_files/Generator.php', __DIR__ . '/_files/NamespaceCoveredFunction.php', __DIR__ . '/end-to-end/code-coverage/ignore-function-using-attribute/src/CoveredFunction.php', - __DIR__ . '/end-to-end/execution-order/_files/MultiDependencyTest.php', ]); EOF @@ -270,6 +271,9 @@ exit $ret %changelog +* Wed Oct 9 2024 Remi Collet - 10.5.36-1 +- update to 10.5.36 + * Thu Sep 19 2024 Remi Collet - 10.5.35-1 - update to 10.5.35 diff --git a/sources b/sources index f5701e1..462d437 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.35-7ac8b4e.tgz) = 0b3a1955b526f8098e9af8d41ce5b7e42ae97e8eb1c60549685538ba44b8184e54840946209a9e1e9780e5452e9c186b1880ecbcd1a8ecf875c3bcffb24ddfe2 +SHA512 (phpunit10-10.5.36-aa0a8ce.tgz) = 258842909013a090fced1d199c3735fb097f7c93dc0c24bfc3e9eba139f30b0779e3cef1f47057024373cd141b4acc13fec6b698a23d9a272c979b40f4c72f3b From 871190afee9d044655d9084a218122a4d83fdac3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Oct 2024 12:14:04 +0200 Subject: [PATCH 11/19] update to 10.5.37 raise dependency on sebastian/comparator 5.0.3 (cherry picked from commit c80e40cc5064a413d0ba103ed21fb95f3b003cc4) --- .gitignore | 1 + phpunit10.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b58172a..19d12a8 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /phpunit10-10.5.34-3c69d31.tgz /phpunit10-10.5.35-7ac8b4e.tgz /phpunit10-10.5.36-aa0a8ce.tgz +/phpunit10-10.5.37-c7cffa0.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 110e73e..987c554 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit aa0a8ce701ea7ee314b0dfaa8970dc94f3f8c870 -%global gh_date 2024-10-08 +%global gh_commit c7cffa0efa2b70c22366523e6d804c9419eb2400 +%global gh_date 2024-10-21 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.36 +%global upstream_version 10.5.37 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -60,7 +60,7 @@ BuildRequires: (php-composer(phpunit/php-text-template) >= 3.0.1 with php-c BuildRequires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) BuildRequires: (php-composer(sebastian/cli-parser) >= 2.0.1 with php-composer(sebastian/cli-parser) < 3) BuildRequires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) -BuildRequires: (php-composer(sebastian/comparator) >= 5.0.2 with php-composer(sebastian/comparator) < 6) +BuildRequires: (php-composer(sebastian/comparator) >= 5.0.3 with php-composer(sebastian/comparator) < 6) BuildRequires: (php-composer(sebastian/diff) >= 5.1.1 with php-composer(sebastian/diff) < 6) BuildRequires: (php-composer(sebastian/environment) >= 6.1.0 with php-composer(sebastian/environment) < 7) BuildRequires: (php-composer(sebastian/exporter) >= 5.1.2 with php-composer(sebastian/exporter) < 6) @@ -96,7 +96,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-timer": "^6.0.0", # "sebastian/cli-parser": "^2.0.1", # "sebastian/code-unit": "^2.0.0", -# "sebastian/comparator": "^5.0.2", +# "sebastian/comparator": "^5.0.3", # "sebastian/diff": "^5.1.1", # "sebastian/environment": "^6.1.0", # "sebastian/exporter": "^5.1.2", @@ -123,7 +123,7 @@ Requires: (php-composer(phpunit/php-text-template) >= 3.0.1 with php-c Requires: (php-composer(phpunit/php-timer) >= 6.0 with php-composer(phpunit/php-timer) < 7) Requires: (php-composer(sebastian/cli-parser) >= 2.0.1 with php-composer(sebastian/cli-parser) < 3) Requires: (php-composer(sebastian/code-unit) >= 2.0 with php-composer(sebastian/code-unit) < 3) -Requires: (php-composer(sebastian/comparator) >= 5.0.2 with php-composer(sebastian/comparator) < 6) +Requires: (php-composer(sebastian/comparator) >= 5.0.3 with php-composer(sebastian/comparator) < 6) Requires: (php-composer(sebastian/diff) >= 5.1.1 with php-composer(sebastian/diff) < 6) Requires: (php-composer(sebastian/environment) >= 6.1.0 with php-composer(sebastian/environment) < 7) Requires: (php-composer(sebastian/exporter) >= 5.1.2 with php-composer(sebastian/exporter) < 6) @@ -271,6 +271,10 @@ exit $ret %changelog +* Mon Oct 21 2024 Remi Collet - 10.5.37-1 +- update to 10.5.37 +- raise dependency on sebastian/comparator 5.0.3 + * Wed Oct 9 2024 Remi Collet - 10.5.36-1 - update to 10.5.36 diff --git a/sources b/sources index 462d437..ac44049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.36-aa0a8ce.tgz) = 258842909013a090fced1d199c3735fb097f7c93dc0c24bfc3e9eba139f30b0779e3cef1f47057024373cd141b4acc13fec6b698a23d9a272c979b40f4c72f3b +SHA512 (phpunit10-10.5.37-c7cffa0.tgz) = 2dfc25ebadc62d2ce48ec2365c85b8e74b0dad24c0ceaeca781925512539eb94f763eefb1bae7930db705e5854687027c60a9b6bdb0bede9f29c21954906a7b1 From b854b935645f54ed9e5629f0dbf160bfd04d248b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 29 Oct 2024 08:23:59 +0100 Subject: [PATCH 12/19] v10.5.38 (cherry picked from commit d9f1897022a4baa25d1a23cbc29253fd050b6d10) --- .gitignore | 1 + phpunit10-rpm.patch | 87 +++++++++++++++++++++++++++++++++------------ phpunit10.spec | 9 +++-- sources | 2 +- 4 files changed, 73 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 19d12a8..f913b08 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /phpunit10-10.5.35-7ac8b4e.tgz /phpunit10-10.5.36-aa0a8ce.tgz /phpunit10-10.5.37-c7cffa0.tgz +/phpunit10-10.5.38-a86773b.tgz diff --git a/phpunit10-rpm.patch b/phpunit10-rpm.patch index fa07a47..0b4ef15 100644 --- a/phpunit10-rpm.patch +++ b/phpunit10-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2024-03-21 10:34:01.000000000 +0100 -+++ ./phpunit 2024-03-21 14:02:24.892294049 +0100 +--- ./phpunit.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./phpunit 2024-10-28 16:48:36.313661416 +0100 @@ -46,27 +46,13 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); @@ -50,18 +50,23 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); +} diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/Command/Commands/VersionCheckCommand.php ---- ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm 2024-03-21 10:34:01.000000000 +0100 -+++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-03-21 14:02:53.539493026 +0100 -@@ -24,7 +24,7 @@ final class VersionCheckCommand implemen - public function execute(): Result - { - $latestVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit'); -- $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . Version::majorVersionNumber()); -+ $latestCompatibleVersion = file_get_contents('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=Version::majorVersionNumber()); +--- ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-10-28 17:08:20.070934441 +0100 +@@ -39,7 +39,7 @@ final class VersionCheckCommand implemen - $notLatest = version_compare($latestVersion, Version::id(), '>'); - $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>'); -@@ -35,7 +35,7 @@ final class VersionCheckCommand implemen + assert($latestVersion !== false); + +- $latestCompatibleVersion = $this->downloader->download('https://phar.phpunit.de/latest-version-of/phpunit-' . $this->majorVersionNumber); ++ $latestCompatibleVersion = $this->downloader->download('https://phar.phpunit.de/latest-version-of/phpunit-' . $major=$this->majorVersionNumber); + + assert($latestCompatibleVersion !== false); + +@@ -48,11 +48,11 @@ final class VersionCheckCommand implemen + + if (!$notLatest && !$notLatestCompatible) { + return Result::from( +- 'You are using the latest version of PHPUnit.' . PHP_EOL, ++ 'You are using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL, ); } @@ -70,26 +75,28 @@ diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/ if ($notLatestCompatible) { $buffer .= sprintf( -@@ -43,6 +43,7 @@ final class VersionCheckCommand implemen - Version::id(), +@@ -60,6 +60,7 @@ final class VersionCheckCommand implemen + $this->versionId, $latestCompatibleVersion, ); + $buffer .= sprintf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); } if ($notLatest) { -@@ -50,6 +51,7 @@ final class VersionCheckCommand implemen +@@ -67,6 +68,9 @@ final class VersionCheckCommand implemen 'The latest version is PHPUnit %s.' . PHP_EOL, $latestVersion, ); -+ $buffer .= sprintf('Try to install and use the phpunit%s command.' . PHP_EOL . PHP_EOL, explode('.', $latestVersion)[0]); ++ if ($major !== ($new = (int)explode('.', $latestVersion)[0])) { ++ $buffer .= sprintf('Try to install and use the phpunit%s command.' . PHP_EOL . PHP_EOL, explode('.', $latestVersion)[0]); ++ } } return Result::from($buffer); diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Configuration/Xml/SchemaFinder.php ---- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-03-21 10:34:01.000000000 +0100 -+++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-03-21 14:02:24.893294091 +0100 -@@ -75,6 +75,6 @@ final class SchemaFinder +--- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-10-28 16:48:35.645635304 +0100 +@@ -77,6 +77,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -98,8 +105,8 @@ diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Config } } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2024-03-21 10:34:01.000000000 +0100 -+++ ./tests/bootstrap.php 2024-03-21 14:02:24.893294091 +0100 +--- ./tests/bootstrap.php.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./tests/bootstrap.php 2024-10-28 16:48:36.312661377 +0100 @@ -11,8 +11,8 @@ if (!defined('TEST_FILES_PATH')) { define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR); } @@ -129,3 +136,39 @@ diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php } if ($phar) { +diff -up ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php +--- ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php.rpm 2024-10-28 16:44:45.000000000 +0100 ++++ ./tests/unit/TextUI/Command/Commands/VersionCheckCommandTest.php 2024-10-28 17:05:46.654936571 +0100 +@@ -28,15 +28,16 @@ final class VersionCheckCommandTest exte + { + return [ + [ +- 'You are using the latest version of PHPUnit.' . PHP_EOL, ++ 'You are using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL, + 10, + '10.5.0', + '10.5.0', + '10.5.0', + ], + [ +- 'You are not using the latest version of PHPUnit.' . PHP_EOL . ++ 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL . + 'The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.' . PHP_EOL . ++ 'Try a system update for new phpunit10 package.' . PHP_EOL . PHP_EOL . + 'The latest version is PHPUnit 10.5.1.' . PHP_EOL, + 10, + '10.5.0', +@@ -44,9 +45,11 @@ final class VersionCheckCommandTest exte + '10.5.1', + ], + [ +- 'You are not using the latest version of PHPUnit.' . PHP_EOL . ++ 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL . + 'The latest version compatible with PHPUnit 10.5.0 is PHPUnit 10.5.1.' . PHP_EOL . +- 'The latest version is PHPUnit 11.0.0.' . PHP_EOL, ++ 'Try a system update for new phpunit10 package.' . PHP_EOL . PHP_EOL . ++ 'The latest version is PHPUnit 11.0.0.' . PHP_EOL . ++ 'Try to install and use the phpunit11 command.' . PHP_EOL . PHP_EOL, + 10, + '10.5.0', + '11.0.0', diff --git a/phpunit10.spec b/phpunit10.spec index 987c554..1b5f65b 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit c7cffa0efa2b70c22366523e6d804c9419eb2400 -%global gh_date 2024-10-21 +%global gh_commit a86773b9e887a67bc53efa9da9ad6e3f2498c132 +%global gh_date 2024-10-28 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.37 +%global upstream_version 10.5.38 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -271,6 +271,9 @@ exit $ret %changelog +* Mon Oct 28 2024 Remi Collet - 10.5.38-1 +- update to 10.5.38 + * Mon Oct 21 2024 Remi Collet - 10.5.37-1 - update to 10.5.37 - raise dependency on sebastian/comparator 5.0.3 diff --git a/sources b/sources index ac44049..26ea5be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.37-c7cffa0.tgz) = 2dfc25ebadc62d2ce48ec2365c85b8e74b0dad24c0ceaeca781925512539eb94f763eefb1bae7930db705e5854687027c60a9b6bdb0bede9f29c21954906a7b1 +SHA512 (phpunit10-10.5.38-a86773b.tgz) = 16749857e9507d429a40c3112dc0dd5b9e653ea1f9925a13a2cad41cf8d4f0fb56ecdf25f6f97cfdbb716ffe0b90129904ad12d39046f7a1c9fa4a0adc906574 From 72b051d73b301b6b5b27d94e592827a5e4c0516c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Dec 2024 14:25:12 +0100 Subject: [PATCH 13/19] update to 10.5.39 raise dependency on myclabs/deep-copy 1.12.1 re-license spec file to CECILL-2.1 (cherry picked from commit 177fc89666de9b0f25c2ab2df95f696874c0f804) --- .gitignore | 1 + phpunit10.spec | 24 ++++++++++++++---------- sources | 2 +- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index f913b08..74be364 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /phpunit10-10.5.36-aa0a8ce.tgz /phpunit10-10.5.37-c7cffa0.tgz /phpunit10-10.5.38-a86773b.tgz +/phpunit10-10.5.39-4e89eff.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 1b5f65b..e68028a 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -1,9 +1,8 @@ # remirepo/fedora spec file for phpunit10 # -# Copyright (c) 2010-2024 Remi Collet -# -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2010-2024 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # @@ -17,8 +16,8 @@ %bcond_with defcmd %endif -%global gh_commit a86773b9e887a67bc53efa9da9ad6e3f2498c132 -%global gh_date 2024-10-28 +%global gh_commit 4e89eff200b801db58f3d580ad7426431949eaa9 +%global gh_date 2024-12-11 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -31,7 +30,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.38 +%global upstream_version 10.5.39 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -50,7 +49,7 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 8.1 -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(phpunit/php-code-coverage) >= 10.1.15 with php-composer(phpunit/php-code-coverage) < 11) @@ -86,7 +85,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "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": "^10.1.15", @@ -113,7 +112,7 @@ Requires: php-libxml Requires: php-mbstring Requires: php-xml Requires: php-xmlwriter -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(phpunit/php-code-coverage) >= 10.1.15 with php-composer(phpunit/php-code-coverage) < 11) @@ -271,6 +270,11 @@ exit $ret %changelog +* Wed Dec 11 2024 Remi Collet - 10.5.39-1 +- update to 10.5.39 +- raise dependency on myclabs/deep-copy 1.12.1 +- re-license spec file to CECILL-2.1 + * Mon Oct 28 2024 Remi Collet - 10.5.38-1 - update to 10.5.38 diff --git a/sources b/sources index 26ea5be..70989bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.38-a86773b.tgz) = 16749857e9507d429a40c3112dc0dd5b9e653ea1f9925a13a2cad41cf8d4f0fb56ecdf25f6f97cfdbb716ffe0b90129904ad12d39046f7a1c9fa4a0adc906574 +SHA512 (phpunit10-10.5.39-4e89eff.tgz) = 25536856bddf89b2b525c52fa8056bbad72dccf76454e618217915fa3e734ce3eae25b43b15e920443a66b32cff0619520e625f49f7ff272750330abd92d50e1 From 2636a4680d0f86fc3ad5ea64ea72b3035b73abaf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Dec 2024 14:16:31 +0100 Subject: [PATCH 14/19] v5.4.0 (cherry picked from commit 54be44b77856680eb22327107914a1eea238768e) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 74be364..56d441e 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /phpunit10-10.5.37-c7cffa0.tgz /phpunit10-10.5.38-a86773b.tgz /phpunit10-10.5.39-4e89eff.tgz +/phpunit10-10.5.40-e6ddda9.tgz diff --git a/phpunit10.spec b/phpunit10.spec index e68028a..64b746a 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -16,8 +16,8 @@ %bcond_with defcmd %endif -%global gh_commit 4e89eff200b801db58f3d580ad7426431949eaa9 -%global gh_date 2024-12-11 +%global gh_commit e6ddda95af52f69c1e0c7b4f977cccb58048798c +%global gh_date 2024-12-21 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -30,7 +30,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.39 +%global upstream_version 10.5.40 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Sun Dec 22 2024 Remi Collet - 10.5.40-1 +- update to 10.5.40 + * Wed Dec 11 2024 Remi Collet - 10.5.39-1 - update to 10.5.39 - raise dependency on myclabs/deep-copy 1.12.1 diff --git a/sources b/sources index 70989bf..ad395c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.39-4e89eff.tgz) = 25536856bddf89b2b525c52fa8056bbad72dccf76454e618217915fa3e734ce3eae25b43b15e920443a66b32cff0619520e625f49f7ff272750330abd92d50e1 +SHA512 (phpunit10-10.5.40-e6ddda9.tgz) = 5e1174f7b2f62c4948591443361a7d9a0afb6225817bad842754afea92f95c5eec04cede8c5390cf6b1da2fc3e8b50bbfc82502a4f3c828f0441684d2e8e91dc From 56a899452c79b76f203060e6a9daa059f6a3bd91 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Jan 2025 11:56:48 +0100 Subject: [PATCH 15/19] v10.5.41 (cherry picked from commit ef649646ff394fdb5cfc58699e0a986c6d1c549c) --- .gitignore | 1 + phpunit10.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 56d441e..0afc5c2 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /phpunit10-10.5.38-a86773b.tgz /phpunit10-10.5.39-4e89eff.tgz /phpunit10-10.5.40-e6ddda9.tgz +/phpunit10-10.5.41-e76586f.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 64b746a..c64b469 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phpunit10 # -# SPDX-FileCopyrightText: Copyright 2010-2024 Remi Collet +# SPDX-FileCopyrightText: Copyright 2010-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # @@ -16,8 +16,8 @@ %bcond_with defcmd %endif -%global gh_commit e6ddda95af52f69c1e0c7b4f977cccb58048798c -%global gh_date 2024-12-21 +%global gh_commit e76586fa3d49714f230221734b44892e384109d7 +%global gh_date 2025-01-13 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -30,7 +30,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.40 +%global upstream_version 10.5.41 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Mon Jan 13 2025 Remi Collet - 10.5.41-1 +- update to 10.5.41 + * Sun Dec 22 2024 Remi Collet - 10.5.40-1 - update to 10.5.40 diff --git a/sources b/sources index ad395c1..b20cfb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.40-e6ddda9.tgz) = 5e1174f7b2f62c4948591443361a7d9a0afb6225817bad842754afea92f95c5eec04cede8c5390cf6b1da2fc3e8b50bbfc82502a4f3c828f0441684d2e8e91dc +SHA512 (phpunit10-10.5.41-e76586f.tgz) = f2c5a2567722b0cf041e8f034a61570ee361d291cbc0cb284b20b207663c916fef334b355843755f6503e32d773845e91f6fa34ff6c762b4b2cdd2484b89543f From 00a557613b9921fbcb24d9a3e74dcfb3e243e90d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Jan 2025 09:51:18 +0100 Subject: [PATCH 16/19] v10.5.42 (cherry picked from commit 1751a12ad912087c6e86728de76bf3e8d2663a7a) (cherry picked from commit bb4d76ff20229f809d83e3c89925c60b77249e1e) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0afc5c2..cac71c0 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /phpunit10-10.5.39-4e89eff.tgz /phpunit10-10.5.40-e6ddda9.tgz /phpunit10-10.5.41-e76586f.tgz +/phpunit10-10.5.42-a9336f4.tgz diff --git a/phpunit10.spec b/phpunit10.spec index c64b469..7130621 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -16,8 +16,8 @@ %bcond_with defcmd %endif -%global gh_commit e76586fa3d49714f230221734b44892e384109d7 -%global gh_date 2025-01-13 +%global gh_commit a9336f40898c5b180e4d7305c62500b99ddf436b +%global gh_date 2025-01-28 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -30,7 +30,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.41 +%global upstream_version 10.5.42 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Wed Jan 29 2025 Remi Collet - 10.5.42-1 +- update to 10.5.42 + * Mon Jan 13 2025 Remi Collet - 10.5.41-1 - update to 10.5.41 diff --git a/sources b/sources index b20cfb6..701e5a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.41-e76586f.tgz) = f2c5a2567722b0cf041e8f034a61570ee361d291cbc0cb284b20b207663c916fef334b355843755f6503e32d773845e91f6fa34ff6c762b4b2cdd2484b89543f +SHA512 (phpunit10-10.5.42-a9336f4.tgz) = 917f3f381dbf110c83cac4c7a05588009b2d5209753dd6e6db6b5e020886eeb987a2a18ee5234113cba3766a8bbb99bd03cda4930e7504b46c9e98abcc504e61 From 278275254700e6ac36caf1840c0dff39836f3b3d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Jan 2025 16:37:43 +0100 Subject: [PATCH 17/19] v10.5.43 (cherry picked from commit d64d183326d35f4d1e6e569b41e6dd11ecfd82fe) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cac71c0..4eeca57 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /phpunit10-10.5.40-e6ddda9.tgz /phpunit10-10.5.41-e76586f.tgz /phpunit10-10.5.42-a9336f4.tgz +/phpunit10-10.5.43-fb117a8.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 7130621..76684b9 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -16,8 +16,8 @@ %bcond_with defcmd %endif -%global gh_commit a9336f40898c5b180e4d7305c62500b99ddf436b -%global gh_date 2025-01-28 +%global gh_commit fb117a8772c14fdc41acb1ded0de44de0c9091f9 +%global gh_date 2025-01-29 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -30,7 +30,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.42 +%global upstream_version 10.5.43 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Wed Jan 29 2025 Remi Collet - 10.5.43-1 +- update to 10.5.43 + * Wed Jan 29 2025 Remi Collet - 10.5.42-1 - update to 10.5.42 diff --git a/sources b/sources index 701e5a6..07d30ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.42-a9336f4.tgz) = 917f3f381dbf110c83cac4c7a05588009b2d5209753dd6e6db6b5e020886eeb987a2a18ee5234113cba3766a8bbb99bd03cda4930e7504b46c9e98abcc504e61 +SHA512 (phpunit10-10.5.43-fb117a8.tgz) = f7801cb7fa5bacfd865a8ecff6c2037cacbe599b1ce611ad8d6ca25ff36f672a4e8d8186244d985efc0ec7b3a35d68dc50ca5e46d051469785ed7afd23de140a From 7b701fb1a527f8b1bacb1dee80d7a01ac8e41b71 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Jan 2025 10:50:15 +0100 Subject: [PATCH 18/19] v10.5.44 (cherry picked from commit 5562db9756f72acefe07bda00fa2883d0f6e9040) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4eeca57..a189423 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /phpunit10-10.5.41-e76586f.tgz /phpunit10-10.5.42-a9336f4.tgz /phpunit10-10.5.43-fb117a8.tgz +/phpunit10-10.5.44-1381c62.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 76684b9..78e8c8a 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -16,8 +16,8 @@ %bcond_with defcmd %endif -%global gh_commit fb117a8772c14fdc41acb1ded0de44de0c9091f9 -%global gh_date 2025-01-29 +%global gh_commit 1381c62769be4bb88fa4c5aec1366c7c66ca4f36 +%global gh_date 2025-01-31 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -30,7 +30,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.43 +%global upstream_version 10.5.44 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Fri Jan 31 2025 Remi Collet - 10.5.44-1 +- update to 10.5.44 + * Wed Jan 29 2025 Remi Collet - 10.5.43-1 - update to 10.5.43 diff --git a/sources b/sources index 07d30ee..bf4e92b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.43-fb117a8.tgz) = f7801cb7fa5bacfd865a8ecff6c2037cacbe599b1ce611ad8d6ca25ff36f672a4e8d8186244d985efc0ec7b3a35d68dc50ca5e46d051469785ed7afd23de140a +SHA512 (phpunit10-10.5.44-1381c62.tgz) = 941cbdba4d4ea39321f335cc8c5d13777767c85eac97543dcef5167108f4dcf0b4ef315788bdb4e313f2bd49e773505330dce65cbae45e0ebb132b2981dda4f5 From efca259311875d6a70f92b13613436ac0d2ac906 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 7 Feb 2025 10:46:56 +0100 Subject: [PATCH 19/19] v10.5.45 (cherry picked from commit bc52925d0eeedd106f5ea48847a5bd8390674a9b) --- .gitignore | 1 + phpunit10.spec | 18 ++++++++---------- sources | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a189423..bf04a5e 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /phpunit10-10.5.42-a9336f4.tgz /phpunit10-10.5.43-fb117a8.tgz /phpunit10-10.5.44-1381c62.tgz +/phpunit10-10.5.45-bd68a78.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 78e8c8a..a5e22cb 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -10,14 +10,14 @@ %bcond_without tests -%if 0%{?fedora} == 39 +%if 0%{?fedora} == 39 || 0%{?fedora} == 40 %bcond_without defcmd %else %bcond_with defcmd %endif -%global gh_commit 1381c62769be4bb88fa4c5aec1366c7c66ca4f36 -%global gh_date 2025-01-31 +%global gh_commit bd68a781d8e30348bc297449f5234b3458267ae8 +%global gh_date 2025-02-07 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpunit @@ -30,7 +30,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.44 +%global upstream_version 10.5.45 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -135,19 +135,14 @@ Requires: (php-composer(sebastian/version) >= 4.0.1 with php-c # "ext-soap": "*", Suggests: php-soap # recommends latest versions -# 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 10.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} @@ -270,6 +265,9 @@ exit $ret %changelog +* Fri Feb 7 2025 Remi Collet - 10.5.45-1 +- update to 10.5.45 + * Fri Jan 31 2025 Remi Collet - 10.5.44-1 - update to 10.5.44 diff --git a/sources b/sources index bf4e92b..4d3d0b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.44-1381c62.tgz) = 941cbdba4d4ea39321f335cc8c5d13777767c85eac97543dcef5167108f4dcf0b4ef315788bdb4e313f2bd49e773505330dce65cbae45e0ebb132b2981dda4f5 +SHA512 (phpunit10-10.5.45-bd68a78.tgz) = 355af6f3ca95973eed631fbd5429f2a5a9ca6677aaaa79aea5e6140a4c3188c5116a141afa57e0782a691a5534fd75a5a673ae3338b7499a2de873ec52bbcfdf