WIP - Subresource maxDepth

.gitignore

@@ -6,3 +6,4 @@
 /vendor/
 /tests/Fixtures/app/cache/*
 /tests/Fixtures/app/logs/*
+/.idea

.travis.yml

@@ -35,8 +35,7 @@ before_install:
   - export PATH="$PATH:$HOME/.composer/vendor/bin"
 
 install:
-  - if [[ $deps = 'beta' ]]; then composer config minimum-stability beta; fi
-  - if [[ $deps != 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --ansi; fi
+  - if [[ ! $deps ]]; then composer update --prefer-dist --no-progress --no-suggest --ansi; fi
   - if [[ $deps = 'low' ]]; then composer update --prefer-dist --no-progress --no-suggest --prefer-stable --prefer-lowest --ansi; fi
 
 script:

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 2.2.0
+
+* Add GraphQL support
+* Add JSONAPI support
+* Add a new `@ApiFilter` annotation to directly configure filters from resource classes
+* Add a partial paginator that prevents `COUNT()` SQL queries
+* Add an option to serialize Validator's payloads (e.g. error levels)
+* Add support for generators in data providers
+* Add a new `allow_plain_identifiers` option to allow using plain IDs as identifier instead of IRIs
+* Add support for resource names without namespace
+* Automatically enable FOSUser support if the bundle is installed
+* Add an `AbstractCollectionNormalizer` to help supporting custom formats
+* Deprecate NelmioApiDocBundle 2 support (upgrade to v3, it has native API Platform support)
+* Deprecate the `ApiPlatform\Core\Bridge\Doctrine\EventListener\WriteListener` class in favor of the new `ApiPlatform\Core\EventListener\WriteListener` class.
+* Delete the `api_platform.doctrine.listener.view.write` event listener service.
+* Add a data persistence layer with a new `ApiPlatform\Core\DataPersister\DataPersisterInterface` interface.
+
 ## 2.1.3
 
 * Don't use dynamic values in Varnish-related service keys (improves Symfony 3.3 compatibility)

README.md

@@ -18,4 +18,4 @@ high performance API-first projects. Extend or override everything you want.
 
 ## Documentation
 
-The documentation of API Platform can be browsed [on the official website](https://api-platform.com/docs/).
+The documentation of API Platform Core Library can be browsed [on the official website](https://api-platform.com/docs/core).

behat.yml.dist

@@ -3,9 +3,11 @@ default:
     default:
       contexts:
         - 'FeatureContext': { doctrine: '@doctrine' }
+        - 'GraphqlContext'
         - 'HydraContext'
         - 'SwaggerContext'
         - 'HttpCacheContext'
+        - 'JsonApiContext': { doctrine: '@doctrine', jsonApiSchemaFile: 'tests/Fixtures/JsonSchema/jsonapi.json' }
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'
         - 'Behatch\Context\JsonContext'
@@ -28,9 +30,11 @@ coverage:
     default:
       contexts:
         - 'FeatureContext': { doctrine: '@doctrine' }
+        - 'GraphqlContext'
         - 'HydraContext'
         - 'SwaggerContext'
         - 'HttpCacheContext'
+        - 'JsonApiContext': { doctrine: '@doctrine', jsonApiSchemaFile: 'tests/Fixtures/JsonSchema/jsonapi.json' }
         - 'CoverageContext'
         - 'Behat\MinkExtension\Context\MinkContext'
         - 'Behatch\Context\RestContext'

composer.json

@@ -37,6 +37,7 @@
         "doctrine/annotations": "^1.2",
         "friendsofsymfony/user-bundle": "^2.0",
         "guzzlehttp/guzzle": "^6.0",
+        "justinrainbow/json-schema": "^1.5",
         "nelmio/api-doc-bundle": "^2.11.2",
         "php-mock/php-mock-phpunit": "^2.0",
         "phpdocumentor/reflection-docblock": "^3.0 || ^4.0",
@@ -62,7 +63,8 @@
         "symfony/security-bundle": "^3.0 || ^4.0",
         "symfony/twig-bundle": "^3.1 || ^4.0",
         "symfony/validator": "^3.3 || ^4.0",
-        "symfony/yaml": "^3.3 || ^4.0"
+        "symfony/yaml": "^3.3 || ^4.0",
+        "webonyx/graphql-php": "^0.10.2"
     },
     "conflict": {
         "symfony/dependency-injection": "<3.3"
@@ -76,7 +78,8 @@
         "symfony/expression-language": "To use authorization features.",
         "symfony/config": "To load XML configuration files.",
         "symfony/security": "To use authorization features.",
-        "symfony/twig-bundle": "To use the Swagger UI integration."
+        "symfony/twig-bundle": "To use the Swagger UI integration.",
+        "webonyx/graphql-php": "To support GraphQL."
     },
     "autoload": {
         "psr-4": { "ApiPlatform\\Core\\": "src/" }
@@ -86,7 +89,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev"
+            "dev-master": "2.2.x-dev"
         }
     }
 }

features/bootstrap/FeatureContext.php

@@ -14,6 +14,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Answer;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeItem;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeLabel;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositePrimitiveItem;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\CompositeRelation;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Container;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy;
@@ -38,6 +39,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedToDummyFriend;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelationEmbedder;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\ThirdLevel;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\User;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\UuidIdentifierDummy;
 use Behat\Behat\Context\Context;
@@ -258,6 +260,31 @@ public function thereIsDummyObjectsWithRelatedDummy(int $nb)
         $this->manager->flush();
     }
 
+    /**
+     * @Given there is :nb dummy objects with relatedDummy and its thirdLevel
+     */
+    public function thereIsDummyObjectsWithRelatedDummyAndItsThirdLevel(int $nb)
+    {
+        for ($i = 1; $i <= $nb; ++$i) {
+            $thirdLevel = new ThirdLevel();
+
+            $relatedDummy = new RelatedDummy();
+            $relatedDummy->setName('RelatedDummy #'.$i);
+            $relatedDummy->setThirdLevel($thirdLevel);
+
+            $dummy = new Dummy();
+            $dummy->setName('Dummy #'.$i);
+            $dummy->setAlias('Alias #'.($nb - $i));
+            $dummy->setRelatedDummy($relatedDummy);
+
+            $this->manager->persist($thirdLevel);
+            $this->manager->persist($relatedDummy);
+            $this->manager->persist($dummy);
+        }
+
+        $this->manager->flush();
+    }
+
     /**
      * @Given there is :nb dummy objects with embeddedDummy
      */
