Merge branch '2.3'

dunglas · dunglas · commit 1486af853925 · 2018-09-11T16:55:26.000+02:00
diff --git a/features/graphql/query.feature b/features/graphql/query.feature
@@ -124,6 +124,20 @@ Feature: GraphQL query support
     And the header "Content-Type" should be equal to "application/json"
     And the JSON node "data.dummyGroup.foo" should be equal to "Foo #1"
 
+  Scenario: Fetch only the internal id
+    When I send the following GraphQL request:
+    """
+    {
+      dummy(id: "/dummies/1") {
+        _id
+      }
+    }
+    """
+    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.dummy._id" should be equal to "1"
+
   @dropSchema
   Scenario: Retrieve an nonexistent item through a GraphQL query
     When I send the following GraphQL request:
diff --git a/src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php b/src/Bridge/Doctrine/Orm/Extension/EagerLoadingExtension.php
@@ -232,6 +232,9 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt
 
             $this->joinRelations($queryBuilder, $queryNameGenerator, $mapping['targetEntity'], $forceEager, $fetchPartial, $associationAlias, $options, $normalizationContext, 'leftJoin' === $method, $joinCount, $currentDepth);
         }
+
+        // result is discarded (this is just re-hydrating the collections) see http://ocramius.github.io/blog/doctrine-orm-optimization-hydration/
+        $queryBuilder->getQuery()->getResult();
     }
 
     private function addSelect(QueryBuilder $queryBuilder, string $entity, string $associationAlias, array $propertyMetadataOptions)
diff --git a/src/GraphQl/Resolver/Factory/CollectionResolverFactory.php b/src/GraphQl/Resolver/Factory/CollectionResolverFactory.php
@@ -18,6 +18,7 @@
 use ApiPlatform\Core\DataProvider\PaginatorInterface;
 use ApiPlatform\Core\DataProvider\SubresourceDataProviderInterface;
 use ApiPlatform\Core\Exception\ResourceClassNotSupportedException;
+use ApiPlatform\Core\GraphQl\Resolver\FieldsToAttributesTrait;
 use ApiPlatform\Core\GraphQl\Resolver\ResourceAccessCheckerTrait;
 use ApiPlatform\Core\GraphQl\Serializer\ItemNormalizer;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
@@ -37,6 +38,7 @@
  */
 final class CollectionResolverFactory implements ResolverFactoryInterface
 {
+    use FieldsToAttributesTrait;
     use ResourceAccessCheckerTrait;
 
     private $collectionDataProvider;
@@ -125,16 +127,6 @@ public function __invoke(string $resourceClass = null, string $rootClass = null,
         };
     }
 
