diff options
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | php-phpdocumentor-reflection-docblock5.spec | 43 |
2 files changed, 34 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 8105049..5e4f039 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require": { "php": "^7.4 || ^8.0", "phpdocumentor/type-resolver": "^1.7", - "webmozart/assert": "^1.9.1", + "webmozart/assert": "^1.9.1 || ^2", "phpdocumentor/reflection-common": "^2.2", "ext-filter": "*", "phpstan/phpdoc-parser": "^1.7|^2.0", diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec index af29067..f58a6c2 100644 --- a/php-phpdocumentor-reflection-docblock5.spec +++ b/php-phpdocumentor-reflection-docblock5.spec @@ -1,12 +1,12 @@ # Fedora/remirepo spec file for php-phpdocumentor-reflection-docblock5 # -# SPDX-FileCopyrightText: Copyright 2014-2024 Remi Collet +# SPDX-FileCopyrightText: Copyright 2014-2025 Remi Collet # SPDX-License-Identifier: CECILL-2.1 # http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global gh_commit e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8 +%global gh_commit 5cee1d3dfc2d2aa6599834520911d246f656bcb8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpDocumentor %global gh_project ReflectionDocBlock @@ -14,8 +14,8 @@ %bcond_without tests Name: php-phpdocumentor-reflection-docblock%{major} -Version: 5.6.1 -Release: 2%{?dist} +Version: 5.6.6 +Release: 1%{?dist} Summary: DocBlock parser License: MIT @@ -32,7 +32,7 @@ BuildRequires: php-fedora-autoloader-devel BuildRequires: php(language) >= 7.4 BuildRequires: php-filter BuildRequires: (php-composer(phpdocumentor/type-resolver) >= 1.7 with php-composer(phpdocumentor/type-resolver) < 2) -BuildRequires: (php-composer(webmozart/assert) >= 1.9.1 with php-composer(webmozart/assert) < 2) +BuildRequires: (php-composer(webmozart/assert) >= 1.9.1 with php-composer(webmozart/assert) < 3) BuildRequires: (php-composer(phpdocumentor/reflection-common) >= 2.2 with php-composer(phpdocumentor/reflection-common) < 3) BuildRequires: (php-composer(phpstan/phpdoc-parser) >= 1.7 with php-composer(phpstan/phpdoc-parser) < 3) BuildRequires: (php-composer(doctrine/deprecations) >= 1.1 with php-composer(doctrine/deprecations) < 2) @@ -56,7 +56,7 @@ BuildRequires: php-spl # From composer.json, require # "php": "^7.4 || ^8.0", # "phpdocumentor/type-resolver": "^1.7", -# "webmozart/assert": "^1.9.1", +# "webmozart/assert": "^1.9.1 || ^2", # "phpdocumentor/reflection-common": "^2.2", # "ext-filter": "*", # "phpstan/phpdoc-parser": "^1.7|^2.0", @@ -64,7 +64,7 @@ BuildRequires: php-spl Requires: php(language) >= 7.4 Requires: php-filter Requires: (php-composer(phpdocumentor/type-resolver) >= 1.7 with php-composer(phpdocumentor/type-resolver) < 2) -Requires: (php-composer(webmozart/assert) >= 1.9.1 with php-composer(webmozart/assert) < 2) +Requires: (php-composer(webmozart/assert) >= 1.9.1 with php-composer(webmozart/assert) < 3) Requires: (php-composer(phpdocumentor/reflection-common) >= 2.2 with php-composer(phpdocumentor/reflection-common) < 3) Requires: (php-composer(phpstan/phpdoc-parser) >= 1.7 with php-composer(phpstan/phpdoc-parser) < 3) Requires: (php-composer(doctrine/deprecations) >= 1.1 with php-composer(doctrine/deprecations) < 2) @@ -105,12 +105,19 @@ phpab \ --output src/DocBlock/autoload.php \ src/ -cat <<AUTOLOAD | tee -a src/DocBlock/autoload.php +cat << 'AUTOLOAD' | tee -a src/DocBlock/autoload.php + +$deps = [ + '%{_datadir}/php/Webmozart/Assert/autoload.php', +]; +if (PHP_VERSION_ID > 80200) { + array_unshift($deps, '%{_datadir}/php/Webmozart/Assert2/autoload.php'); +} \Fedora\Autoloader\Dependencies::required([ '%{_datadir}/php/phpDocumentor/Reflection2/autoload-common.php', '%{_datadir}/php/phpDocumentor/Reflection2/autoload-type-resolver.php', - '%{_datadir}/php/Webmozart/Assert/autoload.php', + $deps, '%{_datadir}/php/PHPStan/PhpDocParser/autoload.php', '%{_datadir}/php/Doctrine/Deprecations/autoload.php', ]); @@ -140,7 +147,7 @@ cat <<BOOTSTRAP | tee -a bootstrap.php BOOTSTRAP RETURN_CODE=0 -for PHP_EXEC in "php %{phpunit}" php81 php82 php83 php84; do +for PHP_EXEC in "php %{phpunit}" php81 php82 php83 php84 php85; do if which $PHP_EXEC; then set $PHP_EXEC $1 -d auto_prepend_file=$PWD/bootstrap.php \ @@ -165,6 +172,22 @@ exit $RETURN_CODE %changelog +* Thu Dec 25 2025 Remi Collet <remi@remirepo.net> - 5.6.6-1 +- update to 5.6.6 +- allow webmozart/assert version 2 + +* Fri Nov 28 2025 Remi Collet <remi@remirepo.net> - 5.6.5-1 +- update to 5.6.5 + +* Wed Nov 19 2025 Remi Collet <remi@remirepo.net> - 5.6.4-1 +- update to 5.6.4 + +* Thu Aug 28 2025 Remi Collet <remi@remirepo.net> - 5.6.3-1 +- update to 5.6.3 + +* Mon Apr 14 2025 Remi Collet <remi@remirepo.net> - 5.6.2-1 +- update to 5.6.2 + * Mon Dec 23 2024 Remi Collet <remi@remirepo.net> - 5.6.1-2 - allow phpstan/phpdoc-parser v2 |