update to 6.0.1

rename to php-phpdocumentor-reflection-docblock6
move to /usr/share/php/phpDocumentor/Reflection/DocBlock6
raise dependency on phpdocumentor/type-resolver 2.0
raise dependency on phpstan/phpdoc-parser 2.0

2 files changed, 27 insertions, 17 deletions

diff --git a/composer.json b/composer.json
index 5e4f039..28edc60 100644
--- a/composer.json
+++ b/composer.json
@@ -15,11 +15,11 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "phpdocumentor/type-resolver": "^1.7",
+        "phpdocumentor/type-resolver": "^2.0",
         "webmozart/assert": "^1.9.1 || ^2",
         "phpdocumentor/reflection-common": "^2.2",
         "ext-filter": "*",
-        "phpstan/phpdoc-parser": "^1.7|^2.0",
+        "phpstan/phpdoc-parser": "^2.0",
         "doctrine/deprecations": "^1.1"
     },
     "require-dev": {
@@ -29,7 +29,8 @@
         "phpstan/phpstan-mockery": "^1.1",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-webmozart-assert": "^1.2",
-        "psalm/phar": "^5.26"
+        "psalm/phar": "^5.26",
+        "shipmonk/dead-code-detector": "^0.5.1"
     },
     "autoload": {
         "psr-4": {
diff --git a/php-phpdocumentor-reflection-docblock6.spec b/php-phpdocumentor-reflection-docblock6.spec
index f58a6c2..e0419a2 100644
--- a/php-phpdocumentor-reflection-docblock6.spec
+++ b/php-phpdocumentor-reflection-docblock6.spec
@@ -1,20 +1,20 @@
 # Fedora/remirepo spec file for php-phpdocumentor-reflection-docblock5
 #
-# SPDX-FileCopyrightText:  Copyright 2014-2025 Remi Collet
+# SPDX-FileCopyrightText:  Copyright 2014-2026 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    5cee1d3dfc2d2aa6599834520911d246f656bcb8
+%global gh_commit    2f5cbed597cb261d1ea458f3da3a9ad32e670b1e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpDocumentor
 %global gh_project   ReflectionDocBlock
-%global major        5
+%global major        6
 %bcond_without       tests
 
 Name:           php-phpdocumentor-reflection-docblock%{major}
-Version:        5.6.6
+Version:        6.0.1
 Release:        1%{?dist}
 Summary:        DocBlock parser
 
@@ -31,10 +31,10 @@ BuildRequires:  php-fedora-autoloader-devel
 %if %{with tests}
 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(phpdocumentor/type-resolver)     >= 2.0   with php-composer(phpdocumentor/type-resolver)     < 3)
 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(phpstan/phpdoc-parser)           >= 2.0   with php-composer(phpstan/phpdoc-parser)           < 3)
 BuildRequires: (php-composer(doctrine/deprecations)           >= 1.1   with php-composer(doctrine/deprecations)           < 2)
 # From composer.json, require-dev
 #        "mockery/mockery": "~1.3.5 || ~1.6.0",
@@ -43,7 +43,8 @@ BuildRequires: (php-composer(doctrine/deprecations)           >= 1.1   with php-
 #        "phpstan/phpstan-mockery": "^1.1",
 #        "phpstan/extension-installer": "^1.1",
 #        "phpstan/phpstan-webmozart-assert": "^1.2",
-#        "psalm/phar": "^5.26"
+#        "psalm/phar": "^5.26",
+#        "shipmonk/dead-code-detector": "^0.5.1"
 BuildRequires:  phpunit9 >= 9.5
 %global phpunit %{_bindir}/phpunit9
 BuildRequires: (php-composer(mockery/mockery) >= 1.6 with php-composer(mockery/mockery) <  2)
@@ -55,18 +56,18 @@ BuildRequires:  php-spl
 
 # From composer.json, require
 #        "php": "^7.4 || ^8.0",
-#        "phpdocumentor/type-resolver": "^1.7",
+#        "phpdocumentor/type-resolver": "^2.0",
 #        "webmozart/assert": "^1.9.1 || ^2",
 #        "phpdocumentor/reflection-common": "^2.2",
 #        "ext-filter": "*",
-#        "phpstan/phpdoc-parser": "^1.7|^2.0",
+#        "phpstan/phpdoc-parser": "^2.0",
 #        "doctrine/deprecations": "^1.1"
 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(phpdocumentor/type-resolver)     >= 2.0   with php-composer(phpdocumentor/type-resolver)     < 3)
 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(phpstan/phpdoc-parser)           >= 2.0   with php-composer(phpstan/phpdoc-parser)           < 3)
 Requires:      (php-composer(doctrine/deprecations)           >= 1.1   with php-composer(doctrine/deprecations)           < 2)
 # From phpcompatinfo report for 4.3.2
 Requires:       php-reflection
@@ -115,8 +116,8 @@ if (PHP_VERSION_ID > 80200) {
 }
 
 \Fedora\Autoloader\Dependencies::required([
+    '%{_datadir}/php/phpDocumentor/Reflection/TypeResolver2/autoload.php',
     '%{_datadir}/php/phpDocumentor/Reflection2/autoload-common.php',
-    '%{_datadir}/php/phpDocumentor/Reflection2/autoload-type-resolver.php',
     $deps,
     '%{_datadir}/php/PHPStan/PhpDocParser/autoload.php',
     '%{_datadir}/php/Doctrine/Deprecations/autoload.php',
@@ -131,7 +132,7 @@ cp -pr src/DocBlock %{buildroot}%{_datadir}/php/phpDocumentor/Reflection/DocBloc
 
 %check
 %if %{with tests}
-sed -e '/autoload.php/d' -i examples/*.php examples/*/*.php
+sed -e '/autoload.php/d' -i docs/examples/*.php
 
 phpab \
   --template fedora \
@@ -153,7 +154,7 @@ for PHP_EXEC in "php %{phpunit}" php81 php82 php83 php84 php85; do
         $1 -d auto_prepend_file=$PWD/bootstrap.php \
             ${2:-%{_bindir}/phpunit9} \
                 --bootstrap bootstrap.php \
-                --filter '^((?!(testAddingAKeyword|testRegressionWordpressDocblocks|testIndentationIsKept)).)*$' \
+                --filter '^((?!(testDescriptionsCanEscapeAtSignsAndClosingBraces)).)*$' \
                 --verbose || RETURN_CODE=1
     fi
 done
@@ -166,12 +167,20 @@ exit $RETURN_CODE
 %files
 %license LICENSE
 %doc *.md
+%doc docs
 %doc composer.json
 %dir %{_datadir}/php/phpDocumentor/Reflection
      %{_datadir}/php/phpDocumentor/Reflection/DocBlock%{major}
 
 
 %changelog
+* Wed Feb 25 2026 Remi Collet <remi@remirepo.net> - 6.0.1-1
+- update to 6.0.1
+- rename to php-phpdocumentor-reflection-docblock6
+- move to /usr/share/php/phpDocumentor/Reflection/DocBlock6
+- raise dependency on phpdocumentor/type-resolver 2.0
+- raise dependency on phpstan/phpdoc-parser 2.0
+
 * Thu Dec 25 2025 Remi Collet <remi@remirepo.net> - 5.6.6-1
 - update to 5.6.6
 - allow webmozart/assert version 2