From 1d4096749e5c266a14c0c0e39237d82e32139155 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Jan 2026 07:09:57 +0100 Subject: [PATCH] update to 5.6.6 allow webmozart/assert version 2 --- .gitignore | 1 + php-phpdocumentor-reflection-docblock5.spec | 25 +++++++++++++++------ sources | 2 +- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index d79d6bb..0f8b5dc 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /php-phpdocumentor-reflection-docblock5-5.6.3-94f8051.tar.gz /php-phpdocumentor-reflection-docblock5-5.6.4-90a04bc.tar.gz /php-phpdocumentor-reflection-docblock5-5.6.5-90614c7.tar.gz +/php-phpdocumentor-reflection-docblock5-5.6.6-5cee1d3.tar.gz diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec index 3969344..7984902 100644 --- a/php-phpdocumentor-reflection-docblock5.spec +++ b/php-phpdocumentor-reflection-docblock5.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 90614c73d3800e187615e2dd236ad0e2a01bf761 +%global gh_commit 5cee1d3dfc2d2aa6599834520911d246f656bcb8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner phpDocumentor %global gh_project ReflectionDocBlock @@ -14,7 +14,7 @@ %bcond_without tests Name: php-phpdocumentor-reflection-docblock%{major} -Version: 5.6.5 +Version: 5.6.6 Release: 1%{?dist} Summary: DocBlock parser @@ -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 < 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', ]); @@ -165,6 +172,10 @@ exit $RETURN_CODE %changelog +* Thu Dec 25 2025 Remi Collet - 5.6.6-1 +- update to 5.6.6 +- allow webmozart/assert version 2 + * Fri Nov 28 2025 Remi Collet - 5.6.5-1 - update to 5.6.5 diff --git a/sources b/sources index d4246ab..6a6f118 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-reflection-docblock5-5.6.5-90614c7.tar.gz) = 8cbbe974603641539c982bf79e0762caf67c5e5cd8c5f662522b71c69b5d468fa2c657e871acb55d22ef7db3256a850bf7451ec7da505a486340f93f0b7136e6 +SHA512 (php-phpdocumentor-reflection-docblock5-5.6.6-5cee1d3.tar.gz) = e3583fd8d8a6e876909e56c7b040fe5d2f140b2b2aa19cd30bf74997b263dfd74a55a8cfafcc306fde831fc069700ce060d239c43c51f5446cd24d78a5af66d3