magento/adobe-stock-integration#1504: Insert rendition images to the content from media gallery instead of original images - Extracted logic from wysiwyg OnInsert controller to a model

Author: jmonteros422

app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php

@@ -14,25 +14,26 @@ class OnInsert extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
     protected $resultRawFactory;
 
     /**
-     * @var \Magento\Cms\Model\Wysiwyg\Images\PrepareImage
+     * @var \Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent
      */
-    protected $prepareImage;
+    protected $getInsertImageContent;
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @param \Magento\Cms\Model\Wysiwyg\Images\PrepareImage $prepareImage
+     * @param \Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent $getInsertImageContent
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
-        \Magento\Cms\Model\Wysiwyg\Images\PrepareImage $prepareImage
+        ?\Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent $getInsertImageContent = null
     ) {
         $this->resultRawFactory = $resultRawFactory;
-        $this->prepareImage = $prepareImage;
         parent::__construct($context, $coreRegistry);
+        $this->getInsertImageContent = $getInsertImageContent ?: $this->_objectManager
+            ->get('Magento\Cms\Model\Wysiwyg\Images\GetInsertImageContent');
     }
 
     /**
@@ -42,13 +43,18 @@ public function __construct(
      */
     public function execute()
     {
-        $request = $this->getRequest();
-
-        /** @var \Magento\Cms\Model\Wysiwyg\Images\PrepareImage $image */
-        $image = $this->prepareImage->execute($request->getParams());
+        $data = $this->getRequest()->getParams();
 
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
         $resultRaw = $this->resultRawFactory->create();
-        return $resultRaw->setContents($image);
+
+        return $resultRaw->setContents(
+            $this->getInsertImageContent->execute(
+                $data['filename'],
+                (int)$data['store_id'],
+                $data['force_static_path'],
+                $data['as_is']
+            )
+        );
     }
 }

app/code/Magento/Cms/Model/Wysiwyg/Images/PrepareImage.php renamed to app/code/Magento/Cms/Model/Wysiwyg/Images/GetInsertImageContent.php

@@ -11,7 +11,7 @@
 use Magento\Catalog\Helper\Data;
 use Magento\Cms\Helper\Wysiwyg\Images as ImagesHelper;
 
-class PrepareImage
+class GetInsertImageContent
 {
     /**
      * @var ImagesHelper
@@ -25,6 +25,7 @@ class PrepareImage
 
     /**
      * PrepareImage constructor.
+     *
      * @param ImagesHelper $imagesHelper
      * @param Data $catalogHelper
      */
@@ -37,24 +38,33 @@ public function __construct(
     }
 
     /**
-     * @param array $data
+     * Prepare Image Contents for Insert
+     *
+     * @param string $encodedFilename
+     * @param int $storeId
+     * @param bool $forceStaticPath
+     * @param bool $renderAsTag
      * @return string
      */
-    public function execute(array $data): string
-    {
-        $filename = $this->imagesHelper->idDecode($data['filename']);
-        $storeId = (int)$data['store_id'];
+    public function execute(
+        string $encodedFilename,
+        int $storeId,
+        bool $forceStaticPath,
+        bool $renderAsTag
+    ): string {
+        $filename = $this->imagesHelper->idDecode($encodedFilename);
 
         $this->catalogHelper->setStoreId($storeId);
         $this->imagesHelper->setStoreId($storeId);
 
-        if ($data['force_static_path']) {
+        if ($forceStaticPath) {
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
-            $image = parse_url($this->imagesHelper->getCurrentUrl() . $filename, PHP_URL_PATH);
-        } else {
-            $image = $this->imagesHelper->getImageHtmlDeclaration($filename, $data['as_is']);
+            return parse_url(
+                $this->imagesHelper->getCurrentUrl() . $filename,
+                PHP_URL_PATH
+            );
         }
 
-        return $image;
+        return $this->imagesHelper->getImageHtmlDeclaration($filename, $renderAsTag);
     }
 }