From 1fca7ba1e6dc88167199956cc42df4fb91dd97a5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 09:44:34 +0200 Subject: [PATCH 01/20] update to 5.0.2 (no change) --- .gitignore | 1 + php-phpunit-php-timer5.spec | 23 +++++++++++------------ sources | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index e2c0f21..6c82d5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /php-phpunit-php-timer5-5.0.1-cc49734.tgz +/php-phpunit-php-timer5-5.0.2-c9ff14f.tgz diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 2a45890..3a9c704 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -7,8 +7,9 @@ # # Please, preserve the changelog entries # -%global bootstrap 1 -%global gh_commit cc49734779cbb302bf51a44297dab8c4bbf941e7 +%bcond_without tests + +%global gh_commit c9ff14f493699e2f6adee9fd06a0245b276643b7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-timer @@ -21,15 +22,10 @@ %global major 5 %global php_home %{_datadir}/php -%if %{bootstrap} -%bcond_with tests -%else -%bcond_without tests -%endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.0.2 +Release: 1%{?dist} Summary: PHP Utility class for timing License: BSD @@ -42,12 +38,12 @@ BuildRequires: php(language) >= 7.3 BuildRequires: php-fedora-autoloader-devel %if %{with tests} # From composer.json"require-dev": { -# "phpunit/phpunit": "^9.2" -BuildRequires: phpunit9 >= 9.2 +# "phpunit/phpunit": "^9.3" +BuildRequires: phpunit9 >= 9.3 %endif # From composer.json -# "php": "^7.3 || ^8.0" +# "php": ">=7.3" Requires: php(language) >= 7.3 # From phpcompatinfo report for version 4.0.0 Requires: php-spl @@ -104,6 +100,9 @@ exit $ret %changelog +* Mon Sep 28 2020 Remi Collet - 5.0.2-1 +- update to 5.0.2 (no change) + * Tue Jul 28 2020 Fedora Release Engineering - 5.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a597e73..e3cab49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-timer5-5.0.1-cc49734.tgz) = 5ac0f3a4bbd1fda51018a3f01c84e955e2b41a398ea6f21a89efa236119289d97492357bf6b2789c6e8db6fbf29b31c93e452e778ddd4f796980d2405f230c4f +SHA512 (php-phpunit-php-timer5-5.0.2-c9ff14f.tgz) = d0e358e4bc39989e093c3efcb1818ca1eb8d6cde0aed2925027936ccda970a0317fbe292d774ad2918a6d5fa07e27f6e9b846081eb2bdbec3946d74eb8a36764 From 21771eb9fdfb2413eda767f794c0ff98ebb7b0c2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 15:20:08 +0100 Subject: [PATCH 02/20] v5.0.3 --- .gitignore | 1 + php-phpunit-php-timer5.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6c82d5a..b9c4197 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-phpunit-php-timer5-5.0.1-cc49734.tgz /php-phpunit-php-timer5-5.0.2-c9ff14f.tgz +/php-phpunit-php-timer5-5.0.3-5a63ce2.tgz diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 3a9c704..edf4ef2 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -9,7 +9,7 @@ # %bcond_without tests -%global gh_commit c9ff14f493699e2f6adee9fd06a0245b276643b7 +%global gh_commit 5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-timer @@ -24,9 +24,9 @@ %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 5.0.2 +Version: 5.0.3 Release: 1%{?dist} -Summary: PHP Utility class for timing +Summary: PHP Utility class for timing, version %{major} License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} @@ -100,6 +100,9 @@ exit $ret %changelog +* Mon Oct 26 2020 Remi Collet - 5.0.3-1 +- update to 5.0.3 + * Mon Sep 28 2020 Remi Collet - 5.0.2-1 - update to 5.0.2 (no change) diff --git a/sources b/sources index e3cab49..c59fad6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-timer5-5.0.2-c9ff14f.tgz) = d0e358e4bc39989e093c3efcb1818ca1eb8d6cde0aed2925027936ccda970a0317fbe292d774ad2918a6d5fa07e27f6e9b846081eb2bdbec3946d74eb8a36764 +SHA512 (php-phpunit-php-timer5-5.0.3-5a63ce2.tgz) = 798a4d78bde219747996ae56d83092fe0d070790ed7c1395c04b51e5dfb836e0021ad789341297e5abe7b3a15f428ca270bff6611c18e938cdf1cf7b86adcb84 From fe46c5d99d7a16e9fc487e5141ddf614726d04b3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 09:44:34 +0200 Subject: [PATCH 03/20] v5.0.3 --- .gitignore | 2 ++ php-phpunit-php-timer5.spec | 25 ++++++++++++------------- sources | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index e2c0f21..b9c4197 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /php-phpunit-php-timer5-5.0.1-cc49734.tgz +/php-phpunit-php-timer5-5.0.2-c9ff14f.tgz +/php-phpunit-php-timer5-5.0.3-5a63ce2.tgz diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 2a45890..bebc971 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -7,8 +7,9 @@ # # Please, preserve the changelog entries # -%global bootstrap 1 -%global gh_commit cc49734779cbb302bf51a44297dab8c4bbf941e7 +%bcond_without tests + +%global gh_commit 5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-timer @@ -21,16 +22,11 @@ %global major 5 %global php_home %{_datadir}/php -%if %{bootstrap} -%bcond_with tests -%else -%bcond_without tests -%endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 5.0.1 -Release: 2%{?dist} -Summary: PHP Utility class for timing +Version: 5.0.3 +Release: 1%{?dist} +Summary: PHP Utility class for timing, version %{major} License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} @@ -42,12 +38,12 @@ BuildRequires: php(language) >= 7.3 BuildRequires: php-fedora-autoloader-devel %if %{with tests} # From composer.json"require-dev": { -# "phpunit/phpunit": "^9.2" -BuildRequires: phpunit9 >= 9.2 +# "phpunit/phpunit": "^9.3" +BuildRequires: phpunit9 >= 9.3 %endif # From composer.json -# "php": "^7.3 || ^8.0" +# "php": ">=7.3" Requires: php(language) >= 7.3 # From phpcompatinfo report for version 4.0.0 Requires: php-spl @@ -104,6 +100,9 @@ exit $ret %changelog +* Mon Oct 26 2020 Remi Collet - 5.0.3-1 +- update to 5.0.3 + * Tue Jul 28 2020 Fedora Release Engineering - 5.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a597e73..c59fad6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-timer5-5.0.1-cc49734.tgz) = 5ac0f3a4bbd1fda51018a3f01c84e955e2b41a398ea6f21a89efa236119289d97492357bf6b2789c6e8db6fbf29b31c93e452e778ddd4f796980d2405f230c4f +SHA512 (php-phpunit-php-timer5-5.0.3-5a63ce2.tgz) = 798a4d78bde219747996ae56d83092fe0d070790ed7c1395c04b51e5dfb836e0021ad789341297e5abe7b3a15f428ca270bff6611c18e938cdf1cf7b86adcb84 From afab8e8a0bd492922770447dc97432fa456e035f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 15:37:56 +0100 Subject: [PATCH 04/20] skip 1 test on 32-bit --- php-phpunit-php-timer5.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index edf4ef2..a9f3c68 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -84,7 +84,11 @@ ret=0 for cmd in php php73 php74 php80; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit9 --verbose || ret=1 + %{_bindir}/phpunit9 \ +%if %{__isa_bits} < 64 + --filter '^((?!(testCanBeFormattedAsString)).)*$' \ +%endif + --verbose || ret=1 fi done exit $ret @@ -102,6 +106,8 @@ exit $ret %changelog * Mon Oct 26 2020 Remi Collet - 5.0.3-1 - update to 5.0.3 +- open https://github.com/sebastianbergmann/php-timer/issues/34 + 32-bit compatibility * Mon Sep 28 2020 Remi Collet - 5.0.2-1 - update to 5.0.2 (no change) From fbc836d76f9f5533019040cc24267668ddc1a9a4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 15:37:56 +0100 Subject: [PATCH 05/20] skip 1 test on 32-bit (cherry picked from commit afab8e8a0bd492922770447dc97432fa456e035f) --- php-phpunit-php-timer5.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index bebc971..35db59a 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -84,7 +84,11 @@ ret=0 for cmd in php php73 php74 php80; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ - %{_bindir}/phpunit9 --verbose || ret=1 + %{_bindir}/phpunit9 \ +%if %{__isa_bits} < 64 + --filter '^((?!(testCanBeFormattedAsString)).)*$' \ +%endif + --verbose || ret=1 fi done exit $ret @@ -102,6 +106,8 @@ exit $ret %changelog * Mon Oct 26 2020 Remi Collet - 5.0.3-1 - update to 5.0.3 +- open https://github.com/sebastianbergmann/php-timer/issues/34 + 32-bit compatibility * Tue Jul 28 2020 Fedora Release Engineering - 5.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 19d9d50b1232b6f7bf75815d3677c229c412f579 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 15:44:11 +0100 Subject: [PATCH 06/20] fix arch detection --- php-phpunit-php-timer5.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index a9f3c68..dbb204d 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -81,13 +81,14 @@ touch vendor/autoload.php : Run upstream test suite ret=0 +if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ]; then + filter="--filter '^((?!(testCanBeFormattedAsString)).)*$'" +fi for cmd in php php73 php74 php80; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit9 \ -%if %{__isa_bits} < 64 - --filter '^((?!(testCanBeFormattedAsString)).)*$' \ -%endif + $filter \ --verbose || ret=1 fi done From 5b5d8da03eb61159b6c7826821d0cbe1b2838482 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Oct 2020 15:44:11 +0100 Subject: [PATCH 07/20] fix arch detection (cherry picked from commit 19d9d50b1232b6f7bf75815d3677c229c412f579) --- php-phpunit-php-timer5.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 35db59a..93c756f 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -81,13 +81,14 @@ touch vendor/autoload.php : Run upstream test suite ret=0 +if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ]; then + filter="--filter '^((?!(testCanBeFormattedAsString)).)*$'" +fi for cmd in php php73 php74 php80; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit9 \ -%if %{__isa_bits} < 64 - --filter '^((?!(testCanBeFormattedAsString)).)*$' \ -%endif + $filter \ --verbose || ret=1 fi done From 21129fd0290850b18d2a7b500130f75e0ca8cd72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:40:17 +0000 Subject: [PATCH 08/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index dbb204d..2a1e818 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD @@ -105,6 +105,9 @@ exit $ret %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 5.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Oct 26 2020 Remi Collet - 5.0.3-1 - update to 5.0.3 - open https://github.com/sebastianbergmann/php-timer/issues/34 From 95bf52e8f0c8458d9f9aade86d5eaef34a30c30b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 03:05:23 +0000 Subject: [PATCH 09/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 2a1e818..58f026e 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD @@ -105,6 +105,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 5.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 5.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 913b0bd6ad6ea5854552a5c32ee9d321e22723e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 08:24:40 +0000 Subject: [PATCH 10/20] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 58f026e..0da6557 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD @@ -105,6 +105,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 5.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 5.0.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From be2be1af337fbabb9f2b0b1813ce23dfe1cad265 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 14:18:29 +0000 Subject: [PATCH 11/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 0da6557..fb7aa6c 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD @@ -105,6 +105,9 @@ exit $ret %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 5.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 5.0.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From cd4e3ba90fd1d9a01ccf83a8f4b37888bd08ca83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:15:54 +0000 Subject: [PATCH 12/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index fb7aa6c..e8d3163 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD @@ -105,6 +105,9 @@ exit $ret %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 5.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 5.0.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From e1fca3fa79a5b2b5cc3813046fc8097b56f8d479 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Apr 2023 11:33:49 +0200 Subject: [PATCH 13/20] use SPDX license ID --- 36.patch | 97 +++++++++++++++++++++++++++++++++++++ php-phpunit-php-timer5.spec | 22 ++++++--- 2 files changed, 111 insertions(+), 8 deletions(-) create mode 100644 36.patch diff --git a/36.patch b/36.patch new file mode 100644 index 0000000..1520ede --- /dev/null +++ b/36.patch @@ -0,0 +1,97 @@ +From b6cd6cc52ef13dc996d3e19d3d78bd1bf1eb6bce Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Tue, 27 Oct 2020 11:38:32 +0100 +Subject: [PATCH] Fix #34 test failing on 32-bit + +--- + tests/DurationTest.php | 70 +++++++++++++++++++++--------------------- + 1 file changed, 35 insertions(+), 35 deletions(-) + +diff --git a/tests/DurationTest.php b/tests/DurationTest.php +index d8ba2a0..2129757 100644 +--- a/tests/DurationTest.php ++++ b/tests/DurationTest.php +@@ -43,7 +43,7 @@ public function testCanBeCreatedFromMicroseconds(): void + * @dataProvider durationProvider + * @testdox Formats $microseconds microseconds as "$string" + */ +- public function testCanBeFormattedAsString(string $string, int $microseconds): void ++ public function testCanBeFormattedAsString(string $string, float $microseconds): void + { + $duration = Duration::fromMicroseconds($microseconds); + +@@ -53,40 +53,40 @@ public function testCanBeFormattedAsString(string $string, int $microseconds): v + public function durationProvider(): array + { + return [ +- ['00:00', (int) round((0 * 1000000))], +- ['00:00.001', (int) round((.001 * 1000000))], +- ['00:00.010', (int) round((.01 * 1000000))], +- ['00:00.100', (int) round((.1 * 1000000))], +- ['00:00.999', (int) round((.999 * 1000000))], +- ['00:00.999', (int) round((.9999 * 1000000))], +- ['00:01', (int) round((1 * 1000000))], +- ['00:02', (int) round((2 * 1000000))], +- ['00:59.900', (int) round((59.9 * 1000000))], +- ['00:59.990', (int) round((59.99 * 1000000))], +- ['00:59.999', (int) round((59.999 * 1000000))], +- ['00:59.999', (int) round((59.9999 * 1000000))], +- ['00:59.001', (int) round((59.001 * 1000000))], +- ['00:59.010', (int) round((59.01 * 1000000))], +- ['01:00', (int) round((60 * 1000000))], +- ['01:01', (int) round((61 * 1000000))], +- ['02:00', (int) round((120 * 1000000))], +- ['02:01', (int) round((121 * 1000000))], +- ['59:59.900', (int) round((3599.9 * 1000000))], +- ['59:59.990', (int) round((3599.99 * 1000000))], +- ['59:59.999', (int) round((3599.999 * 1000000))], +- ['59:59.999', (int) round((3599.9999 * 1000000))], +- ['59:59.001', (int) round((3599.001 * 1000000))], +- ['59:59.010', (int) round((3599.01 * 1000000))], +- ['01:00:00', (int) round((3600 * 1000000))], +- ['01:00:01', (int) round((3601 * 1000000))], +- ['01:00:01.900', (int) round((3601.9 * 1000000))], +- ['01:00:01.990', (int) round((3601.99 * 1000000))], +- ['01:00:01.999', (int) round((3601.999 * 1000000))], +- ['01:00:01.999', (int) round((3601.9999 * 1000000))], +- ['01:00:59.999', (int) round((3659.9999 * 1000000))], +- ['01:00:59.001', (int) round((3659.001 * 1000000))], +- ['01:00:59.010', (int) round((3659.01 * 1000000))], +- ['01:59:59.999', (int) round((7199.9999 * 1000000))], ++ ['00:00', round((0 * 1000000))], ++ ['00:00.001', round((.001 * 1000000))], ++ ['00:00.010', round((.01 * 1000000))], ++ ['00:00.100', round((.1 * 1000000))], ++ ['00:00.999', round((.999 * 1000000))], ++ ['00:00.999', round((.9999 * 1000000))], ++ ['00:01', round((1 * 1000000))], ++ ['00:02', round((2 * 1000000))], ++ ['00:59.900', round((59.9 * 1000000))], ++ ['00:59.990', round((59.99 * 1000000))], ++ ['00:59.999', round((59.999 * 1000000))], ++ ['00:59.999', round((59.9999 * 1000000))], ++ ['00:59.001', round((59.001 * 1000000))], ++ ['00:59.010', round((59.01 * 1000000))], ++ ['01:00', round((60 * 1000000))], ++ ['01:01', round((61 * 1000000))], ++ ['02:00', round((120 * 1000000))], ++ ['02:01', round((121 * 1000000))], ++ ['59:59.900', round((3599.9 * 1000000))], ++ ['59:59.990', round((3599.99 * 1000000))], ++ ['59:59.999', round((3599.999 * 1000000))], ++ ['59:59.999', round((3599.9999 * 1000000))], ++ ['59:59.001', round((3599.001 * 1000000))], ++ ['59:59.010', round((3599.01 * 1000000))], ++ ['01:00:00', round((3600 * 1000000))], ++ ['01:00:01', round((3601 * 1000000))], ++ ['01:00:01.900', round((3601.9 * 1000000))], ++ ['01:00:01.990', round((3601.99 * 1000000))], ++ ['01:00:01.999', round((3601.999 * 1000000))], ++ ['01:00:01.999', round((3601.9999 * 1000000))], ++ ['01:00:59.999', round((3659.9999 * 1000000))], ++ ['01:00:59.001', round((3659.001 * 1000000))], ++ ['01:00:59.010', round((3659.01 * 1000000))], ++ ['01:59:59.999', round((7199.9999 * 1000000))], + ]; + } + } diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index e8d3163..95fd47c 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-php-timer4 # -# Copyright (c) 2010-2020 Christof Damian, Remi Collet +# Copyright (c) 2010-2023 Christof Damian, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -25,14 +25,16 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: PHP Utility class for timing, version %{major} -License: BSD +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +Patch0: https://patch-diff.githubusercontent.com/raw/sebastianbergmann/php-timer/pull/36.patch + BuildArch: noarch BuildRequires: php(language) >= 7.3 BuildRequires: php-fedora-autoloader-devel @@ -57,9 +59,14 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} Utility class for timing things, factored out of PHPUnit into a stand-alone component. +This package provides version %{major} of %{pk_vendor}/%{pk_project} library. + +Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}/autoload.php + %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 %build @@ -81,14 +88,10 @@ touch vendor/autoload.php : Run upstream test suite ret=0 -if [ $(php -r 'echo PHP_INT_SIZE;') -lt 8 ]; then - filter="--filter '^((?!(testCanBeFormattedAsString)).)*$'" -fi -for cmd in php php73 php74 php80; do +for cmd in php php80 php81 php82; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit9 \ - $filter \ --verbose || ret=1 fi done @@ -105,6 +108,9 @@ exit $ret %changelog +* Fri Apr 21 2023 Remi Collet - 5.0.3-7 +- use SPDX License id + * Fri Jan 20 2023 Fedora Release Engineering - 5.0.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3cdcc565e1ee344ddd13f98474dcc0693a1a4798 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:03:38 +0000 Subject: [PATCH 14/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 95fd47c..ae0dce4 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD-3-Clause @@ -108,6 +108,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 5.0.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Apr 21 2023 Remi Collet - 5.0.3-7 - use SPDX License id From bd12f7ed1a997cde5d6c8991b0a90ed382c07ced Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:19:49 +0000 Subject: [PATCH 15/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index ae0dce4..1745f3e 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 8%{?dist} +Release: 9%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD-3-Clause @@ -108,6 +108,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 5.0.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 5.0.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 2a057a1ca5bf9baba4656415f20104461cd9937b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:07:21 +0000 Subject: [PATCH 16/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 1745f3e..9c95aba 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD-3-Clause @@ -108,6 +108,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 5.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 5.0.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c88ea50d825e01b8df7241c61267c260d78d2519 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 17/20] Eliminate use of obsolete %patchN syntax (#2283636) --- php-phpunit-php-timer5.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 9c95aba..5095827 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -66,7 +66,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 +%patch -P0 -p1 %build From eaec8bd627b2a5ab58f75a0aa8e0a9b0943393c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:21:31 +0000 Subject: [PATCH 18/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 5095827..b51590e 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 10%{?dist} +Release: 11%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD-3-Clause @@ -108,6 +108,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 5.0.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 5.0.3-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f96f9d525fb4a6b55619cbbd86ace17573a59d9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:36:22 +0000 Subject: [PATCH 19/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index b51590e..45675d7 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 11%{?dist} +Release: 12%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD-3-Clause @@ -108,6 +108,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 5.0.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 5.0.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From a77b19f4ff9bc448c2e5a221b35d5a5bae22d165 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:28:42 +0000 Subject: [PATCH 20/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-phpunit-php-timer5.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-phpunit-php-timer5.spec b/php-phpunit-php-timer5.spec index 45675d7..61e9ac3 100644 --- a/php-phpunit-php-timer5.spec +++ b/php-phpunit-php-timer5.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 5.0.3 -Release: 12%{?dist} +Release: 13%{?dist} Summary: PHP Utility class for timing, version %{major} License: BSD-3-Clause @@ -108,6 +108,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.0.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 5.0.3-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild