Merge remote-tracking branch 'upstream/2.4' into merge

Author: soyuka

features/doctrine/search_filter.feature

@@ -415,6 +415,17 @@ Feature: Search filter on collections
     And the JSON node "_embedded.item[1]._links.relatedDummies" should have 3 elements
     And the JSON node "_embedded.item[2]._links.relatedDummies" should have 3 elements
 
+  @createSchema
+  Scenario: Search by related collection id
+    Given there are 2 dummy objects having each 2 relatedDummies
+    When I add "Accept" header equal to "application/hal+json"
+    And I send a "GET" request to "/dummies?relatedDummies=3"
+    Then the response status code should be 200
+    And the response should be in JSON
+    And the JSON node "totalItems" should be equal to "1"
+    And the JSON node "_links.item" should have 1 element
+    And the JSON node "_links.item[0].href" should be equal to "/dummies/2"
+
   @createSchema
   Scenario: Get collection by id equals 9.99 which is not possible
     Given there are 30 dummy objects

features/graphql/introspection.feature

@@ -304,11 +304,10 @@ Feature: GraphQL introspection support
     And the JSON node "data.typeCreateInput.inputFields[0].name" should be equal to "bar"
     And the JSON node "data.typeCreateInput.inputFields[1].name" should be equal to "baz"
     And the JSON node "data.typeCreateInput.inputFields[2].name" should be equal to "clientMutationId"
-    And the JSON node "data.typeCreatePayload.fields" should have 4 elements
+    And the JSON node "data.typeCreatePayload.fields" should have 3 elements
     And the JSON node "data.typeCreatePayload.fields[0].name" should be equal to "id"
     And the JSON node "data.typeCreatePayload.fields[1].name" should be equal to "bar"
-    And the JSON node "data.typeCreatePayload.fields[2].name" should be equal to "baz"
-    And the JSON node "data.typeCreatePayload.fields[3].name" should be equal to "clientMutationId"
+    And the JSON node "data.typeCreatePayload.fields[2].name" should be equal to "clientMutationId"
 
   Scenario: Retrieve an item through a GraphQL query
     Given there are 4 dummy objects with relatedDummy

features/graphql/mutation.feature

