bug #48969 [PropertyInfo] Fixes constructor extractor for mixed type (michael.kubovic)

fabpot · fabpot · commit fe23f0f3e4eb · 2023-01-14T12:26:59.000+01:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [PropertyInfo] Fixes constructor extractor for mixed type | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | `ConstructorExtractor` when configured with `PhpDocExtractor` returns an empty array instead of null for properties with `mixed` type. This configuration breaks for example with Messenger. ``` Message: "Could not decode stamp: The type of the "id" attribute for class "Symfony\Component\Messenger\Stamp\TransportMessageIdStamp" must be one of "" ("string" given)." {"exception":"[object] (Symfony\\Component\\Messenger\\Exception\\MessageDecodingFailedException(code: 0): Could not decode stamp: The type of the \"id\" attribute for class \"Symfony\\Component\\Messenger\\Stamp\\TransportMessageIdStamp\" must be one of \"\" (\"string\" given). at /var/www/vendor/symfony/messenger/Transport/Serialization/Serializer.php:123) ``` Commits ------- 4edd347 [PropertyInfo] Fixes constructor extractor for mixed type
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpDocExtractor.php
@@ -200,7 +200,7 @@ public function getTypesFromConstructor(string $class, string $property): ?array
             }
         }
 
-        if (!isset($types[0])) {
+        if (!isset($types[0]) || [] === $types[0]) {
             return null;
         }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -443,6 +443,7 @@ public function constructorTypesProvider()
             ['dateObject', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeInterface')]],
             ['dateTime', null],
             ['ddd', null],
+            ['mixed', null],
         ];
     }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ConstructorDummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ConstructorDummy.php
@@ -29,8 +29,9 @@ class ConstructorDummy
      * @param \DateTimeZone      $timezone
      * @param int                $date       Timestamp
      * @param \DateTimeInterface $dateObject
+     * @param mixed              $mixed
      */
-    public function __construct(\DateTimeZone $timezone, $date, $dateObject, \DateTime $dateTime)
+    public function __construct(\DateTimeZone $timezone, $date, $dateObject, \DateTime $dateTime, $mixed)
     {
         $this->timezone = $timezone->getName();
         $this->date = \DateTime::createFromFormat('U', $date);

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public function getTypesFromConstructor(string $class, string $property): ?array`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`203`		`- if (!isset($types[0])) {`
	`203`	`+ if (!isset($types[0]) \|\| [] === $types[0]) {`
`204`	`204`	`return null;`
`205`	`205`	`}`
`206`	`206`
Original file line number	Diff line number	Diff line change
`@@ -443,6 +443,7 @@ public function constructorTypesProvider()`
`443`	`443`	`['dateObject', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeInterface')]],`
`444`	`444`	`['dateTime', null],`
`445`	`445`	`['ddd', null],`
	`446`	`+ ['mixed', null],`
`446`	`447`	`];`
`447`	`448`	`}`
`448`	`449`	`}`