diff --git a/.gitignore b/.gitignore index 39e6f66..01bc9a4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,14 @@ /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 +/php-phpdocumentor-type-resolver1-1.4.0-6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0.tar.gz +/php-phpdocumentor-type-resolver1-1.5.0-30f38bffc6f24293dadd1823936372dfa9e86e2f.tar.gz +/php-phpdocumentor-type-resolver1-1.5.1-a12f7e301eb7258bb68acd89d4aefa05c2906cae.tar.gz +/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 7bf36d2..381e42b 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-2019 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.3.0 -%global github_commit e878a14a65245fbe78f8080eba03b47c3b705651 +%global github_version 1.12.0 +%global github_commit 92a98ada2b93d9b201a613cb5a33584dde25f195 %global composer_vendor phpdocumentor %global composer_project type-resolver @@ -20,11 +20,17 @@ # Install in reflection-common tree %global ns_major 2 -# "php": "^7.2 || ^8.0" -%global php_min_ver 7.2 +# "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|^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 @@ -50,20 +56,25 @@ BuildArch: noarch %if %{with tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: phpunit8 -BuildRequires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_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}) ## 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 @@ -108,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 @@ -129,11 +142,12 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for cmdarg in php php72 php73 php74 php80; do +for cmdarg in "php %{phpunit}" php81 php82 php83 php84 php85; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=$PWD/bootstrap.php \ - ${2:-%{_bindir}/phpunit8} --verbose --bootstrap bootstrap.php \ + ${2:-%{_bindir}/phpunit9} --verbose --no-coverage --bootstrap bootstrap.php \ + --testsuite=unit \ || RETURN_CODE=1 fi done @@ -150,12 +164,90 @@ exit $RETURN_CODE %doc examples %{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php %{phpdir}/phpDocumentor/Reflection%{ns_major}/FqsenResolver.php -%{phpdir}/phpDocumentor/Reflection%{ns_major}/Type.php -%{phpdir}/phpDocumentor/Reflection%{ns_major}/TypeResolver.php -%{phpdir}/phpDocumentor/Reflection%{ns_major}/Types +%{phpdir}/phpDocumentor/Reflection%{ns_major}/Type* +%{phpdir}/phpDocumentor/Reflection%{ns_major}/PseudoType* %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 + +* Fri Oct 14 2022 Remi Collet - 1.6.2-1 +- update to 1.6.2 +- raise dependency on PHP 7.4 + +* Fri Jul 22 2022 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Mar 30 2022 Remi Collet - 1.6.1-1 +- update to 1.6.1 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 5 2022 Remi Collet - 1.6.0-1 +- update to 1.6.0 + +* Mon Oct 4 2021 Remi Collet - 1.5.1-1 +- update to 1.5.1 + +* Wed Sep 22 2021 Remi Collet - 1.5.0-1 +- update to 1.5.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jan 29 2021 Remi Collet - 1.4.0-2 +- fix phpunit argument and FTBFS + +* Wed Jan 27 2021 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Sep 18 2020 Remi Collet - 1.4.0-1 +- update to 1.4.0 +- switch to phpunit9 + +* Tue Jul 28 2020 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 29 2020 Remi Collet - 1.3.0-1 - update to 1.3.0 diff --git a/sources b/sources index 543ba2a..a4ca170 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-type-resolver1-1.3.0-e878a14a65245fbe78f8080eba03b47c3b705651.tar.gz) = a6dbb4433a6a17a7ea5297623685af001e7a3408a9a75c7eb394217561e8579ae562e41b8c73d381f1c6421379aff162ac9a3376bd4233fe0efa3e6917863a19 +SHA512 (php-phpdocumentor-type-resolver1-1.12.0-92a98ada2b93d9b201a613cb5a33584dde25f195.tar.gz) = 26ed8f79f183eec481272a03b41f204f7d3a300496486c240ecfa5e5d0b9f08467425c0e4dd6c9258ea2f20ae89926319da0f6cb816a954835bea4319aee79ea