From 9b14d228d959a2bd0a16fcf6acdce194baed9e88 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 23 Jun 2020 14:12:02 +0200
Subject: update to 1.2.0

---
 composer.json                         |  4 ++--
 php-phpdocumentor-type-resolver1.spec | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 601532c..b9b327e 100644
--- a/composer.json
+++ b/composer.json
@@ -24,12 +24,12 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "phpDocumentor\\Reflection\\": "tests/unit"
+            "phpDocumentor\\Reflection\\": ["tests/unit", "tests/benchmark"]
         }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.x-dev"
+            "dev-1.x": "1.x-dev"
         }
     }
 }
diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec
index 181e2fd..41c0e3e 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.1.0
-%global github_commit    7462d5f123dfc080dfdf26897032a6513644fc95
+%global github_version   1.2.0
+%global github_commit    30441f2752e493c639526b215ed81d54f369d693
 
 %global composer_vendor  phpdocumentor
 %global composer_project type-resolver
@@ -30,7 +30,7 @@
 %global reflection_common_max_ver 3
 
 # Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
+%bcond_without tests
 
 %{!?phpdir:  %global phpdir  %{_datadir}/php}
 
@@ -50,7 +50,7 @@ Source1:       makesrc.sh
 
 BuildArch:     noarch
 # Tests
-%if %{with_tests}
+%if %{with tests}
 ## composer.json
 BuildRequires:  php(language) >= %{php_min_ver}
 BuildRequires:  phpunit8
@@ -135,7 +135,7 @@ cp -rp src/* %{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major}/
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 : Create tests bootstrap
 cat <<'BOOTSTRAP' | tee bootstrap.php
 <?php
@@ -153,7 +153,7 @@ sed 's#vendor/mockery/mockery/library/Mockery#%{phpdir}/Mockery1#' phpunit.xml.d
 
 : Upstream tests
 RETURN_CODE=0
-for cmdarg in php php72 php73 "php74 %{_bindir}/phpunit9"; do
+for cmdarg in php php72 php73 php74 php80; do
     if which $cmdarg; then
         set $cmdarg
         $1 -d auto_prepend_file=$PWD/bootstrap.php \
@@ -182,6 +182,9 @@ exit $RETURN_CODE
 
 
 %changelog
+* Tue Jun 23 2020 Remi Collet <remi@remirepo.net> - 1.2.0-1
+- update to 1.2.0
+
 * Tue Mar  3 2020 Remi Collet <remi@remirepo.net> - 1.1.0-1
 - update to 1.1.0
 - raise dependency on PHP 7.2
-- 
cgit