@@ -40,6 +40,7 @@ Feature: GraphQL mutation support
     mutation {
       createFoo(input: {name: "A new one", bar: "new", clientMutationId: "myId"}) {
         id
+        _id
         name
         bar
         clientMutationId
@@ -50,10 +51,29 @@ Feature: GraphQL mutation support
     And the response should be in JSON
     And the header "Content-Type" should be equal to "application/json"
     And the JSON node "data.createFoo.id" should be equal to "/foos/1"
+    And the JSON node "data.createFoo._id" should be equal to 1
     And the JSON node "data.createFoo.name" should be equal to "A new one"
     And the JSON node "data.createFoo.bar" should be equal to "new"
     And the JSON node "data.createFoo.clientMutationId" should be equal to "myId"
 
+  Scenario: Create an item without a clientMutationId
+    When I send the following GraphQL request:
+    """
+    mutation {
+      createFoo(input: {name: "Created without mutation id", bar: "works"}) {
+        id
+        name
+        bar
+      }
+    }
+    """
+    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/json"
+    And the JSON node "data.createFoo.id" should be equal to "/foos/2"
+    And the JSON node "data.createFoo.name" should be equal to "Created without mutation id"
+    And the JSON node "data.createFoo.bar" should be equal to "works"
+
   Scenario: Create an item with a subresource
     Given there are 1 dummy objects with relatedDummy
     When I send the following GraphQL request:
@@ -254,7 +274,6 @@ Feature: GraphQL mutation support
       createDummyGroup(input: {bar: "Bar", baz: "Baz", clientMutationId: "myId"}) {
         id
         bar
-        baz
         clientMutationId
       }
     }
@@ -264,7 +283,6 @@ Feature: GraphQL mutation support
     And the header "Content-Type" should be equal to "application/json"
     And the JSON node "data.createDummyGroup.id" should be equal to "/dummy_groups/2"
     And the JSON node "data.createDummyGroup.bar" should be equal to "Bar"
-    And the JSON node "data.createDummyGroup.baz" should be null
     And the JSON node "data.createDummyGroup.clientMutationId" should be equal to "myId"
 
   Scenario: Trigger a validation error

phpstan.neon

@@ -22,7 +22,7 @@ parameters:
         - '#Parameter \#1 \$function of function call_user_func expects callable, .+ given\.#'
         - '#Parameter \#1 \$classes of class ApiPlatform\\Core\\Metadata\\Resource\\ResourceNameCollection constructor expects array<string>, array<int, int\|string> given\.#'
         - '#Method ApiPlatform\\Core\\Util\\RequestParser::parseRequestParams\(\) should return array but returns array\|false\.#'
-        - '#Parameter \#1 \$vars of class GraphQL\\Language\\AST\\(IntValue|ObjectField|ObjectValue|BooleanValue|ListValue|StringValue)Node constructor expects array<GraphQL\\Language\\AST\\Location\|GraphQL\\Language\\AST\\NameNode\|GraphQL\\Language\\AST\\NodeList\|GraphQL\\Language\\AST\\SelectionSetNode\|string\|null>, array<string, .+> given\.#'
+        - '#Parameter \#1 \$vars of class GraphQL\\Language\\AST\\(IntValue|ObjectField|ObjectValue|BooleanValue|ListValue|StringValue)Node constructor expects array<bool\|float\|GraphQL\\Language\\AST\\Location\|GraphQL\\Language\\AST\\NameNode\|GraphQL\\Language\\AST\\NodeList\|GraphQL\\Language\\AST\\SelectionSetNode\|int\|string\|null>, array<string, .+> given\.#'
         - '#Parameter \#1 \$defaultContext of class Symfony\\Component\\Serializer\\Encoder\\Json(De|En)code constructor expects array, (int|true) given\.#'
         - '#Parameter \#(2|3) \$(resourceMetadataFactory|pagination) of class ApiPlatform\\Core\\Bridge\\Doctrine\\Orm\\Extension\\PaginationExtension constructor expects (ApiPlatform\\Core\\Metadata\\Resource\\Factory\\ResourceMetadataFactoryInterface\|Symfony\\Component\\HttpFoundation\\RequestStack|ApiPlatform\\Core\\DataProvider\\Pagination\|ApiPlatform\\Core\\Metadata\\Resource\\Factory\\ResourceMetadataFactoryInterface), stdClass given\.#'
         # Temporary fix while the PHPStan extension for Prophecy isn't compatible with 0.10

src/Annotation/ApiResource.php

@@ -31,6 +31,7 @@
  *     @Attribute("denormalizationContext", type="array"),
  *     @Attribute("deprecationReason", type="string"),
  *     @Attribute("description", type="string"),
+ *     @Attribute("elasticsearch", type="bool"),
  *     @Attribute("fetchPartial", type="bool"),
  *     @Attribute("forceEager", type="bool"),
  *     @Attribute("formats", type="array"),
@@ -137,6 +138,13 @@ final class ApiResource
      */
     private $deprecationReason;
 
+    /**
+     * @see https://github.com/Haehnchen/idea-php-annotation-plugin/issues/112
+     *
+     * @var bool
+     */
+    private $elasticsearch;
+
     /**
      * @see https://github.com/Haehnchen/idea-php-annotation-plugin/issues/112
      *

src/Bridge/Doctrine/Common/DataPersister.php

@@ -13,7 +13,7 @@
 
 namespace ApiPlatform\Core\Bridge\Doctrine\Common;
 
-use ApiPlatform\Core\DataPersister\DataPersisterInterface;
+use ApiPlatform\Core\DataPersister\ContextAwareDataPersisterInterface;
 use ApiPlatform\Core\Util\ClassInfoTrait;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager as DoctrineObjectManager;
@@ -24,7 +24,7 @@
  *
  * @author Baptiste Meyer <[email protected]>
  */
-final class DataPersister implements DataPersisterInterface
+final class DataPersister implements ContextAwareDataPersisterInterface
 {
     use ClassInfoTrait;
 
@@ -38,15 +38,15 @@ public function __construct(ManagerRegistry $managerRegistry)
     /**
      * {@inheritdoc}
      */
-    public function supports($data): bool
+    public function supports($data, array $context = []): bool
     {
         return null !== $this->getManager($data);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function persist($data)
+    public function persist($data, array $context = [])
     {
         if (!$manager = $this->getManager($data)) {
             return $data;
@@ -65,7 +65,7 @@ public function persist($data)
     /**
      * {@inheritdoc}
      */
-    public function remove($data)
+    public function remove($data, array $context = [])
     {
         if (!$manager = $this->getManager($data)) {
             return;

src/Bridge/Doctrine/MongoDbOdm/Filter/RangeFilter.php

@@ -78,7 +78,7 @@ protected function addMatch(Builder $aggregationBuilder, string $field, string $
                     return;
                 }
 
-                $aggregationBuilder->match()->field($matchField)->lte($rangeValue[0])->gte($rangeValue[1]);
+                $aggregationBuilder->match()->field($matchField)->gte($rangeValue[0])->lte($rangeValue[1]);
 
                 break;
             case self::PARAMETER_GREATER_THAN:

src/Bridge/Doctrine/MongoDbOdm/Filter/SearchFilter.php

@@ -135,7 +135,7 @@ protected function filterProperty(string $property, $value, Builder $aggregation
 
         $aggregationBuilder
             ->match()
-            ->field("$matchField.\$id")
+            ->field($matchField)
             ->in($values);
     }
 

src/Bridge/Elasticsearch/DataProvider/CollectionDataProvider.php

@@ -21,6 +21,8 @@
 use ApiPlatform\Core\DataProvider\ContextAwareCollectionDataProviderInterface;
 use ApiPlatform\Core\DataProvider\Pagination;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
+use ApiPlatform\Core\Exception\ResourceClassNotFoundException;
+use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use Elasticsearch\Client;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
@@ -38,18 +40,20 @@ final class CollectionDataProvider implements ContextAwareCollectionDataProvider
     private $identifierExtractor;
     private $denormalizer;
     private $pagination;
+    private $resourceMetadataFactory;
     private $collectionExtensions;
 
     /**
      * @param RequestBodySearchCollectionExtensionInterface[] $collectionExtensions
      */
-    public function __construct(Client $client, DocumentMetadataFactoryInterface $documentMetadataFactory, IdentifierExtractorInterface $identifierExtractor, DenormalizerInterface $denormalizer, Pagination $pagination, iterable $collectionExtensions = [])
+    public function __construct(Client $client, DocumentMetadataFactoryInterface $documentMetadataFactory, IdentifierExtractorInterface $identifierExtractor, DenormalizerInterface $denormalizer, Pagination $pagination, ResourceMetadataFactoryInterface $resourceMetadataFactory, iterable $collectionExtensions = [])
     {
         $this->client = $client;
         $this->documentMetadataFactory = $documentMetadataFactory;
         $this->identifierExtractor = $identifierExtractor;
         $this->denormalizer = $denormalizer;
         $this->pagination = $pagination;
+        $this->resourceMetadataFactory = $resourceMetadataFactory;
         $this->collectionExtensions = $collectionExtensions;
     }
 
@@ -58,6 +62,15 @@ public function __construct(Client $client, DocumentMetadataFactoryInterface $do
      */
     public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
     {
+        try {
+            $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
+            if (false === $resourceMetadata->getCollectionOperationAttribute($operationName, 'elasticsearch', true, true)) {
+                return false;
+            }
+        } catch (ResourceClassNotFoundException $e) {
+            return false;
+        }
+
         try {
             $this->documentMetadataFactory->create($resourceClass);
         } catch (IndexNotFoundException $e) {

src/Bridge/Elasticsearch/DataProvider/ItemDataProvider.php

@@ -20,6 +20,8 @@
 use ApiPlatform\Core\Bridge\Elasticsearch\Serializer\ItemNormalizer;
 use ApiPlatform\Core\DataProvider\ItemDataProviderInterface;
 use ApiPlatform\Core\DataProvider\RestrictedDataProviderInterface;
+use ApiPlatform\Core\Exception\ResourceClassNotFoundException;
+use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
 use Elasticsearch\Client;
 use Elasticsearch\Common\Exceptions\Missing404Exception;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
@@ -38,20 +40,31 @@ final class ItemDataProvider implements ItemDataProviderInterface, RestrictedDat
     private $documentMetadataFactory;
     private $identifierExtractor;
     private $denormalizer;
+    private $resourceMetadataFactory;
 
-    public function __construct(Client $client, DocumentMetadataFactoryInterface $documentMetadataFactory, IdentifierExtractorInterface $identifierExtractor, DenormalizerInterface $denormalizer)
+    public function __construct(Client $client, DocumentMetadataFactoryInterface $documentMetadataFactory, IdentifierExtractorInterface $identifierExtractor, DenormalizerInterface $denormalizer, ResourceMetadataFactoryInterface $resourceMetadataFactory)
     {
         $this->client = $client;
         $this->documentMetadataFactory = $documentMetadataFactory;
         $this->identifierExtractor = $identifierExtractor;
         $this->denormalizer = $denormalizer;
+        $this->resourceMetadataFactory = $resourceMetadataFactory;
     }
 
     /**
      * {@inheritdoc}
      */
     public function supports(string $resourceClass, ?string $operationName = null, array $context = []): bool
     {
+        try {
+            $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
+            if (false === $resourceMetadata->getItemOperationAttribute($operationName, 'elasticsearch', true, true)) {
+                return false;
+            }
+        } catch (ResourceClassNotFoundException $e) {
+            return false;
+        }
+
         try {
             $this->documentMetadataFactory->create($resourceClass);
         } catch (IndexNotFoundException $e) {