@@ -341,7 +368,7 @@ public function thereIsDummyObjectsWithDummyDateAndDummyBoolean(int $nb, string
             $bool = false;
         } else {
             $expected = ['true', 'false', '1', '0'];
-            throw new InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
+            throw new \InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
         }
 
         for ($i = 1; $i <= $nb; ++$i) {
@@ -395,7 +422,7 @@ public function thereIsDummyObjectsWithDummyDateAndRelatedDummy(int $nb)
     /**
      * @Given there is :nb embedded dummy objects with dummyDate and embeddedDummy
      */
-    public function thereIsDummyObjectsWithDummyDateAndEmbeddedDummy($nb)
+    public function thereIsDummyObjectsWithDummyDateAndEmbeddedDummy(int $nb)
     {
         for ($i = 1; $i <= $nb; ++$i) {
             $date = new \DateTime(sprintf('2015-04-%d', $i), new \DateTimeZone('UTC'));
@@ -450,7 +477,7 @@ public function thereIsDummyObjectsWithDummyBoolean(int $nb, string $bool)
             $bool = false;
         } else {
             $expected = ['true', 'false', '1', '0'];
-            throw new InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
+            throw new \InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
         }
         $descriptions = ['Smart dummy.', 'Not so smart dummy.'];
 
@@ -478,7 +505,7 @@ public function thereIsDummyObjectsWithEmbeddedDummyBoolean(int $nb, string $boo
             $bool = false;
         } else {
             $expected = ['true', 'false', '1', '0'];
-            throw new InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
+            throw new \InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
         }
 
         for ($i = 1; $i <= $nb; ++$i) {
@@ -505,7 +532,7 @@ public function thereIsDummyObjectsWithRelationEmbeddedDummyBoolean(int $nb, str
             $bool = false;
         } else {
             $expected = ['true', 'false', '1', '0'];
-            throw new InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
+            throw new \InvalidArgumentException(sprintf('Invalid boolean value for "%s" property, expected one of ( "%s" )', $bool, implode('" | "', $expected)));
         }
 
         for ($i = 1; $i <= $nb; ++$i) {
@@ -577,6 +604,23 @@ public function thereIsACompositeIdentifierObject()
         $this->manager->clear();
     }
 
+    /**
+     * @Given there are composite primitive identifiers objects
+     */
+    public function thereAreCompositePrimitiveIdentifiersObjects()
+    {
+        $foo = new CompositePrimitiveItem('Foo', 2016);
+        $foo->setDescription('This is foo.');
+        $this->manager->persist($foo);
+
+        $bar = new CompositePrimitiveItem('Bar', 2017);
+        $bar->setDescription('This is bar.');
+        $this->manager->persist($bar);
+
+        $this->manager->flush();
+        $this->manager->clear();
+    }
+
     /**
      * @Given there is a FileConfigDummy object
      */
@@ -596,6 +640,9 @@ public function thereIsAFileConfigDummyObject()
     public function thereIsAFooEntityWithRelatedBars()
     {
         $foo = new DummyCar();
+        $foo->setName('mustli');
+        $foo->setCanSell(true);
+        $foo->setAvailableAt(new \DateTime());
         $this->manager->persist($foo);
 
         $bar1 = new DummyCarColor();

features/bootstrap/GraphqlContext.php

@@ -0,0 +1,95 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * 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\Behat\Context\Context;
+use Behat\Behat\Context\Environment\InitializedContextEnvironment;
+use Behat\Behat\Hook\Scope\BeforeScenarioScope;
+use Behat\Gherkin\Node\PyStringNode;
+use Behatch\Context\RestContext;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Context for GraphQL.
+ *
+ * @author Alan Poulain <[email protected]>
+ */
+final class GraphqlContext implements Context
+{
+    /**
+     * @var RestContext
+     */
+    private $restContext;
+
+    /**
+     * @var array
+     */
+    private $graphqlRequest;
+
+    /**
+     * @var int
+     */
+    private $graphqlLine;
+
+    /**
+     * Gives access to the Behatch context.
+     *
+     * @BeforeScenario
+     */
+    public function gatherContexts(BeforeScenarioScope $scope)
+    {
+        /** @var InitializedContextEnvironment $environment */
+        $environment = $scope->getEnvironment();
+        $this->restContext = $environment->getContext(RestContext::class);
+    }
+
+    /**
+     * @When I have the following GraphQL request:
+     */
+    public function IHaveTheFollowingGraphqlRequest(PyStringNode $request)
+    {
+        $this->graphqlRequest = ['query' => $request->getRaw()];
+        $this->graphqlLine = $request->getLine();
+    }
+
+    /**
+     * @When I send the following GraphQL request:
+     */
+    public function ISendTheFollowingGraphqlRequest(PyStringNode $request)
+    {
+        $this->IHaveTheFollowingGraphqlRequest($request);
+        $this->sendGraphqlRequest();
+    }
+
+    /**
+     * @When I send the GraphQL request with variables:
+     */
+    public function ISendTheGraphqlRequestWithVariables(PyStringNode $variables)
+    {
+        $this->graphqlRequest['variables'] = $variables->getRaw();
+        $this->sendGraphqlRequest();
+    }
+
+    /**
+     * @When I send the GraphQL request with operation :operation
+     */
+    public function ISendTheGraphqlRequestWithOperation(string $operation)
+    {
+        $this->graphqlRequest['operation'] = $operation;
+        $this->sendGraphqlRequest();
+    }
+
+    private function sendGraphqlRequest()
+    {
+        $this->restContext->iSendARequestTo(Request::METHOD_GET, '/graphql?'.http_build_query($this->graphqlRequest));
+    }
+}