From 4592b35293b87f9db38e9516c46bd8db6fdff191 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 23 Dec 2024 12:24:31 +0100 Subject: [PATCH] update to 1.10.0 add dependency on phpstan/phpdoc-parser add dependency on doctrine/deprecations --- .gitignore | 1 + php-phpdocumentor-type-resolver1.spec | 37 +++++++++++++++++++-------- sources | 2 +- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index c63c238..29a30dd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /php-phpdocumentor-type-resolver1-1.6.0-93ebd0014cab80c4ea9f5e297ea48672f1b87706.tar.gz /php-phpdocumentor-type-resolver1-1.6.1-77a32518733312af16a44300404e945338981de3.tar.gz /php-phpdocumentor-type-resolver1-1.6.2-48f445a408c131e38cab1c235aa6d2bb7a0bb20d.tar.gz +/php-phpdocumentor-type-resolver1-1.10.0-679e3ce485b99e84c775d28e2e96fade9a7fb50a.tar.gz diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec index b27db51..5d88804 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-2024 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.10.0 +%global github_commit 679e3ce485b99e84c775d28e2e96fade9a7fb50a %global composer_vendor phpdocumentor %global composer_project type-resolver @@ -20,11 +20,17 @@ # Install in reflection-common tree %global ns_major 2 -# "php": "^7.4 || ^8.0" -%global php_min_ver 7.4 +# "php": "^7.3 || ^8.0" +%global php_min_ver 7.3 # "phpdocumentor/reflection-common": "^2.0" %global reflection_common_min_ver 2.0 %global reflection_common_max_ver 3 +# "phpstan/phpdoc-parser": "^1.18", +%global phpdoc_parser_min_ver 1.18 +%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 @@ -33,7 +39,7 @@ Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 6%{?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 @@ -52,19 +58,23 @@ BuildArch: noarch BuildRequires: php(language) >= %{php_min_ver} %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 >= 9.5 -BuildRequires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) +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}) ## phpcompatinfo (computed from version 1.0.0) BuildRequires: php-reflection BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-tokenizer +%endif ## Autoloader BuildRequires: php-fedora-autoloader-devel -%endif # composer.json Requires: php(language) >= %{php_min_ver} -Requires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) +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}) # phpcompatinfo (computed from version 1.0.0) Requires: php-pcre Requires: php-spl @@ -109,6 +119,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 @@ -130,7 +142,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=$PWD/bootstrap.php \ @@ -157,6 +169,11 @@ exit $RETURN_CODE %changelog +* Tue Nov 12 2024 Remi Collet - 1.10.0-1 +- update to 1.10.0 +- add dependency on phpstan/phpdoc-parser +- add dependency on doctrine/deprecations + * Fri Jul 19 2024 Fedora Release Engineering - 1.6.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index bf104ee..db885e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-type-resolver1-1.6.2-48f445a408c131e38cab1c235aa6d2bb7a0bb20d.tar.gz) = bd0c174198d2341ef21a010c3ec0944650ba2d92d45b68456201c52c924dc91255f19c91c44167e88a643c2a9501178d6e57c8157613e38ec5f282a1fa1e9e5b +SHA512 (php-phpdocumentor-type-resolver1-1.10.0-679e3ce485b99e84c775d28e2e96fade9a7fb50a.tar.gz) = 42d18141823cf4b7057a836209cf48bcda8c6c12dbf086edb30ab6fcde407ccf555bde74ec47a01a400bc33b0b8c0aa0432e2db9116e602e18c401fddf04958f