From 7efabb30335772dc5e5a49d347778d3b264d7f3a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Aug 2025 08:31:57 +0200 Subject: [PATCH 1/4] v5.6.3 (cherry picked from commit 3efbcaf286732b6436cbbfd3271892aa1de0f4cc) --- .gitignore | 1 + php-phpdocumentor-reflection-docblock5.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f66591b..adbd774 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /php-phpdocumentor-reflection-docblock5-5.3.0-622548b.tar.gz /php-phpdocumentor-reflection-docblock5-5.6.1-e5e7841.tar.gz /php-phpdocumentor-reflection-docblock5-5.6.2-92dde6a.tar.gz +/php-phpdocumentor-reflection-docblock5-5.6.3-94f8051.tar.gz diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec index 4bd4566..391e25b 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 92dde6a5919e34835c506ac8c523ef095a95ed62 +%global gh_commit 94f8051919d1b0369a6bcc7931d679a511c03fe9 %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.2 +Version: 5.6.3 Release: 1%{?dist} Summary: DocBlock parser @@ -140,7 +140,7 @@ cat < - 5.6.3-1 +- update to 5.6.3 + * Mon Apr 14 2025 Remi Collet - 5.6.2-1 - update to 5.6.2 diff --git a/sources b/sources index 355d7d7..4bc1d20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-reflection-docblock5-5.6.2-92dde6a.tar.gz) = 3913ba0d5faed7236e14754640879fe7955ab031667ad3b4218cfe3297df8926d3b37cde08076d2ac99fe56f71fabd62894b3ac33d2618cd9698d1d0c67b0731 +SHA512 (php-phpdocumentor-reflection-docblock5-5.6.3-94f8051.tar.gz) = 5deaddba705f5f7e78a034d73e1834c06a0fa7f9159530d7a882aa2473ec54d1c03daf9640afb7c12b7589f2d1d2c88182082bdaca686acaa2f7681d334e3d27 From db2700d19a81acfdca005885d9ff08c6f5f8c71f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Nov 2025 11:31:58 +0100 Subject: [PATCH 2/4] v5.6.4 (cherry picked from commit 7f4cb76ffbbe12975693bfea796c244adb135ac6) --- .gitignore | 1 + php-phpdocumentor-reflection-docblock5.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index adbd774..2ee781b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /php-phpdocumentor-reflection-docblock5-5.6.1-e5e7841.tar.gz /php-phpdocumentor-reflection-docblock5-5.6.2-92dde6a.tar.gz /php-phpdocumentor-reflection-docblock5-5.6.3-94f8051.tar.gz +/php-phpdocumentor-reflection-docblock5-5.6.4-90a04bc.tar.gz diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec index 391e25b..97bd026 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 94f8051919d1b0369a6bcc7931d679a511c03fe9 +%global gh_commit 90a04bcbf03784066f16038e87e23a0a83cee3c2 %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.3 +Version: 5.6.4 Release: 1%{?dist} Summary: DocBlock parser @@ -165,6 +165,9 @@ exit $RETURN_CODE %changelog +* Wed Nov 19 2025 Remi Collet - 5.6.4-1 +- update to 5.6.4 + * Thu Aug 28 2025 Remi Collet - 5.6.3-1 - update to 5.6.3 diff --git a/sources b/sources index 4bc1d20..91d2985 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-reflection-docblock5-5.6.3-94f8051.tar.gz) = 5deaddba705f5f7e78a034d73e1834c06a0fa7f9159530d7a882aa2473ec54d1c03daf9640afb7c12b7589f2d1d2c88182082bdaca686acaa2f7681d334e3d27 +SHA512 (php-phpdocumentor-reflection-docblock5-5.6.4-90a04bc.tar.gz) = dca7da9faf0e1510afb6cb705062751894cd9951a58a8ffa366e4e26f4dce18346e01ae1f466092ace1625d625c8c0413521785a69412e9a265334505d80a2ce From 2a5167e9211730e82d24da3e5d06786394f3c445 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Nov 2025 07:26:58 +0100 Subject: [PATCH 3/4] v5.6.5 (cherry picked from commit 04f8a36f7b0c3ed82b816a0cbfbda8475fb13320) --- .gitignore | 1 + php-phpdocumentor-reflection-docblock5.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2ee781b..d79d6bb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /php-phpdocumentor-reflection-docblock5-5.6.2-92dde6a.tar.gz /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 diff --git a/php-phpdocumentor-reflection-docblock5.spec b/php-phpdocumentor-reflection-docblock5.spec index 97bd026..b1a3a1a 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 90a04bcbf03784066f16038e87e23a0a83cee3c2 +%global gh_commit 90614c73d3800e187615e2dd236ad0e2a01bf761 %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.4 +Version: 5.6.5 Release: 1%{?dist} Summary: DocBlock parser @@ -165,6 +165,9 @@ exit $RETURN_CODE %changelog +* Fri Nov 28 2025 Remi Collet - 5.6.5-1 +- update to 5.6.5 + * Wed Nov 19 2025 Remi Collet - 5.6.4-1 - update to 5.6.4 diff --git a/sources b/sources index 91d2985..d4246ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-phpdocumentor-reflection-docblock5-5.6.4-90a04bc.tar.gz) = dca7da9faf0e1510afb6cb705062751894cd9951a58a8ffa366e4e26f4dce18346e01ae1f466092ace1625d625c8c0413521785a69412e9a265334505d80a2ce +SHA512 (php-phpdocumentor-reflection-docblock5-5.6.5-90614c7.tar.gz) = 8cbbe974603641539c982bf79e0762caf67c5e5cd8c5f662522b71c69b5d468fa2c657e871acb55d22ef7db3256a850bf7451ec7da505a486340f93f0b7136e6 From 32789b9da164511ac9029545371110fb0ba90301 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 Jan 2026 07:09:57 +0100 Subject: [PATCH 4/4] update to 5.6.6 allow webmozart/assert version 2 (cherry picked from commit 1d4096749e5c266a14c0c0e39237d82e32139155) --- .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 b1a3a1a..0160321 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