ACP2E-2093: Issue when uploading image with the same name while deleting the old image

 - Addressed the CR comments.

Author: devarul

app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php

@@ -35,12 +35,12 @@ class UpdateHandler extends CreateHandler
     /**
      * @var AttributeValue
      */
-    private mixed $attributeValue;
+    private AttributeValue $attributeValue;
 
     /**
      * @var RemoveDeletedImagesFromCache
      */
-    private mixed $removeDeletedImagesFromCache;
+    private RemoveDeletedImagesFromCache $removeDeletedImagesFromCache;
 
     /**
      * @param MetadataPool $metadataPool

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

@@ -12,15 +12,12 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Encryption\Encryptor;
 use Magento\Framework\Encryption\EncryptorInterface;
-use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
 use Magento\Framework\View\ConfigInterface;
 
 /**
  * Delete image from cache
- *
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class RemoveDeletedImagesFromCache
 {
@@ -61,7 +58,6 @@ class RemoveDeletedImagesFromCache
      * @param Filesystem $filesystem
      * @param ParamsBuilder $imageParamsBuilder
      * @param ConvertImageMiscParamsToReadableFormat $convertImageMiscParamsToReadableFormat
-     * @throws FileSystemException
      */
     public function __construct(
         ConfigInterface $presentationConfig,
@@ -83,38 +79,40 @@ public function __construct(
      * Remove deleted images from cache.
      *
      * @param array $files
-     * @throws FileSystemException
+     *
+     * @return void
      */
-    public function removeDeletedImagesFromCache(array $files)
+    public function removeDeletedImagesFromCache(array $files): void
     {
-        if (count($files) > 0) {
-            $images = $this->presentationConfig
-                ->getViewConfig(['area' => \Magento\Framework\App\Area::AREA_FRONTEND])
-                ->getMediaEntities(
-                    'Magento_Catalog',
-                    Image::MEDIA_TYPE_CONFIG_NODE
-                );
+        if (count($files) === 0) {
+            return;
+        }
+        $images = $this->presentationConfig
+            ->getViewConfig(['area' => \Magento\Framework\App\Area::AREA_FRONTEND])
+            ->getMediaEntities(
+                'Magento_Catalog',
+                Image::MEDIA_TYPE_CONFIG_NODE
+            );
 
-            foreach ($images as $imageData) {
-                $imageMiscParams = $this->imageParamsBuilder->build($imageData);
+        foreach ($images as $imageData) {
+            $imageMiscParams = $this->imageParamsBuilder->build($imageData);
 
-                if (isset($imageMiscParams['image_type'])) {
-                    unset($imageMiscParams['image_type']);
-                }
+            if (isset($imageMiscParams['image_type'])) {
+                unset($imageMiscParams['image_type']);
+            }
 
-                $cacheId = $this->encryptor->hash(
-                    implode('_', $this->convertImageMiscParamsToReadableFormat
-                        ->convertImageMiscParamsToReadableFormat($imageMiscParams)),
-                    Encryptor::HASH_VERSION_MD5
-                );
+            $cacheId = $this->encryptor->hash(
+                implode('_', $this->convertImageMiscParamsToReadableFormat
+                    ->convertImageMiscParamsToReadableFormat($imageMiscParams)),
+                Encryptor::HASH_VERSION_MD5
+            );
 
-                $catalogPath = $this->mediaConfig->getBaseMediaPath();
+            $catalogPath = $this->mediaConfig->getBaseMediaPath();
 
-                foreach ($files as $filePath) {
-                    $this->mediaDirectory->delete(
-                        $catalogPath . '/cache/' . $cacheId . '/' . $filePath
-                    );
-                }
+            foreach ($files as $filePath) {
+                $this->mediaDirectory->delete(
+                    $catalogPath . '/cache/' . $cacheId . '/' . $filePath
+                );
             }
         }
     }

app/code/Magento/Catalog/Test/Unit/Model/Product/Image/RemoveDeletedImagesFromCacheTest.php

@@ -20,12 +20,12 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * Test deleted images from the cache
  */
 class RemoveDeletedImagesFromCacheTest extends TestCase
 {
     /**
-     * @var RemoveDeletedImagesFromCache
+     * @var RemoveDeletedImagesFromCache|MockObject
      */
     protected $model;
 
@@ -110,9 +110,10 @@ protected function setUp(): void
 
     /**
      * @param array $data
+     * @return void
      * @dataProvider createDataProvider
      */
-    public function testRemoveDeletedImagesFromCache($data)
+    public function testRemoveDeletedImagesFromCache(array $data): void
     {
         $this->presentationConfig->expects($this->once())
             ->method('getViewConfig')
@@ -165,10 +166,10 @@ private function getTestDataWithAttributes(): array
             'data' => [
                 'viewImageConfig' => [
                     'width' => 100,
-                    'height' => 50, // <===
+                    'height' => 50,
                     'constrain_only' => false,
                     'aspect_ratio' => false,
-                    'frame' => true, // <===
+                    'frame' => true,
                     'transparency' => false,
                     'background' => '255,255,255',
                     'type' => 'thumbnail' //thumbnail,small_image,image,swatch_image,swatch_thumb