diff --git a/.gitignore b/.gitignore index 01bc9a4..c63c238 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,3 @@ /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 -/php-phpdocumentor-type-resolver1-1.10.1-431c02da15e566adb0ad9c5030fa6f6204d9de9e.tar.gz -/php-phpdocumentor-type-resolver1-1.11.0-8cbe6100e8971efbf8e2e7da3a202ba83eafd5a3.tar.gz -/php-phpdocumentor-type-resolver1-1.11.1-f626740b38009078de0dc8b2b9dc4e7f749c6eba.tar.gz -/php-phpdocumentor-type-resolver1-1.12.0-92a98ada2b93d9b201a613cb5a33584dde25f195.tar.gz diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec index 381e42b..161bce8 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-2024 Remi Collet, Shawn Iwinski +# Copyright (c) 2017-2022 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.12.0 -%global github_commit 92a98ada2b93d9b201a613cb5a33584dde25f195 +%global github_version 1.6.2 +%global github_commit 48f445a408c131e38cab1c235aa6d2bb7a0bb20d %global composer_vendor phpdocumentor %global composer_project type-resolver @@ -20,17 +20,11 @@ # Install in reflection-common tree %global ns_major 2 -# "php": "^7.3 || ^8.0" -%global php_min_ver 7.3 +# "php": "^7.4 || ^8.0" +%global php_min_ver 7.4 # "phpdocumentor/reflection-common": "^2.0" %global reflection_common_min_ver 2.0 %global reflection_common_max_ver 3 -# "phpstan/phpdoc-parser": "^1.18|^2.0", -%global phpdoc_parser_min_ver 1.18 -%global phpdoc_parser_max_ver 3 -# "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 @@ -39,7 +33,7 @@ Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 1%{?github_release}%{?dist} +Release: 2%{?github_release}%{?dist} Summary: A PSR-5 based resolver of Class names, Types and Structural Element Names Group: Development/Libraries @@ -58,23 +52,19 @@ 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(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}) +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 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(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}) +Requires: (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) Requires: php-pcre Requires: php-spl @@ -119,8 +109,6 @@ 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 +130,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for cmdarg in "php %{phpunit}" php81 php82 php83 php84 php85; do +for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=$PWD/bootstrap.php \ @@ -169,44 +157,6 @@ exit $RETURN_CODE %changelog -* Tue Nov 25 2025 Remi Collet - 1.12.0-1 -- update to 1.12.0 - -* Fri Nov 21 2025 Remi Collet - 1.11.1-1 -- update to 1.11.1 - -* Thu Nov 20 2025 Remi Collet - 1.11.0-1 -- update to 1.11.0 - -* Wed Nov 19 2025 Remi Collet - 1.10.1-1 -- update to 1.10.1 - -* Fri Jul 25 2025 Fedora Release Engineering - 1.10.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 1.10.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Dec 23 2024 Remi Collet - 1.10.0-2 -- allow phpstan/phpdoc-parser v2 - -* 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 - -* Thu Jan 25 2024 Fedora Release Engineering - 1.6.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.6.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 1.6.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - * Fri Jan 20 2023 Fedora Release Engineering - 1.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index a4ca170..bf104ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-type-resolver1-1.12.0-92a98ada2b93d9b201a613cb5a33584dde25f195.tar.gz) = 26ed8f79f183eec481272a03b41f204f7d3a300496486c240ecfa5e5d0b9f08467425c0e4dd6c9258ea2f20ae89926319da0f6cb816a954835bea4319aee79ea +SHA512 (php-phpdocumentor-type-resolver1-1.6.2-48f445a408c131e38cab1c235aa6d2bb7a0bb20d.tar.gz) = bd0c174198d2341ef21a010c3ec0944650ba2d92d45b68456201c52c924dc91255f19c91c44167e88a643c2a9501178d6e57c8157613e38ec5f282a1fa1e9e5b