-    private function fieldsToAttributes(ResolveInfo $info): array
-    {
-        $fields = $info->getFieldSelection(PHP_INT_MAX);
-        if (isset($fields['edges']['node'])) {
-            $fields = $fields['edges']['node'];
-        }
-
-        return $fields;
-    }
-
     /**
      * @throws ResourceClassNotSupportedException
      *
diff --git a/src/GraphQl/Resolver/Factory/ItemMutationResolverFactory.php b/src/GraphQl/Resolver/Factory/ItemMutationResolverFactory.php
@@ -17,6 +17,7 @@
 use ApiPlatform\Core\DataPersister\DataPersisterInterface;
 use ApiPlatform\Core\Exception\InvalidArgumentException;
 use ApiPlatform\Core\Exception\ItemNotFoundException;
+use ApiPlatform\Core\GraphQl\Resolver\FieldsToAttributesTrait;
 use ApiPlatform\Core\GraphQl\Resolver\ResourceAccessCheckerTrait;
 use ApiPlatform\Core\GraphQl\Serializer\ItemNormalizer;
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
@@ -38,6 +39,7 @@
  */
 final class ItemMutationResolverFactory implements ResolverFactoryInterface
 {
+    use FieldsToAttributesTrait;
     use ResourceAccessCheckerTrait;
 
     private $iriConverter;
@@ -73,7 +75,7 @@ public function __invoke(string $resourceClass = null, string $rootClass = null,
 
             $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
             $normalizationContext = $resourceMetadata->getGraphqlAttribute($operationName ?? '', 'normalization_context', [], true);
-            $normalizationContext['attributes'] = $info->getFieldSelection(PHP_INT_MAX);
+            $normalizationContext['attributes'] = $this->fieldsToAttributes($info);
 
             if (isset($args['input']['id'])) {
                 try {
diff --git a/src/GraphQl/Resolver/FieldsToAttributesTrait.php b/src/GraphQl/Resolver/FieldsToAttributesTrait.php
@@ -0,0 +1,51 @@
+<?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\GraphQl\Resolver;
+
+use GraphQL\Type\Definition\ResolveInfo;
+
+/**
+ * Transforms the passed GraphQL fields to the list of attributes to serialize.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+trait FieldsToAttributesTrait
+{
+    /**
+     * Retrieves fields, recursively replaces the "_id" key (the raw id) by "id" (the name of the property expected by the Serializer) and flattens edge and node structures (pagination).
+     */
+    private function fieldsToAttributes(ResolveInfo $info): array
+    {
+        $fields = $info->getFieldSelection(PHP_INT_MAX);
+        if (isset($fields['edges']['node'])) {
+            $fields = $fields['edges']['node'];
+        }
+
+        return $this->replaceIdKeys($fields);
+    }
+
+    private function replaceIdKeys(array $fields): array
+    {
+        foreach ($fields as $key => $value) {
+            if ('_id' === $key) {
+                $fields['id'] = $fields['_id'];
+                unset($fields['_id']);
+            } elseif (\is_array($fields[$key])) {
+                $fields[$key] = $this->replaceIdKeys($fields[$key]);
+            }
+        }
+
+        return $fields;
+    }
+}
diff --git a/src/GraphQl/Resolver/ItemResolver.php b/src/GraphQl/Resolver/ItemResolver.php
@@ -33,6 +33,7 @@
 final class ItemResolver
 {
     use ClassInfoTrait;
+    use FieldsToAttributesTrait;
     use ResourceAccessCheckerTrait;
 
     private $iriConverter;
@@ -59,7 +60,7 @@ public function __invoke($source, $args, $context, ResolveInfo $info)
             return null;
         }
 
-        $baseNormalizationContext = ['attributes' => $info->getFieldSelection(PHP_INT_MAX)];
+        $baseNormalizationContext = ['attributes' => $this->fieldsToAttributes($info)];
         try {
             $item = $this->iriConverter->getItemFromIri($args['id'], $baseNormalizationContext);
         } catch (ItemNotFoundException $e) {
diff --git a/tests/Action/ExceptionActionTest.php b/tests/Action/ExceptionActionTest.php
@@ -25,6 +25,8 @@
 /**
  * @author Amrouche Hamza <hamza.simperfit@gmail.com>
  * @author Baptiste Meyer <baptiste.meyer@gmail.com>
+ *
+ * @group time-sensitive
  */
 class ExceptionActionTest extends TestCase
 {
diff --git a/tests/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php b/tests/Bridge/Doctrine/Orm/Extension/EagerLoadingExtensionTest.php
@@ -31,6 +31,7 @@
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\EmbeddableDummy;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\RelatedDummy;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\UnknownDummy;
+use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
@@ -122,6 +123,9 @@ public function testApplyToCollection()
         $queryBuilderProphecy->addSelect('partial relatedDummy_a1.{id,name,embeddedDummy.name}')->shouldBeCalled(1);
         $queryBuilderProphecy->addSelect('partial relatedDummy2_a2.{id,name,embeddedDummy.name}')->shouldBeCalled(1);
 
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(3);
+
         $queryBuilder = $queryBuilderProphecy->reveal();
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, false, null, null, true);
         $eagerExtensionTest->applyToCollection($queryBuilder, new QueryNameGenerator(), Dummy::class, null, $context);
@@ -228,6 +232,9 @@ public function testApplyToItem()
         $queryBuilderProphecy->addSelect('partial relatedDummy4_a5.{id}')->shouldBeCalled(1);
         $queryBuilderProphecy->addSelect('singleInheritanceRelation_a6')->shouldBeCalled(1);
 
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(7);
+
         $queryBuilder = $queryBuilderProphecy->reveal();
         $orderExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, false, null, null, true);
 
@@ -253,6 +260,8 @@ public function testCreateItemWithOperationName()
         $emProphecy->getClassMetadata(Dummy::class)->shouldBeCalled()->willReturn($classMetadataProphecy->reveal());
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
 
         $orderExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, false, null, null, true);
         $orderExtensionTest->applyToItem($queryBuilderProphecy->reveal(), new QueryNameGenerator(), Dummy::class, [], 'item_operation', ['groups' => ['foo']]);
@@ -277,6 +286,8 @@ public function testCreateCollectionWithOperationName()
         $emProphecy->getClassMetadata(Dummy::class)->shouldBeCalled()->willReturn($classMetadataProphecy->reveal());
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
 
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, false, null, null, true);
         $eagerExtensionTest->applyToCollection($queryBuilderProphecy->reveal(), new QueryNameGenerator(), Dummy::class, 'collection_operation', ['groups' => ['foo']]);
@@ -300,6 +311,8 @@ public function testDenormalizeItemWithCorrectResourceClass()
         $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
 
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, false, null, null, true);
         $eagerExtensionTest->applyToItem($queryBuilderProphecy->reveal(), new QueryNameGenerator(), RelatedDummy::class, ['id' => 1], 'item_operation', ['resource_class' => Dummy::class]);
