Merge pull request #463 from greg0ire/dont-cast-null

Do not cast null to array
doctrine · Dec 12, 2022 · 9e034d7 · 9e034d7
2 parents 3587ab5 + fd04499
commit 9e034d7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/Doctrine/Common/Annotations/DocLexer.php b/lib/Doctrine/Common/Annotations/DocLexer.php
@@ -130,10 +130,14 @@ protected function getType(&$value)
     }
 
     /** @return array{value: int|string, type:self::T_*|null, position:int} */
-    public function peek(): array
+    public function peek(): ?array
     {
         $token = parent::peek();
 
+        if ($token === null) {
+            return null;
+        }
+
         return (array) $token;
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
@@ -22,5 +22,3 @@ parameters:
 
         # That tag is empty on purpose
         - '#PHPDoc tag @var has invalid value \(\)\: Unexpected token "\*/", expected type at offset 9#'
-        # Backwards-compatibility
-        - '#^Return type.*of method.*DocLexer::peek.*should be compatible.*$#'
diff --git a/tests/Doctrine/Tests/Common/Annotations/DocLexerTest.php b/tests/Doctrine/Tests/Common/Annotations/DocLexerTest.php
@@ -320,4 +320,9 @@ public function testTokenAdjacency(): void
         self::assertFalse($lexer->nextTokenIsAdjacent());
         self::assertFalse($lexer->moveNext());
     }
+
+    public function testItReturnsNullWhenThereIsNothingToParse(): void
+    {
+        self::assertNull((new DocLexer())->peek());
+    }
 }