Merge remote-tracking branch 'origin/MC-31727' into 2.4-develop-pr15

Author: serhii-balko

app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php

@@ -21,6 +21,7 @@
 use Magento\Framework\Controller\Result\RawFactory;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\Driver\File;
 
 /**
  * Process template text for wysiwyg editor.
@@ -67,6 +68,11 @@ class Directive extends Action implements HttpGetActionInterface
      */
     private $filter;
 
+    /**
+     * @var File
+     */
+    private $file;
+
     /**
      * Constructor
      *
@@ -77,6 +83,7 @@ class Directive extends Action implements HttpGetActionInterface
      * @param LoggerInterface|null $logger
      * @param Config|null $config
      * @param Filter|null $filter
+     * @param File|null $file
      */
     public function __construct(
         Context $context,
@@ -85,7 +92,8 @@ public function __construct(
         AdapterFactory $adapterFactory = null,
         LoggerInterface $logger = null,
         Config $config = null,
-        Filter $filter = null
+        Filter $filter = null,
+        File $file = null
     ) {
         parent::__construct($context);
         $this->urlDecoder = $urlDecoder;
@@ -94,6 +102,7 @@ public function __construct(
         $this->logger = $logger ?: ObjectManager::getInstance()->get(LoggerInterface::class);
         $this->config = $config ?: ObjectManager::getInstance()->get(Config::class);
         $this->filter = $filter ?: ObjectManager::getInstance()->get(Filter::class);
+        $this->file = $file ?: ObjectManager::getInstance()->get(File::class);
     }
 
     /**
@@ -127,6 +136,15 @@ public function execute()
                 $this->logger->warning($e);
             }
         }
+        $mimeType = $image->getMimeType();
+        unset($image);
+        // To avoid issues with PNG images with alpha blending we return raw file
+        // after validation as an image source instead of generating the new PNG image
+        // with image adapter
+        $content = $this->file->fileGetContents($imagePath);
+        $resultRaw->setHeader('Content-Type', $mimeType);
+        $resultRaw->setContents($content);
+
         return $resultRaw;
     }
 }

app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php

@@ -5,100 +5,123 @@
  */
 namespace Magento\Cms\Test\Unit\Controller\Adminhtml\Wysiwyg;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive;
+use Magento\Cms\Model\Template\Filter;
+use Magento\Cms\Model\Wysiwyg\Config;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\App\ResponseInterface;
+use Magento\Framework\Controller\Result\Raw;
+use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Image\Adapter\AdapterInterface;
+use Magento\Framework\Image\AdapterFactory;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\Url\DecoderInterface;
+use PHPUnit\Framework\TestCase;
+use PHPUnit_Framework_MockObject_MockObject;
+use Psr\Log\LoggerInterface;
+
 /**
  * @covers \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
-class DirectiveTest extends \PHPUnit\Framework\TestCase
+class DirectiveTest extends TestCase
 {
     const IMAGE_PATH = 'pub/media/wysiwyg/image.jpg';
 
     /**
-     * @var \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive
+     * @var Directive
      */
     protected $wysiwygDirective;
 
     /**
-     * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     * @var Context|PHPUnit_Framework_MockObject_MockObject
      */
     protected $actionContextMock;
 
     /**
-     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RequestInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $requestMock;
 
     /**
-     * @var \Magento\Framework\Url\DecoderInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var DecoderInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $urlDecoderMock;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManagerInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $objectManagerMock;
 
     /**
-     * @var \Magento\Cms\Model\Template\Filter|\PHPUnit_Framework_MockObject_MockObject
+     * @var Filter|PHPUnit_Framework_MockObject_MockObject
      */
     protected $templateFilterMock;
 
     /**
-     * @var \Magento\Framework\Image\AdapterFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var AdapterFactory|PHPUnit_Framework_MockObject_MockObject
      */
     protected $imageAdapterFactoryMock;
 
     /**
-     * @var \Magento\Framework\Image\Adapter\AdapterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var AdapterInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $imageAdapterMock;
 
     /**
-     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResponseInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $responseMock;
 
     /**
-     * @var \Magento\Cms\Model\Wysiwyg\Config|\PHPUnit_Framework_MockObject_MockObject
+     * @var File|PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $fileMock;
+
+    /**
+     * @var Config|PHPUnit_Framework_MockObject_MockObject
      */
     protected $wysiwygConfigMock;
 
     /**
-     * @var \Psr\Log\LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|PHPUnit_Framework_MockObject_MockObject
      */
     protected $loggerMock;
 
     /**
-     * @var \Magento\Framework\Controller\Result\RawFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var RawFactory|PHPUnit_Framework_MockObject_MockObject
      */
     protected $rawFactoryMock;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Raw|\PHPUnit_Framework_MockObject_MockObject
+     * @var Raw|PHPUnit_Framework_MockObject_MockObject
      */
     protected $rawMock;
 
     protected function setUp()
     {
-        $this->actionContextMock = $this->getMockBuilder(\Magento\Backend\App\Action\Context::class)
+        $this->actionContextMock = $this->getMockBuilder(Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->requestMock = $this->getMockBuilder(\Magento\Framework\App\RequestInterface::class)
+        $this->requestMock = $this->getMockBuilder(RequestInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->urlDecoderMock = $this->getMockBuilder(\Magento\Framework\Url\DecoderInterface::class)
+        $this->urlDecoderMock = $this->getMockBuilder(DecoderInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->objectManagerMock = $this->getMockBuilder(\Magento\Framework\ObjectManagerInterface::class)
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->templateFilterMock = $this->getMockBuilder(\Magento\Cms\Model\Template\Filter::class)
+        $this->templateFilterMock = $this->getMockBuilder(Filter::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->imageAdapterFactoryMock = $this->getMockBuilder(\Magento\Framework\Image\AdapterFactory::class)
+        $this->imageAdapterFactoryMock = $this->getMockBuilder(AdapterFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->imageAdapterMock = $this->getMockBuilder(\Magento\Framework\Image\Adapter\AdapterInterface::class)
+        $this->imageAdapterMock = $this->getMockBuilder(AdapterInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(
                 [
@@ -117,21 +140,25 @@ protected function setUp()
                 ]
             )
             ->getMock();
-        $this->responseMock = $this->getMockBuilder(\Magento\Framework\App\ResponseInterface::class)
+        $this->responseMock = $this->getMockBuilder(ResponseInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setHeader', 'setBody', 'sendResponse'])
             ->getMock();
-        $this->wysiwygConfigMock = $this->getMockBuilder(\Magento\Cms\Model\Wysiwyg\Config::class)
+        $this->fileMock = $this->getMockBuilder(File::class)
             ->disableOriginalConstructor()
+            ->setMethods(['fileGetContents'])
             ->getMock();
-        $this->loggerMock = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
+        $this->wysiwygConfigMock = $this->getMockBuilder(Config::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->rawFactoryMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\RawFactory::class)
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->rawFactoryMock = $this->getMockBuilder(RawFactory::class)
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->rawMock = $this->getMockBuilder(\Magento\Framework\Controller\Result\Raw::class)
+        $this->rawMock = $this->getMockBuilder(Raw::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -145,17 +172,18 @@ protected function setUp()
             ->method('getObjectManager')
             ->willReturn($this->objectManagerMock);
 
-        $objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+        $objectManager = new ObjectManager($this);
         $this->wysiwygDirective = $objectManager->getObject(
-            \Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive::class,
+            Directive::class,
             [
                 'context' => $this->actionContextMock,
                 'urlDecoder' => $this->urlDecoderMock,
                 'resultRawFactory' => $this->rawFactoryMock,
                 'adapterFactory' => $this->imageAdapterFactoryMock,
                 'logger' => $this->loggerMock,
                 'config' => $this->wysiwygConfigMock,
-                'filter' => $this->templateFilterMock
+                'filter' => $this->templateFilterMock,
+                'file' => $this->fileMock,
             ]
         );
     }
@@ -172,23 +200,29 @@ public function testExecute()
         $this->imageAdapterMock->expects($this->once())
             ->method('open')
             ->with(self::IMAGE_PATH);
-        $this->imageAdapterMock->expects($this->once())
+        $this->imageAdapterMock->expects($this->atLeastOnce())
             ->method('getMimeType')
             ->willReturn($mimeType);
-        $this->rawMock->expects($this->once())
+        $this->rawMock->expects($this->atLeastOnce())
             ->method('setHeader')
             ->with('Content-Type', $mimeType)
             ->willReturnSelf();
-        $this->rawMock->expects($this->once())
+        $this->rawMock->expects($this->atLeastOnce())
             ->method('setContents')
             ->with($imageBody)
             ->willReturnSelf();
         $this->imageAdapterMock->expects($this->once())
             ->method('getImage')
             ->willReturn($imageBody);
+        $this->fileMock->expects($this->once())
+            ->method('fileGetContents')
+            ->willReturn($imageBody);
         $this->rawFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->rawMock);
+        $this->imageAdapterFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->imageAdapterMock);
 
         $this->assertSame(
             $this->rawMock,
@@ -217,27 +251,34 @@ public function testExecuteException()
         $this->imageAdapterMock->expects($this->at(1))
             ->method('open')
             ->with($placeholderPath);
-        $this->imageAdapterMock->expects($this->once())
+        $this->imageAdapterMock->expects($this->atLeastOnce())
             ->method('getMimeType')
             ->willReturn($mimeType);
-        $this->rawMock->expects($this->once())
+        $this->rawMock->expects($this->atLeastOnce())
             ->method('setHeader')
             ->with('Content-Type', $mimeType)
             ->willReturnSelf();
-        $this->rawMock->expects($this->once())
+        $this->rawMock->expects($this->atLeastOnce())
             ->method('setContents')
             ->with($imageBody)
             ->willReturnSelf();
-        $this->imageAdapterMock->expects($this->once())
+        $this->imageAdapterMock->expects($this->any())
             ->method('getImage')
             ->willReturn($imageBody);
+        $this->fileMock->expects($this->once())
+            ->method('fileGetContents')
+            ->willReturn($imageBody);
         $this->loggerMock->expects($this->once())
             ->method('warning')
             ->with($exception);
         $this->rawFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->rawMock);
 
+        $this->imageAdapterFactoryMock->expects($this->exactly(1))
+            ->method('create')
+            ->willReturn($this->imageAdapterMock);
+
         $this->assertSame(
             $this->rawMock,
             $this->wysiwygDirective->execute()
@@ -297,6 +338,20 @@ public function testExecuteWithDeletedImage()
             ->method('warning')
             ->with($exception);
 
+        $this->rawMock->expects($this->once())
+            ->method('setHeader')
+            ->with('Content-Type', null)
+            ->willReturnSelf();
+
+        $this->rawMock->expects($this->once())
+            ->method('setContents')
+            ->with(null)
+            ->willReturnSelf();
+
+        $this->rawFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->rawMock);
+
         $this->wysiwygDirective->execute();
     }
 }

lib/internal/Magento/Framework/Image/Adapter/Gd2.php

@@ -75,16 +75,6 @@ public function open($filename)
             $this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),
             $this->_fileName
         );
-        $fileType = $this->getImageType();
-        if (in_array($fileType, [IMAGETYPE_PNG, IMAGETYPE_GIF])) {
-            $this->_keepTransparency = true;
-            if ($this->_imageHandler) {
-                $isAlpha = $this->checkAlpha($this->_fileName);
-                if ($isAlpha) {
-                    $this->_fillBackgroundColor($this->_imageHandler);
-                }
-            }
-        }
     }
 
     /**