Merge branch '2.4'

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 2.5.0 beta 1
 
+* GraphQL: **BC Break** Separate `item_query` and `collection_query` operations so user can use different security and serialization groups for them
 * GraphQL: Add support for custom queries and mutations
 * GraphQL: Add support for custom types
 * GraphQL: Better pagination support (backwards pagination)
@@ -12,8 +13,10 @@
 * GraphQL: Allow to use a search and an exist filter on the same resource
 * GraphQL: Refactor the architecture of the whole system to allow the decoration of useful services (`TypeConverter` to manage custom types, `SerializerContextBuilder` to modify the (de)serialization context dynamically, etc.)
 
-**BC Break** 
-* GraphQL: Separate item_query and collection_query operations so user can use different security and serialization groups for them
+## 2.4.7
+
+* Fix passing context to data persisters' `remove` method
+* Doctrine: ensure that `EntityManagerInterface` is used in data providers
 
 ## 2.4.6
 

src/Action/ExceptionAction.php

@@ -57,7 +57,7 @@ public function __construct(SerializerInterface $serializer, array $errorFormats
     }
 
     /**
-     * Converts a an exception to a JSON response.
+     * Converts an exception to a JSON response.
      */
     public function __invoke(FlattenException $exception, Request $request): Response
     {

src/Bridge/Doctrine/Orm/CollectionDataProvider.php

@@ -21,6 +21,7 @@
 use ApiPlatform\Core\Exception\RuntimeException;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\ORM\EntityManagerInterface;
 
 /**
  * Collection data provider for the Doctrine ORM.
@@ -45,7 +46,7 @@ public function __construct(ManagerRegistry $managerRegistry, iterable $collecti
 
     public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
     {
-        return null !== $this->managerRegistry->getManagerForClass($resourceClass);
+        return $this->managerRegistry->getManagerForClass($resourceClass) instanceof EntityManagerInterface;
     }
 
     /**

src/Bridge/Doctrine/Orm/ItemDataProvider.php

@@ -25,7 +25,6 @@
 use ApiPlatform\Core\Metadata\Property\Factory\PropertyNameCollectionFactoryInterface;
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
 
@@ -56,7 +55,7 @@ public function __construct(ManagerRegistry $managerRegistry, PropertyNameCollec
 
     public function supports(string $resourceClass, string $operationName = null, array $context = []): bool
     {
-        return null !== $this->managerRegistry->getManagerForClass($resourceClass);
+        return $this->managerRegistry->getManagerForClass($resourceClass) instanceof EntityManagerInterface;
     }
 
     /**
@@ -68,7 +67,7 @@ public function supports(string $resourceClass, string $operationName = null, ar
      */
     public function getItem(string $resourceClass, $id, string $operationName = null, array $context = [])
     {
-        /** @var ObjectManager $manager */
+        /** @var EntityManagerInterface $manager */
         $manager = $this->managerRegistry->getManagerForClass($resourceClass);
 
         if ((\is_int($id) || \is_string($id)) && !($context[IdentifierConverterInterface::HAS_IDENTIFIER_CONVERTER] ?? false)) {
@@ -83,7 +82,7 @@ public function getItem(string $resourceClass, $id, string $operationName = null
         $identifiers = $id;
 
         $fetchData = $context['fetch_data'] ?? true;
-        if (!$fetchData && $manager instanceof EntityManagerInterface) {
+        if (!$fetchData) {
             return $manager->getReference($resourceClass, $identifiers);
         }
 

src/DataTransformer/DataTransformerInterface.php

@@ -31,9 +31,9 @@ interface DataTransformerInterface
     public function transform($object, string $to, array $context = []);
 
     /**
-     * Checks whether the transformation is supported for a given object and context.
+     * Checks whether the transformation is supported for a given data and context.
      *
-     * @param object $object
+     * @param object|array $data object on normalize / array on denormalize
      */
-    public function supportsTransformation($object, string $to, array $context = []): bool;
+    public function supportsTransformation($data, string $to, array $context = []): bool;
 }

src/EventListener/WriteListener.php

@@ -106,7 +106,7 @@ public function onKernelView(GetResponseForControllerResultEvent $event): void
 
                 break;
             case 'DELETE':
-                $this->dataPersister->remove($controllerResult);
+                $this->dataPersister->remove($controllerResult, $attributes);
                 $event->setControllerResult(null);
                 break;
         }

src/Serializer/AbstractItemNormalizer.php

@@ -605,11 +605,13 @@ protected function normalizeRelation(PropertyMetadata $propertyMetadata, $relate
 
     /**
      * Finds the first supported data transformer if any.
+     *
+     * @param object|array $data object on normalize / array on denormalize
      */
-    protected function getDataTransformer($object, string $to, array $context = []): ?DataTransformerInterface
+    protected function getDataTransformer($data, string $to, array $context = []): ?DataTransformerInterface
     {
         foreach ($this->dataTransformers as $dataTransformer) {
-            if ($dataTransformer->supportsTransformation($object, $to, $context)) {
+            if ($dataTransformer->supportsTransformation($data, $to, $context)) {
                 return $dataTransformer;
             }
         }

tests/EventListener/WriteListenerTest.php

@@ -172,7 +172,7 @@ public function testOnKernelViewWithControllerResultAndRemove()
 
         $dataPersisterProphecy = $this->prophesize(DataPersisterInterface::class);
         $dataPersisterProphecy->supports($dummy, Argument::type('array'))->willReturn(true)->shouldBeCalled();
-        $dataPersisterProphecy->remove($dummy)->shouldBeCalled();
+        $dataPersisterProphecy->remove($dummy, Argument::type('array'))->shouldBeCalled();
 
         $iriConverterProphecy = $this->prophesize(IriConverterInterface::class);
         $iriConverterProphecy->getIriFromItem($dummy)->shouldNotBeCalled();