Merge pull request #26 from magefan/6822-added-compatibility-for-the-latest-version-of-amasty-image-optimizer

6822 added compatibility for the latest version amasty image optimizer

Author: magefan

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

@@ -79,4 +79,55 @@ public function aroundReplaceWithPictureTag($subject, callable $proceed, $image,
 
         return $html;
     }
+
+    /**
+     * @param $subject
+     * @param callable $proceed
+     * @param algorithm
+     * @param $image
+     * @param $imagePath
+     * @return mixed|null|string|string[]
+     */
+    public function aroundReplace($subject, callable $proceed, $algorithm, $image, $imagePath)
+    {
+
+        if (!$this->config->getEnabled()) {
+            return $proceed($algorithm, $image, $imagePath);
+        }
+
+        $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);
+                if ($p2 !== false) {
+                    $imagePath = substr($image, $p1, $p2 - $p1);
+                }
+            }
+        }
+
+        $html = $proceed($algorithm, $image, $imagePath);
+
+        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);
+            }
+        }
+
+        return $html;
+    }
 }

etc/frontend/di.xml

@@ -21,6 +21,13 @@
         <plugin name="magefan_lazyLoad_plugin_amasty_pagespeedoptimizer_model_output_lazyloadprocessor_plugin"
                 type="Magefan\LazyLoad\Plugin\Amasty\PageSpeedOptimizer\Model\Output\LazyLoadProcessorPlugin" sortOrder="1000"/>
     </type>
+
+    <type name="Amasty\PageSpeedTools\Model\Image\ReplacerComposite">
+        <plugin name="magefan_lazyLoad_plugin_amasty_imagege_replacer_composite_plugin"
+                type="Magefan\LazyLoad\Plugin\Amasty\PageSpeedOptimizer\Model\Output\LazyLoadProcessorPlugin" sortOrder="10000"/>
+    </type>
+
+    
     <!-- Integration with Magefan_WebP -->
     <type name="Magefan\WebP\Model\WebP">
         <plugin name="magefan_lazyLoad_plugin_for_webp"