diff options
| -rw-r--r-- | composer.json | 20 | ||||
| -rw-r--r-- | php-phpdocumentor-type-resolver2.spec | 43 |
2 files changed, 33 insertions, 30 deletions
diff --git a/composer.json b/composer.json index 5c280e3..631eca6 100644 --- a/composer.json +++ b/composer.json @@ -10,20 +10,19 @@ } ], "require": { - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.18|^2.0", + "phpstan/phpdoc-parser": "^2.0", "doctrine/deprecations": "^1.0" }, "require-dev": { "ext-tokenizer": "*", "phpunit/phpunit": "^9.5", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/extension-installer": "^1.1", - "vimeo/psalm": "^4.25", - "rector/rector": "^0.13.9", - "phpbench/phpbench": "^1.2" + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/extension-installer": "^1.4", + "phpbench/phpbench": "^1.2", + "psalm/phar": "^4" }, "autoload": { "psr-4": { @@ -37,12 +36,13 @@ }, "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-1.x": "1.x-dev", + "dev-2.x": "2.x-dev" } }, "config": { "platform": { - "php": "7.3.0" + "php": "7.4.0" }, "allow-plugins": { "phpstan/extension-installer": true diff --git a/php-phpdocumentor-type-resolver2.spec b/php-phpdocumentor-type-resolver2.spec index 60e4ea8..c5e6102 100644 --- a/php-phpdocumentor-type-resolver2.spec +++ b/php-phpdocumentor-type-resolver2.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-2026 Remi Collet, Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -10,23 +10,23 @@ %global github_owner phpDocumentor %global github_name TypeResolver -%global github_version 1.12.0 -%global github_commit 92a98ada2b93d9b201a613cb5a33584dde25f195 +%global github_version 2.0.0 +%global github_commit 327a05bbee54120d4786a0dc67aad30226ad4cf9 %global composer_vendor phpdocumentor %global composer_project type-resolver -%global major 1 +%global major 2 # 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 +# "phpstan/phpdoc-parser": "^2.0", +%global phpdoc_parser_min_ver 2.0 %global phpdoc_parser_max_ver 3 # "doctrine/deprecations": "^1.0" %global deprecations_min_ver 1.0 @@ -101,21 +101,21 @@ This package provides two Resolvers that are capable of: 2. Returning an FQSEN object after resolving any partial Structural Element Names into Fully Qualified Structural Element names. -Autoloader: %{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php +Autoloader: %{phpdir}/phpDocumentor/Reflection/TypeResolver%{major}/autoload.php %prep %setup -qn %{github_name}-%{github_commit} : Update examples autoload require -sed "s#.*require.*vendor.*/autoload.php.*#require_once '%{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php';#" \ +sed "s#.*require.*vendor.*/autoload.php.*#require_once '%{phpdir}/phpDocumentor/Reflection/TypeResolver%{major}/autoload.php';#" \ -i examples/* %build : Create autoloader -%{_bindir}/phpab --template fedora --output src/autoload-type-resolver.php src -cat <<'AUTOLOAD' | tee -a src/autoload-type-resolver.php +%{_bindir}/phpab --template fedora --output src/autoload.php src +cat <<'AUTOLOAD' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-common.php', @@ -126,8 +126,8 @@ AUTOLOAD %install -mkdir -p %{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major} -cp -rp src/* %{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major}/ +mkdir -p %{buildroot}%{phpdir}/phpDocumentor/Reflection/TypeResolver%{major} +cp -rp src/* %{buildroot}%{phpdir}/phpDocumentor/Reflection/TypeResolver%{major} %check @@ -135,14 +135,14 @@ cp -rp src/* %{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major}/ : Create tests bootstrap cat <<'BOOTSTRAP' | tee bootstrap.php <?php -require '%{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php'; +require '%{buildroot}%{phpdir}/phpDocumentor/Reflection/TypeResolver%{major}/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('phpDocumentor\\Reflection\\', __DIR__.'/tests/unit'); BOOTSTRAP : Upstream tests RETURN_CODE=0 -for cmdarg in "php %{phpunit}" php81 php82 php83 php84 php85; do +for cmdarg in "php %{phpunit}" php82 php83 php84 php85; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=$PWD/bootstrap.php \ @@ -162,13 +162,16 @@ exit $RETURN_CODE %doc *.md %doc composer.json %doc examples -%{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php -%{phpdir}/phpDocumentor/Reflection%{ns_major}/FqsenResolver.php -%{phpdir}/phpDocumentor/Reflection%{ns_major}/Type* -%{phpdir}/phpDocumentor/Reflection%{ns_major}/PseudoType* +%dir %{phpdir}/phpDocumentor/Reflection +%{phpdir}/phpDocumentor/Reflection/TypeResolver%{major} %changelog +* Wed Feb 25 2026 Remi Collet <remi@remirepo.net> - 2.0.0-1 +- update to 2.0.0 +- rename to php-phpdocumentor-type-resolver1 +- move to /usr/share/php/phpDocumentor/Reflection/TypeResolver2 + * Tue Nov 25 2025 Remi Collet <remi@remirepo.net> - 1.12.0-1 - update to 1.12.0 |