ACP2E-1353: allow image/x-icon favicon; cr comments

Author: alzota

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

@@ -30,7 +30,7 @@ class Image extends AbstractValidator
         'jpg'  => 'image/jpeg',
         'gif'  => 'image/gif',
         'bmp'  => 'image/bmp',
-        'ico'  => [ 'image/vnd.microsoft.icon', 'image/x-icon']
+        'ico'  => ['image/vnd.microsoft.icon', 'image/x-icon']
     ];
 
     /**
@@ -48,11 +48,6 @@ class Image extends AbstractValidator
      */
     private $file;
 
-    /**
-     * @var ConfigInterface
-     */
-    private $config;
-
     /**
      * @var LoggerInterface
      */
@@ -62,20 +57,17 @@ class Image extends AbstractValidator
      * @param Mime $fileMime
      * @param Factory $imageFactory
      * @param File $file
-     * @param ConfigInterface|null $config
      * @param LoggerInterface|null $logger
      */
     public function __construct(
         Mime $fileMime,
         Factory $imageFactory,
         File $file,
-        ConfigInterface $config = null,
         LoggerInterface $logger = null
     ) {
         $this->fileMime = $fileMime;
         $this->imageFactory = $imageFactory;
         $this->file = $file;
-        $this->config = $config ?? ObjectManager::getInstance()->get(ConfigInterface::class);
         $this->logger = $logger ?? ObjectManager::getInstance()->get(LoggerInterface::class);
 
         parent::__construct();
@@ -93,11 +85,6 @@ public function isValid($filePath): bool
             try {
                 $image = $this->imageFactory->create($filePath);
                 $image->open();
-            } catch (\InvalidArgumentException $e) {
-                if (stripos($fileMimeType, 'icon') !== false) {
-                    $image = $this->imageFactory->create($filePath, $this->getNonDefaultAdapter());
-                    $image->open();
-                }
             } catch (\Exception $e) {
                 $isValid = false;
                 $this->logger->critical($e, ['exception' => $e]);
@@ -106,17 +93,4 @@ public function isValid($filePath): bool
 
         return $isValid;
     }
-
-    /**
-     * Get non default image adapter
-     *
-     * @return string|null
-     */
-    private function getNonDefaultAdapter(): ?string
-    {
-        $defaultAdapter = $this->config->getAdapterAlias();
-        $adapters = $this->config->getAdapters();
-        unset($adapters[$defaultAdapter]);
-        return array_key_first($adapters) ?? null;
-    }
 }

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>