Merge branch 'ACP2E-1353' of https://github.com/magento-l3/magento2ce into PR-L3-2023-01-31

Author: aplapana

app/code/Magento/MediaStorage/Model/File/Validator/Image.php

@@ -27,7 +27,7 @@ class Image extends AbstractValidator
         'jpg'  => 'image/jpeg',
         'gif'  => 'image/gif',
         'bmp'  => 'image/bmp',
-        'ico'  => 'image/vnd.microsoft.icon',
+        'ico'  => ['image/vnd.microsoft.icon', 'image/x-icon']
     ];
 
     /**
@@ -70,7 +70,7 @@ public function isValid($filePath): bool
         $fileMimeType = $this->fileMime->getMimeType($filePath);
         $isValid = true;
 
-        if (in_array($fileMimeType, $this->imageMimeTypes)) {
+        if (stripos(json_encode($this->imageMimeTypes), json_encode($fileMimeType)) !== false) {
             try {
                 $image = $this->imageFactory->create($filePath);
                 $image->open();

app/code/Magento/MediaStorage/Test/Unit/Model/File/Validator/ImageTest.php

@@ -0,0 +1,90 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Test\Unit\Model\File\Validator;
+
+use Magento\Framework\File\Mime;
+use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Image as FrameworkImage;
+use Magento\Framework\Image\Factory;
+use Magento\MediaStorage\Model\File\Validator\Image;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+/** Unit tests for \Magento\MediaStorage\Model\File\Validator\Image class */
+class ImageTest extends TestCase
+{
+    /**
+     * @var Mime|MockObject
+     */
+    private $fileMimeMock;
+
+    /**
+     * @var Factory|MockObject
+     */
+    private $imageFactoryMock;
+
+    /**
+     * @var FrameworkImage|MockObject
+     */
+    private $imageMock;
+
+    /**
+     * @var File|MockObject
+     */
+    private $fileMock;
+
+    /**
+     * @var Image
+     */
+    private $image;
+
+    protected function setUp(): void
+    {
+        $this->fileMimeMock = $this->createMock(Mime::class);
+        $this->imageFactoryMock = $this->createMock(Factory::class);
+        $this->fileMock = $this->createMock(File::class);
+        $this->imageMock = $this->createMock(FrameworkImage::class);
+
+        $this->image = new Image(
+            $this->fileMimeMock,
+            $this->imageFactoryMock,
+            $this->fileMock
+        );
+    }
+
+    /**
+     * @dataProvider dataProviderForIsValid
+     */
+    public function testIsValid($filePath, $mimeType, $result): void
+    {
+        $this->fileMimeMock->expects($this->once())
+            ->method('getMimeType')
+            ->with($filePath)
+            ->willReturn($mimeType);
+        $this->imageMock->expects($this->once())
+                ->method('open')
+                ->willReturn(null);
+        $this->imageFactoryMock->expects($this->once())
+                ->method('create')
+                ->willReturn($this->imageMock);
+        $this->assertEquals($result, $this->image->isValid($filePath));
+    }
+
+    /**
+     * @return array[]
+     */
+    public function dataProviderForIsValid()
+    {
+        return [
+            'x-icon' => [dirname(__FILE__) . '/_files/favicon-x-icon.ico',
+                'image/x-icon', true],
+            'vnd-microsoft-icon' => [dirname(__FILE__) . '/_files/favicon-vnd-microsoft.ico',
+                'image/vnd.microsoft.icon', true]
+        ];
+    }
+}

app/code/Magento/Theme/i18n/en_US.csv

@@ -153,6 +153,7 @@ Configuration,Configuration
 "Other Settings","Other Settings"
 "HTML Head","HTML Head"
 "Allowed file types: ico, png, gif, jpg, jpeg, apng. Not all browsers support all these formats!","Allowed file types: ico, png, gif, jpg, jpeg, apng. Not all browsers support all these formats!"
+"Not all browsers support all these formats! Note: ICO file type is supported by ImageMagik adapter that can be set from Store / Configuration / Developer / Image Processing Settings.","Not all browsers support all these formats! Note: ICO file type is supported by ImageMagik adapter that can be set from Store / Configuration / Developer / Image Processing Settings."
 "Favicon Icon","Favicon Icon"
 "Default Page Title","Default Page Title"
 "Page Title Prefix","Page Title Prefix"

