MAGE-1245 Refactor plugin

Author: cammonro

Plugin/RenderingCacheContextPlugin.php

@@ -20,19 +20,11 @@ class RenderingCacheContextPlugin
     public const RENDERING_WITH_BACKEND = 'with_backend';
     public const RENDERING_WITHOUT_BACKEND = 'without_backend';
 
-    private $configHelper;
-    private $storeManager;
-    private $request;
-
     public function __construct(
-        ConfigHelper $configHelper,
-        StoreManagerInterface $storeManager,
-        Http $request
-    ) {
-        $this->configHelper = $configHelper;
-        $this->storeManager = $storeManager;
-        $this->request = $request;
-    }
+        protected ConfigHelper $configHelper,
+        protected StoreManagerInterface $storeManager,
+        protected Http $request
+    ) { }
 
     /**
      * Add a rendering context to the vary string to distinguish how which versions of the category PLP should be cached
@@ -45,8 +37,7 @@ public function __construct(
      * @throws NoSuchEntityException
      */
     public function beforeGetVaryString(HttpContext $subject): array {
-        $storeId = $this->storeManager->getStore()->getId();
-        if ($this->request->getControllerName() != 'category' || !$this->configHelper->replaceCategories($storeId)) {
+        if (!$this->applyCacheContext()) {
             return [];
         }
 
@@ -62,4 +53,14 @@ public function beforeGetVaryString(HttpContext $subject): array {
 
         return [];
     }
+
+    /**
+     * @return bool
+     * @throws NoSuchEntityException
+     */
+    protected function applyCacheContext(): bool
+    {
+        $storeId = $this->storeManager->getStore()->getId();
+        return $this->request->getControllerName() == 'category' && $this->configHelper->replaceCategories($storeId);
+    }
 }

Test/Integration/Category/CategoryCacheTest.php

@@ -17,7 +17,7 @@ class CategoryCacheTest extends \Magento\TestFramework\TestCase\AbstractControll
     public static function getCategoryProvider(): array
     {
         return [
-            ['categoryId' => 20, 'name' => 'Women'],
+            ['categoryId' => 20, 'name' => 'Women'], // not a category controller
             ['categoryId' => 21, 'name' => 'Women > Tops'],
         ];
     }