diff --git a/.gitignore b/.gitignore index 39e6f66..9cf57f4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 +/php-phpdocumentor-type-resolver1-1.4.0-6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0.tar.gz diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec index 1591c4d..ebb4543 100644 --- a/php-phpdocumentor-type-resolver1.spec +++ b/php-phpdocumentor-type-resolver1.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-phpdocumentor-type-resolver1 # -# Copyright (c) 2017-2019 Remi Collet, Shawn Iwinski +# Copyright (c) 2017-2020 Remi Collet, Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -10,8 +10,8 @@ %global github_owner phpDocumentor %global github_name TypeResolver -%global github_version 1.3.0 -%global github_commit e878a14a65245fbe78f8080eba03b47c3b705651 +%global github_version 1.4.0 +%global github_commit 6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0 %global composer_vendor phpdocumentor %global composer_project type-resolver @@ -33,7 +33,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 @@ -50,7 +50,13 @@ BuildArch: noarch %if %{with tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 31 || 0%{?rhel} >= 9 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 +%else +%global phpunit %{_bindir}/phpunit8 BuildRequires: phpunit8 +%endif BuildRequires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) ## phpcompatinfo (computed from version 1.0.0) BuildRequires: php-reflection @@ -129,11 +135,11 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for cmdarg in php php72 php73 php74 php80; do +for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=$PWD/bootstrap.php \ - ${2:-%{_bindir}/phpunit8} --verbose --bootstrap bootstrap.php \ + ${2:-%{_bindir}/phpunit9} --verbose --no-coverage --bootstrap bootstrap.php \ || RETURN_CODE=1 fi done @@ -150,12 +156,15 @@ exit $RETURN_CODE %doc examples %{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php %{phpdir}/phpDocumentor/Reflection%{ns_major}/FqsenResolver.php -%{phpdir}/phpDocumentor/Reflection%{ns_major}/Type.php -%{phpdir}/phpDocumentor/Reflection%{ns_major}/TypeResolver.php -%{phpdir}/phpDocumentor/Reflection%{ns_major}/Types +%{phpdir}/phpDocumentor/Reflection%{ns_major}/Type* +%{phpdir}/phpDocumentor/Reflection%{ns_major}/PseudoType* %changelog +* Fri Sep 18 2020 Remi Collet - 1.4.0-1 +- update to 1.4.0 +- switch to phpunit9 + * Tue Jul 28 2020 Fedora Release Engineering - 1.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 543ba2a..c639091 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-type-resolver1-1.3.0-e878a14a65245fbe78f8080eba03b47c3b705651.tar.gz) = a6dbb4433a6a17a7ea5297623685af001e7a3408a9a75c7eb394217561e8579ae562e41b8c73d381f1c6421379aff162ac9a3376bd4233fe0efa3e6917863a19 +SHA512 (php-phpdocumentor-type-resolver1-1.4.0-6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0.tar.gz) = 6e7ddfd62028bc7754a4ad7c2a6c6278e137f22a5bb745f7bb8ec1810bf5b54dc80cc00926adda7e1f09ef72ccf26c4c1a903f8bdce849065e2b3b67834de2fe