Webp (#26)

packaged · Aug 28, 2020 · f1a66e3 · f1a66e3
1 parent f654545
commit f1a66e3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Dispatch.php b/src/Dispatch.php
@@ -65,7 +65,7 @@ class Dispatch
   protected $_acceptableTypes;
   protected $_bits = 0;
 
-  private const BIT_WEBP = 0b1;
+  public const BIT_WEBP = 0b1;
   /**
    * @var ResponseCacheConfig
    */

diff --git a/src/ResourceManager.php b/src/ResourceManager.php
@@ -4,6 +4,7 @@
 use Exception;
 use Packaged\Dispatch\Component\DispatchableComponent;
 use Packaged\Dispatch\Component\FixedClassComponent;
+use Packaged\Helpers\BitWise;
 use Packaged\Helpers\Path;
 use Packaged\Helpers\Strings;
 use Packaged\Helpers\ValueAs;
@@ -322,7 +323,7 @@ protected function _optimisePath($path, $relativeFullPath)
       $this->_optimizeWebP = ValueAs::bool(Dispatch::instance()->config()->getItem('optimisation', 'webp', false));
     }
 
-    if($this->_optimizeWebP
+    if($this->_optimizeWebP && BitWise::has(($this->_dispatch ?: Dispatch::instance())->getBits(), Dispatch::BIT_WEBP)
       && in_array(substr($path, -4), ['.jpg', 'jpeg', '.png', '.gif', '.bmp', 'tiff', '.svg'])
       && file_exists($path . '.webp'))
     {