From bac5e856edb154174a7fca74b1e7df8f1d4f9d45 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Mar 2023 10:29:39 +0100 Subject: update to 1.7.0 add dependency on phpstan/phpdoc-parser add dependency on doctrine/deprecations --- .gitignore | 2 ++ composer.json | 7 +++++-- php-phpdocumentor-type-resolver1.spec | 37 +++++++++++++++++++++++++++-------- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1ab5c4f..01f0400 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ +clog package-*.xml *.tgz +*.tar.bz2 *.tar.gz *.tar.xz *.tar.xz.asc diff --git a/composer.json b/composer.json index a7ae10f..3138b4c 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,9 @@ ], "require": { "php": "^7.4 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" + "phpdocumentor/reflection-common": "^2.0", + "phpstan/phpdoc-parser": "^1.13", + "doctrine/deprecations": "^1.0" }, "require-dev": { "ext-tokenizer": "*", @@ -20,7 +22,8 @@ "phpstan/phpstan-phpunit": "^1.1", "phpstan/extension-installer": "^1.1", "vimeo/psalm": "^4.25", - "rector/rector": "^0.13.9" + "rector/rector": "^0.13.9", + "phpbench/phpbench": "^1.2" }, "autoload": { "psr-4": { diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec index 43cf185..4ed7fac 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-2022 Remi Collet, Shawn Iwinski +# Copyright (c) 2017-2023 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.6.2 -%global github_commit 48f445a408c131e38cab1c235aa6d2bb7a0bb20d +%global github_version 1.7.0 +%global github_commit 1534aea9bde19a5c85c5d1e1f834ab63f4c5dcf5 %global composer_vendor phpdocumentor %global composer_project type-resolver @@ -25,6 +25,12 @@ # "phpdocumentor/reflection-common": "^2.0" %global reflection_common_min_ver 2.0 %global reflection_common_max_ver 3 +# "phpstan/phpdoc-parser": "^1.13", +%global phpdoc_parser_min_ver 1.13 +%global phpdoc_parser_max_ver 2 +# "doctrine/deprecations": "^1.0" +%global deprecations_min_ver 1.0 +%global deprecations_max_ver 2 # Build using "--without tests" to disable tests %bcond_without tests @@ -54,10 +60,14 @@ BuildRequires: php(language) >= %{php_min_ver} BuildRequires: phpunit9 >= 9.5 # 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}) -# remirepo:3 +BuildRequires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) +BuildRequires: (php-composer(phpstan/phpdoc-parser) >= %{phpdoc_parser_min_ver} with php-composer(phpstan/phpdoc-parser) < %{phpdoc_parser_max_ver}) +BuildRequires: (php-composer(doctrine/deprecations) >= %{deprecations_min_ver} with php-composer(doctrine/deprecations) < %{deprecations_max_ver}) +# remirepo:5 %else BuildRequires: php-phpdocumentor-reflection-common2 >= %{reflection_common_min_ver} +BuildRequires: php-phpstan-phpdoc-parser >= %{phpdoc_parser_min_ver} +BuildRequires: php-doctrine-deprecations >= %{deprecations_min_ver} %endif ## phpcompatinfo (computed from version 1.0.0) BuildRequires: php-reflection @@ -72,10 +82,14 @@ BuildRequires: php-fedora-autoloader-devel Requires: php(language) >= %{php_min_ver} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) -# remirepo:3 +Requires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) +Requires: (php-composer(phpstan/phpdoc-parser) >= %{phpdoc_parser_min_ver} with php-composer(phpstan/phpdoc-parser) < %{phpdoc_parser_max_ver}) +Requires: (php-composer(doctrine/deprecations) >= %{deprecations_min_ver} with php-composer(doctrine/deprecations) < %{deprecations_max_ver}) +# remirepo:5 %else Requires: php-phpdocumentor-reflection-common2 >= %{reflection_common_min_ver} +Requires: php-phpstan-phpdoc-parser >= %{phpdoc_parser_min_ver} +Requires: php-doctrine-deprecations >= %{deprecations_min_ver} %endif # phpcompatinfo (computed from version 1.0.0) Requires: php-pcre @@ -121,6 +135,8 @@ cat <<'AUTOLOAD' | tee -a src/autoload-type-resolver.php \Fedora\Autoloader\Dependencies::required([ '%{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-common.php', + '%{phpdir}/PHPStan/PhpDocParser/autoload.php', + '%{phpdir}/Doctrine/Deprecations/autoload.php', ]); AUTOLOAD @@ -142,7 +158,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=$PWD/bootstrap.php \ @@ -171,6 +187,11 @@ exit $RETURN_CODE %changelog +* Mon Mar 20 2023 Remi Collet - 1.7.0-1 +- update to 1.7.0 +- add dependency on phpstan/phpdoc-parser +- add dependency on doctrine/deprecations + * Fri Oct 14 2022 Remi Collet - 1.6.2-1 - update to 1.6.2 - raise dependency on PHP 7.4 -- cgit