Merge remote-tracking branch 'dunglas/fix-null-classname' into feat-i…

…nput-output
api-platform · Oct 4, 2018 · b43fc65 · b43fc65
2 parents 44170be + b08731f
commit b43fc65
Show file tree

Hide file tree

Showing 18 changed files with 265 additions and 38 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -164,9 +164,6 @@ jobs:
   behat-coverage:
     docker:
       - image: circleci/php:7.2-node-browsers
-    environment:
-      SYMFONY_DEPRECATIONS_HELPER: weak_vendors
-      APP_ENV: test
     parallelism: 2
     working_directory: ~/api-platform/core
     steps:

diff --git a/.travis.yml b/.travis.yml
@@ -6,11 +6,6 @@ cache:
     - $HOME/.composer/cache
     - $HOME/.npm
 
-env:
-  global:
-    - SYMFONY_DEPRECATIONS_HELPER=weak_vendors
-    - APP_ENV=test
-
 jobs:
   include:
     - php: '7.1'

diff --git a/appveyor.yml b/appveyor.yml
@@ -5,10 +5,6 @@ clone_folder: c:\projects\api-platform\core
 cache:
   - '%LOCALAPPDATA%\Composer\files'
 
-environment:
-  SYMFONY_DEPRECATIONS_HELPER: weak_vendors
-  APP_ENV: test
-
 install:
   - ps: Set-Service wuauserv -StartupType Manual
   - cinst -y php composer

diff --git a/features/bootstrap/FeatureContext.php b/features/bootstrap/FeatureContext.php
@@ -35,6 +35,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\FooDummy;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\FourthLevel;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Greeting;
+use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\MaxDepthDummy;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Node;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Person;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\PersonToPet;
@@ -1024,4 +1025,22 @@ public function thereIsAPersonWithAGreeting(string $name, string $message)
         $this->manager->flush();
         $this->manager->clear();
     }
+
+    /**
+     * @Given there is a max depth dummy with :level level of descendants
+     */
+    public function thereIsAMaxDepthDummyWithLevelOfDescendants(int $level)
+    {
+        $maxDepthDummy = new MaxDepthDummy();
+        $maxDepthDummy->name = "level $level";
+        $this->manager->persist($maxDepthDummy);
+
+        for ($i = 1; $i <= $level; ++$i) {
+            $maxDepthDummy = $maxDepthDummy->child = new MaxDepthDummy();
+            $maxDepthDummy->name = 'level '.($i + 1);
+            $this->manager->persist($maxDepthDummy);
+        }
+
+        $this->manager->flush();
+    }
 }
