diff -pruN 5.6.4-2/debian/changelog 5.6.5-1/debian/changelog --- 5.6.4-2/debian/changelog 2025-11-24 06:59:56.000000000 +0000 +++ 5.6.5-1/debian/changelog 2025-12-01 07:57:30.000000000 +0000 @@ -1,3 +1,13 @@ +php-phpdocumentor-reflection-docblock (5.6.5-1) unstable; urgency=medium + + [ Stefan Bürk ] + * [BUGFIX] Mitigate "Using null as an array offset is deprecated" + + [ Jaapio ] + * Remove outdated test + + -- David Prévot Mon, 01 Dec 2025 08:57:30 +0100 + php-phpdocumentor-reflection-docblock (5.6.4-2) unstable; urgency=medium * Drop data set causing failure with latest php-phpdocumentor-type-resolver diff -pruN 5.6.4-2/debian/patches/0003-Make-provider-functions-static-PHPUnit-11-Fix.patch 5.6.5-1/debian/patches/0003-Make-provider-functions-static-PHPUnit-11-Fix.patch --- 5.6.4-2/debian/patches/0003-Make-provider-functions-static-PHPUnit-11-Fix.patch 2025-11-24 06:59:37.000000000 +0000 +++ 5.6.5-1/debian/patches/0003-Make-provider-functions-static-PHPUnit-11-Fix.patch 2025-12-01 07:57:30.000000000 +0000 @@ -39,7 +39,7 @@ index 7fc90ef..ef00350 100644 return [ ['This is text for a description with a {@}.', 'This is text for a description with a @.'], diff --git a/tests/unit/DocBlock/StandardTagFactoryTest.php b/tests/unit/DocBlock/StandardTagFactoryTest.php -index 8dfced7..2606cc5 100644 +index a75f5e6..1f97d62 100644 --- a/tests/unit/DocBlock/StandardTagFactoryTest.php +++ b/tests/unit/DocBlock/StandardTagFactoryTest.php @@ -481,7 +481,7 @@ class StandardTagFactoryTest extends TestCase @@ -51,7 +51,7 @@ index 8dfced7..2606cc5 100644 { //rendered result is adding a space, because the tags are not rendered properly. return [ -@@ -544,7 +544,7 @@ class StandardTagFactoryTest extends TestCase +@@ -549,7 +549,7 @@ class StandardTagFactoryTest extends TestCase * @return string[][] * @phpstan-return list> */ diff -pruN 5.6.4-2/debian/patches/0006-Modernize-PHPUnit-syntax.patch 5.6.5-1/debian/patches/0006-Modernize-PHPUnit-syntax.patch --- 5.6.4-2/debian/patches/0006-Modernize-PHPUnit-syntax.patch 2025-11-24 06:59:37.000000000 +0000 +++ 5.6.5-1/debian/patches/0006-Modernize-PHPUnit-syntax.patch 2025-12-01 07:57:30.000000000 +0000 @@ -3,6 +3,7 @@ Date: Mon, 17 Feb 2025 18:33:21 +0100 Subject: Modernize PHPUnit syntax --- + tests/integration/ModifyBackTraceSafeTest.php | 11 ++++------- tests/integration/TypedTagsTest.php | 11 ++++++----- tests/unit/DocBlock/DescriptionFactoryTest.php | 5 +++-- tests/unit/DocBlock/StandardTagFactoryTest.php | 9 +++------ @@ -14,10 +15,36 @@ Subject: Modernize PHPUnit syntax tests/unit/DocBlock/Tags/MethodTest.php | 3 ++- tests/unit/DocBlockFactoryTest.php | 3 ++- tests/unit/Exception/PcreExceptionTest.php | 3 ++- - 11 files changed, 29 insertions(+), 22 deletions(-) + 12 files changed, 33 insertions(+), 29 deletions(-) +diff --git a/tests/integration/ModifyBackTraceSafeTest.php b/tests/integration/ModifyBackTraceSafeTest.php +index 09c51ab..81a301c 100644 +--- a/tests/integration/ModifyBackTraceSafeTest.php ++++ b/tests/integration/ModifyBackTraceSafeTest.php +@@ -4,17 +4,14 @@ declare(strict_types=1); + + namespace phpDocumentor\Reflection; + +- ++use PHPUnit\Framework\Attributes\CoversNothing; ++use PHPUnit\Framework\Attributes\DoesNotPerformAssertions; + use PHPUnit\Framework\TestCase; + +-/** +- * @coversNothing +- */ ++#[CoversNothing] + class ModifyBackTraceSafeTest extends TestCase + { +- /** +- * @doesNotPerformAssertions +- */ ++ #[DoesNotPerformAssertions] + public function testBackTraceModificationDoesNotImpactFunctionArguments() + { + $traverser = new Traverser(); diff --git a/tests/integration/TypedTagsTest.php b/tests/integration/TypedTagsTest.php -index b0f6d65..ca43c8f 100644 +index 79e02b3..ab6fbc9 100644 --- a/tests/integration/TypedTagsTest.php +++ b/tests/integration/TypedTagsTest.php @@ -22,6 +22,7 @@ use phpDocumentor\Reflection\Types\Nullable; @@ -106,7 +133,7 @@ index ef00350..bfcfc74 100644 { $tagFactory = m::mock(TagFactory::class); diff --git a/tests/unit/DocBlock/StandardTagFactoryTest.php b/tests/unit/DocBlock/StandardTagFactoryTest.php -index 2606cc5..1428f81 100644 +index 1f97d62..895e7df 100644 --- a/tests/unit/DocBlock/StandardTagFactoryTest.php +++ b/tests/unit/DocBlock/StandardTagFactoryTest.php @@ -30,6 +30,7 @@ use phpDocumentor\Reflection\Fqsen; @@ -128,7 +155,7 @@ index 2606cc5..1428f81 100644 public function testValidFormattedTags(string $input, string $tagName, string $render): void { $fqsenResolver = m::mock(FqsenResolver::class); -@@ -528,9 +527,7 @@ class StandardTagFactoryTest extends TestCase +@@ -533,9 +532,7 @@ class StandardTagFactoryTest extends TestCase ]; } diff -pruN 5.6.4-2/debian/patches/0007-Drop-data-set-causing-failure-with-latest-php-phpdoc.patch 5.6.5-1/debian/patches/0007-Drop-data-set-causing-failure-with-latest-php-phpdoc.patch --- 5.6.4-2/debian/patches/0007-Drop-data-set-causing-failure-with-latest-php-phpdoc.patch 2025-11-24 06:59:37.000000000 +0000 +++ 5.6.5-1/debian/patches/0007-Drop-data-set-causing-failure-with-latest-php-phpdoc.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: =?utf-8?q?David_Pr=C3=A9vot?= -Date: Mon, 24 Nov 2025 07:59:30 +0100 -Subject: Drop data set causing failure with latest - php-phpdocumentor-type-resolver - -TODO: investigate ---- - tests/integration/TypedTagsTest.php | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/tests/integration/TypedTagsTest.php b/tests/integration/TypedTagsTest.php -index ca43c8f..ab6fbc9 100644 ---- a/tests/integration/TypedTagsTest.php -+++ b/tests/integration/TypedTagsTest.php -@@ -180,10 +180,6 @@ DOCBLOCK; - - public static function invalidFormatsProvider(): \Generator - { -- yield from [ -- 'invalid collection' => ['self'], -- ]; -- - foreach (['<', '{', '('] as $badChar) { - yield "invalid format open $badChar" => ["array$badChar\\fooo"]; - } diff -pruN 5.6.4-2/debian/patches/series 5.6.5-1/debian/patches/series --- 5.6.4-2/debian/patches/series 2025-11-24 06:59:37.000000000 +0000 +++ 5.6.5-1/debian/patches/series 2025-12-01 07:57:30.000000000 +0000 @@ -4,4 +4,3 @@ 0004-Drop-TestListener.patch 0005-Group-noparser2-for-test-currently-failing-with-php-.patch 0006-Modernize-PHPUnit-syntax.patch -0007-Drop-data-set-causing-failure-with-latest-php-phpdoc.patch diff -pruN 5.6.4-2/debian/upstream/changelog 5.6.5-1/debian/upstream/changelog --- 5.6.4-2/debian/upstream/changelog 2025-11-24 06:41:33.000000000 +0000 +++ 5.6.5-1/debian/upstream/changelog 2025-12-01 07:57:30.000000000 +0000 @@ -1,3 +1,9 @@ +• 27 Nov 2025 + 5.6.5 + + Remove outdated test by @jaapio in #423 + [BUGFIX] Mitigate "Using null as an array offset is deprecated" by @sbuerk in #422 + • 18 Nov 2025 5.6.4 diff -pruN 5.6.4-2/src/DocBlock/StandardTagFactory.php 5.6.5-1/src/DocBlock/StandardTagFactory.php --- 5.6.4-2/src/DocBlock/StandardTagFactory.php 2025-11-17 21:13:10.000000000 +0000 +++ 5.6.5-1/src/DocBlock/StandardTagFactory.php 2025-11-27 19:50:05.000000000 +0000 @@ -282,8 +282,8 @@ final class StandardTagFactory implement } $parameterName = $parameter->getName(); - if (isset($locator[$typeHint])) { - $arguments[$parameterName] = $locator[$typeHint]; + if (isset($locator[$typeHint ?? ''])) { + $arguments[$parameterName] = $locator[$typeHint ?? '']; continue; } diff -pruN 5.6.4-2/tests/integration/TypedTagsTest.php 5.6.5-1/tests/integration/TypedTagsTest.php --- 5.6.4-2/tests/integration/TypedTagsTest.php 2025-11-17 21:13:10.000000000 +0000 +++ 5.6.5-1/tests/integration/TypedTagsTest.php 2025-11-27 19:50:05.000000000 +0000 @@ -179,10 +179,6 @@ DOCBLOCK; public static function invalidFormatsProvider(): \Generator { - yield from [ - 'invalid collection' => ['self'], - ]; - foreach (['<', '{', '('] as $badChar) { yield "invalid format open $badChar" => ["array$badChar\\fooo"]; } diff -pruN 5.6.4-2/tests/unit/DocBlock/StandardTagFactoryTest.php 5.6.5-1/tests/unit/DocBlock/StandardTagFactoryTest.php --- 5.6.4-2/tests/unit/DocBlock/StandardTagFactoryTest.php 2025-11-17 21:13:10.000000000 +0000 +++ 5.6.5-1/tests/unit/DocBlock/StandardTagFactoryTest.php 2025-11-27 19:50:05.000000000 +0000 @@ -525,6 +525,11 @@ class StandardTagFactoryTest extends Tes 'tag', '@tag (is valid)', ], + 'full-qualified-class-name following a tag name is valid' => [ + '@tag \InvalidArgumentException', + 'tag', + '@tag \InvalidArgumentException', + ], ]; }