ENGCOM-8079: Update FlushCacheByTags to use after plugins instead of around plugins #27077

Author: gabrieldagama

lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php

@@ -56,36 +56,40 @@ public function __construct(
     }
 
     /**
-     * Clean cache on save object
+     * Clean cache when object is saved
      *
      * @param AbstractResource $subject
-     * @param \Closure $proceed
+     * @param AbstractResource $result
      * @param AbstractModel $object
      * @return AbstractResource
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundSave(AbstractResource $subject, \Closure $proceed, AbstractModel $object): AbstractResource
-    {
-        $result = $proceed($object);
+    public function afterSave(
+        AbstractResource $subject,
+        AbstractResource $result,
+        AbstractModel $object
+    ): AbstractResource {
         $tags = $this->tagResolver->getTags($object);
         $this->cleanCacheByTags($tags);
 
         return $result;
     }
 
     /**
-     * Clean cache on delete object
+     * Clean cache when object is deleted
      *
      * @param AbstractResource $subject
-     * @param \Closure $proceed
+     * @param AbstractResource $result
      * @param AbstractModel $object
      * @return AbstractResource
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function aroundDelete(AbstractResource $subject, \Closure $proceed, AbstractModel $object): AbstractResource
-    {
+    public function afterDelete(
+        AbstractResource $subject,
+        AbstractResource $result,
+        AbstractModel $object
+    ): AbstractResource {
         $tags = $this->tagResolver->getTags($object);
-        $result = $proceed($object);
         $this->cleanCacheByTags($tags);
 
         return $result;
@@ -102,11 +106,12 @@ private function cleanCacheByTags(array $tags): void
         if (!$tags) {
             return;
         }
+        $uniqueTags = null;
         foreach ($this->cacheList as $cacheType) {
             if ($this->cacheState->isEnabled($cacheType)) {
                 $this->cachePool->get($cacheType)->clean(
                     \Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG,
-                    \array_unique($tags)
+                    $uniqueTags = $uniqueTags ?? \array_unique($tags)
                 );
             }
         }

lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php

@@ -61,7 +61,7 @@ protected function setUp(): void
     /**
      * @return void
      */
-    public function testAroundSave(): void
+    public function testAfterSave(): void
     {
         $resource = $this->getMockBuilder(AbstractResource::class)
             ->disableOriginalConstructor()
@@ -71,11 +71,9 @@ public function testAroundSave(): void
             ->getMockForAbstractClass();
         $this->tagResolver->expects($this->atLeastOnce())->method('getTags')->with($model)->willReturn([]);
 
-        $result = $this->plugin->aroundSave(
+        $result = $this->plugin->afterSave(
+            $resource,
             $resource,
-            function () use ($resource) {
-                return $resource;
-            },
             $model
         );
 
@@ -85,7 +83,7 @@ function () use ($resource) {
     /**
      * @return void
      */
-    public function testAroundDelete(): void
+    public function testAfterDelete(): void
     {
         $resource = $this->getMockBuilder(AbstractResource::class)
             ->disableOriginalConstructor()
@@ -95,11 +93,9 @@ public function testAroundDelete(): void
             ->getMockForAbstractClass();
         $this->tagResolver->expects($this->atLeastOnce())->method('getTags')->with($model)->willReturn([]);
 
-        $result = $this->plugin->aroundDelete(
+        $result = $this->plugin->afterDelete(
+            $resource,
             $resource,
-            function () use ($resource) {
-                return $resource;
-            },
             $model
         );