ECP-202 Deprecate Rotation Support in Magento

- Fixed static tests

Author: paliarush

app/code/Magento/Catalog/Model/Product/Image.php

@@ -10,9 +10,11 @@
 use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Image as MagentoImage;
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Catalog\Model\Product\Image\ParamsBuilder;
+use Magento\Framework\Filesystem\Driver\File as FilesystemDriver;
 
 /**
  * Image operations
@@ -200,6 +202,11 @@ class Image extends \Magento\Framework\Model\AbstractModel
      */
     private $serializer;
 
+    /**
+     * @var FilesystemDriver
+     */
+    private $filesystemDriver;
+
     /**
      * Constructor
      *
@@ -220,6 +227,8 @@ class Image extends \Magento\Framework\Model\AbstractModel
      * @param array $data
      * @param SerializerInterface $serializer
      * @param ParamsBuilder $paramsBuilder
+     * @param FilesystemDriver $filesystemDriver
+     * @throws \Magento\Framework\Exception\FileSystemException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
@@ -240,7 +249,8 @@ public function __construct(
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
         SerializerInterface $serializer = null,
-        ParamsBuilder $paramsBuilder = null
+        ParamsBuilder $paramsBuilder = null,
+        FilesystemDriver $filesystemDriver = null
     ) {
         $this->_storeManager = $storeManager;
         $this->_catalogProductMediaConfig = $catalogProductMediaConfig;
@@ -255,6 +265,7 @@ public function __construct(
         $this->viewAssetPlaceholderFactory = $viewAssetPlaceholderFactory;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
         $this->paramsBuilder = $paramsBuilder ?: ObjectManager::getInstance()->get(ParamsBuilder::class);
+        $this->filesystemDriver = $filesystemDriver ?: ObjectManager::getInstance()->get(FilesystemDriver::class);
     }
 
     /**
@@ -666,7 +677,12 @@ public function getDestinationSubdir()
     public function isCached()
     {
         $path = $this->imageAsset->getPath();
-        return is_array($this->loadImageInfoFromCache($path)) || file_exists($path);
+        try {
+            $isCached = is_array($this->loadImageInfoFromCache($path)) || $this->filesystemDriver->isExists($path);
+        } catch (FileSystemException $e) {
+            $isCached = false;
+        }
+        return $isCached;
     }
 
     /**

lib/internal/Magento/Framework/Image.php

@@ -49,7 +49,7 @@ public function open()
         $this->_adapter->checkDependencies();
 
         if (!file_exists($this->_fileName)) {
-            throw new \Exception("File '{$this->_fileName}' does not exist.");
+            throw new \RuntimeException("File '{$this->_fileName}' does not exist.");
         }
 
         $this->_adapter->open($this->_fileName);
@@ -95,7 +95,7 @@ public function rotate($angle)
     /**
      * Crop an image.
      *
-     * @param int $top  Default value is 0
+     * @param int $top Default value is 0
      * @param int $left Default value is 0
      * @param int $right Default value is 0
      * @param int $bottom Default value is 0
@@ -195,7 +195,7 @@ public function quality($value)
      * @param int $watermarkImageOpacity Watermark image opacity.
      * @param bool $repeat Enable or disable watermark brick.
      * @access public
-     * @throws \Exception
+     * @throws \RuntimeException
      * @return void
      */
     public function watermark(
@@ -206,7 +206,7 @@ public function watermark(
         $repeat = false
     ) {
         if (!file_exists($watermarkImage)) {
-            throw new \Exception("Required file '{$watermarkImage}' does not exists.");
+            throw new \RuntimeException("Required file '{$watermarkImage}' does not exists.");
         }
         $this->_adapter->watermark($watermarkImage, $positionX, $positionY, $watermarkImageOpacity, $repeat);
     }
@@ -233,16 +233,19 @@ public function getImageType()
         return $this->_adapter->getImageType();
     }
 
+    // phpcs:disable Magento2.CodeAnalysis.EmptyBlock
     /**
      * Process
      *
-     * @access public
+     * @access public,
      * @return void
      */
     public function process()
     {
     }
+    // phpcs:enable Magento2.CodeAnalysis.EmptyBlock
 
+    // phpcs:disable Magento2.CodeAnalysis.EmptyBlock
     /**
      * Instruction
      *
@@ -252,6 +255,7 @@ public function process()
     public function instruction()
     {
     }
+    // phpcs:enable Magento2.CodeAnalysis.EmptyBlock
 
     /**
      * Set image background color

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

@@ -41,9 +41,6 @@ abstract class AbstractAdapter implements AdapterInterface
 
     const POSITION_CENTER = 'center';
 
-    /**
-     * Default font size
-     */
     const DEFAULT_FONT_SIZE = 15;
 
     /**

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

@@ -28,6 +28,8 @@ interface AdapterInterface
     public function getColorAt($x, $y);
 
     /**
+     * Render image and return its binary contents
+     *
      * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
      * @return string
      */
@@ -99,6 +101,7 @@ public function crop($top = 0, $left = 0, $right = 0, $bottom = 0);
 
     /**
      * Save image to specific path.
+     *
      * If some folders of path does not exist they will be created
      *
      * @param null|string $destination

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

@@ -5,6 +5,11 @@
  */
 namespace Magento\Framework\Image\Adapter;
 
+/**
+ * Wrapper for Imagick image processing PHP Extension.
+ *
+ * @link https://www.php.net/manual/en/book.imagick.php
+ */
 class ImageMagick extends \Magento\Framework\Image\Adapter\AbstractAdapter
 {
     /**
@@ -77,7 +82,11 @@ public function open($filename)
         try {
             $this->_imageHandler = new \Imagick($this->_fileName);
         } catch (\ImagickException $e) {
-            throw new \Exception(sprintf('Unsupported image format. File: %s', $this->_fileName), $e->getCode(), $e);
+            throw new \RuntimeException(
+                sprintf('Unsupported image format. File: %s', $this->_fileName),
+                $e->getCode(),
+                $e
+            );
         }
 
         $this->backgroundColor();
@@ -86,6 +95,7 @@ public function open($filename)
 
     /**
      * Save image to specific path.
+     *
      * If some folders of path does not exist they will be created
      *
      * @param null|string $destination
@@ -124,6 +134,8 @@ protected function _applyOptions()
     }
 
     /**
+     * Render image binary content and return it.
+     *
      * @see \Magento\Framework\Image\Adapter\AbstractAdapter::getImage
      * @return string
      */
@@ -334,7 +346,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
                 );
             }
         } catch (\ImagickException $e) {
-            throw new \Exception('Unable to create watermark.', $e->getCode(), $e);
+            throw new \RuntimeException('Unable to create watermark.', $e->getCode(), $e);
         }
 
         // merge layers
@@ -347,12 +359,12 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
      * Checks required dependencies
      *
      * @return void
-     * @throws \Exception If some of dependencies are missing
+     * @throws \RuntimeException If some of dependencies are missing
      */
     public function checkDependencies()
     {
         if (!class_exists('\Imagick', false)) {
-            throw new \Exception("Required PHP extension 'Imagick' was not loaded.");
+            throw new \RuntimeException("Required PHP extension 'Imagick' was not loaded.");
         }
     }