diff options
| author | Remi Collet <remi@remirepo.net> | 2021-09-22 11:12:10 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-09-22 11:12:10 +0200 |
| commit | 6c32a34d3e6cb7bbca172f71a7ee62880405416f (patch) | |
| tree | 9d3a8f08306e800916115ea03c779bcdd7648359 | |
| parent | d6aa8039a825e8d0c93cc1e0bf9152b30042f3d8 (diff) | |
update to 1.5.0
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | php-phpdocumentor-type-resolver1.spec | 16 |
2 files changed, 9 insertions, 10 deletions
diff --git a/composer.json b/composer.json index 242ecbe..4dbf623 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,8 @@ "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "ext-tokenizer": "*" + "ext-tokenizer": "*", + "psalm/phar": "^4.8" }, "autoload": { "psr-4": { diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec index 9fc9965..2abc42e 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.4.0 -%global github_commit 6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0 +%global github_version 1.5.0 +%global github_commit 30f38bffc6f24293dadd1823936372dfa9e86e2f %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,13 +50,8 @@ 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 # 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}) @@ -147,7 +142,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=$PWD/bootstrap.php \ @@ -176,6 +171,9 @@ exit $RETURN_CODE %changelog +* Wed Sep 22 2021 Remi Collet <remi@remirepo.net> - 1.5.0-1 +- update to 1.5.0 + * Fri Jan 29 2021 Remi Collet <remi@remirepo.net> - 1.4.0-2 - fix phpunit argument and FTBFS |