cs: fixes

soyuka · soyuka · commit 5f3721df34d0 · 2023-08-14T10:32:43.000+02:00
diff --git a/src/Serializer/AbstractItemNormalizer.php b/src/Serializer/AbstractItemNormalizer.php
@@ -356,12 +356,12 @@ protected function getClassDiscriminatorResolvedClass(array $data, string $class
         }
 
         if (!isset($data[$mapping->getTypeProperty()])) {
-            throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('Type property "%s" not found for the abstract object "%s".', $mapping->getTypeProperty(), $class), null, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'] . '.' . $mapping->getTypeProperty() : $mapping->getTypeProperty());
+            throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('Type property "%s" not found for the abstract object "%s".', $mapping->getTypeProperty(), $class), null, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'].'.'.$mapping->getTypeProperty() : $mapping->getTypeProperty());
         }
 
         $type = $data[$mapping->getTypeProperty()];
         if (null === ($mappedClass = $mapping->getClassForType($type))) {
-            throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type "%s" is not a valid value.', $type), $type, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'] . '.' . $mapping->getTypeProperty() : $mapping->getTypeProperty(), true);
+            throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type "%s" is not a valid value.', $type), $type, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'].'.'.$mapping->getTypeProperty() : $mapping->getTypeProperty(), true);
         }
 
         return $mappedClass;
