Remove useless code and tags

Author: dunglas

features/http_cache/tags.feature

@@ -17,7 +17,7 @@ Feature: Cache invalidation trough HTTP Cache tags
     """
     Then the response status code should be 201
     And the header "Cache-Tags" should not exist
-    And "/relation_embedders,/related_dummies,/third_levels,/relation_embedders/1,/related_dummies/1,/third_levels/1" IRIs should be purged
+    And "/relation_embedders,/related_dummies,/third_levels" IRIs should be purged
 
   Scenario: Tags must be set for items
     When I send a "GET" request to "/relation_embedders/1"
@@ -53,7 +53,7 @@ Feature: Cache invalidation trough HTTP Cache tags
     """
     Then the response status code should be 200
     And the header "Cache-Tags" should not exist
-    And "/relation_embedders,/relation_embedders/1,/related_dummies/1,/third_levels/1" IRIs should be purged
+    And "/relation_embedders,/relation_embedders/1" IRIs should be purged
 
   @dropSchema
   Scenario: Purge item and the related collection on update

src/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php

@@ -16,6 +16,7 @@
 use ApiPlatform\Core\Api\IriConverterInterface;
 use ApiPlatform\Core\Api\ResourceClassResolverInterface;
 use ApiPlatform\Core\Exception\InvalidArgumentException;
+use ApiPlatform\Core\HttpCache\PurgerInterface;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -29,42 +30,38 @@
  */
 final class PurgeHttpCacheListener
 {
-    private $requestStack;
+    private $purger;
     private $iriConverter;
     private $resourceClassResolver;
 
-    public function __construct(RequestStack $requestStack, IriConverterInterface $iriConverter, ResourceClassResolverInterface $resourceClassResolver)
+    public function __construct(PurgerInterface $purger, IriConverterInterface $iriConverter, ResourceClassResolverInterface $resourceClassResolver)
     {
-        $this->requestStack = $requestStack;
+        $this->purger = $purger;
         $this->iriConverter = $iriConverter;
         $this->resourceClassResolver = $resourceClassResolver;
     }
 
     public function onFlush(OnFlushEventArgs $eventArgs)
     {
-        if (!$request = $this->requestStack->getCurrentRequest()) {
-            return;
-        }
-
-        $resources = $request->attributes->get('_resources', []);
+        $tags = [];
         $uow = $eventArgs->getEntityManager()->getUnitOfWork();
 
         foreach ($uow->getScheduledEntityInsertions() as $entity) {
-            $resources = $this->purge($resources, $entity, false);
+            $tags = $this->gatherTags($tags, $entity, false);
         }
 
         foreach ($uow->getScheduledEntityUpdates() as $entity) {
-            $resources = $this->purge($resources, $entity, true);
+            $tags = $this->gatherTags($tags, $entity, true);
         }
 
         foreach ($uow->getScheduledEntityDeletions() as $entity) {
-            $resources = $this->purge($resources, $entity, true);
+            $tags = $this->gatherTags($tags, $entity, true);
         }
 
-        $request->attributes->set('_resources', $resources);
+        $this->purger->purge($tags);
     }
 
-    private function purge(array $resources, $entity, bool $purgeItem): array
+    private function gatherTags(array $resources, $entity, bool $purgeItem): array
     {
         try {
             $resourceClass = $this->resourceClassResolver->getResourceClass($entity);

src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm.xml

@@ -104,7 +104,7 @@
         </service>
 
         <service id="api_platform.doctrine.listener.http_cache.purge" class="ApiPlatform\Core\Bridge\Doctrine\EventListener\PurgeHttpCacheListener">
-            <argument type="service" id="request_stack" />
+            <argument type="service" id="api_platform.http_cache.purger" />
             <argument type="service" id="api_platform.iri_converter" />
             <argument type="service" id="api_platform.resource_class_resolver" />
 

src/Bridge/Symfony/Bundle/Resources/config/http_cache_tags.xml

@@ -13,12 +13,5 @@
 
             <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="-2" />
         </service>
-
-        <!-- The onKernelView method must be executed after the validation (32) but before the write (64) -->
-        <service id="api_platform.http_cache.listener.response.purge" class="ApiPlatform\Core\HttpCache\EventListener\PurgeListener">
-            <argument type="service" id="api_platform.http_cache.purger" />
-
-            <tag name="kernel.event_listener" event="kernel.terminate" method="onKernelTerminate" />
-        </service>
     </services>
 </container>