app/code/Magento/Theme/view/adminhtml/ui_component/design_config_form.xml

@@ -56,7 +56,7 @@
             </settings>
             <field name="head_shortcut_icon" formElement="imageUploader">
                 <settings>
-                    <notice translate="true">Not all browsers support all these formats!</notice>
+                    <notice translate="true">Not all browsers support all these formats! Note: ICO file type is supported by ImageMagik adapter that can be set from Store / Configuration / Developer / Image Processing Settings.</notice>
                     <label translate="true">Favicon Icon</label>
                     <componentType>imageUploader</componentType>
                 </settings>

dev/tests/integration/testsuite/Magento/Theme/Controller/Adminhtml/System/Design/ThemeControllerTest.php

@@ -5,18 +5,40 @@
  */
 namespace Magento\Theme\Controller\Adminhtml\System\Design;
 
-use Magento\Framework\Filesystem;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem\DirectoryList;
 
 /**
  * @magentoAppArea adminhtml
  */
 class ThemeControllerTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
+    /**
+     * @var ScopeConfigInterface|mixed
+     */
+    private $config;
+
+    /**
+     * @var string
+     */
+    private $imageAdapter;
+
+    /**
+     * @inheritDoc
+     */
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->config = $this->_objectManager->get(ScopeConfigInterface::class);
+        $this->imageAdapter = $this->config->getValue('dev/image/default_adapter');
+    }
+
     public function testUploadJsAction()
     {
         $name = 'simple-js-file.js';
-        $this->createUploadFixture($name);
+        $this->createUploadFixture($name, 'application/x-javascript', 'js_files_uploader');
         $theme = $this->_objectManager->create(\Magento\Framework\View\Design\ThemeInterface::class)
             ->getCollection()
             ->getFirstItem();
@@ -28,13 +50,38 @@ public function testUploadJsAction()
         $this->assertStringContainsString($name, $output);
     }
 
+    public function testUploadFaviconAction()
+    {
+        $names = ['favicon-x-icon.ico', 'favicon-vnd-microsoft.ico'];
+        foreach ($names as $name) {
+            $this->createUploadFixture($name, 'image/vnd.microsoft.icon', 'head_shortcut_icon');
+            $theme = $this->_objectManager->create(\Magento\Framework\View\Design\ThemeInterface::class)
+                ->getCollection()
+                ->getFirstItem();
+            $this->getRequest()->setPostValue('id', $theme->getId());
+            $this->dispatch('backend/admin/design_config_fileUploader/save');
+            $output = $this->getResponse()->getBody();
+            if (!in_array('imagick', get_loaded_extensions()) || $this->imageAdapter == 'GD2') {
+                $this->assertStringContainsString(
+                    '{"error":"File validation failed."',
+                    $output
+                );
+            } else {
+                $this->assertStringContainsString('"error":"false"', $output);
+                $this->assertStringContainsString($name, $output);
+            }
+        }
+    }
+
     /**
      * Creates a fixture for testing uploaded file
      *
      * @param string $name
+     * @params string $mimeType
      * @return void
+     * @throws FileSystemException
      */
-    private function createUploadFixture($name)
+    private function createUploadFixture($name, $mimeType, $model)
     {
         /** @var \Magento\TestFramework\App\Filesystem $filesystem */
         $filesystem = $this->_objectManager->get(\Magento\Framework\Filesystem::class);
@@ -44,11 +91,11 @@ private function createUploadFixture($name)
         $target = $tmpDir->getAbsolutePath("{$subDir}/{$name}");
         copy(__DIR__ . "/_files/{$name}", $target);
         $_FILES = [
-            'js_files_uploader' => [
-                'name' => 'simple-js-file.js',
-                'type' => 'application/x-javascript',
+            $model => [
+                'name' => $name,
+                'type' => $mimeType,
                 'tmp_name' => $target,
-                'error' => '0',
+                'error' => 'false',
                 'size' => '28',
             ],
         ];