From fcc1f7b7964620b60f2cbe1efa83f9d1009baa91 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 3 Mar 2020 12:10:28 +0100
Subject: update to 1.1.0 raise dependency on PHP 7.2 switch to phpunit8

---
 composer.json                         |  5 ++---
 php-phpdocumentor-type-resolver1.spec | 25 +++++++++++++++----------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/composer.json b/composer.json
index f784935..601532c 100644
--- a/composer.json
+++ b/composer.json
@@ -10,13 +10,12 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "phpdocumentor/reflection-common": "^2.0"
     },
     "require-dev": {
         "mockery/mockery": "~1",
-        "ext-tokenizer": "^7.1",
-        "phpunit/phpunit": "^7.0"
+        "ext-tokenizer": "^7.2"
     },
     "autoload": {
         "psr-4": {
diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec
index 15ffc04..181e2fd 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
@@ -53,7 +53,7 @@ BuildArch:     noarch
 %if %{with_tests}
 ## composer.json
 BuildRequires:  php(language) >= %{php_min_ver}
-BuildRequires:  phpunit7
+BuildRequires:  phpunit8
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) <  %{reflection_common_max_ver})
@@ -153,11 +153,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
@@ -182,6 +182,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
+
 * Fri Sep 13 2019 Remi Collet <remi@remirepo.net> - 1.0.1-1
 - update to 1.0.1
 - rename to php-phpdocumentor-type-resolver1
-- 
cgit