From 524a2d5bca023c1c72af93a03924b5802f98ae4d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Aug 2023 11:28:28 +0200 Subject: [PATCH 01/25] v10.3.2 (cherry picked from commit 5f34fd97428d69f94d08d63b4d56ff9da90f822d) --- .gitignore | 1 + phpunit10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ab552b3..7c75648 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /phpunit10-10.2.7-a215d9e.tgz /phpunit10-10.3.0-c87ae28.tgz /phpunit10-10.3.1-d442ce7.tgz +/phpunit10-10.3.2-0dafb11.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 833ad5e..6a42dc5 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -11,7 +11,7 @@ %bcond_without tests -%global gh_commit d442ce7c4104d5683c12e67e4dcb5058159e9804 +%global gh_commit 0dafb1175c366dd274eaa9a625e914451506bcd1 #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 10 %global ver_minor 3 -%global upstream_version 10.3.1 +%global upstream_version 10.3.2 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -249,6 +249,9 @@ exit $ret %changelog +* Fri Aug 18 2023 Remi Collet - 10.3.2-1 +- update to 10.3.2 + * Fri Aug 4 2023 Remi Collet - 10.3.1-1 - update to 10.3.1 diff --git a/sources b/sources index 19b0e96..6121480 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.3.1-d442ce7.tgz) = f1a7f77baef4ad4b20192b2397af4d3fee4ed9be9dfb2710ce8975ad2e51c822e85e7ca5f7bd211bc97de65b56762547a0d62d25f228a886d72a6261b4440003 +SHA512 (phpunit10-10.3.2-0dafb11.tgz) = 4f73b5d18870ec45bd85a4f053b03bb52769ce1beb254bc71cf393de6cf9bf776d28c4c180f917ae3a51859517891f75efa0d0269f9c05737b3333ac79ae3d71 From a3fd81f54e892e6c3fba5160ba0f6c7ad0b36c25 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Sep 2023 08:38:43 +0200 Subject: [PATCH 02/25] v10.3.3 (cherry picked from commit f72196a2be88c7dd8a15b5717c133d9b140895a0) --- .gitignore | 1 + phpunit10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c75648..d44ad3b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /phpunit10-10.3.0-c87ae28.tgz /phpunit10-10.3.1-d442ce7.tgz /phpunit10-10.3.2-0dafb11.tgz +/phpunit10-10.3.3-241ed4d.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 6a42dc5..828b542 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -11,7 +11,7 @@ %bcond_without tests -%global gh_commit 0dafb1175c366dd274eaa9a625e914451506bcd1 +%global gh_commit 241ed4dd0db1c096984e62d414c4e1ac8d5dbff4 #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 10 %global ver_minor 3 -%global upstream_version 10.3.2 +%global upstream_version 10.3.3 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -249,6 +249,9 @@ exit $ret %changelog +* Tue Sep 5 2023 Remi Collet - 10.3.3-1 +- update to 10.3.3 + * Fri Aug 18 2023 Remi Collet - 10.3.2-1 - update to 10.3.2 diff --git a/sources b/sources index 6121480..34176c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.3.2-0dafb11.tgz) = 4f73b5d18870ec45bd85a4f053b03bb52769ce1beb254bc71cf393de6cf9bf776d28c4c180f917ae3a51859517891f75efa0d0269f9c05737b3333ac79ae3d71 +SHA512 (phpunit10-10.3.3-241ed4d.tgz) = 383236d253b5cedb2cf134cf93eda9f71272ec85077bb773c5871c8175ce472e6b05d05a9a27a86866958ba0463233a1f979b4c43687b02617f65fb685d803c4 From db1907614fd6abeb26bc9dee365177140c667006 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Sep 2023 09:27:14 +0200 Subject: [PATCH 03/25] update to 10.3.4 raise dependency on phpunit/php-code-coverage 10.1.5 (cherry picked from commit 2409e6df90571a5d42f3dc6cd2021ede0ad1b3f5) --- .gitignore | 1 + phpunit10.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d44ad3b..fb81ed0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /phpunit10-10.3.1-d442ce7.tgz /phpunit10-10.3.2-0dafb11.tgz /phpunit10-10.3.3-241ed4d.tgz +/phpunit10-10.3.4-b8d5947.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 828b542..85ce5ff 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -11,7 +11,7 @@ %bcond_without tests -%global gh_commit 241ed4dd0db1c096984e62d414c4e1ac8d5dbff4 +%global gh_commit b8d59476f19115c9774b3b447f78131781c6c32b #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 10 %global ver_minor 3 -%global upstream_version 10.3.3 +%global upstream_version 10.3.4 #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": "^10.1.1", +# "phpunit/php-code-coverage": "^10.1.5", # "phpunit/php-file-iterator": "^4.0", # "phpunit/php-invoker": "^4.0", # "phpunit/php-text-template": "^3.0", @@ -110,7 +110,7 @@ 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.1 with php-composer(phpunit/php-code-coverage) < 11) +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(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) @@ -249,6 +249,10 @@ exit $ret %changelog +* Wed Sep 13 2023 Remi Collet - 10.3.4-1 +- update to 10.3.4 +- raise dependency on phpunit/php-code-coverage 10.1.5 + * Tue Sep 5 2023 Remi Collet - 10.3.3-1 - update to 10.3.3 diff --git a/sources b/sources index 34176c6..72ccb34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.3.3-241ed4d.tgz) = 383236d253b5cedb2cf134cf93eda9f71272ec85077bb773c5871c8175ce472e6b05d05a9a27a86866958ba0463233a1f979b4c43687b02617f65fb685d803c4 +SHA512 (phpunit10-10.3.4-b8d5947.tgz) = 10e3f470bbb2645434daab546ddcedef4e6df740eca1c1046019b088f06717199b9d1bf88b77aedb246bcb1f75b5bf53088116472be67413500d7b96d42a30e7 From aa9045753be91a7382315938d22d451ad737fbd8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Sep 2023 10:11:38 +0200 Subject: [PATCH 04/25] update to 10.3.5 raise dependency on sebastian/exporter 5 (cherry picked from commit dcef4241928d86f28e6836d9a0f6b667e20630bd) --- .gitignore | 1 + phpunit10.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index fb81ed0..b4f863d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /phpunit10-10.3.2-0dafb11.tgz /phpunit10-10.3.3-241ed4d.tgz /phpunit10-10.3.4-b8d5947.tgz +/phpunit10-10.3.5-747c3b2.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 85ce5ff..35a3ffa 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -11,7 +11,7 @@ %bcond_without tests -%global gh_commit b8d59476f19115c9774b3b447f78131781c6c32b +%global gh_commit 747c3b2038f1139e3dcd9886a3f5a948648b7503 #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 10 %global ver_minor 3 -%global upstream_version 10.3.4 +%global upstream_version 10.3.5 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -57,7 +57,7 @@ BuildRequires: (php-composer(sebastian/code-unit) >= 2.0 with php-c 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.0 with php-composer(sebastian/exporter) < 6) +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/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) @@ -93,7 +93,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "sebastian/comparator": "^5.0", # "sebastian/diff": "^5.0", # "sebastian/environment": "^6.0", -# "sebastian/exporter": "^5.0", +# "sebastian/exporter": "^5.1", # "sebastian/global-state": "^6.0.1", # "sebastian/object-enumerator": "^5.0", # "sebastian/recursion-context": "^5.0", @@ -120,7 +120,7 @@ Requires: (php-composer(sebastian/code-unit) >= 2.0 with php-c 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.0 with php-composer(sebastian/exporter) < 6) +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/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) @@ -249,6 +249,10 @@ exit $ret %changelog +* Tue Sep 19 2023 Remi Collet - 10.3.5-1 +- update to 10.3.5 +- raise dependency on sebastian/exporter 5 + * Wed Sep 13 2023 Remi Collet - 10.3.4-1 - update to 10.3.4 - raise dependency on phpunit/php-code-coverage 10.1.5 diff --git a/sources b/sources index 72ccb34..a363c88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.3.4-b8d5947.tgz) = 10e3f470bbb2645434daab546ddcedef4e6df740eca1c1046019b088f06717199b9d1bf88b77aedb246bcb1f75b5bf53088116472be67413500d7b96d42a30e7 +SHA512 (phpunit10-10.3.5-747c3b2.tgz) = e0fbbac35dc1948ddc42e2752b390c65951efddc53b7b64dcd1f0b714cb3e089336dc137db2ec68b2db68ce8c8d23bef2024459729ab11df6179eb812ba1064e From c69d7daf96eb1a6e09b2ca9bb76d0156694621a9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 6 Oct 2023 07:40:42 +0200 Subject: [PATCH 05/25] v10.4.0 (cherry picked from commit 776c0a6304ddf75c92a6ca0a5afe0ac098fad2d5) --- .gitignore | 1 + phpunit10.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b4f863d..9eac6b7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /phpunit10-10.3.3-241ed4d.tgz /phpunit10-10.3.4-b8d5947.tgz /phpunit10-10.3.5-747c3b2.tgz +/phpunit10-10.4.0-9784e87.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 35a3ffa..052efec 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -11,7 +11,7 @@ %bcond_without tests -%global gh_commit 747c3b2038f1139e3dcd9886a3f5a948648b7503 +%global gh_commit 9784e877e3700de37475545bdbdce8383ff53d25 #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 PHPUnit10 %global php_home %{_datadir}/php %global ver_major 10 -%global ver_minor 3 +%global ver_minor 4 -%global upstream_version 10.3.5 +%global upstream_version 10.4.0 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -43,11 +43,10 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 8.1 -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(phpunit/php-code-coverage) >= 10.1.1 with php-composer(phpunit/php-code-coverage) < 11) +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(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) @@ -141,6 +140,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. @@ -249,6 +253,9 @@ exit $ret %changelog +* Fri Oct 6 2023 Remi Collet - 10.4.0-1 +- update to 10.4.0 + * Tue Sep 19 2023 Remi Collet - 10.3.5-1 - update to 10.3.5 - raise dependency on sebastian/exporter 5 diff --git a/sources b/sources index a363c88..f32e715 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.3.5-747c3b2.tgz) = e0fbbac35dc1948ddc42e2752b390c65951efddc53b7b64dcd1f0b714cb3e089336dc137db2ec68b2db68ce8c8d23bef2024459729ab11df6179eb812ba1064e +SHA512 (phpunit10-10.4.0-9784e87.tgz) = 599e5fd6d459bf9e7c1661e9d8bdb17c2e91d9a696ea5b5826a9a19d78cb8efdcecd56c836912bde55f08a69f0e5900b35af3fbcafcc29c12ca96de2d3c587a5 From 7fc3e52ca75287e4b399a1d2051e2cd3c595d972 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 10 Oct 2023 11:21:46 +0200 Subject: [PATCH 06/25] v10.4.1 (cherry picked from commit d6510f45d605d22d8c03798d4870e4e5f0de809b) --- .gitignore | 1 + phpunit10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9eac6b7..3dd3b5e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /phpunit10-10.3.4-b8d5947.tgz /phpunit10-10.3.5-747c3b2.tgz /phpunit10-10.4.0-9784e87.tgz +/phpunit10-10.4.1-62bd7af.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 052efec..bd692d8 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -11,7 +11,7 @@ %bcond_without tests -%global gh_commit 9784e877e3700de37475545bdbdce8383ff53d25 +%global gh_commit 62bd7af13d282deeb95650077d28ba3600ca321c #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 10 %global ver_minor 4 -%global upstream_version 10.4.0 +%global upstream_version 10.4.1 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -253,6 +253,9 @@ exit $ret %changelog +* Sun Oct 8 2023 Remi Collet - 10.4.1-1 +- update to 10.4.1 + * Fri Oct 6 2023 Remi Collet - 10.4.0-1 - update to 10.4.0 diff --git a/sources b/sources index f32e715..cf103f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.4.0-9784e87.tgz) = 599e5fd6d459bf9e7c1661e9d8bdb17c2e91d9a696ea5b5826a9a19d78cb8efdcecd56c836912bde55f08a69f0e5900b35af3fbcafcc29c12ca96de2d3c587a5 +SHA512 (phpunit10-10.4.1-62bd7af.tgz) = 7d469ea3b15f08adf6d48c9ec2099a21eb4f645bd8ba1d99525d99d3d39e8b2eb5a5baa0097a1afbf44689e4b508809579e86c46dc586f21c4c85dcb711ca5c7 From 66a09b5b3184ab6701e9f2b42a3b41b61eb683e0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 26 Oct 2023 10:59:00 +0200 Subject: [PATCH 07/25] v10.4.2 (cherry picked from commit c5663696460e129b57d9fd40b89334ef9fb7c578) --- .gitignore | 1 + phpunit10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3dd3b5e..bf5bf76 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /phpunit10-10.3.5-747c3b2.tgz /phpunit10-10.4.0-9784e87.tgz /phpunit10-10.4.1-62bd7af.tgz +/phpunit10-10.4.2-cacd8b9.tgz diff --git a/phpunit10.spec b/phpunit10.spec index bd692d8..4f7da1a 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -11,7 +11,7 @@ %bcond_without tests -%global gh_commit 62bd7af13d282deeb95650077d28ba3600ca321c +%global gh_commit cacd8b9dd224efa8eb28beb69004126c7ca1a1a1 #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 10 %global ver_minor 4 -%global upstream_version 10.4.1 +%global upstream_version 10.4.2 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -253,6 +253,9 @@ exit $ret %changelog +* Thu Oct 26 2023 Remi Collet - 10.4.2-1 +- update to 10.4.2 + * Sun Oct 8 2023 Remi Collet - 10.4.1-1 - update to 10.4.1 diff --git a/sources b/sources index cf103f7..5ec54bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.4.1-62bd7af.tgz) = 7d469ea3b15f08adf6d48c9ec2099a21eb4f645bd8ba1d99525d99d3d39e8b2eb5a5baa0097a1afbf44689e4b508809579e86c46dc586f21c4c85dcb711ca5c7 +SHA512 (phpunit10-10.4.2-cacd8b9.tgz) = 74c113f7aae00a26f488eb29179367b679f4b83e72469cb9399ea6c9abe862b4336ac8d27770a792f26ee3e00fec08ae2a6ad7e0070a7c5385551053959c0d86 From 8632c06be00e2619a8a7c5ecbe26d03a42895af1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 1 Dec 2023 10:28:20 +0100 Subject: [PATCH 08/25] update to 10.5.0 provide phpunit command (cherry picked from commit 5edbe5c4e6e5c78b1c90bcf78249ad71589d309c) --- .gitignore | 1 + phpunit10.spec | 23 ++++++++++++++++++++--- sources | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bf5bf76..605ea25 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /phpunit10-10.4.0-9784e87.tgz /phpunit10-10.4.1-62bd7af.tgz /phpunit10-10.4.2-cacd8b9.tgz +/phpunit10-10.5.0-80cab18.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 4f7da1a..1a4116b 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -11,7 +11,13 @@ %bcond_without tests -%global gh_commit cacd8b9dd224efa8eb28beb69004126c7ca1a1a1 +%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 +%bcond_without defcmd +%else +%bcond_with defcmd +%endif + +%global gh_commit 80cab181aebc2efac422940443e28db556137637 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -23,9 +29,9 @@ %global ns_vendor PHPUnit10 %global php_home %{_datadir}/php %global ver_major 10 -%global ver_minor 4 +%global ver_minor 5 -%global upstream_version 10.4.2 +%global upstream_version 10.5.0 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -226,6 +232,10 @@ mkdir %{buildroot}%{php_home}/%{ns_vendor}/Extensions install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name} install -p -m 644 phpunit.xsd %{buildroot}%{php_home}/%{ns_vendor}/phpunit.xsd +%if %{with defcmd} +ln -s %{name} %{buildroot}%{_bindir}/phpunit +%endif + %if %{with tests} %check @@ -249,10 +259,17 @@ exit $ret %doc README.md ChangeLog-%{ver_major}.%{ver_minor}.md %doc composer.json %{_bindir}/%{name} +%if %{with defcmd} +%{_bindir}/phpunit +%endif %{php_home}/%{ns_vendor} %changelog +* Fri Dec 1 2023 Remi Collet - 10.5.0-1 +- update to 10.5.0 +- provide phpunit command + * Thu Oct 26 2023 Remi Collet - 10.4.2-1 - update to 10.4.2 diff --git a/sources b/sources index 5ec54bd..7956be2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.4.2-cacd8b9.tgz) = 74c113f7aae00a26f488eb29179367b679f4b83e72469cb9399ea6c9abe862b4336ac8d27770a792f26ee3e00fec08ae2a6ad7e0070a7c5385551053959c0d86 +SHA512 (phpunit10-10.5.0-80cab18.tgz) = 830d32f46c35105c4b79b49f122c8c31d8f835495976a829c3ca1779b590d0b13aea3350e0d3737d1ee59850dc2c9f371eca5653ff320bb716153f5e96c5f99d From 5886188eb2772541b9e2b45cd1b8a4d3b992a6b5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Dec 2023 10:45:01 +0100 Subject: [PATCH 09/25] v10.5.1 (cherry picked from commit 8c8dd2ef02790a4324ef77dd3ebc863e6c7b733d) --- .gitignore | 1 + phpunit10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 605ea25..641d19e 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /phpunit10-10.4.1-62bd7af.tgz /phpunit10-10.4.2-cacd8b9.tgz /phpunit10-10.5.0-80cab18.tgz +/phpunit10-10.5.1-d5d9dca.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 1a4116b..f4ec14d 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,7 +17,7 @@ %bcond_with defcmd %endif -%global gh_commit 80cab181aebc2efac422940443e28db556137637 +%global gh_commit d5d9dca6a902d05b34c4bcbc7c1636ce1dc25408 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.0 +%global upstream_version 10.5.1 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -266,6 +266,9 @@ exit $ret %changelog +* Sat Dec 2 2023 Remi Collet - 10.5.1-1 +- update to 10.5.1 + * Fri Dec 1 2023 Remi Collet - 10.5.0-1 - update to 10.5.0 - provide phpunit command diff --git a/sources b/sources index 7956be2..eb051e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.0-80cab18.tgz) = 830d32f46c35105c4b79b49f122c8c31d8f835495976a829c3ca1779b590d0b13aea3350e0d3737d1ee59850dc2c9f371eca5653ff320bb716153f5e96c5f99d +SHA512 (phpunit10-10.5.1-d5d9dca.tgz) = 9829e81e6d5e5bced5356b311e40c03d5032f1fd8c5d711153b71e1ade25aa6ab691c7e9aa0480209da8815bcbf1ee7722684d52baeb2b1ddeeb69a0a955eb51 From 634413a98c71df3e6eeb359e45a969e2d8316ede Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Dec 2023 09:36:49 +0100 Subject: [PATCH 10/25] v10.5.2 (cherry picked from commit 2ebeb5410ab5fdab06a1a26df523bd4b06d90610) --- .gitignore | 1 + phpunit10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 641d19e..b18eab6 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /phpunit10-10.4.2-cacd8b9.tgz /phpunit10-10.5.0-80cab18.tgz /phpunit10-10.5.1-d5d9dca.tgz +/phpunit10-10.5.2-5aedff4.tgz diff --git a/phpunit10.spec b/phpunit10.spec index f4ec14d..41af482 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,7 +17,7 @@ %bcond_with defcmd %endif -%global gh_commit d5d9dca6a902d05b34c4bcbc7c1636ce1dc25408 +%global gh_commit 5aedff46afba98dddecaa12349ec044d9103d4fe #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.1 +%global upstream_version 10.5.2 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -266,6 +266,9 @@ exit $ret %changelog +* Wed Dec 6 2023 Remi Collet - 10.5.2-1 +- update to 10.5.2 + * Sat Dec 2 2023 Remi Collet - 10.5.1-1 - update to 10.5.1 diff --git a/sources b/sources index eb051e4..069a73c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.1-d5d9dca.tgz) = 9829e81e6d5e5bced5356b311e40c03d5032f1fd8c5d711153b71e1ade25aa6ab691c7e9aa0480209da8815bcbf1ee7722684d52baeb2b1ddeeb69a0a955eb51 +SHA512 (phpunit10-10.5.2-5aedff4.tgz) = 235fc591e47080e9ce24e5a91c72838cc17dc310682cb01a54021bd54e61a0a2822103ce2c2d2d1fff6b1b7b5030dace974a38de3d998b4a416cdb980d823a42 From 5cc08139563604a4effd5bd5dba5987a453d943d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Dec 2023 09:40:24 +0100 Subject: [PATCH 11/25] v10.5.3 (cherry picked from commit b6938f028a72aa9b41e14453b789c5103c3687fa) --- .gitignore | 1 + phpunit10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b18eab6..6552e7a 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /phpunit10-10.5.0-80cab18.tgz /phpunit10-10.5.1-d5d9dca.tgz /phpunit10-10.5.2-5aedff4.tgz +/phpunit10-10.5.3-6fce887.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 41af482..9cde84e 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,7 +17,7 @@ %bcond_with defcmd %endif -%global gh_commit 5aedff46afba98dddecaa12349ec044d9103d4fe +%global gh_commit 6fce887c71076a73f32fd3e0774a6833fc5c7f19 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.2 +%global upstream_version 10.5.3 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -266,6 +266,9 @@ exit $ret %changelog +* Wed Dec 13 2023 Remi Collet - 10.5.3-1 +- update to 10.5.3 + * Wed Dec 6 2023 Remi Collet - 10.5.2-1 - update to 10.5.2 diff --git a/sources b/sources index 069a73c..066ca46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.2-5aedff4.tgz) = 235fc591e47080e9ce24e5a91c72838cc17dc310682cb01a54021bd54e61a0a2822103ce2c2d2d1fff6b1b7b5030dace974a38de3d998b4a416cdb980d823a42 +SHA512 (phpunit10-10.5.3-6fce887.tgz) = 8cd5102c32eed56c861444f1f4704d4ee011713a0e8833a3e02ce8d1af556455b7f4a28b180645172a76f235fb5d67b0897e61221f9d1c42f60caf5010423e09 From 8662337261e67cf593b29c4bd0cbcbfa2b72a8c5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Jan 2024 07:56:26 +0100 Subject: [PATCH 12/25] v10.5.5 (cherry picked from commit 70974452dde276ccaa5e4a361b3c910ca5a26413) --- .gitignore | 1 + phpunit10.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6552e7a..945833c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /phpunit10-10.5.1-d5d9dca.tgz /phpunit10-10.5.2-5aedff4.tgz /phpunit10-10.5.3-6fce887.tgz +/phpunit10-10.5.5-ed21115.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 9cde84e..37ca0ed 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,7 +17,7 @@ %bcond_with defcmd %endif -%global gh_commit 6fce887c71076a73f32fd3e0774a6833fc5c7f19 +%global gh_commit ed21115d505b4b4f7dc7b5651464e19a2c7f7856 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann @@ -31,7 +31,7 @@ %global ver_major 10 %global ver_minor 5 -%global upstream_version 10.5.3 +%global upstream_version 10.5.5 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -266,6 +266,9 @@ exit $ret %changelog +* Thu Dec 28 2023 Remi Collet - 10.5.5-1 +- update to 10.5.5 + * Wed Dec 13 2023 Remi Collet - 10.5.3-1 - update to 10.5.3 diff --git a/sources b/sources index 066ca46..205fb94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.3-6fce887.tgz) = 8cd5102c32eed56c861444f1f4704d4ee011713a0e8833a3e02ce8d1af556455b7f4a28b180645172a76f235fb5d67b0897e61221f9d1c42f60caf5010423e09 +SHA512 (phpunit10-10.5.5-ed21115.tgz) = 5206d80817de09b5e657e139e7680fa7a1ae4d9c02feb739e408f2d4248e976e7a21a6d44838bdcf1806c117ed691b1c53b3409e54f4e0a875050cdcd697b245 From 0f53518d4dd7429d6f0910db787a69ba18649c4b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Jan 2024 07:47:24 +0100 Subject: [PATCH 13/25] v10.5.7 (cherry picked from commit 07621175b5091b8fbbb53e0a1aa86d48f74a1596) --- .gitignore | 1 + phpunit10-rpm.patch | 22 ++++++++++++---------- phpunit10.spec | 9 ++++++--- sources | 2 +- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 945833c..b5cac8f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /phpunit10-10.5.2-5aedff4.tgz /phpunit10-10.5.3-6fce887.tgz /phpunit10-10.5.5-ed21115.tgz +/phpunit10-10.5.7-e5c5b39.tgz diff --git a/phpunit10-rpm.patch b/phpunit10-rpm.patch index 2e82286..9ddfc8c 100644 --- a/phpunit10-rpm.patch +++ b/phpunit10-rpm.patch @@ -1,7 +1,7 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2023-04-14 10:47:29.000000000 +0200 -+++ ./phpunit 2023-04-14 10:49:23.217236377 +0200 -@@ -71,29 +71,25 @@ if (isset($GLOBALS['_composer_autoload_p +--- ./phpunit.rpm 2024-01-15 07:31:36.850034357 +0100 ++++ ./phpunit 2024-01-15 07:33:02.306130486 +0100 +@@ -46,27 +46,13 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); unset($GLOBALS['_composer_autoload_path']); @@ -13,10 +13,10 @@ diff -up ./phpunit.rpm ./phpunit - break; - } - } -- + - unset($file); -} - +- -if (!defined('PHPUNIT_COMPOSER_INSTALL')) { - fwrite( - STDERR, @@ -34,9 +34,11 @@ diff -up ./phpunit.rpm ./phpunit } require PHPUNIT_COMPOSER_INSTALL; +@@ -101,4 +87,13 @@ if ([] !== $unavailableExtensions) { + + unset($requiredExtensions, $unavailableExtensions); -exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv'])); -+ +if (class_exists('PHPUnit\\TextUI\\Application')) { + // PHPUnit v10 or newer + exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv'])); @@ -48,8 +50,8 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); +} diff -up ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm ./src/TextUI/Configuration/Xml/SchemaFinder.php ---- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2023-04-14 10:51:13.796036447 +0200 -+++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2023-04-14 10:53:03.227838557 +0200 +--- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-01-15 07:25:40.000000000 +0100 ++++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-01-15 07:31:36.850034357 +0100 @@ -48,6 +48,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -59,8 +61,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 2023-04-14 10:47:29.000000000 +0200 -+++ ./tests/bootstrap.php 2023-04-14 10:49:23.217236377 +0200 +--- ./tests/bootstrap.php.rpm 2024-01-15 07:25:39.000000000 +0100 ++++ ./tests/bootstrap.php 2024-01-15 07:31:36.851034393 +0100 @@ -11,8 +11,8 @@ if (!defined('TEST_FILES_PATH')) { define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR); } diff --git a/phpunit10.spec b/phpunit10.spec index 37ca0ed..6f4465e 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit ed21115d505b4b4f7dc7b5651464e19a2c7f7856 -#global gh_date 20150927 +%global gh_commit e5c5b397a95cb0db013270a985726fcae93e61b8 +%global gh_date 2024-01-14 %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.5 +%global upstream_version 10.5.7 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -266,6 +266,9 @@ exit $ret %changelog +* Mon Jan 15 2024 Remi Collet - 10.5.7-1 +- update to 10.5.7 + * Thu Dec 28 2023 Remi Collet - 10.5.5-1 - update to 10.5.5 diff --git a/sources b/sources index 205fb94..8a79d94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.5-ed21115.tgz) = 5206d80817de09b5e657e139e7680fa7a1ae4d9c02feb739e408f2d4248e976e7a21a6d44838bdcf1806c117ed691b1c53b3409e54f4e0a875050cdcd697b245 +SHA512 (phpunit10-10.5.7-e5c5b39.tgz) = 09b1b453d989ab51ddb526bcc92a8f9ce15d93ce8dadcd9781d541fc6b7f3fbb1e57ac8042cb96d8785d33809ccc7f08ee648c39ecf81de8636e2f9af49291d2 From 29219d229a93b5a247bc648fd9e71b2025a77cc4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Jan 2024 09:58:04 +0100 Subject: [PATCH 14/25] v10.5.8 (cherry picked from commit 7cea090376845af1bc1602e95fdb85d090451fd7) --- .gitignore | 1 + makesrc.sh | 7 +++++-- phpunit10.spec | 9 ++++++--- sources | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b5cac8f..153b946 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /phpunit10-10.5.3-6fce887.tgz /phpunit10-10.5.5-ed21115.tgz /phpunit10-10.5.7-e5c5b39.tgz +/phpunit10-10.5.8-08f4fa7.tgz diff --git a/makesrc.sh b/makesrc.sh index 3580b58..45fea74 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -1,20 +1,23 @@ #!/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) 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 - 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 --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 echo "Getting commit..." pushd $PROJECT-$COMMIT diff --git a/phpunit10.spec b/phpunit10.spec index 6f4465e..5cc4332 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit e5c5b397a95cb0db013270a985726fcae93e61b8 -%global gh_date 2024-01-14 +%global gh_commit 08f4fa74d5fbfff1ef22abffee47aaedcaea227e +%global gh_date 2024-01-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.7 +%global upstream_version 10.5.8 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -266,6 +266,9 @@ exit $ret %changelog +* Fri Jan 19 2024 Remi Collet - 10.5.8-1 +- update to 10.5.8 + * Mon Jan 15 2024 Remi Collet - 10.5.7-1 - update to 10.5.7 diff --git a/sources b/sources index 8a79d94..ce25ef7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.7-e5c5b39.tgz) = 09b1b453d989ab51ddb526bcc92a8f9ce15d93ce8dadcd9781d541fc6b7f3fbb1e57ac8042cb96d8785d33809ccc7f08ee648c39ecf81de8636e2f9af49291d2 +SHA512 (phpunit10-10.5.8-08f4fa7.tgz) = c188ef298df218b52749ebb75d08d9216b361cd9dd1d30b1e578e5d066dbc67ae6c45ca837887025b48ba5b4d110dca8ade8eb9090df599c8340869d172ac3eb From b935b5d92fb3c5e6489eb1050e8782fd1a21fea4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 23 Jan 2024 07:53:39 +0100 Subject: [PATCH 15/25] v10.5.9 (cherry picked from commit cc25f2d20fe3d49ce57f5e6002693564fa119583) (cherry picked from commit 95ea87c415763f874802f96befdc4164366a3688) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 153b946..3721fe8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /phpunit10-10.5.5-ed21115.tgz /phpunit10-10.5.7-e5c5b39.tgz /phpunit10-10.5.8-08f4fa7.tgz +/phpunit10-10.5.9-0bd6637.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 5cc4332..32bd092 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 08f4fa74d5fbfff1ef22abffee47aaedcaea227e -%global gh_date 2024-01-19 +%global gh_commit 0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe +%global gh_date 2024-01-22 %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.8 +%global upstream_version 10.5.9 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -266,6 +266,9 @@ exit $ret %changelog +* Tue Jan 23 2024 Remi Collet - 10.5.9-1 +- update to 10.5.9 + * Fri Jan 19 2024 Remi Collet - 10.5.8-1 - update to 10.5.8 diff --git a/sources b/sources index ce25ef7..49038a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.8-08f4fa7.tgz) = c188ef298df218b52749ebb75d08d9216b361cd9dd1d30b1e578e5d066dbc67ae6c45ca837887025b48ba5b4d110dca8ade8eb9090df599c8340869d172ac3eb +SHA512 (phpunit10-10.5.9-0bd6637.tgz) = fe76b828c47e5dd5ae08c50f384c9a5117a98ec4b4f277ea653bf45a47afde318f08096f9beb2ab473c352de8f937a9f0990b02f6a7eb1d41eb21165ddb8d823 From 134ae42f908e9fd6a4cca7396e4e94a1e40cb6b5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Feb 2024 09:48:08 +0100 Subject: [PATCH 16/25] v10.5.10 (cherry picked from commit 324c09a8f8d6616bdee8922db0edf4c70b982167) --- .gitignore | 1 + phpunit10.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 3721fe8..8b85e88 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /phpunit10-10.5.7-e5c5b39.tgz /phpunit10-10.5.8-08f4fa7.tgz /phpunit10-10.5.9-0bd6637.tgz +/phpunit10-10.5.10-50b8e31.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 32bd092..8c7debc 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -11,14 +11,14 @@ %bcond_without tests -%if 0%{?fedora} >= 39 || 0%{?rhel} >= 10 +%if 0%{?fedora} == 39 %bcond_without defcmd %else %bcond_with defcmd %endif -%global gh_commit 0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe -%global gh_date 2024-01-22 +%global gh_commit 50b8e314b6d0dd06521dc31d1abffa73f25f850c +%global gh_date 2024-02-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.9 +%global upstream_version 10.5.10 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -266,6 +266,9 @@ exit $ret %changelog +* Mon Feb 5 2024 Remi Collet - 10.5.10-1 +- update to 10.5.10 + * Tue Jan 23 2024 Remi Collet - 10.5.9-1 - update to 10.5.9 diff --git a/sources b/sources index 49038a5..9dc303a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.9-0bd6637.tgz) = fe76b828c47e5dd5ae08c50f384c9a5117a98ec4b4f277ea653bf45a47afde318f08096f9beb2ab473c352de8f937a9f0990b02f6a7eb1d41eb21165ddb8d823 +SHA512 (phpunit10-10.5.10-50b8e31.tgz) = 422430a68b525f57a49a4fab790551843fcac2b1e8e376d54e2169e3f60b79bffa13a45e4d2f9c8f7b057168b5d1818997b78685fb96333663cf23c8ce9f5b22 From b2dc67f7fa5930b6fab73f2c0ac411e23978747a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Feb 2024 10:16:17 +0100 Subject: [PATCH 17/25] v10.5.11 (cherry picked from commit ad9d518c2aec6c09a3b3e848164461bd67557d30) --- .gitignore | 1 + phpunit10.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8b85e88..a8c4d29 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /phpunit10-10.5.8-08f4fa7.tgz /phpunit10-10.5.9-0bd6637.tgz /phpunit10-10.5.10-50b8e31.tgz +/phpunit10-10.5.11-0d968f6.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 8c7debc..d93f8b7 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phpunit10 # -# 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/ @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 50b8e314b6d0dd06521dc31d1abffa73f25f850c -%global gh_date 2024-02-04 +%global gh_commit 0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4 +%global gh_date 2024-02-25 %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.10 +%global upstream_version 10.5.11 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -135,7 +135,10 @@ Requires: (php-composer(sebastian/version) >= 4.0 with php-c # "ext-soap": "*", Suggests: php-soap # recommends latest versions -# none yet +# 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 10.0.0 @@ -266,6 +269,9 @@ exit $ret %changelog +* Mon Feb 26 2024 Remi Collet - 10.5.11-1 +- update to 10.5.11 + * Mon Feb 5 2024 Remi Collet - 10.5.10-1 - update to 10.5.10 diff --git a/sources b/sources index 9dc303a..ed84d28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.10-50b8e31.tgz) = 422430a68b525f57a49a4fab790551843fcac2b1e8e376d54e2169e3f60b79bffa13a45e4d2f9c8f7b057168b5d1818997b78685fb96333663cf23c8ce9f5b22 +SHA512 (phpunit10-10.5.11-0d968f6.tgz) = 22c0f7a028e4b1d88b9217924238fd0900a365689669bb192a5b2fc7918d4d66a065f800606e56fef455810bc151d425073d4b0e213433bdbece70d3c421075d From 10aa148936c88b3b3e829b11285ab133633312c1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Mar 2024 07:46:33 +0100 Subject: [PATCH 18/25] v10.5.12 (cherry picked from commit e45af72de812d0fcb7ae727db12a3d82d0248766) --- .gitignore | 1 + phpunit10-rpm.patch | 42 +++++++++++++++++++++++++++++++++++------- phpunit10.spec | 10 +++++++--- sources | 2 +- 4 files changed, 44 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index a8c4d29..bb19382 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /phpunit10-10.5.9-0bd6637.tgz /phpunit10-10.5.10-50b8e31.tgz /phpunit10-10.5.11-0d968f6.tgz +/phpunit10-10.5.12-41a9886.tgz diff --git a/phpunit10-rpm.patch b/phpunit10-rpm.patch index 9ddfc8c..ac79d54 100644 --- a/phpunit10-rpm.patch +++ b/phpunit10-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2024-01-15 07:31:36.850034357 +0100 -+++ ./phpunit 2024-01-15 07:33:02.306130486 +0100 +--- ./phpunit.rpm 2024-02-26 09:36:05.000000000 +0100 ++++ ./phpunit 2024-03-06 10:22:28.176494758 +0100 @@ -46,27 +46,13 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); @@ -49,10 +49,38 @@ diff -up ./phpunit.rpm ./phpunit + // PHPUnit v6 to v9 + 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-06 10:23:20.003477445 +0100 ++++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-03-06 10:24:42.157620333 +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()); + + $notLatest = version_compare($latestVersion, Version::id(), '>'); + $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>'); +@@ -43,6 +43,7 @@ final class VersionCheckCommand implemen + Version::id(), + $latestCompatibleVersion, + ); ++ $buffer .= sprintf('Try a system update for new phpunit%s package.' . PHP_EOL, $major); + } + + if ($notLatest) { +@@ -50,6 +51,7 @@ 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, 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-01-15 07:25:40.000000000 +0100 -+++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-01-15 07:31:36.850034357 +0100 -@@ -48,6 +48,6 @@ final class SchemaFinder +--- ./src/TextUI/Configuration/Xml/SchemaFinder.php.rpm 2024-02-26 09:36:05.000000000 +0100 ++++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-03-06 10:22:28.177494796 +0100 +@@ -75,6 +75,6 @@ final class SchemaFinder return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -61,8 +89,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-01-15 07:25:39.000000000 +0100 -+++ ./tests/bootstrap.php 2024-01-15 07:31:36.851034393 +0100 +--- ./tests/bootstrap.php.rpm 2024-02-26 09:36:05.000000000 +0100 ++++ ./tests/bootstrap.php 2024-03-06 10:22:28.177494796 +0100 @@ -11,8 +11,8 @@ if (!defined('TEST_FILES_PATH')) { define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR); } diff --git a/phpunit10.spec b/phpunit10.spec index d93f8b7..b7387ea 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 0d968f6323deb3dbfeba5bfd4929b9415eb7a9a4 -%global gh_date 2024-02-25 +%global gh_commit 41a9886b85ac7bf3929853baf96b95361cd69d2b +%global gh_date 2024-03-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.11 +%global upstream_version 10.5.12 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -41,6 +41,7 @@ Summary: The PHP Unit Testing framework version %{ver_major} License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} +# run makesrc.sh to create a git snapshot with test suite Source0: %{name}-%{upstream_version}-%{gh_short}.tgz Source1: makesrc.sh @@ -269,6 +270,9 @@ exit $ret %changelog +* Sat Mar 9 2024 Remi Collet - 10.5.12-1 +- update to 10.5.12 + * Mon Feb 26 2024 Remi Collet - 10.5.11-1 - update to 10.5.11 diff --git a/sources b/sources index ed84d28..bf779c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.11-0d968f6.tgz) = 22c0f7a028e4b1d88b9217924238fd0900a365689669bb192a5b2fc7918d4d66a065f800606e56fef455810bc151d425073d4b0e213433bdbece70d3c421075d +SHA512 (phpunit10-10.5.12-41a9886.tgz) = 082dedf29edbad2ad803a8baa56500a5b0eb9ddd565e8481aa929bea09aef094003f3698570e51ec84276728d0bd24060663cf7d412433d18345070259b92855 From c4f13ac4f9c48c47905bea26864a4c6c412bf9ed Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Mar 2024 09:13:05 +0100 Subject: [PATCH 19/25] v10.5.13 (cherry picked from commit 61e14d3d1be773d2ecae1aeb7a5672a68caf2be9) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bb19382..ff6bf30 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /phpunit10-10.5.10-50b8e31.tgz /phpunit10-10.5.11-0d968f6.tgz /phpunit10-10.5.12-41a9886.tgz +/phpunit10-10.5.13-20a63fc.tgz diff --git a/phpunit10.spec b/phpunit10.spec index b7387ea..a92feca 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 41a9886b85ac7bf3929853baf96b95361cd69d2b -%global gh_date 2024-03-09 +%global gh_commit 20a63fc1c6db29b15da3bd02d4b6cf59900088a7 +%global gh_date 2024-03-12 %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.12 +%global upstream_version 10.5.13 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Wed Mar 13 2024 Remi Collet - 10.5.13-1 +- update to 10.5.13 + * Sat Mar 9 2024 Remi Collet - 10.5.12-1 - update to 10.5.12 diff --git a/sources b/sources index bf779c3..7c4f522 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.12-41a9886.tgz) = 082dedf29edbad2ad803a8baa56500a5b0eb9ddd565e8481aa929bea09aef094003f3698570e51ec84276728d0bd24060663cf7d412433d18345070259b92855 +SHA512 (phpunit10-10.5.13-20a63fc.tgz) = 08c18730f0f1d6c5f259e5a19e2b3bff4fd5c062a3ee0ec9cb2a75eb2c03f5ac1fe34eaef7450a8ad6e52662c5dd2c47c9279fd0adcac44f240c74706b4ae44c From 6b5024c707da3c555514f234580d977c6ce6fd19 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 21 Mar 2024 10:37:18 +0100 Subject: [PATCH 20/25] v10.5.14 (cherry picked from commit cdd722631a79ea6840e4c20ed629d7512248ea6e) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ff6bf30..f4d9f7a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /phpunit10-10.5.11-0d968f6.tgz /phpunit10-10.5.12-41a9886.tgz /phpunit10-10.5.13-20a63fc.tgz +/phpunit10-10.5.14-4cf8824.tgz diff --git a/phpunit10.spec b/phpunit10.spec index a92feca..686d381 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 20a63fc1c6db29b15da3bd02d4b6cf59900088a7 -%global gh_date 2024-03-12 +%global gh_commit 4cf8824bab39c2dd57b57b9f6332f7135e2a3a49 +%global gh_date 2024-03-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.13 +%global upstream_version 10.5.14 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Thu Mar 21 2024 Remi Collet - 10.5.14-1 +- update to 10.5.14 + * Wed Mar 13 2024 Remi Collet - 10.5.13-1 - update to 10.5.13 diff --git a/sources b/sources index 7c4f522..36ebe02 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.13-20a63fc.tgz) = 08c18730f0f1d6c5f259e5a19e2b3bff4fd5c062a3ee0ec9cb2a75eb2c03f5ac1fe34eaef7450a8ad6e52662c5dd2c47c9279fd0adcac44f240c74706b4ae44c +SHA512 (phpunit10-10.5.14-4cf8824.tgz) = 551f0794233e0afd7cc658ab48a590166b653abbdce9f7b595c078bc12a5c3ffbbf0f105caa6a6b8df982f9e7d6397e05c9cdf949620de2fbcca56f8c207afaf From 07cb38c5cb665b62764bb2a714373f4be1bdda24 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 22 Mar 2024 07:53:37 +0100 Subject: [PATCH 21/25] v10.5.15 (cherry picked from commit 0d569131e247281a2f4079fdd1a1e50037fc2443) --- .gitignore | 1 + phpunit10-rpm.patch | 29 +++++++++++++++++++---------- phpunit10.spec | 9 ++++++--- sources | 2 +- 4 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index f4d9f7a..4ae61db 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /phpunit10-10.5.12-41a9886.tgz /phpunit10-10.5.13-20a63fc.tgz /phpunit10-10.5.14-4cf8824.tgz +/phpunit10-10.5.15-86376e0.tgz diff --git a/phpunit10-rpm.patch b/phpunit10-rpm.patch index ac79d54..fa07a47 100644 --- a/phpunit10-rpm.patch +++ b/phpunit10-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2024-02-26 09:36:05.000000000 +0100 -+++ ./phpunit 2024-03-06 10:22:28.176494758 +0100 +--- ./phpunit.rpm 2024-03-21 10:34:01.000000000 +0100 ++++ ./phpunit 2024-03-21 14:02:24.892294049 +0100 @@ -46,27 +46,13 @@ if (isset($GLOBALS['_composer_autoload_p define('PHPUNIT_COMPOSER_INSTALL', $GLOBALS['_composer_autoload_path']); @@ -50,8 +50,8 @@ 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-06 10:23:20.003477445 +0100 -+++ ./src/TextUI/Command/Commands/VersionCheckCommand.php 2024-03-06 10:24:42.157620333 +0100 +--- ./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 { @@ -61,11 +61,20 @@ diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/ $notLatest = version_compare($latestVersion, Version::id(), '>'); $notLatestCompatible = version_compare($latestCompatibleVersion, Version::id(), '>'); +@@ -35,7 +35,7 @@ final class VersionCheckCommand implemen + ); + } + +- $buffer = 'You are not using the latest version of PHPUnit.' . PHP_EOL; ++ $buffer = 'You are not using the latest version of PHPUnit.' . PHP_EOL . PHP_EOL; + + if ($notLatestCompatible) { + $buffer .= sprintf( @@ -43,6 +43,7 @@ final class VersionCheckCommand implemen Version::id(), $latestCompatibleVersion, ); -+ $buffer .= sprintf('Try a system update for new phpunit%s package.' . PHP_EOL, $major); ++ $buffer .= sprintf('Try a system update for new phpunit%s package.' . PHP_EOL . PHP_EOL, $major); } if ($notLatest) { @@ -73,13 +82,13 @@ diff -up ./src/TextUI/Command/Commands/VersionCheckCommand.php.rpm ./src/TextUI/ 'The latest version is PHPUnit %s.' . PHP_EOL, $latestVersion, ); -+ $buffer .= sprintf('Try to install and use the phpunit%s command.' . PHP_EOL, 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-02-26 09:36:05.000000000 +0100 -+++ ./src/TextUI/Configuration/Xml/SchemaFinder.php 2024-03-06 10:22:28.177494796 +0100 +--- ./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 return __PHPUNIT_PHAR_ROOT__ . '/'; } @@ -89,8 +98,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-02-26 09:36:05.000000000 +0100 -+++ ./tests/bootstrap.php 2024-03-06 10:22:28.177494796 +0100 +--- ./tests/bootstrap.php.rpm 2024-03-21 10:34:01.000000000 +0100 ++++ ./tests/bootstrap.php 2024-03-21 14:02:24.893294091 +0100 @@ -11,8 +11,8 @@ if (!defined('TEST_FILES_PATH')) { define('TEST_FILES_PATH', __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR); } diff --git a/phpunit10.spec b/phpunit10.spec index 686d381..6b3328c 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 4cf8824bab39c2dd57b57b9f6332f7135e2a3a49 -%global gh_date 2024-03-21 +%global gh_commit 86376e05e8745ed81d88232ff92fee868247b07b +%global gh_date 2024-03-22 %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.14 +%global upstream_version 10.5.15 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Fri Mar 22 2024 Remi Collet - 10.5.15-1 +- update to 10.5.15 + * Thu Mar 21 2024 Remi Collet - 10.5.14-1 - update to 10.5.14 diff --git a/sources b/sources index 36ebe02..e3c8bd3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.14-4cf8824.tgz) = 551f0794233e0afd7cc658ab48a590166b653abbdce9f7b595c078bc12a5c3ffbbf0f105caa6a6b8df982f9e7d6397e05c9cdf949620de2fbcca56f8c207afaf +SHA512 (phpunit10-10.5.15-86376e0.tgz) = 9373f4807c4380fdb788ddbddcf1badff5b5ca5ddac175c97cdbf6f1ebd385441ef590b4e39cc95272f86e6179d205fae3aab83301ea0a478bb275e3844da722 From 31d2914c263dfc24c834fa70a4248207db9fabc9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Mar 2024 14:40:32 +0100 Subject: [PATCH 22/25] v10.5.16 (cherry picked from commit 9f944b5c1e4a53a21adf064a102cd899af1fa7c5) --- .gitignore | 1 + phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4ae61db..6beddc0 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /phpunit10-10.5.13-20a63fc.tgz /phpunit10-10.5.14-4cf8824.tgz /phpunit10-10.5.15-86376e0.tgz +/phpunit10-10.5.16-18f8d4a.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 6b3328c..558edc8 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 86376e05e8745ed81d88232ff92fee868247b07b -%global gh_date 2024-03-22 +%global gh_commit 18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd +%global gh_date 2024-03-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.15 +%global upstream_version 10.5.16 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Thu Mar 28 2024 Remi Collet - 10.5.16-1 +- update to 10.5.16 + * Fri Mar 22 2024 Remi Collet - 10.5.15-1 - update to 10.5.15 diff --git a/sources b/sources index e3c8bd3..f77e619 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.15-86376e0.tgz) = 9373f4807c4380fdb788ddbddcf1badff5b5ca5ddac175c97cdbf6f1ebd385441ef590b4e39cc95272f86e6179d205fae3aab83301ea0a478bb275e3844da722 +SHA512 (phpunit10-10.5.16-18f8d4a.tgz) = f5466dd3f787f41f428f0fd096a9438aca6a2b75af459fe4755a951dc523c72af20ca6973ea401d49d82cedecd8a0cefa179e4ec60bcd17adc3f55e058cea854 From b2a7448987059a0c3a410464bcf003464b24f1cd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 16 Apr 2024 08:24:59 +0200 Subject: [PATCH 23/25] v10.5.18 (cherry picked from commit 517c87f736db28e31ed398fef640724f92c2cdbb) (cherry picked from commit 138ac32d87a2d79ec09dad36ce868f0464a1c55c) --- .gitignore | 2 ++ phpunit10.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6beddc0..fdf958b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /phpunit10-10.5.14-4cf8824.tgz /phpunit10-10.5.15-86376e0.tgz /phpunit10-10.5.16-18f8d4a.tgz +/phpunit10-10.5.17-c1f736a.tgz +/phpunit10-10.5.18-835df17.tgz diff --git a/phpunit10.spec b/phpunit10.spec index 558edc8..6ae5c23 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 18f8d4a5f52b61fdd9370aaae3167daa0eeb69cd -%global gh_date 2024-03-28 +%global gh_commit 835df1709ac6c968ba34bf23f3c30e5d5a266de8 +%global gh_date 2024-04-14 %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.16 +%global upstream_version 10.5.18 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Mon Apr 15 2024 Remi Collet - 10.5.18-1 +- update to 10.5.18 + * Thu Mar 28 2024 Remi Collet - 10.5.16-1 - update to 10.5.16 diff --git a/sources b/sources index f77e619..711f281 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.16-18f8d4a.tgz) = f5466dd3f787f41f428f0fd096a9438aca6a2b75af459fe4755a951dc523c72af20ca6973ea401d49d82cedecd8a0cefa179e4ec60bcd17adc3f55e058cea854 +SHA512 (phpunit10-10.5.18-835df17.tgz) = cc2f3b454a55093b96822d9f625ac05912592cd08bba1a27682719c57afd613f5e360c40f7ce97b34f5cc6d5e3b43dc2199b1d8ae1c24998c63d42a9b62f4b24 From 92ad00fceebc705ad204c0633c2bb3542f094359 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 18 Apr 2024 07:47:03 +0200 Subject: [PATCH 24/25] v10.5.19 (cherry picked from commit 154c56a7fa6c55c74e23b54ec4bbf5f0c3336ae1) --- .gitignore | 1 + makesrc.sh | 4 ++-- phpunit10.spec | 9 ++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index fdf958b..7eff6ba 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /phpunit10-10.5.16-18f8d4a.tgz /phpunit10-10.5.17-c1f736a.tgz /phpunit10-10.5.18-835df17.tgz +/phpunit10-10.5.19-c726f0d.tgz diff --git a/makesrc.sh b/makesrc.sh index 45fea74..c85b319 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -17,11 +17,11 @@ else echo "Cloning..." rm -rf $PROJECT-$COMMIT - git clone --shallow-since=$DATE 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/phpunit10.spec b/phpunit10.spec index 6ae5c23..8fd0966 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit 835df1709ac6c968ba34bf23f3c30e5d5a266de8 -%global gh_date 2024-04-14 +%global gh_commit c726f0de022368f6ed103e452a765d3304a996a4 +%global gh_date 2024-04-17 %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.18 +%global upstream_version 10.5.19 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Thu Apr 18 2024 Remi Collet - 10.5.19-1 +- update to 10.5.19 + * Mon Apr 15 2024 Remi Collet - 10.5.18-1 - update to 10.5.18 diff --git a/sources b/sources index 711f281..53064f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.18-835df17.tgz) = cc2f3b454a55093b96822d9f625ac05912592cd08bba1a27682719c57afd613f5e360c40f7ce97b34f5cc6d5e3b43dc2199b1d8ae1c24998c63d42a9b62f4b24 +SHA512 (phpunit10-10.5.19-c726f0d.tgz) = 7edf918536e04cddce89d92a7375a149ba2c25a9fd30839f778ea22d4ea82ca522133f035d3d07afc744909bb1a69a6571983e0fb21c1da4193658cdd2f7fb4e From cc1499e798e868f5f506375774f1ec1aecf616b0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Apr 2024 11:13:25 +0200 Subject: [PATCH 25/25] v10.5.20 (cherry picked from commit 51de57045c59ee215b1cfd4ad3a9543dc0896ba9) --- .gitignore | 1 + makesrc.sh | 6 ++++-- phpunit10.spec | 9 ++++++--- sources | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7eff6ba..a2a3b80 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /phpunit10-10.5.17-c1f736a.tgz /phpunit10-10.5.18-835df17.tgz /phpunit10-10.5.19-c726f0d.tgz +/phpunit10-10.5.20-547d314.tgz diff --git a/makesrc.sh b/makesrc.sh index c85b319..04ad6a0 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -5,10 +5,12 @@ 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) +MAJOR=$(sed -n '/^%global ver_major/{s/.* //;p}' $NAME.spec) +MINOR=$(sed -n '/^%global ver_minor/{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) +DATE=$(date -d "$DATE -1 week" +%Y-%m-%d) if [ -f $NAME-$VERSION-$SHORT.tgz ]; then echo "$NAME-$VERSION-$SHORT.tgz already there" @@ -17,7 +19,7 @@ else echo "Cloning..." rm -rf $PROJECT-$COMMIT - git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 + git clone --branch $MAJOR.$MINOR --shallow-since=$DATE https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT || exit 1 echo "Getting commit..." pushd $PROJECT-$COMMIT diff --git a/phpunit10.spec b/phpunit10.spec index 8fd0966..7b1de60 100644 --- a/phpunit10.spec +++ b/phpunit10.spec @@ -17,8 +17,8 @@ %bcond_with defcmd %endif -%global gh_commit c726f0de022368f6ed103e452a765d3304a996a4 -%global gh_date 2024-04-17 +%global gh_commit 547d314dc24ec1e177720d45c6263fb226cc2ae3 +%global gh_date 2024-04-24 %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.19 +%global upstream_version 10.5.20 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -270,6 +270,9 @@ exit $ret %changelog +* Wed Apr 24 2024 Remi Collet - 10.5.20-1 +- update to 10.5.20 + * Thu Apr 18 2024 Remi Collet - 10.5.19-1 - update to 10.5.19 diff --git a/sources b/sources index 53064f1..c82920f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit10-10.5.19-c726f0d.tgz) = 7edf918536e04cddce89d92a7375a149ba2c25a9fd30839f778ea22d4ea82ca522133f035d3d07afc744909bb1a69a6571983e0fb21c1da4193658cdd2f7fb4e +SHA512 (phpunit10-10.5.20-547d314.tgz) = 49366edfde85452b203e63a8463613386a7015e9e3a57a524cd97ae536dd6003183057818e52aa4058dd874c7a9e66657db7e437ab6e692150921faa6a4ec978