[Serializer][PropertyAccessor] Allow to ignore generics

mtarld · mtarld · commit a170c98ed761 · 2023-11-24T06:03:37.000+01:00
diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md
@@ -172,6 +172,11 @@ MonologBridge
 
  * [BC break] Add native return type to `Logger::clear()` and to `DebugProcessor::clear()`
 
+PropertyInfo
+------------
+
+ * [BC Break] `PhpDocExtractor` and `PhpStanExtractor` no longer support the `ignore_docblock_generics` context value
+
 PsrHttpMessageBridge
 --------------------
 
diff --git a/src/Symfony/Component/PropertyInfo/CHANGELOG.md b/src/Symfony/Component/PropertyInfo/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 ---
 
  * Make properties writable when a setter in camelCase exists, similar to the camelCase getter
+ * Allow `PhpDocExtractor` and `PhpStanExtractor` to ignore non-collection generics using `ignore_docblock_generics` context value
 
 6.1
 ---
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ConstructorArgumentTypeExtractorInterface.php b/src/Symfony/Component/PropertyInfo/Extractor/ConstructorArgumentTypeExtractorInterface.php
@@ -29,5 +29,5 @@ interface ConstructorArgumentTypeExtractorInterface
      *
      * @internal
      */
-    public function getTypesFromConstructor(string $class, string $property): ?array;
+    public function getTypesFromConstructor(string $class, string $property, array $context = []): ?array;
 }
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ConstructorExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ConstructorExtractor.php
@@ -31,7 +31,7 @@ public function __construct(
     public function getTypes(string $class, string $property, array $context = []): ?array
     {
         foreach ($this->extractors as $extractor) {
-            $value = $extractor->getTypesFromConstructor($class, $property);
+            $value = $extractor->getTypesFromConstructor($class, $property, $context);
             if (null !== $value) {
                 return $value;
             }
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -113,6 +113,10 @@ public function getLongDescription(string $class, string $property, array $conte
 
     public function getTypes(string $class, string $property, array $context = []): ?array
     {
+        if (true === $ignoreDocblockGenerics = ($context['ignore_docblock_generics'] ?? false)) {
+            trigger_deprecation('symfony/property-info', '6.4', 'Ignoring docblock generics by setting "ignore_docblock_generics" context value to "true" is deprecated without replacement.');
+        }
+
         /** @var $docBlock DocBlock */
         [$docBlock, $source, $prefix] = $this->getDocBlock($class, $property);
         if (!$docBlock) {
@@ -130,7 +134,7 @@ public function getTypes(string $class, string $property, array $context = []):
         /** @var DocBlock\Tags\Var_|DocBlock\Tags\Return_|DocBlock\Tags\Param $tag */
         foreach ($docBlock->getTagsByName($tag) as $tag) {
             if ($tag && !$tag instanceof InvalidTag && null !== $tag->getType()) {
-                foreach ($this->phpDocTypeHelper->getTypes($tag->getType()) as $type) {
+                foreach ($this->phpDocTypeHelper->getTypes($tag->getType(), $ignoreDocblockGenerics) as $type) {
                     switch ($type->getClassName()) {
                         case 'self':
                         case 'static':
@@ -164,8 +168,12 @@ public function getTypes(string $class, string $property, array $context = []):
         return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $types[0])];
     }
 
-    public function getTypesFromConstructor(string $class, string $property): ?array
+    public function getTypesFromConstructor(string $class, string $property, array $context = []): ?array
     {
+        if (true === $ignoreDocblockGenerics = ($context['ignore_docblock_generics'] ?? false)) {
+            trigger_deprecation('symfony/property-info', '6.4', 'Ignoring docblock generics by setting "ignore_docblock_generics" context value to "true" is deprecated without replacement.');
+        }
+
         $docBlock = $this->getDocBlockFromConstructor($class, $property);
 
         if (!$docBlock) {
@@ -176,7 +184,7 @@ public function getTypesFromConstructor(string $class, string $property): ?array
         /** @var DocBlock\Tags\Var_|DocBlock\Tags\Return_|DocBlock\Tags\Param $tag */
         foreach ($docBlock->getTagsByName('param') as $tag) {
             if ($tag && null !== $tag->getType()) {
-                $types[] = $this->phpDocTypeHelper->getTypes($tag->getType());
+                $types[] = $this->phpDocTypeHelper->getTypes($tag->getType(), $ignoreDocblockGenerics);
             }
         }
 
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php
@@ -75,6 +75,10 @@ public function __construct(array $mutatorPrefixes = null, array $accessorPrefix
 
     public function getTypes(string $class, string $property, array $context = []): ?array
     {
+        if (true === $ignoreDocblockGenerics = ($context['ignore_docblock_generics'] ?? false)) {
+            trigger_deprecation('symfony/property-info', '6.4', 'Ignoring docblock generics by setting "ignore_docblock_generics" context value to "true" is deprecated without replacement.');
+        }
+
         /** @var PhpDocNode|null $docNode */
         [$docNode, $source, $prefix, $declaringClass] = $this->getDocBlock($class, $property);
         $nameScope = $this->nameScopeFactory->create($class, $declaringClass);
@@ -111,7 +115,7 @@ public function getTypes(string $class, string $property, array $context = []):
                 continue;
             }
 
-            foreach ($this->phpStanTypeHelper->getTypes($tagDocNode->value, $nameScope) as $type) {
+            foreach ($this->phpStanTypeHelper->getTypes($tagDocNode->value, $nameScope, $ignoreDocblockGenerics) as $type) {
                 switch ($type->getClassName()) {
                     case 'self':
                     case 'static':
@@ -144,14 +148,18 @@ public function getTypes(string $class, string $property, array $context = []):
         return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $types[0])];
     }
 
-    public function getTypesFromConstructor(string $class, string $property): ?array
+    public function getTypesFromConstructor(string $class, string $property, array $context = []): ?array
     {
+        if (true === $ignoreDocblockGenerics = ($context['ignore_docblock_generics'] ?? false)) {
+            trigger_deprecation('symfony/property-info', '6.4', 'Ignoring docblock generics by setting "ignore_docblock_generics" context value to "true" is deprecated without replacement.');
+        }
+
         if (null === $tagDocNode = $this->getDocBlockFromConstructor($class, $property)) {
             return null;
         }
 
         $types = [];
-        foreach ($this->phpStanTypeHelper->getTypes($tagDocNode, $this->nameScopeFactory->create($class)) as $type) {
+        foreach ($this->phpStanTypeHelper->getTypes($tagDocNode, $this->nameScopeFactory->create($class), $ignoreDocblockGenerics) as $type) {
             $types[] = $type;
         }
 
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -156,7 +156,7 @@ public function getTypes(string $class, string $property, array $context = []):
         return null;
     }
 
-    public function getTypesFromConstructor(string $class, string $property): ?array
+    public function getTypesFromConstructor(string $class, string $property, array $context = []): ?array
     {
         try {
             $reflection = new \ReflectionClass($class);
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -447,6 +447,15 @@ public static function promotedPropertyProvider(): array
             ['promotedAndMutated', [new Type(Type::BUILTIN_TYPE_STRING)]],
         ];
     }
+
+    /**
+     * @group legacy
+     */
+    public function testIgnoreGenerics()
+    {
+        $this->assertCount(1, $this->extractor->getTypes(PhpDocGenericsDocblock::class, 'foo'));
+        $this->assertNull($this->extractor->getTypes(PhpDocGenericsDocblock::class, 'foo', ['ignore_docblock_generics' => true]));
+    }
 }
 
 class EmptyDocBlock
@@ -465,3 +474,9 @@ public function setOmittedType(array $omittedTagType)
     {
     }
 }
+
+class PhpDocGenericsDocblock
+{
+    /** @var \stcClass<int> */
+    public $foo;
+}
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php
@@ -473,6 +473,15 @@ public static function php80TypesProvider()
             [Php80PromotedDummy::class, 'promoted', null],
         ];
     }
+
+    /**
+     * @group legacy
+     */
+    public function testIgnoreGenerics()
+    {
+        $this->assertCount(1, $this->extractor->getTypes(PhpDocGenericsDocblock::class, 'foo'));
+        $this->assertNull($this->extractor->getTypes(PhpDocGenericsDocblock::class, 'foo', ['ignore_docblock_generics' => true]));
+    }
 }
 
 class PhpStanOmittedParamTagTypeDocBlock
@@ -486,3 +495,9 @@ public function setOmittedType(array $omittedTagType)
     {
     }
 }
+
+class PhpStanGenericsDocblock
+{
+    /** @var \stcClass<int> */
+    public $foo;
+}
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyExtractor.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/DummyExtractor.php
@@ -39,7 +39,7 @@ public function getTypes($class, $property, array $context = []): ?array
         return [new Type(Type::BUILTIN_TYPE_INT)];
     }
 
-    public function getTypesFromConstructor(string $class, string $property): ?array
+    public function getTypesFromConstructor(string $class, string $property, array $context = []): ?array
     {
         return [new Type(Type::BUILTIN_TYPE_STRING)];
     }
diff --git a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
@@ -39,10 +39,14 @@ final class PhpDocTypeHelper
     /**
      * Creates a {@see Type} from a PHPDoc type.
      *
+     * @param bool $ignoreGenerics
+     *
      * @return Type[]
      */
-    public function getTypes(DocType $varType): array
+    public function getTypes(DocType $varType /*, bool $ignoreGenerics */): array
     {
+        $ignoreGenerics = func_get_args()[1] ?? false;
+
         if ($varType instanceof ConstExpression) {
             // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment
             return [];
@@ -61,7 +65,7 @@ public function getTypes(DocType $varType): array
                 $nullable = true;
             }
 
-            $type = $this->createType($varType, $nullable);
+            $type = $this->createType($varType, $nullable, $ignoreGenerics);
             if (null !== $type) {
                 $types[] = $type;
             }
@@ -93,7 +97,7 @@ public function getTypes(DocType $varType): array
         }
 
         foreach ($varTypes as $varType) {
-            $type = $this->createType($varType, $nullable);
+            $type = $this->createType($varType, $nullable, $ignoreGenerics);
             if (null !== $type) {
                 $types[] = $type;
             }
@@ -105,11 +109,15 @@ public function getTypes(DocType $varType): array
     /**
      * Creates a {@see Type} from a PHPDoc type.
      */
-    private function createType(DocType $type, bool $nullable, string $docType = null): ?Type
+    private function createType(DocType $type, bool $nullable, bool $ignoreGenerics): ?Type
     {
-        $docType ??= (string) $type;
+        $docType = (string) $type;
 
         if ($type instanceof Collection) {
+            if ($ignoreGenerics) {
+                return null;
+            }
+
             $fqsen = $type->getFqsen();
             if ($fqsen && 'list' === $fqsen->getName() && !class_exists(List_::class, false) && !class_exists((string) $fqsen)) {
                 // Workaround for phpdocumentor/type-resolver < 1.6
diff --git a/src/Symfony/Component/PropertyInfo/Util/PhpStanTypeHelper.php b/src/Symfony/Component/PropertyInfo/Util/PhpStanTypeHelper.php
@@ -41,12 +41,16 @@ final class PhpStanTypeHelper
     /**
      * Creates a {@see Type} from a PhpDocTagValueNode type.
      *
+     * @param bool $ignoreGenerics
+     *
      * @return Type[]
      */
-    public function getTypes(PhpDocTagValueNode $node, NameScope $nameScope): array
+    public function getTypes(PhpDocTagValueNode $node, NameScope $nameScope /*, bool $ignoreGenerics */): array
     {
+        $ignoreGenerics = func_get_args()[2] ?? false;
+
         if ($node instanceof ParamTagValueNode || $node instanceof ReturnTagValueNode || $node instanceof VarTagValueNode) {
-            return $this->compressNullableType($this->extractTypes($node->type, $nameScope));
+            return $this->compressNullableType($this->extractTypes($node->type, $nameScope, $ignoreGenerics));
         }
 
         return [];
@@ -98,7 +102,7 @@ private function compressNullableType(array $types): array
     /**
      * @return Type[]
      */
-    private function extractTypes(TypeNode $node, NameScope $nameScope): array
+    private function extractTypes(TypeNode $node, NameScope $nameScope, bool $ignoreGenerics): array
     {
         if ($node instanceof UnionTypeNode) {
             $types = [];
@@ -107,7 +111,7 @@ private function extractTypes(TypeNode $node, NameScope $nameScope): array
                     // It's safer to fall back to other extractors here, as resolving const types correctly is not easy at the moment
                     return [];
                 }
-                foreach ($this->extractTypes($type, $nameScope) as $subType) {
+                foreach ($this->extractTypes($type, $nameScope, $ignoreGenerics) as $subType) {
                     $types[] = $subType;
                 }
             }
@@ -119,23 +123,27 @@ private function extractTypes(TypeNode $node, NameScope $nameScope): array
                 return [new Type(Type::BUILTIN_TYPE_STRING)];
             }
 
-            [$mainType] = $this->extractTypes($node->type, $nameScope);
+            [$mainType] = $this->extractTypes($node->type, $nameScope, $ignoreGenerics);
 
             if (Type::BUILTIN_TYPE_INT === $mainType->getBuiltinType()) {
                 return [$mainType];
             }
 
+            if ($ignoreGenerics && !\in_array($mainType->getClassName(), [\Traversable::class, \Iterator::class, \IteratorAggregate::class, null], true)) {
+                return [];
+            }
+
             $collectionKeyTypes = $mainType->getCollectionKeyTypes();
             $collectionKeyValues = [];
             if (1 === \count($node->genericTypes)) {
-                foreach ($this->extractTypes($node->genericTypes[0], $nameScope) as $subType) {
+                foreach ($this->extractTypes($node->genericTypes[0], $nameScope, $ignoreGenerics) as $subType) {
                     $collectionKeyValues[] = $subType;
                 }
             } elseif (2 === \count($node->genericTypes)) {
-                foreach ($this->extractTypes($node->genericTypes[0], $nameScope) as $keySubType) {
+                foreach ($this->extractTypes($node->genericTypes[0], $nameScope, $ignoreGenerics) as $keySubType) {
                     $collectionKeyTypes[] = $keySubType;
                 }
-                foreach ($this->extractTypes($node->genericTypes[1], $nameScope) as $valueSubType) {
+                foreach ($this->extractTypes($node->genericTypes[1], $nameScope, $ignoreGenerics) as $valueSubType) {
                     $collectionKeyValues[] = $valueSubType;
                 }
             }
@@ -146,13 +154,13 @@ private function extractTypes(TypeNode $node, NameScope $nameScope): array
             return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true)];
         }
         if ($node instanceof ArrayTypeNode) {
-            return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [new Type(Type::BUILTIN_TYPE_INT)], $this->extractTypes($node->type, $nameScope))];
+            return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, [new Type(Type::BUILTIN_TYPE_INT)], $this->extractTypes($node->type, $nameScope, $ignoreGenerics))];
         }
         if ($node instanceof CallableTypeNode || $node instanceof CallableTypeParameterNode) {
             return [new Type(Type::BUILTIN_TYPE_CALLABLE)];
         }
         if ($node instanceof NullableTypeNode) {
-            $subTypes = $this->extractTypes($node->type, $nameScope);
+            $subTypes = $this->extractTypes($node->type, $nameScope, $ignoreGenerics);
             if (\count($subTypes) > 1) {
                 $subTypes[] = new Type(Type::BUILTIN_TYPE_NULL);
 
diff --git a/src/Symfony/Component/PropertyInfo/composer.json b/src/Symfony/Component/PropertyInfo/composer.json
@@ -24,6 +24,7 @@
     ],
     "require": {
         "php": ">=8.1",
+        "symfony/deprecation-contracts": "^2.5|^3",
         "symfony/string": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -370,7 +370,7 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
                 }
             }
 
-            $types = $this->getTypes($resolvedClass, $attribute);
+            $types = $this->getTypes($resolvedClass, $attribute, $context);
 
             if (null !== $types) {
                 try {
@@ -602,7 +602,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
      */
     protected function denormalizeParameter(\ReflectionClass $class, \ReflectionParameter $parameter, string $parameterName, mixed $parameterData, array $context, string $format = null): mixed
     {
-        if ($parameter->isVariadic() || null === $this->propertyTypeExtractor || null === $types = $this->getTypes($class->getName(), $parameterName)) {
+        if ($parameter->isVariadic() || null === $this->propertyTypeExtractor || null === $types = $this->getTypes($class->getName(), $parameterName, $context)) {
             return parent::denormalizeParameter($class, $parameter, $parameterName, $parameterData, $context, $format);
         }
 
@@ -614,7 +614,7 @@ protected function denormalizeParameter(\ReflectionClass $class, \ReflectionPara
     /**
      * @return Type[]|null
      */
-    private function getTypes(string $currentClass, string $attribute): ?array
+    private function getTypes(string $currentClass, string $attribute, array $context): ?array
     {
         if (null === $this->propertyTypeExtractor) {
             return null;
@@ -625,7 +625,7 @@ private function getTypes(string $currentClass, string $attribute): ?array
             return false === $this->typesCache[$key] ? null : $this->typesCache[$key];
         }
 
-        if (null !== $types = $this->propertyTypeExtractor->getTypes($currentClass, $attribute)) {
+        if (null !== $types = $this->propertyTypeExtractor->getTypes($currentClass, $attribute, $context)) {
             return $this->typesCache[$key] = $types;
         }
 
@@ -637,7 +637,7 @@ private function getTypes(string $currentClass, string $attribute): ?array
             }
 
             foreach ($discriminatorMapping->getTypesMapping() as $mappedClass) {
-                if (null !== $types = $this->propertyTypeExtractor->getTypes($mappedClass, $attribute)) {
+                if (null !== $types = $this->propertyTypeExtractor->getTypes($mappedClass, $attribute, $context)) {
                     return $this->typesCache[$key] = $types;
                 }
             }
diff --git a/src/Symfony/Component/Serializer/Tests/DeserializeNestedArrayOfObjectsTest.php b/src/Symfony/Component/Serializer/Tests/DeserializeNestedArrayOfObjectsTest.php

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,5 @@ interface ConstructorArgumentTypeExtractorInterface`
`29`	`29`	`*`
`30`	`30`	`* @internal`
`31`	`31`	`*/`
`32`		`- public function getTypesFromConstructor(string $class, string $property): ?array;`
	`32`	`+ public function getTypesFromConstructor(string $class, string $property, array $context = []): ?array;`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __construct(`
`31`	`31`	`public function getTypes(string $class, string $property, array $context = []): ?array`
`32`	`32`	`{`
`33`	`33`	`foreach ($this->extractors as $extractor) {`
`34`		`- $value = $extractor->getTypesFromConstructor($class, $property);`
	`34`	`+ $value = $extractor->getTypesFromConstructor($class, $property, $context);`
`35`	`35`	`if (null !== $value) {`
`36`	`36`	`return $value;`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,10 @@ public function __construct(array $mutatorPrefixes = null, array $accessorPrefix`
`75`	`75`
`76`	`76`	`public function getTypes(string $class, string $property, array $context = []): ?array`
`77`	`77`	`{`
	`78`	`+ if (true === $ignoreDocblockGenerics = ($context['ignore_docblock_generics'] ?? false)) {`
	`79`	`+ trigger_deprecation('symfony/property-info', '6.4', 'Ignoring docblock generics by setting "ignore_docblock_generics" context value to "true" is deprecated without replacement.');`
	`80`	`+ }`
	`81`	`+`
`78`	`82`	`/** @var PhpDocNode\|null $docNode */`
`79`	`83`	`[$docNode, $source, $prefix, $declaringClass] = $this->getDocBlock($class, $property);`
`80`	`84`	`$nameScope = $this->nameScopeFactory->create($class, $declaringClass);`
`@@ -111,7 +115,7 @@ public function getTypes(string $class, string $property, array $context = []):`
`111`	`115`	`continue;`
`112`	`116`	`}`
`113`	`117`
`114`		`- foreach ($this->phpStanTypeHelper->getTypes($tagDocNode->value, $nameScope) as $type) {`
	`118`	`+ foreach ($this->phpStanTypeHelper->getTypes($tagDocNode->value, $nameScope, $ignoreDocblockGenerics) as $type) {`
`115`	`119`	`switch ($type->getClassName()) {`
`116`	`120`	`case 'self':`
`117`	`121`	`case 'static':`
`@@ -144,14 +148,18 @@ public function getTypes(string $class, string $property, array $context = []):`
`144`	`148`	`return [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), $types[0])];`
`145`	`149`	`}`
`146`	`150`
`147`		`- public function getTypesFromConstructor(string $class, string $property): ?array`
	`151`	`+ public function getTypesFromConstructor(string $class, string $property, array $context = []): ?array`
`148`	`152`	`{`
	`153`	`+ if (true === $ignoreDocblockGenerics = ($context['ignore_docblock_generics'] ?? false)) {`
	`154`	`+ trigger_deprecation('symfony/property-info', '6.4', 'Ignoring docblock generics by setting "ignore_docblock_generics" context value to "true" is deprecated without replacement.');`
	`155`	`+ }`
	`156`	`+`
`149`	`157`	`if (null === $tagDocNode = $this->getDocBlockFromConstructor($class, $property)) {`
`150`	`158`	`return null;`
`151`	`159`	`}`
`152`	`160`
`153`	`161`	`$types = [];`
`154`		`- foreach ($this->phpStanTypeHelper->getTypes($tagDocNode, $this->nameScopeFactory->create($class)) as $type) {`
	`162`	`+ foreach ($this->phpStanTypeHelper->getTypes($tagDocNode, $this->nameScopeFactory->create($class), $ignoreDocblockGenerics) as $type) {`
`155`	`163`	`$types[] = $type;`
`156`	`164`	`}`
`157`	`165`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public function getTypes(string $class, string $property, array $context = []):`
`156`	`156`	`return null;`
`157`	`157`	`}`
`158`	`158`
`159`		`- public function getTypesFromConstructor(string $class, string $property): ?array`
	`159`	`+ public function getTypesFromConstructor(string $class, string $property, array $context = []): ?array`
`160`	`160`	`{`
`161`	`161`	`try {`
`162`	`162`	`$reflection = new \ReflectionClass($class);`
Original file line number	Diff line number	Diff line change
`@@ -447,6 +447,15 @@ public static function promotedPropertyProvider(): array`
`447`	`447`	`['promotedAndMutated', [new Type(Type::BUILTIN_TYPE_STRING)]],`
`448`	`448`	`];`
`449`	`449`	`}`
	`450`	`+`
	`451`	`+ /**`
	`452`	`+ * @group legacy`
	`453`	`+ */`
	`454`	`+ public function testIgnoreGenerics()`
	`455`	`+ {`
	`456`	`+ $this->assertCount(1, $this->extractor->getTypes(PhpDocGenericsDocblock::class, 'foo'));`
	`457`	`+ $this->assertNull($this->extractor->getTypes(PhpDocGenericsDocblock::class, 'foo', ['ignore_docblock_generics' => true]));`
	`458`	`+ }`
`450`	`459`	`}`
`451`	`460`
`452`	`461`	`class EmptyDocBlock`
`@@ -465,3 +474,9 @@ public function setOmittedType(array $omittedTagType)`
`465`	`474`	`{`
`466`	`475`	`}`
`467`	`476`	`}`
	`477`	`+`
	`478`	`+class PhpDocGenericsDocblock`
	`479`	`+{`
	`480`	`+ /** @var \stcClass<int> */`
	`481`	`+ public $foo;`
	`482`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -473,6 +473,15 @@ public static function php80TypesProvider()`
`473`	`473`	`[Php80PromotedDummy::class, 'promoted', null],`
`474`	`474`	`];`
`475`	`475`	`}`
	`476`	`+`
	`477`	`+ /**`
	`478`	`+ * @group legacy`
	`479`	`+ */`
	`480`	`+ public function testIgnoreGenerics()`
	`481`	`+ {`
	`482`	`+ $this->assertCount(1, $this->extractor->getTypes(PhpDocGenericsDocblock::class, 'foo'));`
	`483`	`+ $this->assertNull($this->extractor->getTypes(PhpDocGenericsDocblock::class, 'foo', ['ignore_docblock_generics' => true]));`
	`484`	`+ }`
`476`	`485`	`}`
`477`	`486`
`478`	`487`	`class PhpStanOmittedParamTagTypeDocBlock`
`@@ -486,3 +495,9 @@ public function setOmittedType(array $omittedTagType)`
`486`	`495`	`{`
`487`	`496`	`}`
`488`	`497`	`}`
	`498`	`+`
	`499`	`+class PhpStanGenericsDocblock`
	`500`	`+{`
	`501`	`+ /** @var \stcClass<int> */`
	`502`	`+ public $foo;`
	`503`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function getTypes($class, $property, array $context = []): ?array`
`39`	`39`	`return [new Type(Type::BUILTIN_TYPE_INT)];`
`40`	`40`	`}`
`41`	`41`
`42`		`- public function getTypesFromConstructor(string $class, string $property): ?array`
	`42`	`+ public function getTypesFromConstructor(string $class, string $property, array $context = []): ?array`
`43`	`43`	`{`
`44`	`44`	`return [new Type(Type::BUILTIN_TYPE_STRING)];`
`45`	`45`	`}`