Convert HTTP method to uppercase

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.5.0 beta 1
+
+* GraphQL: Add support for custom types
+
 ## 2.4.2
 
 * Fix a dependency injection injection problem in `FilterEagerLoadingExtension`
@@ -105,7 +109,7 @@
 * Allow to set the HTTP status code to send to the client through the `status` attribute
 * Add support for the `Sunset` HTTP header using the `sunset` attribute
 * Set the `Content-Location` and `Location` headers when appropriate for better RFC7231 conformance
-* Display the matching data provider and data persiter in the debug panel
+* Display the matching data provider and data persister in the debug panel
 * GraphQL: improve performance by lazy loading types
 * Add the `api_persist` request attribute to enable or disable the `WriteListener`
 * Allow to set a default context in all normalizers

behat.yml.dist

@@ -2,6 +2,7 @@ default:
   suites:
     default:
       contexts:
+        - 'CommandContext'
         - 'DoctrineContext':
             doctrine: '@doctrine'
         - 'HttpHeaderContext'
@@ -21,6 +22,7 @@ default:
         tags: '~@postgres&&~@mongodb&&~@elasticsearch'
     postgres:
       contexts:
+        - 'CommandContext'
         - 'DoctrineContext':
             doctrine: '@doctrine'
         - 'HttpHeaderContext'
@@ -40,6 +42,7 @@ default:
         tags: '~@sqlite&&~@mongodb&&~@elasticsearch'
     mongodb:
       contexts:
+        - 'CommandContext'
         - 'DoctrineContext':
             doctrine: '@doctrine_mongodb'
         - 'HttpHeaderContext'
@@ -89,6 +92,7 @@ coverage:
   suites:
     default:
       contexts:
+        - 'CommandContext'
         - 'DoctrineContext':
             doctrine: '@doctrine'
         - 'HttpHeaderContext'

features/bootstrap/CommandContext.php

@@ -0,0 +1,105 @@
+<?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);
+
+use Behat\Gherkin\Node\PyStringNode;
+use Behat\Gherkin\Node\TableNode;
+use Behat\Symfony2Extension\Context\KernelAwareContext;
+use PHPUnit\Framework\Assert;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Component\HttpKernel\KernelInterface;
+
+/**
+ * Context for Symfony commands.
+ *
+ * @author Alan Poulain <contact@alanpoulain.eu>
+ */
+final class CommandContext implements KernelAwareContext
+{
+    /**
+     * @var KernelInterface
+     */
+    private $kernel;
+
+    /**
+     * @var Application
+     */
+    private $application;
+
+    /**
+     * @var CommandTester
+     */
+    private $commandTester;
+
+    /**
+     * @When I run the command :command
+     */
+    public function iRunTheCommand(string $command): void
+    {
+        $command = $this->getApplication()->find($command);
+
+        $this->getCommandTester($command)->execute([]);
+    }
+
+    /**
+     * @When I run the command :command with options:
+     */
+    public function iRunTheCommandWithOptions(string $command, TableNode $options): void
+    {
+        $command = $this->getApplication()->find($command);
+
+        $this->getCommandTester($command)->execute($options->getRowsHash());
+    }
+
+    /**
+     * @Then the command output should be:
+     */
+    public function theCommandOutputShouldBe(PyStringNode $expectedOutput): void
+    {
+        Assert::assertEquals($expectedOutput->getRaw(), $this->commandTester->getDisplay());
+    }
+
+    /**
+     * @Then the command output should contain:
+     */
+    public function theCommandOutputShouldContain(PyStringNode $expectedOutput): void
+    {
+        $expectedOutput = str_replace('###', '"""', $expectedOutput->getRaw());
+
+        Assert::assertContains($expectedOutput, $this->commandTester->getDisplay());
+    }
+
+    public function setKernel(KernelInterface $kernel): void
+    {
+        $this->kernel = $kernel;
+    }
+
+    public function getApplication(): Application
+    {
+        if (null !== $this->application) {
+            return $this->application;
+        }
+
+        $this->application = new Application($this->kernel);
+
+        return $this->application;
+    }
+
+    private function getCommandTester(Command $command): CommandTester
+    {
+        $this->commandTester = new CommandTester($command);
+
+        return $this->commandTester;
+    }
+}

