From c4ea872bb3004cea97c442b4f9a8087e694a56ba Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 3 Mar 2020 12:13:48 +0100
Subject: [PATCH] update to 1.1.0 raise dependency on PHP 7.2 switch to
 phpunit8

---
 .gitignore                            |  1 +
 php-phpdocumentor-type-resolver1.spec | 27 ++++++++++++++++-----------
 sources                               |  2 +-
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4b9c6f1..26653ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /php-phpdocumentor-type-resolver1-1.0.1-2e32a6d48972b2c1976ed5d8967145b6cec4a4a9.tar.gz
+/php-phpdocumentor-type-resolver1-1.1.0-7462d5f123dfc080dfdf26897032a6513644fc95.tar.gz
diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec
index 3f10f58..44eb1ca 100644
--- a/php-phpdocumentor-type-resolver1.spec
+++ b/php-phpdocumentor-type-resolver1.spec
@@ -10,8 +10,8 @@
 
 %global github_owner     phpDocumentor
 %global github_name      TypeResolver
-%global github_version   1.0.1
-%global github_commit    2e32a6d48972b2c1976ed5d8967145b6cec4a4a9
+%global github_version   1.1.0
+%global github_commit    7462d5f123dfc080dfdf26897032a6513644fc95
 
 %global composer_vendor  phpdocumentor
 %global composer_project type-resolver
@@ -20,8 +20,8 @@
 # Install in reflection-common tree
 %global ns_major         2
 
-# "php": "^7.1"
-%global php_min_ver 7.1
+# "php": "^7.2"
+%global php_min_ver 7.2
 # "mockery/mockery": "^1"
 %global mockery_min_ver 1
 %global mockery_max_ver 2
@@ -36,7 +36,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}%{major}
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       A PSR-5 based resolver of Class names, Types and Structural Element Names
 
 Group:         Development/Libraries
@@ -53,7 +53,7 @@ BuildArch:     noarch
 %if %{with_tests}
 ## composer.json
 BuildRequires:  php(language) >= %{php_min_ver}
-BuildRequires:  phpunit7
+BuildRequires:  phpunit8
 BuildRequires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) <  %{reflection_common_max_ver})
 BuildRequires: (php-composer(mockery/mockery)                 >= %{mockery_min_ver}           with php-composer(mockery/mockery)                 <  %{mockery_max_ver})
 ## phpcompatinfo (computed from version 1.0.0)
@@ -140,11 +140,11 @@ sed 's#vendor/mockery/mockery/library/Mockery#%{phpdir}/Mockery1#' phpunit.xml.d
 
 : Upstream tests
 RETURN_CODE=0
-PHPUNIT=$(which phpunit7)
-for PHP_EXEC in php php71 php72 php73 php74; do
-    if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
-        $PHP_EXEC -d auto_prepend_file=$PWD/bootstrap.php \
-            $PHPUNIT --verbose --bootstrap bootstrap.php \
+for cmdarg in php php72 php73 "php74 %{_bindir}/phpunit9"; do
+    if which $cmdarg; then
+        set $cmdarg
+        $1 -d auto_prepend_file=$PWD/bootstrap.php \
+            ${2:-%{_bindir}/phpunit8} --verbose --bootstrap bootstrap.php \
             || RETURN_CODE=1
     fi
 done
@@ -167,6 +167,11 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue Mar  3 2020 Remi Collet <remi@remirepo.net> - 1.1.0-1
+- update to 1.1.0
+- raise dependency on PHP 7.2
+- switch to phpunit8
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 323305d..523fc56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpdocumentor-type-resolver1-1.0.1-2e32a6d48972b2c1976ed5d8967145b6cec4a4a9.tar.gz) = 41b38eea6086916aa31c25f1b0d53b2b33206151785ef904b5bb37afc6bad0c7445261fcf3916b175cb80d3907c45ca06b2161e342f4936f2d0578406ed8f50f
+SHA512 (php-phpdocumentor-type-resolver1-1.1.0-7462d5f123dfc080dfdf26897032a6513644fc95.tar.gz) = fec8952e21fad7fe24fb1580afea2a694ddfaa5b6247675fc737bdd17e8420b9d53ca66588c29cf46c5e812b910d9ee9052b9e85c8f0de12d049806f7d3c7e4a