[PropertyInfo] fix array types with keys (array<string, string>)

digilist · digilist · commit ab80d9e5168e · 2020-07-11T16:17:35.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php
@@ -150,6 +150,39 @@ public function provideCollectionTypes()
                 null,
                 null,
             ],
+            [
+                'arrayWithKeys',
+                [new Type(
+                    Type::BUILTIN_TYPE_ARRAY,
+                    false,
+                    null,
+                    true,
+                    new Type(Type::BUILTIN_TYPE_STRING),
+                    new Type(Type::BUILTIN_TYPE_STRING)
+                )],
+                null,
+                null,
+            ],
+            [
+                'arrayWithKeysAndComplexValue',
+                [new Type(
+                    Type::BUILTIN_TYPE_ARRAY,
+                    false,
+                    null,
+                    true,
+                    new Type(Type::BUILTIN_TYPE_STRING),
+                    new Type(
+                        Type::BUILTIN_TYPE_ARRAY,
+                        true,
+                        null,
+                        true,
+                        new Type(Type::BUILTIN_TYPE_INT),
+                        new Type(Type::BUILTIN_TYPE_STRING, true)
+                    )
+                )],
+                null,
+                null,
+            ],
         ];
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -56,6 +56,8 @@ public function testGetProperties()
                 'iteratorCollection',
                 'iteratorCollectionWithKey',
                 'nestedIterators',
+                'arrayWithKeys',
+                'arrayWithKeysAndComplexValue',
                 'foo',
                 'foo2',
                 'foo3',
@@ -104,6 +106,8 @@ public function testGetPropertiesWithCustomPrefixes()
                 'iteratorCollection',
                 'iteratorCollectionWithKey',
                 'nestedIterators',
+                'arrayWithKeys',
+                'arrayWithKeysAndComplexValue',
                 'foo',
                 'foo2',
                 'foo3',
@@ -142,6 +146,8 @@ public function testGetPropertiesWithNoPrefixes()
                 'iteratorCollection',
                 'iteratorCollectionWithKey',
                 'nestedIterators',
+                'arrayWithKeys',
+                'arrayWithKeysAndComplexValue',
                 'foo',
                 'foo2',
                 'foo3',
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Dummy.php
@@ -130,6 +130,16 @@ class Dummy extends ParentDummy
      */
     public $nestedIterators;
 
+    /**
+     * @var array<string, string>
+     */
+    public $arrayWithKeys;
+
+    /**
+     * @var array<string, array<integer, null|string>|null>
+     */
+    public $arrayWithKeysAndComplexValue;
+
     public static function getStatic()
     {
     }
diff --git a/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php b/src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\PropertyInfo\Util;
 
 use phpDocumentor\Reflection\Type as DocType;
+use phpDocumentor\Reflection\Types\Array_;
 use phpDocumentor\Reflection\Types\Collection;
 use phpDocumentor\Reflection\Types\Compound;
 use phpDocumentor\Reflection\Types\Null_;
@@ -90,7 +91,7 @@ private function createType(DocType $type, bool $nullable, string $docType = nul
         $docType = $docType ?? (string) $type;
 
         if ($type instanceof Collection) {
-            list($phpType, $class) = $this->getPhpTypeAndClass((string) $type->getFqsen());
+            [$phpType, $class] = $this->getPhpTypeAndClass((string) $type->getFqsen());
 
             $key = $this->getTypes($type->getKeyType());
             $value = $this->getTypes($type->getValueType());
@@ -109,19 +110,30 @@ private function createType(DocType $type, bool $nullable, string $docType = nul
         }
 
         if ('[]' === substr($docType, -2)) {
-            if ('mixed[]' === $docType) {
-                $collectionKeyType = null;
+            $collectionKeyType = new Type(Type::BUILTIN_TYPE_INT);
+            $collectionValueType = $this->createType($type, false, substr($docType, 0, -2));
+
+            return new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, $collectionKeyType, $collectionValueType);
+        }
+
+        if ('array<' === substr($docType, 0, 6) && $type instanceof Array_) {
+            // array<value> is converted to x[] which is handled above
+            // so it's only necessary to handle array<key, value> here
+            $collectionKeyType = $this->getTypes($type->getKeyType())[0];
+
+            // TODO as far as I can see there is no way to define union types yet?
+            $collectionValueTypes = $this->getTypes($type->getValueType());
+            if (\count($collectionValueTypes) > 1) {
                 $collectionValueType = null;
             } else {
-                $collectionKeyType = new Type(Type::BUILTIN_TYPE_INT);
-                $collectionValueType = $this->createType($type, false, substr($docType, 0, -2));
+                $collectionValueType = $collectionValueTypes[0];
             }
 
             return new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, $collectionKeyType, $collectionValueType);
         }
 
         $docType = $this->normalizeType($docType);
-        list($phpType, $class) = $this->getPhpTypeAndClass($docType);
+        [$phpType, $class] = $this->getPhpTypeAndClass($docType);
 
         if ('array' === $docType) {
             return new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true, null, null);
@@ -160,6 +172,6 @@ private function getPhpTypeAndClass(string $docType): array
             return [$docType, null];
         }
 
-        return ['object', substr($docType, 1)];
+        return ['object', substr($docType, 1)]; // substr to strip the namespace's `\`-prefix
     }
 }