features/bootstrap/DoctrineContext.php

@@ -22,6 +22,8 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\DummyAggregateOffer as DummyAggregateOfferDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\DummyCar as DummyCarDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\DummyCarColor as DummyCarColorDocument;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\DummyCustomMutation as DummyCustomMutationDocument;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\DummyCustomQuery as DummyCustomQueryDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\DummyDate as DummyDateDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\DummyDtoCustom as DummyDtoCustomDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\DummyDtoNoInput as DummyDtoNoInputDocument;
@@ -50,6 +52,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\RelatedToDummyFriend as RelatedToDummyFriendDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\RelationEmbedder as RelationEmbedderDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\SecuredDummy as SecuredDummyDocument;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\SoMany as SoManyDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\ThirdLevel as ThirdLevelDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Document\User as UserDocument;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Address;
@@ -64,6 +67,8 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyAggregateOffer;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyCar;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyCarColor;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyCustomMutation;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyCustomQuery;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyDate;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyDtoCustom;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\DummyDtoNoInput;
@@ -95,6 +100,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedToDummyFriend;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelationEmbedder;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\SecuredDummy;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\SoMany;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\ThirdLevel;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\User;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\UuidIdentifierDummy;
@@ -165,6 +171,21 @@ public function thereAreDummyObjects(int $nb)
         $this->manager->flush();
     }
 
+    /**
+     * @Given there are :nb of these so many objects
+     */
+    public function thereAreOfTheseSoManyObjects(int $nb)
+    {
+        for ($i = 1; $i <= $nb; ++$i) {
+            $dummy = $this->isOrm() ? new SoMany() : new SoManyDocument();
+            $dummy->content = 'Many #'.$i;
+
+            $this->manager->persist($dummy);
+        }
+
+        $this->manager->flush();
+    }
+
     /**
      * @Given there are :nb foo objects with fake names
      */
@@ -402,6 +423,35 @@ public function thereAreDummyDtoNoOutputObjects(int $nb)
         $this->manager->flush();
     }
 
+    /**
+     * @Given there are :nb dummyCustomQuery objects
+     */
+    public function thereAreDummyCustomQueryObjects(int $nb)
+    {
+        for ($i = 1; $i <= $nb; ++$i) {
+            $dummyCustomQuery = $this->buildDummyCustomQuery();
+
+            $this->manager->persist($dummyCustomQuery);
+        }
+
+        $this->manager->flush();
+    }
+
+    /**
+     * @Given there are :nb dummyCustomMutation objects
+     */
+    public function thereAreDummyCustomMutationObjects(int $nb)
+    {
+        for ($i = 1; $i <= $nb; ++$i) {
+            $customMutationDummy = $this->buildDummyCustomMutation();
+            $customMutationDummy->setOperandA(3);
+
+            $this->manager->persist($customMutationDummy);
+        }
+
+        $this->manager->flush();
+    }
+
     /**
      * @Given there are :nb dummy objects with JSON and array data
      */
@@ -1320,6 +1370,22 @@ private function buildDummyDtoNoOutput()
         return $this->isOrm() ? new DummyDtoNoOutput() : new DummyDtoNoOutputDocument();
     }
 
+    /**
+     * @return DummyCustomQuery|DummyCustomQueryDocument
+     */
+    private function buildDummyCustomQuery()
+    {
+        return $this->isOrm() ? new DummyCustomQuery() : new DummyCustomQueryDocument();
+    }
+
+    /**
+     * @return DummyCustomMutation|DummyCustomMutationDocument
+     */
+    private function buildDummyCustomMutation()
+    {
+        return $this->isOrm() ? new DummyCustomMutation() : new DummyCustomMutationDocument();
+    }
+
     /**
      * @return DummyFriend|DummyFriendDocument
      */

features/doctrine/date_filter.feature

