Skip to content

Commit 8b3d215

Browse files
xabbuhxabbuh
committed
treat simple arrays of mixed values as arrays not as lists
1 parent 8b1daf2 commit 8b3d215

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

‎src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public static function typesProvider()
111111
['parent', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy')], null, null],
112112
['collection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeImmutable'))], null, null],
113113
['nestedCollection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING, false)))], null, null],
114-
['mixedCollection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, null, null)], null, null],
114+
['mixedCollection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), null)], null, null],
115115
['a', [new Type(Type::BUILTIN_TYPE_INT)], 'A.', null],
116116
['b', [new Type(Type::BUILTIN_TYPE_OBJECT, true, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy')], 'B.', null],
117117
['c', [new Type(Type::BUILTIN_TYPE_BOOL, true)], null, null],
@@ -122,7 +122,7 @@ public static function typesProvider()
122122
['df', [new Type(Type::BUILTIN_TYPE_FALSE)], null, null],
123123
['e', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_RESOURCE))], null, null],
124124
['f', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeImmutable'))], null, null],
125-
['g', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)], 'Nullable array.', null],
125+
['g', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true, new Type(Type::BUILTIN_TYPE_INT))], 'Nullable array.', null],
126126
['h', [new Type(Type::BUILTIN_TYPE_STRING, true)], null, null],
127127
['i', [new Type(Type::BUILTIN_TYPE_STRING, true), new Type(Type::BUILTIN_TYPE_INT, true)], null, null],
128128
['j', [new Type(Type::BUILTIN_TYPE_OBJECT, true, 'DateTimeImmutable')], null, null],
@@ -234,14 +234,14 @@ public static function typesWithCustomPrefixesProvider()
234234
['parent', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy')], null, null],
235235
['collection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeImmutable'))], null, null],
236236
['nestedCollection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING, false)))], null, null],
237-
['mixedCollection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, null, null)], null, null],
237+
['mixedCollection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), null)], null, null],
238238
['a', null, 'A.', null],
239239
['b', null, 'B.', null],
240240
['c', [new Type(Type::BUILTIN_TYPE_BOOL, true)], null, null],
241241
['d', [new Type(Type::BUILTIN_TYPE_BOOL)], null, null],
242242
['e', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_RESOURCE))], null, null],
243243
['f', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeImmutable'))], null, null],
244-
['g', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)], 'Nullable array.', null],
244+
['g', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true, new Type(Type::BUILTIN_TYPE_INT))], 'Nullable array.', null],
245245
['h', [new Type(Type::BUILTIN_TYPE_STRING, true)], null, null],
246246
['i', [new Type(Type::BUILTIN_TYPE_STRING, true), new Type(Type::BUILTIN_TYPE_INT, true)], null, null],
247247
['j', [new Type(Type::BUILTIN_TYPE_OBJECT, true, 'DateTimeImmutable')], null, null],
@@ -277,14 +277,14 @@ public static function typesWithNoPrefixesProvider()
277277
['parent', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy')], null, null],
278278
['collection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeImmutable'))], null, null],
279279
['nestedCollection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING, false)))], null, null],
280-
['mixedCollection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, null, null)], null, null],
280+
['mixedCollection', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), null)], null, null],
281281
['a', null, 'A.', null],
282282
['b', null, 'B.', null],
283283
['c', null, null, null],
284284
['d', null, null, null],
285285
['e', null, null, null],
286286
['f', null, null, null],
287-
['g', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true)], 'Nullable array.', null],
287+
['g', [new Type(Type::BUILTIN_TYPE_ARRAY, true, null, true, new Type(Type::BUILTIN_TYPE_INT))], 'Nullable array.', null],
288288
['h', [new Type(Type::BUILTIN_TYPE_STRING, true)], null, null],
289289
['i', [new Type(Type::BUILTIN_TYPE_STRING, true), new Type(Type::BUILTIN_TYPE_INT, true)], null, null],
290290
['j', [new Type(Type::BUILTIN_TYPE_OBJECT, true, 'DateTimeImmutable')], null, null],

‎src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use phpDocumentor\Reflection\Types\Collection;
2020
use phpDocumentor\Reflection\Types\Compound;
2121
use phpDocumentor\Reflection\Types\Integer;
22+
use phpDocumentor\Reflection\Types\Mixed_;
2223
use phpDocumentor\Reflection\Types\Null_;
2324
use phpDocumentor\Reflection\Types\Nullable;
2425
use phpDocumentor\Reflection\Types\String_;
@@ -109,6 +110,10 @@ private function createType(DocType $type, bool $nullable): ?Type
109110
{
110111
$docType = (string) $type;
111112

113+
if ('array' === $docType && $type instanceof Array_ && !method_exists($type, 'getOriginalValueType') && $type->getValueType() instanceof Mixed_) {
114+
$docType = 'mixed[]';
115+
}
116+
112117
if ($type instanceof Collection) {
113118
$fqsen = $type->getFqsen();
114119
if ($fqsen && 'list' === $fqsen->getName() && !class_exists(List_::class, false) && !class_exists((string) $fqsen)) {

0 commit comments

Comments
 (0)