magento-engcom/magento2ce#2176: fixed failed tests

Author: Stanislav Idolov

app/code/Magento/Catalog/Block/Product/View/Gallery.php

@@ -23,6 +23,8 @@
 use Magento\Framework\Stdlib\ArrayUtils;
 
 /**
+ * Product gallery block
+ *
  * @api
  * @since 100.0.2
  */
@@ -196,6 +198,8 @@ public function isMainImage($image)
     }
 
     /**
+     * Returns image attribute
+     *
      * @param string $imageId
      * @param string $attributeName
      * @param string $default
@@ -222,6 +226,8 @@ private function getConfigView()
     }
 
     /**
+     * Returns image gallery config object
+     *
      * @return Collection
      */
     private function getGalleryImagesConfig()

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

@@ -102,6 +102,8 @@ public function __construct(
     }
 
     /**
+     * Execute create handler
+     *
      * @param object $product
      * @param array $arguments
      * @return object
@@ -204,6 +206,8 @@ public function execute($product, $arguments = [])
     }
 
     /**
+     * Returns media gallery atribute instance
+     *
      * @return \Magento\Catalog\Api\Data\ProductAttributeInterface
      * @since 101.0.0
      */
@@ -219,6 +223,8 @@ public function getAttribute()
     }
 
     /**
+     * Process delete images
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param array $images
      * @return void
@@ -230,6 +236,8 @@ protected function processDeletedImages($product, array &$images)
     }
 
     /**
+     * Process images
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @param array $images
      * @return void
@@ -292,6 +300,8 @@ protected function processNewImage($product, array &$image)
     }
 
     /**
+     * Duplicate attribute
+     *
      * @param \Magento\Catalog\Model\Product $product
      * @return $this
      * @since 101.0.0
@@ -360,6 +370,8 @@ private function getSafeFilename($file)
     }
 
     /**
+     * Returns file name according to tmp name
+     *
      * @param string $file
      * @return string
      * @since 101.0.0
@@ -447,8 +459,10 @@ private function getMediaAttributeCodes()
     }
 
     /**
+     * Process media attribute
+     *
      * @param \Magento\Catalog\Model\Product $product
-     * @param $mediaAttrCode
+     * @param string $mediaAttrCode
      * @param array $clearImages
      * @param array $newImages
      */
@@ -476,8 +490,10 @@ private function processMediaAttribute(
     }
 
     /**
+     * Process media attribute label
+     *
      * @param \Magento\Catalog\Model\Product $product
-     * @param $mediaAttrCode
+     * @param string $mediaAttrCode
      * @param array $clearImages
      * @param array $newImages
      * @param array $existImages

app/code/Magento/Catalog/Test/Unit/Block/Product/View/GalleryTest.php

@@ -147,6 +147,11 @@ private function prepareGetGalleryImagesJsonMocks($hasLabel = true)
             ->with('product')
             ->willReturn($productMock);
 
+        $this->imageHelper = $this->getMockBuilder(\Magento\Catalog\Helper\Image::class)
+            ->setMethods(['init', 'setImageFile', 'getUrl'])
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->imageHelper->expects($this->any())
             ->method('init')
             ->willReturnMap([
@@ -159,13 +164,13 @@ private function prepareGetGalleryImagesJsonMocks($hasLabel = true)
             ->method('setImageFile')
             ->with('test_file')
             ->willReturnSelf();
-        $this->imageHelper->expects($this->at(2))
+        $this->urlBuilder->expects($this->at(0))
             ->method('getUrl')
             ->willReturn('product_page_image_small_url');
-        $this->imageHelper->expects($this->at(5))
+        $this->urlBuilder->expects($this->at(1))
             ->method('getUrl')
             ->willReturn('product_page_image_medium_url');
-        $this->imageHelper->expects($this->at(8))
+        $this->urlBuilder->expects($this->at(2))
             ->method('getUrl')
             ->willReturn('product_page_image_large_url');
 

app/code/Magento/Checkout/Controller/Cart.php

@@ -106,8 +106,7 @@ protected function _isInternalUrl($url)
     /**
      * Get resolved back url
      *
-     * @param null $defaultUrl
-     *
+     * @param string|null $defaultUrl
      * @return mixed|null|string
      */
     protected function getBackUrl($defaultUrl = null)
@@ -129,6 +128,8 @@ protected function getBackUrl($defaultUrl = null)
     }
 
     /**
+     * Is redirect should be performed after the product was added to cart.
+     *
      * @return bool
      */
     private function shouldRedirectToCart()

app/code/Magento/Checkout/Controller/Cart/Add.php

@@ -11,6 +11,8 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 
 /**
+ * Controller for processing add to cart action.
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Add extends \Magento\Checkout\Controller\Cart
@@ -205,6 +207,8 @@ protected function goBack($backUrl = null, $product = null)
     }
 
     /**
+     * Returns cart url
+     *
      * @return string
      */
     private function getCartUrl()
@@ -213,6 +217,8 @@ private function getCartUrl()
     }
 
     /**
+     * Is redirect should be performed after the product was added to cart.
+     *
      * @return bool
      */
     private function shouldRedirectToCart()

app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less

@@ -123,7 +123,7 @@
     }
 
     td {
-        .admin__field-control  {
+        .admin__field-control {
             position: relative;
         }
     }