make code more simple

Author: Bohdan Berezhniy

Plugin/Amasty/PageSpeedOptimizer/Model/Output/LazyLoadProcessorPlugin.php

@@ -42,10 +42,12 @@ public function aroundReplaceWithPictureTag($subject, callable $proceed, $image,
         }
 
         $originImagePath = $imagePath;
+
         if (strpos($imagePath, 'Magefan_LazyLoad/images/pixel.jpg')) {
 
             $doStr = 'data-original="';
             $p1 = strpos($image, $doStr);
+            
             if ($p1 !== false) {
                 $p1 += strlen($doStr);
                 $p2 = strpos($image, '"', $p1);

Plugin/Magefan/WebP/Model/WebPPlugin.php

@@ -9,79 +9,71 @@
 namespace Magefan\LazyLoad\Plugin\Magefan\WebP\Model;
 
 use Magefan\LazyLoad\Model\Config;
-use Magefan\WebP\Model\WebP;
-use Magento\Framework\Filesystem\Driver\File;
 
 /**
  * Class WebPPlugin
  */
 class WebPPlugin
 {
-    const LAZY_TAG = '<!-- MAGEFAN_LAZY_LOAD -->';
 
     /**
-     * @var WebP 
+     * @var Config
      */
-    private $webp;
+    private $config;
 
     /**
-     * @var Config 
+     * WebPPlugin constructor.
+     * @param Config $config
      */
-    private $config;
-
     public function __construct(
-        WebP  $webp,
-        Config $config,
-        File $fileDriver
+        Config $config
 
     ) {
-        $this->webp = $webp;
         $this->config = $config;
-        $this->fileDriver = $fileDriver;
     }
 
-    public function aroundGetPictureTagHtml($subject, callable $proceed, $webpUrl, $imagePath, $htmlTag)
+    /**
+     * @param $subject
+     * @param callable $proceed
+     * @param $imagePath
+     * @param $htmlTag
+     * @return mixed|string|string[]|null
+     */
+    public function aroundGetPictureTagHtml($subject, callable $proceed, $imagePath, $image)
     {
-
         if (!$this->config->getEnabled()) {
-            return $proceed($webpUrl, $imagePath, $htmlTag);
+            return $proceed($imagePath, $image);
         }
 
         $originImagePath = $imagePath;
 
         if (strpos($imagePath, 'Magefan_LazyLoad/images/pixel.jpg')) {
 
             $doStr = 'data-original="';
-            $p1 = strpos($htmlTag, $doStr);
+            $p1 = strpos($image, $doStr);
 
             if ($p1 !== false) {
                 $p1 += strlen($doStr);
-                $p2 = strpos($htmlTag, '"', $p1);
+                $p2 = strpos($image, '"', $p1);
                 if ($p2 !== false) {
-                    $imagePath = substr($htmlTag, $p1, $p2 - $p1);
-                    $webpUrl = $this->webp->getWebpUrl($imagePath);
-
+                    $imagePath = substr($image, $p1, $p2 - $p1);
                 }
             }
-
-        } else {
-
-            return  $proceed($webpUrl, $imagePath, $htmlTag);
-        }
-
-        if (!$this->fileDriver->isExists($this->webp->getPathFromUrl($imagePath))) {
-            return $htmlTag;
         }
 
-        $html = $proceed($webpUrl, $imagePath, $htmlTag);
+        $html = $proceed($imagePath, $image);
 
         if ($originImagePath != $imagePath) {
+
             if (strpos($html, '<picture') !== false) {
                 $tmpSrc = 'TMP_SRC';
                 $pixelSrc = 'srcset="' . $originImagePath . '"';
+
                 $html = str_replace($pixelSrc, $tmpSrc, $html);
+
                 $html = preg_replace('#<source\s+([^>]*)(?:srcset="([^"]*)")([^>]*)?>#isU', '<source ' . $pixelSrc .
                     ' data-originalset="$2" $1 $3/>', $html);
+
                 $html = str_replace($tmpSrc, $pixelSrc, $html);
             }
         }