diff --git a/.gitignore b/.gitignore index 7118e2f..b5a21d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ /php-phpunit-php-timer2-2.0.0-8b8454e.tar.gz /php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz -/php-phpunit-php-timer2-2.1.2-1038454.tar.gz -/php-phpunit-php-timer2-2.1.3-2454ae1.tar.gz -/php-phpunit-php-timer2-2.1.4-a691211.tgz diff --git a/21.patch b/21.patch new file mode 100644 index 0000000..c633abd --- /dev/null +++ b/21.patch @@ -0,0 +1,70 @@ +From d07774e18e532336361f2b59c039099fae512898 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 20 Feb 2019 14:52:09 +0100 +Subject: [PATCH 1/2] fix for 32-bit where large value are converted to float + +--- + src/Timer.php | 4 ++-- + tests/TimerTest.php | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/Timer.php b/src/Timer.php +index 8f919b6..9ad76dc 100644 +--- a/src/Timer.php ++++ b/src/Timer.php +@@ -44,7 +44,7 @@ public static function stop(): float + return \microtime(true) - \array_pop(self::$startTimes); + } + +- public static function bytesToString(int $bytes): string ++ public static function bytesToString(float $bytes): string + { + foreach (self::$sizes as $unit => $value) { + if ($bytes >= $value) { +@@ -54,7 +54,7 @@ public static function bytesToString(int $bytes): string + } + } + +- return $bytes . ' byte' . ($bytes !== 1 ? 's' : ''); ++ return $bytes . ' byte' . ((int)$bytes !== 1 ? 's' : ''); + } + + public static function secondsToTimeString(float $time): string +diff --git a/tests/TimerTest.php b/tests/TimerTest.php +index e8cf7ef..93cc474 100644 +--- a/tests/TimerTest.php ++++ b/tests/TimerTest.php +@@ -112,7 +112,7 @@ public function secondsProvider(): array + /** + * @dataProvider bytesProvider + */ +- public function testCanFormatBytesAsString(string $string, int $bytes): void ++ public function testCanFormatBytesAsString(string $string, float $bytes): void + { + $this->assertEquals($string, Timer::bytesToString($bytes)); + } + +From 9398c85d883eec73ab9fddb4d72d42091425791b Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Wed, 20 Feb 2019 15:02:00 +0100 +Subject: [PATCH 2/2] simplify code + +--- + src/Timer.php | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/Timer.php b/src/Timer.php +index 9ad76dc..c78a6ee 100644 +--- a/src/Timer.php ++++ b/src/Timer.php +@@ -48,9 +48,7 @@ public static function bytesToString(float $bytes): string + { + foreach (self::$sizes as $unit => $value) { + if ($bytes >= $value) { +- $size = \sprintf('%.2f', $bytes >= 1024 ? $bytes / $value : $bytes); +- +- return $size . ' ' . $unit; ++ return \sprintf('%.2f %s', $bytes >= 1024 ? $bytes / $value : $bytes, $unit); + } + } + diff --git a/makesrc.sh b/makesrc.sh deleted file mode 100755 index 3d8028d..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) -COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) -SHORT=${COMMIT:0:7} - -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" - -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT - -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd - -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT - -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT - -echo "Done." diff --git a/php-phpunit-php-timer2.spec b/php-phpunit-php-timer2.spec index c2d5d68..66203d8 100644 --- a/php-phpunit-php-timer2.spec +++ b/php-phpunit-php-timer2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpunit-php-timer2 # -# Copyright (c) 2010-2024 Christof Damian, Remi Collet +# Copyright (c) 2010-2019 Christof Damian, Remi Collet # # License: MIT # http://opensource.org/licenses/MIT @@ -8,7 +8,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit a691211e94ff39a34811abd521c31bd5b305b0bb +%global gh_commit 8b389aebe1b8b0578430bda0c7c95a829608e059 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project php-timer @@ -28,26 +28,27 @@ %endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 2.1.4 -Release: 4%{?dist} +Version: 2.1.1 +Release: 2%{?dist} Summary: PHP Utility class for timing -License: BSD-3-Clause +License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{version}-%{gh_short}.tgz -Source1: makesrc.sh +Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz + +Patch0: https://patch-diff.githubusercontent.com/raw/sebastianbergmann/php-timer/pull/21.patch BuildArch: noarch -BuildRequires: php(language) >= 7.2 +BuildRequires: php(language) >= 7.1 BuildRequires: php-fedora-autoloader-devel %if %{with_tests} # From composer.json"require-dev": { -# "phpunit/phpunit": "^8.5" -BuildRequires: phpunit8 >= 8.5 +# "phpunit/phpunit": "^7.0" +BuildRequires: phpunit7 %endif # From composer.json -# "php": ">=7.1" +# "php": "^7.1" Requires: php(language) >= 7.1 # From phpcompatinfo report for version 2.0.0 Requires: php-spl @@ -64,6 +65,7 @@ component. %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 %build @@ -85,10 +87,10 @@ touch vendor/autoload.php : Run upstream test suite ret=0 -for cmd in php php81 php82 php83; do +for cmd in php php71 php72 php73; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php \ - %{_bindir}/phpunit8 --verbose || ret=1 + %{_bindir}/phpunit7 --verbose || ret=1 fi done exit $ret @@ -104,63 +106,6 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 2.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 2.1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 2.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Mar 1 2024 Remi Collet - 2.1.4-1 -- update to 2.1.4 (no change) -- sources from git snapshot - -* Thu Jan 25 2024 Fedora Release Engineering - 2.1.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 2.1.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 2.1.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Apr 20 2023 Remi Collet - 2.1.3-7 -- use SPDX license ID - -* Fri Jan 20 2023 Fedora Release Engineering - 2.1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 2.1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 2.1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 2.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Nov 30 2020 Remi Collet - 2.1.3-1 -- update to 2.1.3 (no change) -- switch to phpunit8 - -* Tue Jul 28 2020 Fedora Release Engineering - 2.1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 2.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 2.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Jun 7 2019 Remi Collet - 2.1.2-1 -- update to 2.1.2 -- drop patch merged upstream - * Wed Feb 20 2019 Remi Collet - 2.1.1-2 - add patch from https://github.com/sebastianbergmann/php-timer/pull/21 fix for 32-bit where large value are converted to float @@ -168,12 +113,6 @@ exit $ret * Wed Feb 20 2019 Remi Collet - 2.1.1-1 - update to 2.1.1 -* Sat Feb 02 2019 Fedora Release Engineering - 2.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Wed Feb 7 2018 Remi Collet - 2.0.0-1 - normal build diff --git a/sources b/sources index dd2633f..329c839 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpunit-php-timer2-2.1.4-a691211.tgz) = 0ea06d2db0eb91fe5a8bed06425b79ee43397b9c018a444a8aeaeadfdc721295aa2f525e6a3e67d9e53919073c9f91470a0cab1a43b2040b10e60a412e9b9250 +SHA512 (php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz) = 8801280c65fbe238193e7ab26250fb120f15b2251e379d8de7f81a8fd7c48407921ad097916fddbf1b53c56af3011acccb9143127bb814a80de0b29745e46973