MC-39340: Improve image upload

Author: Viktor Sevch

app/code/Magento/Catalog/Controller/Adminhtml/Product/Gallery/Upload.php

@@ -11,7 +11,7 @@
 use Magento\Framework\Exception\LocalizedException;
 
 /**
- * Class Upload
+ * Class Upload image(s)
  */
 class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
@@ -108,8 +108,10 @@ public function execute()
 
             $result['url'] = $this->productMediaConfig->getTmpMediaUrl($result['file']);
             $result['file'] = $result['file'] . '.tmp';
-        } catch (\Exception $e) {
+        } catch (LocalizedException $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
+        } catch (\Throwable $e) {
+            $result = ['error' => 'Something went wrong while saving the file(s).', 'errorcode' => 0];
         }
 
         /** @var \Magento\Framework\Controller\Result\Raw $response */

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Gallery/UploadTest.php

@@ -198,15 +198,15 @@ public function uploadActionWithErrorsDataProvider(): array
                     'current_path' => '/../../../../_files',
                 ],
                 'expectation' => [
-                    'message' => 'Wrong file size.',
+                    'message' => 'Something went wrong while saving the file(s).',
                     'errorcode' => 0,
                     'tmp_media_path' => '/m/a/magento_empty.jpg',
                 ],
             ],
             'upload_without_image' => [
                 'file' => [],
                 'expectation' => [
-                    'message' => '$_FILES array is empty',
+                    'message' => 'Something went wrong while saving the file(s).',
                     'errorcode' => 0,
                 ],
             ],
@@ -218,7 +218,7 @@ public function uploadActionWithErrorsDataProvider(): array
                     'current_path' => '/../../../../_files',
                 ],
                 'expectation' => [
-                    'message' => 'Unsupported image format.',
+                    'message' => 'Something went wrong while saving the file(s).',
                     'errorcode' => 0,
                     'tmp_media_path' => '/m/w/magento_wrong.png',
                 ],

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

@@ -6,8 +6,6 @@
 
 namespace Magento\Framework\Image\Adapter;
 
-use Magento\Framework\Exception\LocalizedException;
-
 /**
  * Gd2 adapter.
  *
@@ -58,7 +56,7 @@ protected function _reset()
      *
      * @param string $filename
      * @return void
-     * @throws \OverflowException|LocalizedException
+     * @throws \OverflowException
      */
     public function open($filename)
     {
@@ -73,11 +71,10 @@ public function open($filename)
             throw new \OverflowException('Memory limit has been reached.');
         }
         $this->imageDestroy();
-        try {
-            $this->_imageHandler = call_user_func($this->_getCallback('create'), $this->_fileName);
-        } catch (\Throwable $ex) {
-            throw new LocalizedException(__('Unsupported image format.'));
-        }
+        $this->_imageHandler = call_user_func(
+            $this->_getCallback('create', null, sprintf('Unsupported image format. File: %s', $this->_fileName)),
+            $this->_fileName
+        );
     }
 
     /**