Merge 4.2

Author: soyuka

src/Hal/JsonSchema/SchemaFactory.php

@@ -92,7 +92,7 @@ public function buildSchema(string $className, string $format = 'jsonhal', strin
 
         $schema = $this->schemaFactory->buildSchema($className, 'json', $type, $operation, $schema, $serializerContext, $forceCollection);
         $definitions = $schema->getDefinitions();
-        $definitionName = $this->definitionNameFactory->create($className, $format, $className, $operation, $serializerContext);
+        $definitionName = $this->definitionNameFactory->create($className, $format, $className, $operation, $serializerContext + ['schema_type' => $type]);
         $prefix = $this->getSchemaUriPrefix($schema->getVersion());
         $collectionKey = $schema->getItemsDefinitionKey();
 

src/Hydra/JsonSchema/SchemaFactory.php

@@ -247,7 +247,7 @@ public function buildSchema(string $className, string $format = 'jsonld', string
             ];
         }
 
-        $definitionName = $this->definitionNameFactory->create($className, $format, $inputOrOutputClass, $operation, $serializerContext);
+        $definitionName = $this->definitionNameFactory->create($className, $format, $inputOrOutputClass, $operation, $serializerContext + ['schema_type' => $type]);
         $schema['type'] = 'object';
         $schema['description'] = "$definitionName collection.";
         $schema['allOf'] = [

src/JsonApi/JsonSchema/SchemaFactory.php

@@ -125,7 +125,7 @@ public function buildSchema(string $className, string $format = 'jsonapi', strin
         }
 
         $schema = $this->schemaFactory->buildSchema($className, 'json', $type, $operation, $schema, $jsonApiSerializerContext, $forceCollection);
-        $definitionName = $this->definitionNameFactory->create($inputOrOutputClass, $format, $className, $operation, $jsonApiSerializerContext);
+        $definitionName = $this->definitionNameFactory->create($inputOrOutputClass, $format, $className, $operation, $jsonApiSerializerContext + ['schema_type' => $type]);
         $prefix = $this->getSchemaUriPrefix($schema->getVersion());
         $definitions = $schema->getDefinitions();
         $collectionKey = $schema->getItemsDefinitionKey();
@@ -300,7 +300,7 @@ private function buildDefinitionPropertiesSchema(string $key, string $className,
                     $operation = $this->findOperation($relatedClassName, $type, null, $serializerContext);
                     $inputOrOutputClass = $this->findOutputClass($relatedClassName, $type, $operation, $serializerContext);
                     $serializerContext ??= $this->getSerializerContext($operation, $type);
-                    $definitionName = $this->definitionNameFactory->create($relatedClassName, $format, $inputOrOutputClass, $operation, $serializerContext);
+                    $definitionName = $this->definitionNameFactory->create($relatedClassName, $format, $inputOrOutputClass, $operation, $serializerContext + ['schema_type' => $type]);
 
                     // to avoid recursion
                     if ($this->builtSchema[$definitionName] ?? false) {

src/JsonSchema/SchemaFactory.php

@@ -97,7 +97,7 @@ public function buildSchema(string $className, string $format = 'json', string $
             $isJsonMergePatch => 'merge-patch+json',
         };
 
-        $definitionName = $this->definitionNameFactory->create($className, $definitionFormat, $inputOrOutputClass, $operation, $serializerContext);
+        $definitionName = $this->definitionNameFactory->create($className, $definitionFormat, $inputOrOutputClass, $operation, $serializerContext + ['schema_type' => $type]);
 
         if (!isset($schema['$ref']) && !isset($schema['type'])) {
             $ref = $this->getSchemaUriPrefix($version).$definitionName;

src/State/Processor/ObjectMapperProcessor.php

@@ -15,8 +15,8 @@
 
 use ApiPlatform\Metadata\Operation;
 use ApiPlatform\State\ProcessorInterface;
-use Symfony\Component\ObjectMapper\ObjectMapperInterface;
 use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\ObjectMapper\ObjectMapperInterface;
 
 /**
  * @implements ProcessorInterface<mixed,mixed>

src/State/Provider/ObjectMapperProvider.php

@@ -40,7 +40,11 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
     {
         $data = $this->decorated->provide($operation, $uriVariables, $context);
 
-        if (!$this->objectMapper || !\is_object($data) || !$operation->canMap()) {
+        if (!$this->objectMapper || !$operation->canMap()) {
+            return $data;
+        }
+
+        if (!\is_object($data) && !\is_array($data)) {
             return $data;
         }
 
@@ -49,6 +53,12 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
 
         if ($data instanceof PaginatorInterface) {
             $data = new ArrayPaginator(array_map(fn ($v) => $this->objectMapper->map($v, $operation->getClass()), iterator_to_array($data)), 0, \count($data));
+        } elseif (\is_array($data)) {
+            foreach ($data as &$v) {
+                if (\is_object($v)) {
+                    $v = $this->objectMapper->map($v, $operation->getClass());
+                }
+            }
         } else {
             $data = $this->objectMapper->map($data, $operation->getClass());
         }

src/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -309,7 +309,7 @@ private function registerCommonConfiguration(ContainerBuilder $container, array
         $container->setParameter('api_platform.collection.pagination.client_items_per_page', $config['defaults']['pagination_client_items_per_page'] ?? false);
         $container->setParameter('api_platform.collection.pagination.client_partial', $config['defaults']['pagination_client_partial'] ?? false);
         $container->setParameter('api_platform.collection.pagination.items_per_page', $config['defaults']['pagination_items_per_page'] ?? 30);
-        $container->setParameter('api_platform.collection.pagination.maximum_items_per_page', \array_key_exists('pagination_maximum_items_per_page', $config['defaults']) ? $config['defaults']['pagination_maximum_items_per_page'] : 30);
+        $container->setParameter('api_platform.collection.pagination.maximum_items_per_page', \array_key_exists('pagination_maximum_items_per_page', $config['defaults'] ?? []) ? $config['defaults']['pagination_maximum_items_per_page'] : 30);
         $container->setParameter('api_platform.collection.pagination.page_parameter_name', $config['defaults']['pagination_page_parameter_name'] ?? $config['collection']['pagination']['page_parameter_name']);
         $container->setParameter('api_platform.collection.pagination.enabled_parameter_name', $config['defaults']['pagination_enabled_parameter_name'] ?? $config['collection']['pagination']['enabled_parameter_name']);
         $container->setParameter('api_platform.collection.pagination.items_per_page_parameter_name', $config['defaults']['pagination_items_per_page_parameter_name'] ?? $config['collection']['pagination']['items_per_page_parameter_name']);