diff --git a/.gitignore b/.gitignore index 4b9c6f1..39e6f66 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +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 c4a9c10..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.0.1 -%global github_commit 2e32a6d48972b2c1976ed5d8967145b6cec4a4a9 +%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.1" -%global php_min_ver 7.1 -# "mockery/mockery": "^1" -%global mockery_min_ver 1 -%global mockery_max_ver 2 +# "php": "^7.2 || ^8.0" +%global php_min_ver 7.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: 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) BuildRequires: php-reflection BuildRequires: php-pcre @@ -122,29 +118,22 @@ cp -rp src/* %{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major}/ %check -%if %{with_tests} +%if %{with tests} : Create tests bootstrap cat <<'BOOTSTRAP' | tee bootstrap.php phpunit.xml - : 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 php80; 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 +156,14 @@ exit $RETURN_CODE %changelog +* Mon Jun 29 2020 Remi Collet - 1.3.0-1 +- update to 1.3.0 + +* Tue Mar 3 2020 Remi Collet - 1.1.0-1 +- update to 1.1.0 +- raise dependency on PHP 7.2 +- switch to phpunit8 + * Fri Sep 13 2019 Remi Collet - 1.0.1-1 - update to 1.0.1 - rename to php-phpdocumentor-type-resolver1 diff --git a/sources b/sources index 323305d..543ba2a 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.3.0-e878a14a65245fbe78f8080eba03b47c3b705651.tar.gz) = a6dbb4433a6a17a7ea5297623685af001e7a3408a9a75c7eb394217561e8579ae562e41b8c73d381f1c6421379aff162ac9a3376bd4233fe0efa3e6917863a19