@@ -322,6 +335,8 @@ public function testDenormalizeItemWithExistingGroups()
         $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
 
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, false, null, null, true);
         $eagerExtensionTest->applyToItem($queryBuilderProphecy->reveal(), new QueryNameGenerator(), RelatedDummy::class, ['id' => 1], 'item_operation', [AbstractNormalizer::GROUPS => 'some_groups']);
@@ -442,6 +457,8 @@ public function testMaxDepth()
 
         $queryBuilderProphecy->innerJoin(Argument::type('string'), Argument::type('string'))->shouldBeCalledTimes(2);
         $queryBuilderProphecy->addSelect(Argument::type('string'))->shouldBeCalled();
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(3);
 
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, false, null, null, true, $classMetadataFactoryProphecy->reveal());
         $eagerExtensionTest->applyToCollection($queryBuilderProphecy->reveal(), new QueryNameGenerator(), Dummy::class);
@@ -487,6 +504,9 @@ public function testForceEager()
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
 
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(2);
+
         $orderExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, true, null, null, true);
         $orderExtensionTest->applyToItem($queryBuilderProphecy->reveal(), new QueryNameGenerator(), Dummy::class, []);
     }
@@ -523,6 +543,9 @@ public function testExtraLazy()
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
 
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
+
         $orderExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, true, null, null, true);
         $orderExtensionTest->applyToItem($queryBuilderProphecy->reveal(), new QueryNameGenerator(), Dummy::class, []);
     }
@@ -546,6 +569,8 @@ public function testResourceClassNotFoundException()
         $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
 
         $orderExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, true, null, null, true);
         $orderExtensionTest->applyToItem($queryBuilderProphecy->reveal(), new QueryNameGenerator(), Dummy::class, [], null);
@@ -570,6 +595,8 @@ public function testPropertyNotFoundException()
         $queryBuilderProphecy = $this->prophesize(QueryBuilder::class);
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
 
         $orderExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, true, null, null, true);
         $orderExtensionTest->applyToItem($queryBuilderProphecy->reveal(), new QueryNameGenerator(), Dummy::class, []);
@@ -599,6 +626,8 @@ public function testResourceClassNotFoundExceptionPropertyNameCollection()
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
         $queryBuilderProphecy->innerJoin('o.relation', 'relation_a1')->shouldBeCalled(1);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
 
         $orderExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30, true, null, null, true);
         $orderExtensionTest->applyToItem($queryBuilderProphecy->reveal(), new QueryNameGenerator(), Dummy::class, []);
@@ -654,6 +683,8 @@ public function testApplyToCollectionWithSerializerContextBuilder()
 
         $queryBuilderProphecy->leftJoin('o.relatedDummy', 'relatedDummy_a1')->shouldBeCalled(1);
         $queryBuilderProphecy->addSelect('partial relatedDummy_a1.{id,name}')->shouldBeCalled(1);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(2);
 
         $request = Request::create('/api/dummies', 'GET', []);
 
@@ -718,6 +749,8 @@ public function testAttributes()
 
         $queryBuilderProphecy->leftJoin('o.relatedDummy', 'relatedDummy_a1')->shouldBeCalled(1);
         $queryBuilderProphecy->addSelect('partial relatedDummy_a1.{id,name}')->shouldBeCalled(1);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(2);
 
         $request = Request::create('/api/dummies', 'GET', []);
 
@@ -759,6 +792,8 @@ public function testNotInAttributes()
 
         $queryBuilderProphecy->getRootAliases()->willReturn(['o']);
         $queryBuilderProphecy->getEntityManager()->willReturn($emProphecy);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
 
         $request = Request::create('/api/dummies', 'GET', []);
 
