Allow to configure skipped layout handles via DI type of `ShouldModif…

…yOutput`
yireo · Sep 22, 2023 · 5e5b835 · 5e5b835
1 parent c1f26f7
commit 5e5b835
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+- Allow to configure skipped layout handles via DI type of `ShouldModifyOutput`
+
 ### Fixed
 - Field in admin is `cache_directory_path` instead of `cache_directory` #154
 

diff --git a/Util/ShouldModifyOutput.php b/Util/ShouldModifyOutput.php
@@ -11,16 +11,23 @@ class ShouldModifyOutput
      * @var Config
      */
     private $config;
-
+
+    /**
+     * @var array
+     */
+    private $skippedHandles = [];
+
     /**
      * @param Config $config
      */
     public function __construct(
-        Config $config
+        Config $config,
+        array $skippedHandles = []
     ) {
         $this->config = $config;
+        $this->skippedHandles = $skippedHandles;
     }
-    
+
     /**
      * @param LayoutInterface $layout
      * @return bool
@@ -30,27 +37,27 @@ public function shouldModifyOutput(LayoutInterface $layout): bool
         if (!$this->config->enabled()) {
             return false;
         }
-        
+
         $handles = $layout->getUpdate()->getHandles();
         if (empty($handles)) {
             return false;
         }
-        
+
         foreach ($handles as $handle) {
             if (strstr($handle, '_email_')) {
                 return false;
             }
         }
-
-        $skippedHandles = [
-            'webp_skip',
-            'nextgenimages_skip',
-        ];
-
-        if (array_intersect($skippedHandles, $handles)) {
+
+        if (array_intersect($this->skippedHandles, $handles)) {
             return false;
         }
-        
+
         return true;
     }
+
+    public function getSkippedHandles(): array
+    {
+        return $this->skippedHandles;
+    }
 }
diff --git a/etc/di.xml b/etc/di.xml
@@ -33,4 +33,13 @@
             </argument>
         </arguments>
     </type>
+
+    <type name="Yireo\NextGenImages\Util\ShouldModifyOutput">
+        <arguments>
+            <argument name="skippedHandles" xsi:type="array">
+                <item name="webp_skip" xsi:type="string">webp_skip</item>
+                <item name="nextgenimages_skip" xsi:type="string">nextgenimages_skip</item>
+            </argument>
+        </arguments>
+    </type>
 </config>