From 4e0b4f75392ccdebead35d3a8ca0e902b064b59c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 7 Feb 2020 11:36:23 +0100
Subject: update to 3.0.0 raise dependency on PHP 7.3 rename to
 php-phpunit-php-timer3 move to /usr/share/php/SebastianBergmann/Timer3

---
 composer.json               |  9 ++++++---
 php-phpunit-php-timer3.spec | 39 +++++++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index d400ad7..3388af2 100644
--- a/composer.json
+++ b/composer.json
@@ -19,12 +19,15 @@
     },
     "prefer-stable": true,
     "require": {
-        "php": "^7.1"
+        "php": "^7.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^9.0"
     },
     "config": {
+        "platform": {
+            "php": "7.3.0"
+        },
         "optimize-autoloader": true,
         "sort-packages": true
     },
@@ -35,7 +38,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1-dev"
+            "dev-master": "3.0-dev"
         }
     }
 }
diff --git a/php-phpunit-php-timer3.spec b/php-phpunit-php-timer3.spec
index 05fbf6f..36ed92b 100644
--- a/php-phpunit-php-timer3.spec
+++ b/php-phpunit-php-timer3.spec
@@ -1,6 +1,6 @@
-# remirepo/fedora spec file for php-phpunit-php-timer2
+# remirepo/fedora spec file for php-phpunit-php-timer3
 #
-# Copyright (c) 2010-2019 Christof Damian, Remi Collet
+# Copyright (c) 2010-2020 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    1038454804406b0b5f5f520358e78c1c2f71501e
+%global gh_commit    4118013a4d0f97356eae8e7fb2f6c6472575d1df
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   php-timer
@@ -19,7 +19,7 @@
 %global ns_vendor    SebastianBergmann
 %global ns_project   Timer
 
-%global major        2
+%global major        3
 %global php_home     %{_datadir}/php
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
@@ -28,7 +28,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.1.2
+Version:        3.0.0
 Release:        1%{?dist}
 Summary:        PHP Utility class for timing
 
@@ -37,18 +37,19 @@ 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
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 7.1
+BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
 # From composer.json"require-dev": {
-#        "phpunit/phpunit": "^7.0"
-BuildRequires:  phpunit7
+#        "phpunit/phpunit": "^9.0"
+# TODO test suite passes with v8, switch to v9 when available
+BuildRequires:  phpunit8
 %endif
 
 # From composer.json
-#        "php": "^7.1"
-Requires:       php(language) >= 7.1
-# From phpcompatinfo report for version 2.0.0
+#        "php": "^7.3"
+Requires:       php(language) >= 7.3
+# From phpcompatinfo report for version 3.0.0
 Requires:       php-spl
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
@@ -74,7 +75,7 @@ phpab \
 
 %install
 mkdir -p   %{buildroot}%{php_home}/%{ns_vendor}
-cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}
+cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}
 
 
 %if %{with_tests}
@@ -84,10 +85,10 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php 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
+    $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
+      %{_bindir}/phpunit8 --verbose || ret=1
   fi
 done
 exit $ret
@@ -101,10 +102,16 @@ exit $ret
 %doc README.md
 %doc composer.json
 %dir %{php_home}/%{ns_vendor}
-     %{php_home}/%{ns_vendor}/%{ns_project}
+     %{php_home}/%{ns_vendor}/%{ns_project}%{major}
 
 
 %changelog
+* Fri Feb  7 2020 Remi Collet <remi@remirepo.net> - 3.0.0-1
+- update to 3.0.0
+- raise dependency on PHP 7.3
+- rename to php-phpunit-php-timer3
+- move to /usr/share/php/SebastianBergmann/Timer3
+
 * Fri Jun  7 2019 Remi Collet <remi@remirepo.net> - 2.1.2-1
 - update to 2.1.2
 - drop patch merged upstream
-- 
cgit