@@ -491,7 +491,7 @@ protected function validateType(string $attribute, Type $type, mixed $value, str
         if (Type::BUILTIN_TYPE_FLOAT === $builtinType && null !== $format && str_contains($format, 'json')) {
             $isValid = \is_float($value) || \is_int($value);
         } else {
-            $isValid = \call_user_func('is_' . $builtinType, $value);
+            $isValid = \call_user_func('is_'.$builtinType, $value);
         }
 
         if (!$isValid) {
@@ -515,7 +515,7 @@ protected function denormalizeCollection(string $attribute, ApiProperty $propert
         $childContext = $this->createChildContext($this->createOperationContext($context, $className), $attribute, $format);
         $values = [];
         foreach ($value as $index => $obj) {
-            if (null !== $collectionKeyBuiltinType && !\call_user_func('is_' . $collectionKeyBuiltinType, $index)) {
+            if (null !== $collectionKeyBuiltinType && !\call_user_func('is_'.$collectionKeyBuiltinType, $index)) {
                 throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the key "%s" must be "%s", "%s" given.', $index, $collectionKeyBuiltinType, \gettype($index)), $index, [$collectionKeyBuiltinType], ($context['deserialization_path'] ?? false) ? sprintf('key(%s)', $context['deserialization_path']) : null, true);
             }
 
@@ -577,7 +577,7 @@ protected function getFactoryOptions(array $context): array
             $options['serializer_groups'] = (array) $context[self::GROUPS];
         }
 
-        $operationCacheKey = ($context['resource_class'] ?? '') . ($context['operation_name'] ?? '') . ($context['api_normalize'] ?? '');
+        $operationCacheKey = ($context['resource_class'] ?? '').($context['operation_name'] ?? '').($context['api_normalize'] ?? '');
         if ($operationCacheKey && isset($this->localFactoryOptionsCache[$operationCacheKey])) {
             return $options + $this->localFactoryOptionsCache[$operationCacheKey];
         }
@@ -633,6 +633,7 @@ protected function getAttributeValue(object $object, string $attribute, string $
 
                 $resourceClass = $this->resourceClassResolver->getResourceClass($attributeValue, $className);
                 $childContext = $this->createChildContext($this->createOperationContext($context, $resourceClass), $attribute, $format);
+
                 return $this->normalizeCollectionOfRelations($propertyMetadata, $attributeValue, $resourceClass, $format, $childContext);
             }
 
@@ -646,6 +647,7 @@ protected function getAttributeValue(object $object, string $attribute, string $
 
                 $resourceClass = $this->resourceClassResolver->getResourceClass($attributeValue, $className);
                 $childContext = $this->createChildContext($this->createOperationContext($context, $resourceClass), $attribute, $format);
+
                 return $this->normalizeRelation($propertyMetadata, $attributeValue, $resourceClass, $format, $childContext);
             }
 
@@ -660,13 +662,15 @@ protected function getAttributeValue(object $object, string $attribute, string $
 
             // Anonymous resources
             if ($type->getClassName()) {
-				$childContext = $this->createChildContext($this->createOperationContext($context, null), $attribute, $format);
+                $childContext = $this->createChildContext($this->createOperationContext($context, null), $attribute, $format);
                 $childContext['output']['gen_id'] = $propertyMetadata->getGenId() ?? true;
+
                 return $this->serializer->normalize($attributeValue, $format, $childContext);
             }
 
             if ('array' === $type->getBuiltinType()) {
-				$childContext = $this->createChildContext($this->createOperationContext($context, null), $attribute, $format);
+                $childContext = $this->createChildContext($this->createOperationContext($context, null), $attribute, $format);
+
                 return $this->serializer->normalize($attributeValue, $format, $childContext);
             }
         }
@@ -795,7 +799,8 @@ private function createAndValidateAttributeValue(string $attribute, mixed $value
                 && $this->resourceClassResolver->isResourceClass($className)
             ) {
                 $resourceClass = $this->resourceClassResolver->getResourceClass(null, $className);
-				$childContext = $this->createChildContext($this->createOperationContext($context, $resourceClass), $attribute, $format);
+                $childContext = $this->createChildContext($this->createOperationContext($context, $resourceClass), $attribute, $format);
+
                 return $this->denormalizeRelation($attribute, $propertyMetadata, $resourceClass, $value, $format, $childContext);
             }
 
@@ -811,7 +816,7 @@ private function createAndValidateAttributeValue(string $attribute, mixed $value
 
                 unset($context['resource_class']);
 
-                return $this->serializer->denormalize($value, $className . '[]', $format, $context);
+                return $this->serializer->denormalize($value, $className.'[]', $format, $context);
             }
 
             if (null !== $className = $type->getClassName()) {

Original file line number	Diff line number	Diff line change
`@@ -356,12 +356,12 @@ protected function getClassDiscriminatorResolvedClass(array $data, string $class`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`if (!isset($data[$mapping->getTypeProperty()])) {`
`359`		`- throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('Type property "%s" not found for the abstract object "%s".', $mapping->getTypeProperty(), $class), null, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'] . '.' . $mapping->getTypeProperty() : $mapping->getTypeProperty());`
	`359`	`+ throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('Type property "%s" not found for the abstract object "%s".', $mapping->getTypeProperty(), $class), null, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'].'.'.$mapping->getTypeProperty() : $mapping->getTypeProperty());`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`$type = $data[$mapping->getTypeProperty()];`
`363`	`363`	`if (null === ($mappedClass = $mapping->getClassForType($type))) {`
`364`		`- throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type "%s" is not a valid value.', $type), $type, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'] . '.' . $mapping->getTypeProperty() : $mapping->getTypeProperty(), true);`
	`364`	`+ throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type "%s" is not a valid value.', $type), $type, ['string'], isset($context['deserialization_path']) ? $context['deserialization_path'].'.'.$mapping->getTypeProperty() : $mapping->getTypeProperty(), true);`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`return $mappedClass;`
`@@ -491,7 +491,7 @@ protected function validateType(string $attribute, Type $type, mixed $value, str`
`491`	`491`	`if (Type::BUILTIN_TYPE_FLOAT === $builtinType && null !== $format && str_contains($format, 'json')) {`
`492`	`492`	`$isValid = \is_float($value) \|\| \is_int($value);`
`493`	`493`	`} else {`
`494`		`- $isValid = \call_user_func('is_' . $builtinType, $value);`
	`494`	`+ $isValid = \call_user_func('is_'.$builtinType, $value);`
`495`	`495`	`}`
`496`	`496`
`497`	`497`	`if (!$isValid) {`
`@@ -515,7 +515,7 @@ protected function denormalizeCollection(string $attribute, ApiProperty $propert`
`515`	`515`	`$childContext = $this->createChildContext($this->createOperationContext($context, $className), $attribute, $format);`
`516`	`516`	`$values = [];`
`517`	`517`	`foreach ($value as $index => $obj) {`
`518`		`- if (null !== $collectionKeyBuiltinType && !\call_user_func('is_' . $collectionKeyBuiltinType, $index)) {`
	`518`	`+ if (null !== $collectionKeyBuiltinType && !\call_user_func('is_'.$collectionKeyBuiltinType, $index)) {`
`519`	`519`	`throw NotNormalizableValueException::createForUnexpectedDataType(sprintf('The type of the key "%s" must be "%s", "%s" given.', $index, $collectionKeyBuiltinType, \gettype($index)), $index, [$collectionKeyBuiltinType], ($context['deserialization_path'] ?? false) ? sprintf('key(%s)', $context['deserialization_path']) : null, true);`
`520`	`520`	`}`
`521`	`521`
`@@ -577,7 +577,7 @@ protected function getFactoryOptions(array $context): array`
`577`	`577`	`$options['serializer_groups'] = (array) $context[self::GROUPS];`
`578`	`578`	`}`
`579`	`579`
`580`		`- $operationCacheKey = ($context['resource_class'] ?? '') . ($context['operation_name'] ?? '') . ($context['api_normalize'] ?? '');`
	`580`	`+ $operationCacheKey = ($context['resource_class'] ?? '').($context['operation_name'] ?? '').($context['api_normalize'] ?? '');`
`581`	`581`	`if ($operationCacheKey && isset($this->localFactoryOptionsCache[$operationCacheKey])) {`
`582`	`582`	`return $options + $this->localFactoryOptionsCache[$operationCacheKey];`
`583`	`583`	`}`
`@@ -633,6 +633,7 @@ protected function getAttributeValue(object $object, string $attribute, string $`
`633`	`633`
`634`	`634`	`$resourceClass = $this->resourceClassResolver->getResourceClass($attributeValue, $className);`
`635`	`635`	`$childContext = $this->createChildContext($this->createOperationContext($context, $resourceClass), $attribute, $format);`
	`636`	`+`
`636`	`637`	`return $this->normalizeCollectionOfRelations($propertyMetadata, $attributeValue, $resourceClass, $format, $childContext);`
`637`	`638`	`}`
`638`	`639`
`@@ -646,6 +647,7 @@ protected function getAttributeValue(object $object, string $attribute, string $`
`646`	`647`
`647`	`648`	`$resourceClass = $this->resourceClassResolver->getResourceClass($attributeValue, $className);`
`648`	`649`	`$childContext = $this->createChildContext($this->createOperationContext($context, $resourceClass), $attribute, $format);`
	`650`	`+`
`649`	`651`	`return $this->normalizeRelation($propertyMetadata, $attributeValue, $resourceClass, $format, $childContext);`
`650`	`652`	`}`
`651`	`653`
`@@ -660,13 +662,15 @@ protected function getAttributeValue(object $object, string $attribute, string $`
`660`	`662`
`661`	`663`	`// Anonymous resources`
`662`	`664`	`if ($type->getClassName()) {`
`663`		`- $childContext = $this->createChildContext($this->createOperationContext($context, null), $attribute, $format);`
	`665`	`+ $childContext = $this->createChildContext($this->createOperationContext($context, null), $attribute, $format);`
`664`	`666`	`$childContext['output']['gen_id'] = $propertyMetadata->getGenId() ?? true;`
	`667`	`+`
`665`	`668`	`return $this->serializer->normalize($attributeValue, $format, $childContext);`
`666`	`669`	`}`
`667`	`670`
`668`	`671`	`if ('array' === $type->getBuiltinType()) {`
`669`		`- $childContext = $this->createChildContext($this->createOperationContext($context, null), $attribute, $format);`
	`672`	`+ $childContext = $this->createChildContext($this->createOperationContext($context, null), $attribute, $format);`
	`673`	`+`
`670`	`674`	`return $this->serializer->normalize($attributeValue, $format, $childContext);`
`671`	`675`	`}`
`672`	`676`	`}`
`@@ -795,7 +799,8 @@ private function createAndValidateAttributeValue(string $attribute, mixed $value`
`795`	`799`	`&& $this->resourceClassResolver->isResourceClass($className)`
`796`	`800`	`) {`
`797`	`801`	`$resourceClass = $this->resourceClassResolver->getResourceClass(null, $className);`
`798`		`- $childContext = $this->createChildContext($this->createOperationContext($context, $resourceClass), $attribute, $format);`
	`802`	`+ $childContext = $this->createChildContext($this->createOperationContext($context, $resourceClass), $attribute, $format);`
	`803`	`+`
`799`	`804`	`return $this->denormalizeRelation($attribute, $propertyMetadata, $resourceClass, $value, $format, $childContext);`
`800`	`805`	`}`
`801`	`806`
`@@ -811,7 +816,7 @@ private function createAndValidateAttributeValue(string $attribute, mixed $value`
`811`	`816`
`812`	`817`	`unset($context['resource_class']);`
`813`	`818`
`814`		`- return $this->serializer->denormalize($value, $className . '[]', $format, $context);`
	`819`	`+ return $this->serializer->denormalize($value, $className.'[]', $format, $context);`
`815`	`820`	`}`
`816`	`821`
`817`	`822`	`if (null !== $className = $type->getClassName()) {`