From 7d14c0e96289c741e86e782daecad55b525dc6f5 Mon Sep 17 00:00:00 2001
From: Ben Davies <ben.davies@gmail.com>
Date: Wed, 26 Jul 2017 10:09:49 +0100
Subject: [PATCH] purge on kernel terminate, instead of post flush

---
 src/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php  | 2 +-
 .../Resources/config/doctrine_orm_http_cache_purger.xml       | 2 +-
 .../Doctrine/EventListener/PurgeHttpCacheListenerTest.php     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php b/src/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php
index 7fef6475424..3443712936c 100644
--- a/src/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php
+++ b/src/Bridge/Doctrine/EventListener/PurgeHttpCacheListener.php
@@ -97,7 +97,7 @@ public function onFlush(OnFlushEventArgs $eventArgs)
     /**
      * Purges tags collected during this request, and clears the tag list.
      */
-    public function postFlush()
+    public function onKernelTerminate()
     {
         $this->purger->purge($this->tags);
         $this->tags = [];
diff --git a/src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml b/src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml
index 6c7f3c62f3b..7223994392d 100644
--- a/src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml
+++ b/src/Bridge/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml
@@ -15,7 +15,7 @@
 
             <tag name="doctrine.event_listener" event="preUpdate" />
             <tag name="doctrine.event_listener" event="onFlush" />
-            <tag name="doctrine.event_listener" event="postFlush" />
+            <tag name="kernel.event_listener" event="kernel.terminate" method="onKernelTerminate" />
         </service>
 
     </services>
diff --git a/tests/Bridge/Doctrine/EventListener/PurgeHttpCacheListenerTest.php b/tests/Bridge/Doctrine/EventListener/PurgeHttpCacheListenerTest.php
index d275a6dad81..9d573fd0209 100644
--- a/tests/Bridge/Doctrine/EventListener/PurgeHttpCacheListenerTest.php
+++ b/tests/Bridge/Doctrine/EventListener/PurgeHttpCacheListenerTest.php
@@ -71,7 +71,7 @@ public function testOnFlush()
 
         $listener = new PurgeHttpCacheListener($purgerProphecy->reveal(), $iriConverterProphecy->reveal(), $resourceClassResolverProphecy->reveal());
         $listener->onFlush($eventArgs);
-        $listener->postFlush();
+        $listener->onKernelTerminate();
     }
 
     public function testPreUpdate()
@@ -108,6 +108,6 @@ public function testPreUpdate()
 
         $listener = new PurgeHttpCacheListener($purgerProphecy->reveal(), $iriConverterProphecy->reveal(), $resourceClassResolverProphecy->reveal());
         $listener->preUpdate($eventArgs);
-        $listener->postFlush();
+        $listener->onKernelTerminate();
     }
 }