From eee5b48fafcced41f4ae323b435de00890d34712 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 23 Jun 2020 14:13:03 +0200
Subject: [PATCH] v1.3.0

(cherry picked from commit 55b1445df1e77a63880afec897231bca57484204)
(cherry picked from commit 5e6e32217ef366b5bb4de1697077cdb07f7043fc)
---
 .gitignore                            |  2 ++
 php-phpdocumentor-type-resolver1.spec | 28 ++++++++++-----------------
 sources                               |  2 +-
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 26653ca..39e6f66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /php-phpdocumentor-type-resolver1-1.0.1-2e32a6d48972b2c1976ed5d8967145b6cec4a4a9.tar.gz
 /php-phpdocumentor-type-resolver1-1.1.0-7462d5f123dfc080dfdf26897032a6513644fc95.tar.gz
+/php-phpdocumentor-type-resolver1-1.2.0-30441f2752e493c639526b215ed81d54f369d693.tar.gz
+/php-phpdocumentor-type-resolver1-1.3.0-e878a14a65245fbe78f8080eba03b47c3b705651.tar.gz
diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec
index 7b5cf00..6f1eaad 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.3.0
+%global github_commit    e878a14a65245fbe78f8080eba03b47c3b705651
 
 %global composer_vendor  phpdocumentor
 %global composer_project type-resolver
@@ -20,17 +20,14 @@
 # Install in reflection-common tree
 %global ns_major         2
 
-# "php": "^7.2"
+# "php": "^7.2 || ^8.0"
 %global php_min_ver 7.2
-# "mockery/mockery": "^1"
-%global mockery_min_ver 1
-%global mockery_max_ver 2
 # "phpdocumentor/reflection-common": "^2.0"
 %global reflection_common_min_ver 2.0
 %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,12 +47,11 @@ Source1:       makesrc.sh
 
 BuildArch:     noarch
 # Tests
-%if %{with_tests}
+%if %{with tests}
 ## composer.json
 BuildRequires:  php(language) >= %{php_min_ver}
 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)
 BuildRequires:  php-reflection
 BuildRequires:  php-pcre
@@ -122,25 +118,18 @@ 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
 require '%{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('phpDocumentor\\Reflection\\', __DIR__.'/tests/unit');
-
-\Fedora\Autoloader\Dependencies::required([
-    '%{phpdir}/Mockery1/autoload.php',
-]);
 BOOTSTRAP
 
-: Adjust listener path
-sed 's#vendor/mockery/mockery/library/Mockery#%{phpdir}/Mockery1#' phpunit.xml.dist > phpunit.xml
-
 : 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 \
@@ -167,6 +156,9 @@ exit $RETURN_CODE
 
 
 %changelog
+* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 1.3.0-1
+- update to 1.3.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
diff --git a/sources b/sources
index 523fc56..543ba2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-phpdocumentor-type-resolver1-1.1.0-7462d5f123dfc080dfdf26897032a6513644fc95.tar.gz) = fec8952e21fad7fe24fb1580afea2a694ddfaa5b6247675fc737bdd17e8420b9d53ca66588c29cf46c5e812b910d9ee9052b9e85c8f0de12d049806f7d3c7e4a
+SHA512 (php-phpdocumentor-type-resolver1-1.3.0-e878a14a65245fbe78f8080eba03b47c3b705651.tar.gz) = a6dbb4433a6a17a7ea5297623685af001e7a3408a9a75c7eb394217561e8579ae562e41b8c73d381f1c6421379aff162ac9a3376bd4233fe0efa3e6917863a19