@@ -808,6 +843,8 @@ public function testApplyToCollectionNoPartial()
         $queryBuilderProphecy->innerJoin('o.relatedDummy2', 'relatedDummy2_a2')->shouldBeCalled(1);
         $queryBuilderProphecy->addSelect('relatedDummy_a1')->shouldBeCalled(1);
         $queryBuilderProphecy->addSelect('relatedDummy2_a2')->shouldBeCalled(1);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(3);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30);
@@ -864,6 +901,8 @@ private function doTestApplyToCollectionWithANonRedableButFetchEagerProperty(boo
         $queryBuilderProphecy->innerJoin('o.relatedDummy2', 'relatedDummy2_a2')->shouldBeCalled(1);
         $queryBuilderProphecy->addSelect('relatedDummy_a1')->shouldBeCalled(1);
         $queryBuilderProphecy->addSelect('relatedDummy2_a2')->shouldBeCalled(1);
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(3);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30);
@@ -918,6 +957,8 @@ private function doTestApplyToCollectionWithARedableButNotFetchEagerProperty(boo
         $queryBuilderProphecy->innerJoin('o.relatedDummy2', 'relatedDummy2_a2')->shouldNotBeCalled();
         $queryBuilderProphecy->addSelect('relatedDummy_a1')->shouldNotBeCalled();
         $queryBuilderProphecy->addSelect('relatedDummy2_a2')->shouldNotBeCalled();
+        $queryAbstractProphecy = $this->prophesize(AbstractQuery::class);
+        $queryBuilderProphecy->getQuery()->willReturn($queryAbstractProphecy)->shouldBeCalledTimes(1);
 
         $queryBuilder = $queryBuilderProphecy->reveal();
         $eagerExtensionTest = new EagerLoadingExtension($propertyNameCollectionFactoryProphecy->reveal(), $propertyMetadataFactoryProphecy->reveal(), $resourceMetadataFactoryProphecy->reveal(), 30);

Original file line number	Diff line number	Diff line change
`@@ -232,6 +232,9 @@ private function joinRelations(QueryBuilder $queryBuilder, QueryNameGeneratorInt`
`232`	`232`
`233`	`233`	`$this->joinRelations($queryBuilder, $queryNameGenerator, $mapping['targetEntity'], $forceEager, $fetchPartial, $associationAlias, $options, $normalizationContext, 'leftJoin' === $method, $joinCount, $currentDepth);`
`234`	`234`	`}`
	`235`	`+`
	`236`	`+ // result is discarded (this is just re-hydrating the collections) see http://ocramius.github.io/blog/doctrine-orm-optimization-hydration/`
	`237`	`+ $queryBuilder->getQuery()->getResult();`
`235`	`238`	`}`
`236`	`239`
`237`	`240`	`private function addSelect(QueryBuilder $queryBuilder, string $entity, string $associationAlias, array $propertyMetadataOptions)`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@`
`33`	`33`	`final class ItemResolver`
`34`	`34`	`{`
`35`	`35`	`use ClassInfoTrait;`
	`36`	`+ use FieldsToAttributesTrait;`
`36`	`37`	`use ResourceAccessCheckerTrait;`
`37`	`38`
`38`	`39`	`private $iriConverter;`
`@@ -59,7 +60,7 @@ public function __invoke($source, $args, $context, ResolveInfo $info)`
`59`	`60`	`return null;`
`60`	`61`	`}`
`61`	`62`
`62`		`- $baseNormalizationContext = ['attributes' => $info->getFieldSelection(PHP_INT_MAX)];`
	`63`	`+ $baseNormalizationContext = ['attributes' => $this->fieldsToAttributes($info)];`
`63`	`64`	`try {`
`64`	`65`	`$item = $this->iriConverter->getItemFromIri($args['id'], $baseNormalizationContext);`
`65`	`66`	`} catch (ItemNotFoundException $e) {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`/**`
`26`	`26`	`* @author Amrouche Hamza <hamza.simperfit@gmail.com>`
`27`	`27`	`* @author Baptiste Meyer <baptiste.meyer@gmail.com>`
	`28`	`+ *`
	`29`	`+ * @group time-sensitive`
`28`	`30`	`*/`
`29`	`31`	`class ExceptionActionTest extends TestCase`
`30`	`32`	`{`