bug #41582 Fix not null get collection key types (dragosprotung)

nicolas-grekas · nicolas-grekas · commit 22fd9609a1ba · 2021-06-08T15:59:23.000+02:00
This PR was merged into the 5.3 branch. Discussion ---------- Fix not null get collection key types | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no  | Deprecations? | no  | Tickets | -  | License | MIT | Doc PR | -  `Warning: Undefined array key 0` is generated because `getCollectionKeyTypes` never returns `null` so a check against empty array is needed. Commits ------- e7552ab [Serializer] Fix not null return check by "getCollectionKeyTypes"
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -470,7 +470,7 @@ private function validateAndDenormalize(string $currentClass, string $attribute,
                 $builtinType = Type::BUILTIN_TYPE_OBJECT;
                 $class = $collectionValueType->getClassName().'[]';
 
-                if (null !== $collectionKeyType = $type->getCollectionKeyTypes()) {
+                if (\count($collectionKeyType = $type->getCollectionKeyTypes()) > 0) {
                     [$context['key_type']] = $collectionKeyType;
                 }
             } elseif ($type->isCollection() && \count($collectionValueType = $type->getCollectionValueTypes()) > 0 && Type::BUILTIN_TYPE_ARRAY === $collectionValueType[0]->getBuiltinType()) {

Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ private function validateAndDenormalize(string $currentClass, string $attribute,`
`470`	`470`	`$builtinType = Type::BUILTIN_TYPE_OBJECT;`
`471`	`471`	`$class = $collectionValueType->getClassName().'[]';`
`472`	`472`
`473`		`- if (null !== $collectionKeyType = $type->getCollectionKeyTypes()) {`
	`473`	`+ if (\count($collectionKeyType = $type->getCollectionKeyTypes()) > 0) {`
`474`	`474`	`[$context['key_type']] = $collectionKeyType;`
`475`	`475`	`}`
`476`	`476`	`} elseif ($type->isCollection() && \count($collectionValueType = $type->getCollectionValueTypes()) > 0 && Type::BUILTIN_TYPE_ARRAY === $collectionValueType[0]->getBuiltinType()) {`