From 61b9210021b8d6328b4ddbf19bad098acce1f23a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 3 Feb 2023 10:33:08 +0100 Subject: [PATCH 01/12] v9.6.0 (cherry picked from commit 4ad048d368706b2b76e3db620a1f02282eb1a591) --- .gitignore | 1 + phpunit9.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index a823462..0dd967c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /phpunit9-9.5.26-851867e.tgz /phpunit9-9.5.27-a2bc7ff.tgz /phpunit9-9.5.28-954ca31.tgz +/phpunit9-9.6.0-70fc8be.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 0c9e587..846c6cc 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -1,8 +1,8 @@ # remirepo/fedora spec file for phpunit9 # -# Copyright (c) 2010-2022 Remi Collet +# Copyright (c) 2010-2023 Remi Collet # -# License: CC-BY-SA +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 954ca3113a03bf780d22f07bf055d883ee04b65e +%global gh_commit 70fc8be1d0b9fad56a199a4df5f9cfabfc246f84 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -23,9 +23,9 @@ %global ns_vendor PHPUnit9 %global php_home %{_datadir}/php %global ver_major 9 -%global ver_minor 5 +%global ver_minor 6 -%global upstream_version 9.5.28 +%global upstream_version 9.6.0 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -184,6 +184,7 @@ if (PHP_VERSION_ID > 80100) { '%{php_home}/SebastianBergmann/FileIterator3/autoload.php', '%{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', @@ -197,7 +198,6 @@ if (PHP_VERSION_ID > 80100) { '%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php', '%{php_home}/SebastianBergmann/Type3/autoload.php', '%{php_home}/SebastianBergmann/Version3/autoload.php', - $inst, '%{php_home}/DeepCopy/autoload.php', '%{php_home}/PharIo/Manifest2/autoload.php', '%{php_home}/PharIo/Version3/autoload.php', @@ -252,6 +252,9 @@ exit $ret %changelog +* Fri Feb 3 2023 Remi Collet - 9.6.0-1 +- update to 9.6.0 + * Mon Jan 16 2023 Remi Collet - 9.5.28-1 - update to 9.5.28 - allow doctrine/instantiator v2 diff --git a/sources b/sources index 2db9052..e45c26f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.5.28-954ca31.tgz) = 5c12e28e2b0add0e4a3683b7a7e27c6bbfe9a195d1c2f3c9ff1630b325a19894b237ed8f29c62e32b8c3ba20213cb0a940089336d689e8cfa5f704be58be06c7 +SHA512 (phpunit9-9.6.0-70fc8be.tgz) = ad62d12309fe317c66932e5db8a03e17ec97e513f4d831324b9e77835e281932f2e08cd5e7750f6cb88861da4a12c437df1e4c92e005185c0a02a89921a54936 From e6af8953d12f7f3262cbda6fd2580a3e61b29164 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 6 Feb 2023 07:58:39 +0100 Subject: [PATCH 02/12] v9.6.3 (cherry picked from commit a9b3fa4ffef690bdb1b57a8ef07d6c4922fabd75) --- .gitignore | 1 + phpunit9-rpm.patch | 13 +++++++++---- phpunit9.spec | 7 +++++-- sources | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0dd967c..d2de14d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /phpunit9-9.5.27-a2bc7ff.tgz /phpunit9-9.5.28-954ca31.tgz /phpunit9-9.6.0-70fc8be.tgz +/phpunit9-9.6.3-e7b1615.tgz diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index 0360db7..be09111 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -33,15 +33,20 @@ diff -up ./phpunit.rpm ./phpunit } $options = getopt('', array('prepend:')); -@@ -95,4 +79,8 @@ unset($options); +@@ -95,4 +79,13 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; -PHPUnit\TextUI\Command::main(); -+if (class_exists('PHPUnit_TextUI_Command')) { -+ PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older ++if (class_exists('PHPUnit\\TextUI\\Application')) { ++ // PHPUnit v10 or newer ++ exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv'])); ++} else if (class_exists('PHPUnit_TextUI_Command')) { ++ // PHPUnit v5 or older ++ PHPUnit_TextUI_Command::main(); +} else { -+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer ++ // PHPUnit v6 to v9 ++ PHPUnit\TextUI\Command::main(); +} 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 diff --git a/phpunit9.spec b/phpunit9.spec index 846c6cc..411f35e 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 70fc8be1d0b9fad56a199a4df5f9cfabfc246f84 +%global gh_commit e7b1615e3e887d6c719121c6d4a44b0ab9645555 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.0 +%global upstream_version 9.6.3 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -252,6 +252,9 @@ exit $ret %changelog +* Mon Feb 6 2023 Remi Collet - 9.6.3-1 +- update to 9.6.3 + * Fri Feb 3 2023 Remi Collet - 9.6.0-1 - update to 9.6.0 diff --git a/sources b/sources index e45c26f..fb56990 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.0-70fc8be.tgz) = ad62d12309fe317c66932e5db8a03e17ec97e513f4d831324b9e77835e281932f2e08cd5e7750f6cb88861da4a12c437df1e4c92e005185c0a02a89921a54936 +SHA512 (phpunit9-9.6.3-e7b1615.tgz) = f67253af942fa8b132288a7f3efe53924d776d223298729a7e3f4b2c50ce5b25a36e20a7909a0fb2a972ecbdeb0e4f06fb24d9a880fce01442f9e27b816ab6ca From 0e2e99568a139ac9a3c8bd37af6e39a5927cff82 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Feb 2023 15:32:34 +0100 Subject: [PATCH 03/12] v9.6.4 (cherry picked from commit 9963348eb7e9fe1c9539f4f5f0e51b3492eba21b) --- .gitignore | 1 + phpunit9.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d2de14d..c8780a9 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /phpunit9-9.5.28-954ca31.tgz /phpunit9-9.6.0-70fc8be.tgz /phpunit9-9.6.3-e7b1615.tgz +/phpunit9-9.6.4-9125ee0.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 411f35e..3db03d7 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit e7b1615e3e887d6c719121c6d4a44b0ab9645555 +%global gh_commit 9125ee085b6d95e78277dc07aa1f46f9e0607b8d #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.3 +%global upstream_version 9.6.4 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -135,6 +135,8 @@ Requires: (php-composer(sebastian/version) >= 3.0.1 with php-c # "ext-xdebug": "*" Suggests: php-soap Suggests: php-xdebug +# recommends latest versions +Recommends: phpunit10 # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 8.0.0 @@ -252,6 +254,9 @@ exit $ret %changelog +* Tue Feb 28 2023 Remi Collet - 9.6.4-1 +- update to 9.6.4 + * Mon Feb 6 2023 Remi Collet - 9.6.3-1 - update to 9.6.3 diff --git a/sources b/sources index fb56990..eea7ef4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.3-e7b1615.tgz) = f67253af942fa8b132288a7f3efe53924d776d223298729a7e3f4b2c50ce5b25a36e20a7909a0fb2a972ecbdeb0e4f06fb24d9a880fce01442f9e27b816ab6ca +SHA512 (phpunit9-9.6.4-9125ee0.tgz) = 46a418783f2a574f57aa3cc1acb558f301727fa68f2bb185bb58e03516fba2534d1047b0bea4b0ef834be0778a1e23db5760b0a957e4583a0d6c0bc4851f1b67 From a3ce706d764c5818030d66d960e1e818ea96400f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Mar 2023 10:29:54 +0100 Subject: [PATCH 04/12] v9.6.5 (cherry picked from commit bc041c2d862f68d80663b66742df6bd552ca96ae) --- .gitignore | 1 + phpunit9.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c8780a9..4d4adee 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /phpunit9-9.6.0-70fc8be.tgz /phpunit9-9.6.3-e7b1615.tgz /phpunit9-9.6.4-9125ee0.tgz +/phpunit9-9.6.5-86e7619.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 3db03d7..2a9e99c 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 9125ee085b6d95e78277dc07aa1f46f9e0607b8d +%global gh_commit 86e761949019ae83f49240b2f2123fb5ab3b2fc5 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.4 +%global upstream_version 9.6.5 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -254,6 +254,9 @@ exit $ret %changelog +* Thu Mar 9 2023 Remi Collet - 9.6.5-1 +- update to 9.6.5 + * Tue Feb 28 2023 Remi Collet - 9.6.4-1 - update to 9.6.4 diff --git a/sources b/sources index eea7ef4..a96b7bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.4-9125ee0.tgz) = 46a418783f2a574f57aa3cc1acb558f301727fa68f2bb185bb58e03516fba2534d1047b0bea4b0ef834be0778a1e23db5760b0a957e4583a0d6c0bc4851f1b67 +SHA512 (phpunit9-9.6.5-86e7619.tgz) = 124164f8d4a6c44688341fd5e2198d8df228100df1ceafd48d8ab6b2f83bfa4ed67373e328469ee1edf24929eca477fbb33b91c5170e30f6a36119ff784feebd From f6617a7882033cdaffaa88e7a9b18b144d3dcc80 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 Mar 2023 17:10:44 +0200 Subject: [PATCH 05/12] v9.6.6 (cherry picked from commit 60a3fc65d71bf67a8ad23e1b5d2351ddfb5da60b) --- .gitignore | 1 + phpunit9.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4d4adee..425f95e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /phpunit9-9.6.3-e7b1615.tgz /phpunit9-9.6.4-9125ee0.tgz /phpunit9-9.6.5-86e7619.tgz +/phpunit9-9.6.6-b65d59a.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 2a9e99c..b268db3 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 86e761949019ae83f49240b2f2123fb5ab3b2fc5 +%global gh_commit b65d59a059d3004a040c16a82e07bbdf6cfdd115 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.5 +%global upstream_version 9.6.6 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -254,6 +254,9 @@ exit $ret %changelog +* Mon Mar 27 2023 Remi Collet - 9.6.6-1 +- update to 9.6.6 + * Thu Mar 9 2023 Remi Collet - 9.6.5-1 - update to 9.6.5 diff --git a/sources b/sources index a96b7bb..a641a19 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.5-86e7619.tgz) = 124164f8d4a6c44688341fd5e2198d8df228100df1ceafd48d8ab6b2f83bfa4ed67373e328469ee1edf24929eca477fbb33b91c5170e30f6a36119ff784feebd +SHA512 (phpunit9-9.6.6-b65d59a.tgz) = 22ba0a4a17c68dfb26a42758e62346eb88123df4b39355f716cbbd9aa735334dd911561f552fae04a9473f6e416fae8231cb21c7c9e68ed4fe036659e8960972 From 8ceac1664c4cf408cdadb3546e52e43acf3cb422 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 14 Apr 2023 14:45:19 +0200 Subject: [PATCH 06/12] v9.6.7 (cherry picked from commit 735f23ca2291be4e24b1db29d74a0f912e746ba0) --- .gitignore | 1 + phpunit9.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 425f95e..5d8c7ea 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /phpunit9-9.6.4-9125ee0.tgz /phpunit9-9.6.5-86e7619.tgz /phpunit9-9.6.6-b65d59a.tgz +/phpunit9-9.6.7-c993f0d.tgz diff --git a/phpunit9.spec b/phpunit9.spec index b268db3..5bb5c2b 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b65d59a059d3004a040c16a82e07bbdf6cfdd115 +%global gh_commit c993f0d3b0489ffc42ee2fe0bd645af1538a63b2 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.6 +%global upstream_version 9.6.7 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -254,6 +254,9 @@ exit $ret %changelog +* Fri Apr 14 2023 Remi Collet - 9.6.7-1 +- update to 9.6.7 + * Mon Mar 27 2023 Remi Collet - 9.6.6-1 - update to 9.6.6 diff --git a/sources b/sources index a641a19..0d6aa5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.6-b65d59a.tgz) = 22ba0a4a17c68dfb26a42758e62346eb88123df4b39355f716cbbd9aa735334dd911561f552fae04a9473f6e416fae8231cb21c7c9e68ed4fe036659e8960972 +SHA512 (phpunit9-9.6.7-c993f0d.tgz) = c21c8197496ab118f01cafdee5611830663ba570030a5be2e514d13f9382d30b3b6a83b1f22a7bf12e002b985745edf1810b9f1429da95234dbaf8c241072d72 From 475612d04762a699247777a5d237284762727d74 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 11 May 2023 11:20:38 +0200 Subject: [PATCH 07/12] v9.6.8 (cherry picked from commit 7684ae899e5ada03416dbd205f685d2ba5a3a4d2) --- .gitignore | 1 + phpunit9.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5d8c7ea..cd0b761 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /phpunit9-9.6.5-86e7619.tgz /phpunit9-9.6.6-b65d59a.tgz /phpunit9-9.6.7-c993f0d.tgz +/phpunit9-9.6.8-17d621b.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 5bb5c2b..260a806 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit c993f0d3b0489ffc42ee2fe0bd645af1538a63b2 +%global gh_commit 17d621b3aff84d0c8b62539e269e87d8d5baa76e #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.7 +%global upstream_version 9.6.8 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -160,7 +160,7 @@ Documentation: https://phpunit.readthedocs.io/ %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p0 -b .rpm +%patch -P0 -p0 -b .rpm find . -name \*.rpm -delete -print @@ -254,6 +254,9 @@ exit $ret %changelog +* Thu May 11 2023 Remi Collet - 9.6.8-1 +- update to 9.6.8 + * Fri Apr 14 2023 Remi Collet - 9.6.7-1 - update to 9.6.7 diff --git a/sources b/sources index 0d6aa5b..6caa409 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.7-c993f0d.tgz) = c21c8197496ab118f01cafdee5611830663ba570030a5be2e514d13f9382d30b3b6a83b1f22a7bf12e002b985745edf1810b9f1429da95234dbaf8c241072d72 +SHA512 (phpunit9-9.6.8-17d621b.tgz) = 26960a4e66551ee175cfcef3f7aae61e8967c0647c4fe4dfa12f625ad743040350181fcb0dda014a756621a4d81ac74b9d87525b7f4570eca47cc7e0d1816008 From 91957ce56f658313db9d2cfba07f804366b95de6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 12 Jun 2023 08:16:40 +0200 Subject: [PATCH 08/12] v9.6.9 (cherry picked from commit 001d90ac9940c363100e89c62dc490fa27564d86) --- .gitignore | 1 + phpunit9.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cd0b761..234763d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /phpunit9-9.6.6-b65d59a.tgz /phpunit9-9.6.7-c993f0d.tgz /phpunit9-9.6.8-17d621b.tgz +/phpunit9-9.6.9-a9aceaf.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 260a806..89dd69a 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 17d621b3aff84d0c8b62539e269e87d8d5baa76e +%global gh_commit a9aceaf20a682aeacf28d582654a1670d8826778 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.8 +%global upstream_version 9.6.9 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -254,6 +254,9 @@ exit $ret %changelog +* Mon Jun 12 2023 Remi Collet - 9.6.9-1 +- update to 9.6.9 + * Thu May 11 2023 Remi Collet - 9.6.8-1 - update to 9.6.8 diff --git a/sources b/sources index 6caa409..64a9222 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.8-17d621b.tgz) = 26960a4e66551ee175cfcef3f7aae61e8967c0647c4fe4dfa12f625ad743040350181fcb0dda014a756621a4d81ac74b9d87525b7f4570eca47cc7e0d1816008 +SHA512 (phpunit9-9.6.9-a9aceaf.tgz) = 319837f1653ff69e94bf8db91afe2fcd78c016f784a1d43231c9e52ae2ab768338bf315893a21bb0066c633445021517b46f1154a8963f565f3e713d3d04dfd3 From cb7c12b0ebb2d54d591da9ae1b71eb2cb6f769ea Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Jul 2023 07:22:40 +0200 Subject: [PATCH 09/12] v9.6.10 (cherry picked from commit 324af538ff928c9ee60e353be0bd77e949766a37) --- .gitignore | 1 + phpunit9.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 234763d..b2ecda5 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /phpunit9-9.6.7-c993f0d.tgz /phpunit9-9.6.8-17d621b.tgz /phpunit9-9.6.9-a9aceaf.tgz +/phpunit9-9.6.10-a6d3516.tgz diff --git a/phpunit9.spec b/phpunit9.spec index 89dd69a..c5be4b3 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a9aceaf20a682aeacf28d582654a1670d8826778 +%global gh_commit a6d351645c3fe5a30f5e86be6577d946af65a328 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -25,7 +25,7 @@ %global ver_major 9 %global ver_minor 6 -%global upstream_version 9.6.9 +%global upstream_version 9.6.10 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -254,6 +254,9 @@ exit $ret %changelog +* Mon Jul 10 2023 Remi Collet - 9.6.10-1 +- update to 9.6.10 + * Mon Jun 12 2023 Remi Collet - 9.6.9-1 - update to 9.6.9 diff --git a/sources b/sources index 64a9222..1f32953 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.6.9-a9aceaf.tgz) = 319837f1653ff69e94bf8db91afe2fcd78c016f784a1d43231c9e52ae2ab768338bf315893a21bb0066c633445021517b46f1154a8963f565f3e713d3d04dfd3 +SHA512 (phpunit9-9.6.10-a6d3516.tgz) = 63ac6facc5082dfee7f02ca3c25d3ec107f12cebf52a05cea09dc1175f4ef172a4de2ec44ffc11458f5d72806c0409f702c9c592ae05542825a13a3275eaee80 From 5491580ed807f10f1f78a558ad198aa16fe368fb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Aug 2023 11:13:56 +0200 Subject: [PATCH 10/12] v9.6.11 (cherry picked from commit d7c31635dbf5f5282c4b4cdd52aa2cd7e92488b6) (cherry picked from commit 3450328f3018a1309bd70a3a0f0c16b5a0480cd1) --- .gitignore | 1 + phpunit9.spec | 11 ++++++----- sources | 2 +- 3 files changed, 8 insertions(+), 6 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 c5be4b3..b49a178 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,7 +23,7 @@ %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} @@ -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 + * Mon Jul 10 2023 Remi Collet - 9.6.10-1 - update to 9.6.10 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 2af1bafb27708ba76fb1160a0e384f25d4cfac6a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Sep 2023 09:17:05 +0200 Subject: [PATCH 11/12] update to 9.6.12 raise dependency on phpunit/php-code-coverage 9.2.28 (cherry picked from commit ea3eda18ed40187e3393cc12655069c499bd9ce7) --- .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 b49a178..4ef00ac 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 5f35fd45bda8dc8e1fe24046424726cda3362d48 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Sep 2023 10:26:37 +0200 Subject: [PATCH 12/12] v9.6.13 (cherry picked from commit 55903c3bfb95c58279fc9103cd26792df66012e9) --- .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 4ef00ac..593c6e1 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