@@ -413,7 +413,7 @@ Feature: Date filter on collections
       },
       "hydra:search": {
         "@type": "hydra:IriTemplate",
-        "hydra:template": "/dummies{?dummyBoolean,relatedDummy.embeddedDummy.dummyBoolean,dummyDate[before],dummyDate[strictly_before],dummyDate[after],dummyDate[strictly_after],relatedDummy.dummyDate[before],relatedDummy.dummyDate[strictly_before],relatedDummy.dummyDate[after],relatedDummy.dummyDate[strictly_after],description[exists],relatedDummy.name[exists],dummyBoolean[exists],relatedDummy[exists],dummyFloat,dummyFloat[],dummyPrice,dummyPrice[],order[id],order[name],order[description],order[relatedDummy.name],order[relatedDummy.symfony],order[dummyDate],dummyFloat[between],dummyFloat[gt],dummyFloat[gte],dummyFloat[lt],dummyFloat[lte],dummyPrice[between],dummyPrice[gt],dummyPrice[gte],dummyPrice[lt],dummyPrice[lte],id,id[],name,alias,description,relatedDummy.name,relatedDummy.name[],relatedDummies,relatedDummies[],dummy,relatedDummies.name,relatedDummy.thirdLevel.level,relatedDummy.thirdLevel.level[],relatedDummy.thirdLevel.fourthLevel.level,relatedDummy.thirdLevel.fourthLevel.level[],relatedDummy.thirdLevel.badFourthLevel.level,relatedDummy.thirdLevel.badFourthLevel.level[],relatedDummy.thirdLevel.fourthLevel.badThirdLevel.level,relatedDummy.thirdLevel.fourthLevel.badThirdLevel.level[],properties[]}",
+        "hydra:template": "/dummies{?dummyBoolean,relatedDummy.embeddedDummy.dummyBoolean,dummyDate[before],dummyDate[strictly_before],dummyDate[after],dummyDate[strictly_after],relatedDummy.dummyDate[before],relatedDummy.dummyDate[strictly_before],relatedDummy.dummyDate[after],relatedDummy.dummyDate[strictly_after],exists[alias],exists[description],exists[relatedDummy.name],exists[dummyBoolean],exists[relatedDummy],dummyFloat,dummyFloat[],dummyPrice,dummyPrice[],order[id],order[name],order[description],order[relatedDummy.name],order[relatedDummy.symfony],order[dummyDate],dummyFloat[between],dummyFloat[gt],dummyFloat[gte],dummyFloat[lt],dummyFloat[lte],dummyPrice[between],dummyPrice[gt],dummyPrice[gte],dummyPrice[lt],dummyPrice[lte],id,id[],name,alias,description,relatedDummy.name,relatedDummy.name[],relatedDummies,relatedDummies[],dummy,relatedDummies.name,relatedDummy.thirdLevel.level,relatedDummy.thirdLevel.level[],relatedDummy.thirdLevel.fourthLevel.level,relatedDummy.thirdLevel.fourthLevel.level[],relatedDummy.thirdLevel.badFourthLevel.level,relatedDummy.thirdLevel.badFourthLevel.level[],relatedDummy.thirdLevel.fourthLevel.badThirdLevel.level,relatedDummy.thirdLevel.fourthLevel.badThirdLevel.level[],properties[]}",
         "hydra:variableRepresentation": "BasicRepresentation",
         "hydra:mapping": [
           {
@@ -478,25 +478,31 @@ Feature: Date filter on collections
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "description[exists]",
+            "variable": "exists[alias]",
+            "property": "alias",
+            "required": false
+          },
+          {
+            "@type": "IriTemplateMapping",
+            "variable": "exists[description]",
             "property": "description",
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "relatedDummy.name[exists]",
+            "variable": "exists[relatedDummy.name]",
             "property": "relatedDummy.name",
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "dummyBoolean[exists]",
+            "variable": "exists[dummyBoolean]",
             "property": "dummyBoolean",
             "required": false
           },
           {
             "@type": "IriTemplateMapping",
-            "variable": "relatedDummy[exists]",
+            "variable": "exists[relatedDummy]",
             "property": "relatedDummy",
             "required": false
           },
@@ -840,7 +846,7 @@ Feature: Date filter on collections
           },
           "hydra:search": {
               "@type": "hydra:IriTemplate",
-              "hydra:template": "/dummies{?dummyBoolean,dummyDate[before],dummyDate[after],relatedDummy.dummyDate[before],relatedDummy.dummyDate[strictly_before],relatedDummy.dummyDate[after],relatedDummy.dummyDate[strictly_after],description[exists],relatedDummy.name[exists],dummyBoolean[exists],relatedDummy[exists],dummyFloat,dummyPrice,order[id],order[name],order[relatedDummy.symfony],dummyFloat[between],dummyFloat[gt],dummyFloat[gte],dummyFloat[lt],dummyFloat[lte],dummyPrice[between],dummyPrice[gt],dummyPrice[gte],dummyPrice[lt],dummyPrice[lte],id,id[],name,alias,description,relatedDummy.name,relatedDummy.name[],relatedDummies,relatedDummies[],dummy,relatedDummies.name}",
+              "hydra:template": "/dummies{?dummyBoolean,dummyDate[before],dummyDate[after],relatedDummy.dummyDate[before],relatedDummy.dummyDate[strictly_before],relatedDummy.dummyDate[after],relatedDummy.dummyDate[strictly_after],exists[description],exists[relatedDummy.name],exists[dummyBoolean],exists[relatedDummy],dummyFloat,dummyPrice,order[id],order[name],order[relatedDummy.symfony],dummyFloat[between],dummyFloat[gt],dummyFloat[gte],dummyFloat[lt],dummyFloat[lte],dummyPrice[between],dummyPrice[gt],dummyPrice[gte],dummyPrice[lt],dummyPrice[lte],id,id[],name,alias,description,relatedDummy.name,relatedDummy.name[],relatedDummies,relatedDummies[],dummy,relatedDummies.name}",
               "hydra:variableRepresentation": "BasicRepresentation",
               "hydra:mapping": [
                   {
@@ -899,25 +905,25 @@ Feature: Date filter on collections
                   },
                   {
                       "@type": "IriTemplateMapping",
-                      "variable": "description[exists]",
+                      "variable": "exists[description]",
                       "property": "description",
                       "required": false
                   },
                   {
                       "@type": "IriTemplateMapping",
-                      "variable": "relatedDummy.name[exists]",
+                      "variable": "exists[relatedDummy.name]",
                       "property": "relatedDummy.name",
                       "required": false
                   },
                   {
                     "@type": "IriTemplateMapping",
-                    "variable": "relatedDummy[exists]",
+                    "variable": "exists[relatedDummy]",
                     "property": "relatedDummy",
                     "required": false
                   },
                   {
                       "@type": "IriTemplateMapping",
-                      "variable": "dummyBoolean[exists]",
+                      "variable": "exists[dummyBoolean]",
                       "property": "dummyBoolean",
                       "required": false
                   },

features/doctrine/exists_filter.feature

@@ -6,7 +6,7 @@ Feature: Exists filter on collections
   @createSchema
   Scenario: Get collection where exists does not exist
     Given there are 15 dummy objects with dummyBoolean true
-    When I send a "GET" request to "/dummies?dummyBoolean[exists]=0"
+    When I send a "GET" request to "/dummies?exists[dummyBoolean]=0"
     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"
@@ -26,7 +26,7 @@ Feature: Exists filter on collections
         "hydra:view": {
           "type": "object",
           "properties": {
-            "@id": {"pattern": "^/dummies\\?dummyBoolean%5Bexists%5D=0$"},
+            "@id": {"pattern": "^/dummies\\?exists%5BdummyBoolean%5D=0$"},
             "@type": {"pattern": "^hydra:PartialCollectionView$"}
           }
         }
@@ -35,7 +35,7 @@ Feature: Exists filter on collections
     """
 
   Scenario: Get collection where exists does exist
-    When I send a "GET" request to "/dummies?dummyBoolean[exists]=1"
+    When I send a "GET" request to "/dummies?exists[dummyBoolean]=1"
     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"
@@ -55,7 +55,7 @@ Feature: Exists filter on collections
         "hydra:view": {
           "type": "object",
           "properties": {
-            "@id": {"pattern": "^/dummies\\?dummyBoolean%5Bexists%5D=1&page=1$"},
+            "@id": {"pattern": "^/dummies\\?exists%5BdummyBoolean%5D=1&page=1$"},
             "@type": {"pattern": "^hydra:PartialCollectionView$"}
           }
         }