Merge pull request #1301 from ruudk/fix-nullable

`Undefined offset: 0` when using `@var null|string` instead of `@var string|null`
schmittjoh · Mar 22, 2021 · b1e5bb6 · b1e5bb6
2 parents 0887ce8 + 413909d
commit b1e5bb6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/Metadata/Driver/DocBlockTypeResolver.php b/src/Metadata/Driver/DocBlockTypeResolver.php
@@ -143,9 +143,9 @@ private function flattenVarTagValueTypes(array $varTagValues): array
      */
     private function filterNullFromTypes(array $types): array
     {
-        return array_filter(array_map(function (TypeNode $node) {
+        return array_values(array_filter(array_map(function (TypeNode $node) {
             return $this->isNullType($node) ? null : $node;
-        }, $types));
+        }, $types)));
     }
 
     /**

diff --git a/tests/Fixtures/ObjectWithPhpDocProperty.php b/tests/Fixtures/ObjectWithPhpDocProperty.php
@@ -11,4 +11,14 @@ final class ObjectWithPhpDocProperty
      */
     private $emptyBlock;
 
+    /**
+     * @var string|null
+     */
+    private $firstname;
+
+    /**
+     * @var null|string
+     */
+    private $lastname;
+
 }
diff --git a/tests/Metadata/Driver/DocBlockTypeResolverTest.php b/tests/Metadata/Driver/DocBlockTypeResolverTest.php
@@ -22,4 +22,21 @@ public function testGetPropertyDocblockTypeHintDoesNotCrash(): void
             )
         );
     }
+
+    public function testGetPropertyDocblockTypeHintDoesNotCrashWhenUnionType(): void
+    {
+        $resolver = new DocBlockTypeResolver();
+        self::assertSame(
+            'string',
+            $resolver->getPropertyDocblockTypeHint(
+                new ReflectionProperty(ObjectWithPhpDocProperty::class, 'firstname')
+            )
+        );
+        self::assertSame(
+            'string',
+            $resolver->getPropertyDocblockTypeHint(
+                new ReflectionProperty(ObjectWithPhpDocProperty::class, 'lastname')
+            )
+        );
+    }
 }