MAGETWO-90927: Refactor conditional to avoid complexity by checking existence of array and matching existing image count to current image count

Author: admanesachin

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

@@ -194,7 +194,6 @@ public function execute()
      */
     private function handleImageRemoveError($postData, $productId)
     {
-        
         if (isset($postData['product']['media_gallery']['images'])) {
             $removedImagesAmount = 0;
             foreach ($postData['product']['media_gallery']['images'] as $image) {
@@ -205,12 +204,11 @@ private function handleImageRemoveError($postData, $productId)
             if ($removedImagesAmount) {
                 $expectedImagesAmount = count($postData['product']['media_gallery']['images']) - $removedImagesAmount;
                 $product = $this->productRepository->getById($productId);
-                if (is_array($product->getMediaGallery('images'))) {
-                    if ($expectedImagesAmount != count($product->getMediaGallery('images'))) {
-                        $this->messageManager->addNoticeMessage(
-                            __('The image cannot be removed as it has been assigned to the other image role')
-                        );
-                    }
+                $images = $product->getMediaGallery('images');
+                if (is_array($images) && $expectedImagesAmount != count($images)) {
+                    $this->messageManager->addNoticeMessage(
+                        __('The image cannot be removed as it has been assigned to the other image role')
+                    );
                 }
             }
         }