diff --git a/features/doctrine/search_filter.feature b/features/doctrine/search_filter.feature
@@ -374,6 +374,35 @@ Feature: Search filter on collections
     }
     """
 
+  @sqlite
+  Scenario: Search for entities with an existing collection route name
+    When I send a "GET" request to "/dummies?relatedDummies=dummy_cars"
+    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 JSON should be valid according to this schema:
+    """
+    {
+      "type": "object",
+      "properties": {
+        "@context": {"pattern": "^/contexts/Dummy$"},
+        "@id": {"pattern": "^/dummies$"},
+        "@type": {"pattern": "^hydra:Collection$"},
+        "hydra:member": {
+          "type": "array",
+          "maxItems": 0
+        },
+        "hydra:view": {
+          "type": "object",
+          "properties": {
+            "@id": {"pattern": "^/dummies\\?relatedDummies=dummy_cars"},
+            "@type": {"pattern": "^hydra:PartialCollectionView$"}
+          }
+        }
+      }
+    }
+    """
+
   @createSchema
   Scenario: Search related collection by name
     Given there are 3 dummy objects having each 3 relatedDummies

diff --git a/features/hal/max_depth.feature b/features/hal/max_depth.feature
@@ -7,7 +7,7 @@ Feature: Max depth handling
   Scenario: Create a resource with 1 level of descendants
     When I add "Accept" header equal to "application/hal+json"
     And I add "Content-Type" header equal to "application/json"
-    And I send a "POST" request to "/max_depth_dummies" with body:
+    And I send a "POST" request to "/max_depth_eager_dummies" with body:
     """
     {
       "name": "level 1",
@@ -24,17 +24,17 @@ Feature: Max depth handling
     {
       "_links": {
         "self": {
-          "href": "\/max_depth_dummies\/1"
+          "href": "\/max_depth_eager_dummies\/1"
         },
         "child": {
-          "href": "\/max_depth_dummies\/2"
+          "href": "\/max_depth_eager_dummies\/2"
         }
       },
       "_embedded": {
         "child": {
           "_links": {
             "self": {
-              "href": "\/max_depth_dummies\/2"
+              "href": "\/max_depth_eager_dummies\/2"
             }
           },
           "id": 2,
@@ -46,8 +46,54 @@ Feature: Max depth handling
     }
     """
 
-  @dropSchema
   Scenario: Add a 2nd level of descendants
+    When I add "Accept" header equal to "application/hal+json"
+    And I add "Content-Type" header equal to "application/json"
+    And I send a "PUT" request to "max_depth_eager_dummies/1" with body:
+    """
+    {
+      "id": "/max_depth_eager_dummies/1",
+      "child": {
+        "id": "/max_depth_eager_dummies/2",
+        "child": {
+          "name": "level 3"
+        }
+      }
+    }
+    """
+    And the response status code should be 200
+    And the response should be in JSON
+    And the header "Content-Type" should be equal to "application/hal+json; charset=utf-8"
+    And the JSON should be equal to:
+    """
+    {
+      "_links": {
+        "self": {
+          "href": "\/max_depth_eager_dummies\/1"
+        },
+        "child": {
+          "href": "\/max_depth_eager_dummies\/2"
+        }
+      },
+      "_embedded": {
+        "child": {
+          "_links": {
+            "self": {
+              "href": "\/max_depth_eager_dummies\/2"
+            }
+          },
+          "id": 2,
+          "name": "level 2"
+        }
+      },
+      "id": 1,
+      "name": "level 1"
+    }
+    """
+
+  @dropSchema
+  Scenario: Add a 2nd level of descendants when eager fetching is disabled
+    Given there is a max depth dummy with 1 level of descendants
     When I add "Accept" header equal to "application/hal+json"
     And I add "Content-Type" header equal to "application/json"
     And I send a "PUT" request to "max_depth_dummies/1" with body:
@@ -62,7 +108,7 @@ Feature: Max depth handling
       }
     }
     """
-    And the response status code should be 200
+    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/hal+json; charset=utf-8"
     And the JSON should be equal to:

diff --git a/features/jsonld/max_depth.feature b/features/jsonld/max_depth.feature
@@ -6,7 +6,7 @@ Feature: Max depth handling
   @createSchema
   Scenario: Create a resource with 1 level of descendants
     When I add "Content-Type" header equal to "application/ld+json"
-    And I send a "POST" request to "/max_depth_dummies" with body:
+    And I send a "POST" request to "/max_depth_eager_dummies" with body:
     """
     {
       "name": "level 1",
@@ -21,14 +21,14 @@ Feature: Max depth handling
     And the JSON should be equal to:
     """
     {
-      "@context": "/contexts/MaxDepthDummy",
-      "@id": "/max_depth_dummies/1",
-      "@type": "MaxDepthDummy",
+      "@context": "/contexts/MaxDepthEagerDummy",
+      "@id": "/max_depth_eager_dummies/1",
+      "@type": "MaxDepthEagerDummy",
       "id": 1,
       "name": "level 1",
       "child": {
-        "@id": "/max_depth_dummies/2",
-        "@type": "MaxDepthDummy",
+        "@id": "/max_depth_eager_dummies/2",
+        "@type": "MaxDepthEagerDummy",
         "id": 2,
         "name": "level 2"
       }
@@ -38,12 +38,12 @@ Feature: Max depth handling
   @dropSchema
   Scenario: Add a 2nd level of descendants
     When I add "Content-Type" header equal to "application/ld+json"
-    And I send a "PUT" request to "max_depth_dummies/1" with body:
+    And I send a "PUT" request to "max_depth_eager_dummies/1" with body:
     """
     {
-      "@id": "/max_depth_dummies/1",
+      "@id": "/max_depth_eager_dummies/1",
       "child": {
-        "@id": "/max_depth_dummies/2",
+        "@id": "/max_depth_eager_dummies/2",
         "child": {
           "name": "level 3"
         }
@@ -56,14 +56,14 @@ Feature: Max depth handling
     And the JSON should be equal to:
     """
     {
-      "@context": "/contexts/MaxDepthDummy",
-      "@id": "/max_depth_dummies/1",
-      "@type": "MaxDepthDummy",
+      "@context": "/contexts/MaxDepthEagerDummy",
+      "@id": "/max_depth_eager_dummies/1",
+      "@type": "MaxDepthEagerDummy",
       "id": 1,
       "name": "level 1",
       "child": {
-        "@id": "/max_depth_dummies/2",
-        "@type": "MaxDepthDummy",
+        "@id": "/max_depth_eager_dummies/2",
+        "@type": "MaxDepthEagerDummy",
         "id": 2,
         "name": "level 2"
       }

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -10,6 +10,7 @@
     <php>
         <ini name="error_reporting" value="-1" />
         <ini name="memory_limit" value="-1" />
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak_vendors" />
         <server name="KERNEL_DIR" value="tests/Fixtures/app/" />
         <server name="KERNEL_CLASS" value="AppKernel" />
         <server name="APP_ENV" value="test" />

diff --git a/src/Bridge/Doctrine/Common/DataPersister.php b/src/Bridge/Doctrine/Common/DataPersister.php
@@ -17,6 +17,7 @@
 use ApiPlatform\Core\Util\ClassInfoTrait;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager as DoctrineObjectManager;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
 
 /**
  * Data persister for Doctrine.
@@ -51,7 +52,7 @@ public function persist($data)
             return $data;
         }
 
-        if (!$manager->contains($data)) {
+        if (!$manager->contains($data) || $this->isDeferredExplicit($manager, $data)) {
             $manager->persist($data);
         }
 
@@ -84,4 +85,19 @@ private function getManager($data)
     {
         return \is_object($data) ? $this->managerRegistry->getManagerForClass($this->getObjectClass($data)) : null;
     }
+
+    /**
+     * Checks if doctrine does not manage data automatically.
+     *
+     * @return bool
+     */
+    private function isDeferredExplicit(DoctrineObjectManager $manager, $data)
+    {
+        $classMetadata = $manager->getClassMetadata($this->getObjectClass($data));
+        if ($classMetadata instanceof ClassMetadataInfo && \method_exists($classMetadata, 'isChangeTrackingDeferredExplicit')) {
+            return $classMetadata->isChangeTrackingDeferredExplicit();
+        }
+
+        return false;
+    }
 }
diff --git a/src/Bridge/Symfony/Routing/IriConverter.php b/src/Bridge/Symfony/Routing/IriConverter.php
@@ -79,6 +79,10 @@ public function getItemFromIri(string $iri, array $context = [])
             throw new InvalidArgumentException(sprintf('No resource associated to "%s".', $iri));
         }
 
+        if (isset($parameters['_api_collection_operation_name'])) {
+            throw new InvalidArgumentException(sprintf('The iri "%s" references a collection not an item.', $iri));
+        }
+
         $attributes = AttributesExtractor::extractAttributes($parameters);
 
         try {

diff --git a/src/DataPersister/ChainDataPersister.php b/src/DataPersister/ChainDataPersister.php
@@ -63,7 +63,7 @@ public function remove($data)
     {
         foreach ($this->persisters as $persister) {
             if ($persister->supports($data)) {
-                $persister->remove($data);
+                return $persister->remove($data);
             }
         }
     }

diff --git a/src/GraphQl/Type/SchemaBuilder.php b/src/GraphQl/Type/SchemaBuilder.php
@@ -366,6 +366,10 @@ private function convertType(Type $type, bool $input = false, string $mutationNa
                 }
 
                 $resourceClass = $this->isCollection($type) ? $type->getCollectionValueType()->getClassName() : $type->getClassName();
+                if (null === $resourceClass) {
+                    return null;
+                }
+
                 try {
                     $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
                     if ([] === $resourceMetadata->getGraphql() ?? []) {

diff --git a/src/Hal/Serializer/ItemNormalizer.php b/src/Hal/Serializer/ItemNormalizer.php
@@ -16,6 +16,7 @@
 use ApiPlatform\Core\Exception\RuntimeException;
 use ApiPlatform\Core\Serializer\AbstractItemNormalizer;
 use ApiPlatform\Core\Serializer\ContextTrait;
+use ApiPlatform\Core\Util\ClassInfoTrait;
 use Symfony\Component\Serializer\Mapping\AttributeMetadataInterface;
 
 /**
@@ -26,6 +27,7 @@
 final class ItemNormalizer extends AbstractItemNormalizer
 {
     use ContextTrait;
+    use ClassInfoTrait;
 
     const FORMAT = 'jsonhal';
 
@@ -102,7 +104,7 @@ protected function getAttributes($object, $format = null, array $context)
      */
     private function getComponents($object, string $format = null, array $context)
     {
-        $cacheKey = \get_class($object).'-'.$context['cache_key'];
+        $cacheKey = $this->getObjectClass($object).'-'.$context['cache_key'];
 
         if (isset($this->componentsCache[$cacheKey])) {
             return $this->componentsCache[$cacheKey];
@@ -160,7 +162,7 @@ private function getComponents($object, string $format = null, array $context)
      */
     private function populateRelation(array $data, $object, string $format = null, array $context, array $components, string $type): array
     {
-        $class = \get_class($object);
+        $class = $this->getObjectClass($object);
 
         $attributesMetadata = \array_key_exists($class, $this->attributesMetadataCache) ?
             $this->attributesMetadataCache[$class] :