Merge pull request #1462 from dgafka/handle-non-docblock-constructor-…

…promoted-property Handle non docblock constructor promoted property
schmittjoh · Jan 12, 2023 · e8b252e · e8b252e
2 parents 4b40b09 + 19d5dd8
commit e8b252e
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 1 deletion.
diff --git a/phpstan/no-typed-prop.neon b/phpstan/no-typed-prop.neon
@@ -6,4 +6,6 @@ parameters:
         - %currentWorkingDirectory%/tests/Fixtures/TypedProperties/UnionTypedProperties.php
         - %currentWorkingDirectory%/tests/Metadata/Driver/UnionTypedPropertiesDriverTest.php
         - %currentWorkingDirectory%/tests/Fixtures/DocBlockType/Collection/ConstructorPropertyPromotion.php
+        - %currentWorkingDirectory%/tests/Fixtures/DocBlockType/Collection/ConstructorPropertyPromotionWithoutDocblock.php
+        - %currentWorkingDirectory%/tests/Fixtures/DocBlockType/Collection/ConstructorPropertyPromotionWithScalar.php
         - %currentWorkingDirectory%/tests/Serializer/BaseSerializationTest.php
diff --git a/src/Metadata/Driver/DocBlockDriver/DocBlockTypeResolver.php b/src/Metadata/Driver/DocBlockDriver/DocBlockTypeResolver.php
@@ -329,7 +329,16 @@ private function resolveTypeFromDocblock(\ReflectionProperty $reflectionProperty
     {
         $docComment = $reflectionProperty->getDocComment();
         if (!$docComment && PHP_VERSION_ID >= 80000 && $reflectionProperty->isPromoted()) {
-            $docComment = $reflectionProperty->getDeclaringClass()->getConstructor()->getDocComment();
+            $constructor = $reflectionProperty->getDeclaringClass()->getConstructor();
+            if (!$constructor) {
+                return [];
+            }
+
+            $docComment = $constructor->getDocComment();
+
+            if (!$docComment) {
+                return [];
+            }
 
             $tokens = $this->lexer->tokenize($docComment);
             $phpDocNode = $this->phpDocParser->parse(new TokenIterator($tokens));

diff --git a/tests/Fixtures/DocBlockType/Collection/ConstructorPropertyPromotionWithScalar.php b/tests/Fixtures/DocBlockType/Collection/ConstructorPropertyPromotionWithScalar.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures\DocBlockType\Collection;
+
+final class ConstructorPropertyPromotionWithScalar
+{
+    /**
+     * @param string $data
+     */
+    public function __construct(
+        private $data,
+    ) {
+    }
+}
diff --git a/tests/Fixtures/DocBlockType/Collection/ConstructorPropertyPromotionWithoutDocblock.php b/tests/Fixtures/DocBlockType/Collection/ConstructorPropertyPromotionWithoutDocblock.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace JMS\Serializer\Tests\Fixtures\DocBlockType\Collection;
+
+final class ConstructorPropertyPromotionWithoutDocblock
+{
+    public function __construct(
+        private array $data,
+    ) {
+    }
+}
diff --git a/tests/Metadata/Driver/DocBlockDriverTest.php b/tests/Metadata/Driver/DocBlockDriverTest.php
@@ -28,6 +28,8 @@
 use JMS\Serializer\Tests\Fixtures\DocBlockType\Collection\CollectionOfScalars;
 use JMS\Serializer\Tests\Fixtures\DocBlockType\Collection\CollectionTypedAsGenericClass;
 use JMS\Serializer\Tests\Fixtures\DocBlockType\Collection\ConstructorPropertyPromotion;
+use JMS\Serializer\Tests\Fixtures\DocBlockType\Collection\ConstructorPropertyPromotionWithoutDocblock;
+use JMS\Serializer\Tests\Fixtures\DocBlockType\Collection\ConstructorPropertyPromotionWithScalar;
 use JMS\Serializer\Tests\Fixtures\DocBlockType\Collection\Details\ProductColor;
 use JMS\Serializer\Tests\Fixtures\DocBlockType\Collection\Details\ProductDescription;
 use JMS\Serializer\Tests\Fixtures\DocBlockType\Collection\Details\ProductName;
@@ -378,6 +380,34 @@ public function testInferTypeForConstructorPropertyPromotion()
         );
     }
 
+    public function testInferTypeForConstructorPropertyPromotionWithoutDocblock()
+    {
+        if (PHP_VERSION_ID < 80000) {
+            $this->markTestSkipped('Constructor property promotion requires PHP 8.0');
+        }
+
+        $m = $this->resolve(ConstructorPropertyPromotionWithoutDocblock::class);
+
+        self::assertEquals(
+            null,
+            $m->propertyMetadata['data']->type
+        );
+    }
+
+    public function testInferTypeForConstructorPropertyPromotionWithScalar()
+    {
+        if (PHP_VERSION_ID < 80000) {
+            $this->markTestSkipped('Constructor property promotion requires PHP 8.0');
+        }
+
+        $m = $this->resolve(ConstructorPropertyPromotionWithScalar::class);
+
+        self::assertEquals(
+            ['name' => 'string', 'params' => []],
+            $m->propertyMetadata['data']->type
+        );
+    }
+
     public function testInferTypeForPhpstanArray()
     {
         $m = $this->resolve(PhpstanArrayShape::class);