update to 2.1.2
drop patch merged upstream
(cherry picked from commit 951017ffb6)
This commit is contained in:
Remi Collet
parent
f06d7aa82e
commit
4cfbd86bee
4 changed files with 10 additions and 78 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
|||
/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
|
||||
|
|
|
|||
70
21.patch
70
21.patch
|
|
@ -1,70 +0,0 @@
|
|||
From d07774e18e532336361f2b59c039099fae512898 Mon Sep 17 00:00:00 2001
|
||||
From: Remi Collet <remi@remirepo.net>
|
||||
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 <remi@remirepo.net>
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
# Please, preserve the changelog entries
|
||||
#
|
||||
%global bootstrap 0
|
||||
%global gh_commit 8b389aebe1b8b0578430bda0c7c95a829608e059
|
||||
%global gh_commit 1038454804406b0b5f5f520358e78c1c2f71501e
|
||||
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
|
||||
%global gh_owner sebastianbergmann
|
||||
%global gh_project php-timer
|
||||
|
|
@ -28,16 +28,14 @@
|
|||
%endif
|
||||
|
||||
Name: php-%{pk_vendor}-%{pk_project}%{major}
|
||||
Version: 2.1.1
|
||||
Release: 2%{?dist}
|
||||
Version: 2.1.2
|
||||
Release: 1%{?dist}
|
||||
Summary: PHP Utility class for timing
|
||||
|
||||
License: BSD
|
||||
URL: https://github.com/%{gh_owner}/%{gh_project}
|
||||
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.1
|
||||
BuildRequires: php-fedora-autoloader-devel
|
||||
|
|
@ -65,7 +63,6 @@ component.
|
|||
|
||||
%prep
|
||||
%setup -q -n %{gh_project}-%{gh_commit}
|
||||
%patch0 -p1
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -87,7 +84,7 @@ touch vendor/autoload.php
|
|||
|
||||
: Run upstream test suite
|
||||
ret=0
|
||||
for cmd in php php71 php72 php73; do
|
||||
for cmd in php php71 php72 php73 php74; do
|
||||
if which $cmd; then
|
||||
$cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php \
|
||||
%{_bindir}/phpunit7 --verbose || ret=1
|
||||
|
|
@ -106,6 +103,10 @@ exit $ret
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Jun 7 2019 Remi Collet <remi@remirepo.net> - 2.1.2-1
|
||||
- update to 2.1.2
|
||||
- drop patch merged upstream
|
||||
|
||||
* Wed Feb 20 2019 Remi Collet <remi@remirepo.net> - 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
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (php-phpunit-php-timer2-2.1.1-8b389ae.tar.gz) = 8801280c65fbe238193e7ab26250fb120f15b2251e379d8de7f81a8fd7c48407921ad097916fddbf1b53c56af3011acccb9143127bb814a80de0b29745e46973
|
||||
SHA512 (php-phpunit-php-timer2-2.1.2-1038454.tar.gz) = b035f63bb5192629eeaf794e38885de471d3e8f90c2402231e7ded14b2cdfc502a870e657d77b7c5e5d85d1ed9355af3c093de2eaf75a882af101c4dd39cbf3b
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue