Merge 2.4 onto master

features/hydra/collection.feature

@@ -396,7 +396,6 @@ Feature: Collections support
     }
     """
 
-  @!mongodb
   @createSchema
   Scenario: Allow passing 0 to `itemsPerPage`
     When I send a "GET" request to "/dummies?itemsPerPage=0"

features/main/crud_abstract.feature

@@ -80,20 +80,20 @@ Feature: Create-Retrieve-Update-Delete on abstract resource
     """
 
   Scenario: Update a concrete resource
-      When I add "Content-Type" header equal to "application/ld+json"
-      And I send a "PUT" request to "/concrete_dummies/1" with body:
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I send a "PUT" request to "/concrete_dummies/1" with body:
       """
       {
         "@id": "/concrete_dummies/1",
         "instance": "Become real",
         "name": "A nice dummy"
       }
       """
-      Then the response status code should be 200
-      And the response should be in JSON
-      And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
-      And the header "Content-Location" should be equal to "/concrete_dummies/1"
-      And the JSON should be equal to:
+    Then the response status code should be 200
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+    And the header "Content-Location" should be equal to "/concrete_dummies/1"
+    And the JSON should be equal to:
       """
       {
         "@context": "/contexts/ConcreteDummy",
@@ -105,7 +105,61 @@ Feature: Create-Retrieve-Update-Delete on abstract resource
       }
       """
 
+  Scenario: Update a concrete resource using abstract resource uri
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I send a "PUT" request to "/abstract_dummies/1" with body:
+      """
+      {
+        "@id": "/concrete_dummies/1",
+        "instance": "Become surreal",
+        "name": "A nicer dummy"
+      }
+      """
+    Then the response status code should be 200
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+    And the header "Content-Location" should be equal to "/concrete_dummies/1"
+    And the JSON should be equal to:
+      """
+      {
+        "@context": "/contexts/ConcreteDummy",
+        "@id": "/concrete_dummies/1",
+        "@type": "ConcreteDummy",
+        "instance": "Become surreal",
+        "id": 1,
+        "name": "A nicer dummy"
+      }
+      """
+
   Scenario: Delete a resource
     When I send a "DELETE" request to "/abstract_dummies/1"
     Then the response status code should be 204
     And the response should be empty
+
+  @createSchema
+  Scenario: Create a concrete resource with discriminator
+    When I add "Content-Type" header equal to "application/ld+json"
+    And I send a "POST" request to "/abstract_dummies" with body:
+    """
+    {
+      "discr": "concrete",
+      "instance": "Concrete",
+      "name": "My Dummy"
+    }
+    """
+    Then the response status code should be 201
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/ld+json; charset=utf-8"
+    And the header "Content-Location" should be equal to "/concrete_dummies/1"
+    And the header "Location" should be equal to "/concrete_dummies/1"
+    And the JSON should be equal to:
+    """
+    {
+      "@context": "/contexts/ConcreteDummy",
+      "@id": "/concrete_dummies/1",
+      "@type": "ConcreteDummy",
+      "instance": "Concrete",
+      "id": 1,
+      "name": "My Dummy"
+    }
+    """

phpstan.neon

@@ -49,3 +49,5 @@ parameters:
         - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\MongoDbOdm\\Filter\\(Abstract|Boolean|Date|Exists|Numeric|Order|Range|Search)Filter::isPropertyNested\(\) invoked with 2 parameters, 1 required\.#'
         - '#Method ApiPlatform\\Core\\Bridge\\Doctrine\\MongoDbOdm\\Filter\\(Abstract|Boolean|Date|Exists|Numeric|Order|Range|Search)Filter::splitPropertyParts\(\) invoked with 2 parameters, 1 required\.#'
         - '#Method ApiPlatform\\Core\\DataProvider\\CollectionDataProviderInterface::getCollection\(\) invoked with 3 parameters, 1-2 required\.#'
+        - '#Method Symfony\\Component\\Serializer\\NameConverter\\NameConverterInterface::normalize\(\) invoked with 3 parameters, 1 required\.#'
+        - '#Method Symfony\\Component\\Serializer\\NameConverter\\NameConverterInterface::normalize\(\) invoked with 4 parameters, 1 required\.#'

src/Bridge/Doctrine/MongoDbOdm/Extension/PaginationExtension.php

@@ -64,12 +64,18 @@ public function applyToCollection(Builder $aggregationBuilder, string $resourceC
             throw new RuntimeException(sprintf('The repository for "%s" must be an instance of "%s".', $resourceClass, DocumentRepository::class));
         }
 
+        $resultsAggregationBuilder = $repository->createAggregationBuilder()->skip($offset);
+        if ($limit > 0) {
+            $resultsAggregationBuilder->limit($limit);
+        } else {
+            // Results have to be 0 but MongoDB does not support a limit equal to 0.
+            $resultsAggregationBuilder->match()->field(Paginator::LIMIT_ZERO_MARKER_FIELD)->equals(Paginator::LIMIT_ZERO_MARKER);
+        }
+
         $aggregationBuilder
             ->facet()
             ->field('results')->pipeline(
-                $repository->createAggregationBuilder()
-                    ->skip($offset)
-                    ->limit($limit)
+                $resultsAggregationBuilder
             )
             ->field('count')->pipeline(
                 $repository->createAggregationBuilder()

src/Bridge/Doctrine/MongoDbOdm/Paginator.php

@@ -28,6 +28,9 @@
  */
 final class Paginator implements \IteratorAggregate, PaginatorInterface
 {
+    public const LIMIT_ZERO_MARKER_FIELD = '___';
+    public const LIMIT_ZERO_MARKER = 'limit0';
+
     /**
      * @var Iterator
      */
@@ -76,7 +79,7 @@ public function __construct(Iterator $mongoDbOdmIterator, UnitOfWork $unitOfWork
          * skip/limit parameters of the query, the values set in the facet stage are used instead.
          */
         $this->firstResult = $this->getStageInfo($resultsFacetInfo, '$skip');
-        $this->maxResults = $this->getStageInfo($resultsFacetInfo, '$limit');
+        $this->maxResults = $this->hasLimitZeroStage($resultsFacetInfo) ? 0 : $this->getStageInfo($resultsFacetInfo, '$limit');
         $this->totalItems = $mongoDbOdmIterator->toArray()[0]['count'][0]['count'] ?? 0;
     }
 
@@ -85,6 +88,10 @@ public function __construct(Iterator $mongoDbOdmIterator, UnitOfWork $unitOfWork
      */
     public function getCurrentPage(): float
     {
+        if (0 >= $this->maxResults) {
+            return 1.;
+        }
+
         return floor($this->firstResult / $this->maxResults) + 1.;
     }
 
@@ -93,6 +100,10 @@ public function getCurrentPage(): float
      */
     public function getLastPage(): float
     {
+        if (0 >= $this->maxResults) {
+            return 1.;
+        }
+
         return ceil($this->totalItems / $this->maxResults) ?: 1.;
     }
 
@@ -161,4 +172,15 @@ private function getStageInfo(array $resultsFacetInfo, string $stage): int
 
         throw new InvalidArgumentException("$stage stage was not applied to the facet stage of the aggregation pipeline.");
     }
+
+    private function hasLimitZeroStage(array $resultsFacetInfo): bool
+    {
+        foreach ($resultsFacetInfo as $resultFacetInfo) {
+            if (self::LIMIT_ZERO_MARKER === ($resultFacetInfo['$match'][self::LIMIT_ZERO_MARKER_FIELD] ?? null)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

src/Bridge/Elasticsearch/DataProvider/Extension/SortExtension.php

@@ -89,11 +89,11 @@ private function getOrder(string $resourceClass, string $property, string $direc
         $order = ['order' => strtolower($direction)];
 
         if (null !== $nestedPath = $this->getNestedFieldPath($resourceClass, $property)) {
-            $nestedPath = null === $this->nameConverter ? $nestedPath : $this->nameConverter->normalize($nestedPath);
+            $nestedPath = null === $this->nameConverter ? $nestedPath : $this->nameConverter->normalize($nestedPath, $resourceClass);
             $order['nested'] = ['path' => $nestedPath];
         }
 
-        $property = null === $this->nameConverter ? $property : $this->nameConverter->normalize($property);
+        $property = null === $this->nameConverter ? $property : $this->nameConverter->normalize($property, $resourceClass);
 
         return [$property => $order];
     }

src/Bridge/Elasticsearch/DataProvider/Filter/AbstractSearchFilter.php

@@ -72,9 +72,9 @@ public function apply(array $clauseBody, string $resourceClass, ?string $operati
                 continue;
             }
 
-            $property = null === $this->nameConverter ? $property : $this->nameConverter->normalize($property);
+            $property = null === $this->nameConverter ? $property : $this->nameConverter->normalize($property, $resourceClass, null, $context);
             $nestedPath = $this->getNestedFieldPath($resourceClass, $property);
-            $nestedPath = null === $nestedPath || null === $this->nameConverter ? $nestedPath : $this->nameConverter->normalize($nestedPath);
+            $nestedPath = null === $nestedPath || null === $this->nameConverter ? $nestedPath : $this->nameConverter->normalize($nestedPath, $resourceClass, null, $context);
 
             $searches[] = $this->getQuery($property, $values, $nestedPath);
         }

src/Bridge/Elasticsearch/DataProvider/Filter/OrderFilter.php

@@ -70,11 +70,11 @@ public function apply(array $clauseBody, string $resourceClass, ?string $operati
             $order = ['order' => $direction];
 
             if (null !== $nestedPath = $this->getNestedFieldPath($resourceClass, $property)) {
-                $nestedPath = null === $this->nameConverter ? $nestedPath : $this->nameConverter->normalize($nestedPath);
+                $nestedPath = null === $this->nameConverter ? $nestedPath : $this->nameConverter->normalize($nestedPath, $resourceClass, null, $context);
                 $order['nested'] = ['path' => $nestedPath];
             }
 
-            $property = null === $this->nameConverter ? $property : $this->nameConverter->normalize($property);
+            $property = null === $this->nameConverter ? $property : $this->nameConverter->normalize($property, $resourceClass, null, $context);
             $orders[] = [$property => $order];
         }
 

src/Bridge/Elasticsearch/Serializer/ItemNormalizer.php

@@ -84,7 +84,7 @@ public function normalize($object, $format = null, array $context = [])
     private function populateIdentifier(array $data, string $class): array
     {
         $identifier = $this->identifierExtractor->getIdentifierFromResourceClass($class);
-        $identifier = null === $this->nameConverter ? $identifier : $this->nameConverter->normalize($identifier);
+        $identifier = null === $this->nameConverter ? $identifier : $this->nameConverter->normalize($identifier, $class, self::FORMAT);
 
         if (!isset($data['_source'][$identifier])) {
             $data['_source'][$identifier] = $data['_id'];

src/Bridge/Elasticsearch/Serializer/NameConverter/InnerFieldsNameConverter.php

@@ -13,6 +13,7 @@
 
 namespace ApiPlatform\Core\Bridge\Elasticsearch\Serializer\NameConverter;
 
+use Symfony\Component\Serializer\NameConverter\AdvancedNameConverterInterface;
 use Symfony\Component\Serializer\NameConverter\CamelCaseToSnakeCaseNameConverter;
 use Symfony\Component\Serializer\NameConverter\NameConverterInterface;
 
@@ -23,7 +24,7 @@
  *
  * @author Baptiste Meyer <baptiste.meyer@gmail.com>
  */
-final class InnerFieldsNameConverter implements NameConverterInterface
+final class InnerFieldsNameConverter implements AdvancedNameConverterInterface
 {
     private $decorated;
 
@@ -35,25 +36,25 @@ public function __construct(?NameConverterInterface $decorated = null)
     /**
      * {@inheritdoc}
      */
-    public function normalize($propertyName)
+    public function normalize($propertyName, string $class = null, string $format = null, $context = [])
     {
-        return $this->convertInnerFields($propertyName, true);
+        return $this->convertInnerFields($propertyName, true, $class, $format, $context);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function denormalize($propertyName)
+    public function denormalize($propertyName, string $class = null, string $format = null, $context = [])
     {
-        return $this->convertInnerFields($propertyName, false);
+        return $this->convertInnerFields($propertyName, false, $class, $format, $context);
     }
 
-    private function convertInnerFields(string $propertyName, bool $normalization): string
+    private function convertInnerFields(string $propertyName, bool $normalization, string $class = null, string $format = null, $context = []): string
     {
         $convertedProperties = [];
 
         foreach (explode('.', $propertyName) as $decomposedProperty) {
-            $convertedProperties[] = $this->decorated->{$normalization ? 'normalize' : 'denormalize'}($decomposedProperty);
+            $convertedProperties[] = $this->decorated->{$normalization ? 'normalize' : 'denormalize'}($decomposedProperty, $class, $format, $context);
         }
 
         return implode('.', $convertedProperties);

src/Bridge/NelmioApiDoc/Parser/ApiPlatformParser.php

@@ -180,7 +180,7 @@ private function getPropertyMetadata(ResourceMetadata $resourceMetadata, string
                 ($propertyMetadata->isReadable() && self::OUT_PREFIX === $io) ||
                 ($propertyMetadata->isWritable() && self::IN_PREFIX === $io)
             ) {
-                $normalizedPropertyName = $this->nameConverter ? $this->nameConverter->normalize($propertyName) : $propertyName;
+                $normalizedPropertyName = $this->nameConverter ? $this->nameConverter->normalize($propertyName, $resourceClass) : $propertyName;
                 $data[$normalizedPropertyName] = $this->parseProperty($resourceMetadata, $propertyMetadata, $io, null, $visited);
             }
         }

src/Bridge/Symfony/Bundle/DependencyInjection/ApiPlatformExtension.php

@@ -25,6 +25,7 @@
 use ApiPlatform\Core\DataProvider\CollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface;
+use ApiPlatform\Core\DataTransformer\DataTransformerInterface;
 use ApiPlatform\Core\Exception\RuntimeException;
 use ApiPlatform\Core\GraphQl\Type\Definition\TypeInterface as GraphQlTypeInterface;
 use Doctrine\Common\Annotations\Annotation;
@@ -79,10 +80,6 @@ public function prepend(ContainerBuilder $container)
         if (!isset($propertyInfoConfig['enabled'])) {
             $container->prependExtensionConfig('framework', ['property_info' => ['enabled' => true]]);
         }
-
-        if (isset($serializerConfig['name_converter'])) {
-            $container->prependExtensionConfig('api_platform', ['name_converter' => $serializerConfig['name_converter']]);
-        }
     }
 
     /**
@@ -149,6 +146,7 @@ public function load(array $configs, ContainerBuilder $container)
         $this->registerMercureConfiguration($container, $config, $loader, $useDoctrine);
         $this->registerMessengerConfiguration($config, $loader);
         $this->registerElasticsearchConfiguration($container, $config, $loader);
+        $this->registerDataTransformerConfiguration($container);
     }
 
     /**
@@ -447,6 +445,7 @@ private function registerCacheConfiguration(ContainerBuilder $container)
         $container->register('api_platform.cache.route_name_resolver', ArrayAdapter::class);
         $container->register('api_platform.cache.identifiers_extractor', ArrayAdapter::class);
         $container->register('api_platform.cache.subresource_operation_factory', ArrayAdapter::class);
+        $container->register('api_platform.elasticsearch.cache.metadata.document', ArrayAdapter::class);
     }
 
     /**
@@ -602,4 +601,10 @@ private function registerElasticsearchConfiguration(ContainerBuilder $container,
         $container->setParameter('api_platform.elasticsearch.hosts', $config['elasticsearch']['hosts']);
         $container->setParameter('api_platform.elasticsearch.mapping', $config['elasticsearch']['mapping']);
     }
+
+    private function registerDataTransformerConfiguration(ContainerBuilder $container)
+    {
+        $container->registerForAutoconfiguration(DataTransformerInterface::class)
+            ->addTag('api_platform.data_transformer');
+    }
 }

src/Bridge/Symfony/Bundle/DependencyInjection/Compiler/MetadataAwareNameConverterPass.php

@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Core\Bridge\Symfony\Bundle\DependencyInjection\Compiler;
+
+use ApiPlatform\Core\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * Injects the metadata aware name converter if available.
+ *
+ * @internal
+ *
+ * @author Antoine Bluchet <soyuka@gmail.com>
+ */
+final class MetadataAwareNameConverterPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @throws RuntimeException
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasAlias('api_platform.name_converter') && $container->hasDefinition('serializer.name_converter.metadata_aware')) {
+            $container->setAlias('api_platform.name_converter', 'serializer.name_converter.metadata_aware');
+        }
+    }
+}

src/Bridge/Symfony/Bundle/Resources/config/api.xml

@@ -99,7 +99,7 @@
             <argument type="service" id="api_platform.item_data_provider" on-invalid="ignore" />
             <argument>%api_platform.allow_plain_identifiers%</argument>
             <argument>null</argument>
-            <argument type="service" id="api_platform.data_transformer" on-invalid="ignore" />
+            <argument type="tagged" tag="api_platform.data_transformer" on-invalid="ignore" />
             <argument type="service" id="api_platform.metadata.resource.metadata_factory" on-invalid="ignore" />
             <argument>true</argument>
 
@@ -287,12 +287,6 @@
         <service id="api_platform.cache.subresource_operation_factory" parent="cache.system" public="false">
             <tag name="cache.pool" />
         </service>
-
-        <service id="api_platform.data_transformer.chain_transformer" class="ApiPlatform\Core\DataTransformer\ChainDataTransformer" public="false">
-            <argument type="tagged" tag="api_platform.data_transformer" />
-        </service>
-
-        <service id="api_platform.data_transformer" alias="api_platform.data_transformer.chain_transformer" />
     </services>
 
 </container>