ACP2E-1353: allow image/x-icon favicon

Author: alzota

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

@@ -8,9 +8,12 @@
 namespace Magento\MediaStorage\Model\File\Validator;
 
 use Laminas\Validator\AbstractValidator;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\File\Mime;
 use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Image\Adapter\ConfigInterface;
 use Magento\Framework\Image\Factory;
+use Psr\Log\LoggerInterface;
 
 /**
  * Image validator
@@ -45,19 +48,35 @@ class Image extends AbstractValidator
      */
     private $file;
 
+    /**
+     * @var ConfigInterface
+     */
+    private $config;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * @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
+        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();
     }
@@ -71,12 +90,20 @@ public function isValid($filePath): bool
         $isValid = false;
 
         if (stripos(serialize($this->imageMimeTypes), $fileMimeType) !== false) {
+            $defaultAdapter = $this->config->getAdapterAlias();
             try {
-                $image = $this->imageFactory->create($filePath);
+                $image = $this->imageFactory->create($filePath, $defaultAdapter);
+                $image->open();
+                $isValid = true;
+            } catch (\InvalidArgumentException $e) {
+                $adapters = $this->config->getAdapters();
+                unset($adapters[$defaultAdapter]);
+                $image = $this->imageFactory->create($filePath, array_key_first($adapters) ?? null);
                 $image->open();
                 $isValid = true;
             } catch (\Exception $e) {
                 $isValid = false;
+                $this->logger->critical($e, ['exception' => $e]);
             }
         }