Merge branch 'MAGETWO-87974' into EPAM-PR-8

VeronikaYarats · VeronikaYarats · commit 016a4b993b06 · 2018-09-13T19:02:42.000+03:00
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -949,7 +949,7 @@ public function getMediaGalleryAttributeId()
     }
 
     /**
-     * Get product by type name.
+     * Retrieve product type by name.
      *
      * @param string $name
      * @return Product\Type\AbstractType
@@ -1972,7 +1972,7 @@ private function getImagesHiddenStates($rowData)
     }
 
     /**
-     * Process row categories.
+     * Resolve valid category ids from provided row data.
      *
      * @param array $rowData
      * @return array
@@ -2829,7 +2829,7 @@ protected function getProductUrlSuffix($storeId = null)
     }
 
     /**
-     * Get url key.
+     * Retrieve url key from provided row data.
      *
      * @param array $rowData
      * @return string

Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ public function getMediaGalleryAttributeId()`
`949`	`949`	`}`
`950`	`950`
`951`	`951`	`/**`
`952`		`- * Get product by type name.`
	`952`	`+ * Retrieve product type by name.`
`953`	`953`	`*`
`954`	`954`	`* @param string $name`
`955`	`955`	`* @return Product\Type\AbstractType`
`@@ -1972,7 +1972,7 @@ private function getImagesHiddenStates($rowData)`
`1972`	`1972`	`}`
`1973`	`1973`
`1974`	`1974`	`/**`
`1975`		`- * Process row categories.`
	`1975`	`+ * Resolve valid category ids from provided row data.`
`1976`	`1976`	`*`
`1977`	`1977`	`* @param array $rowData`
`1978`	`1978`	`* @return array`
`@@ -2829,7 +2829,7 @@ protected function getProductUrlSuffix($storeId = null)`
`2829`	`2829`	`}`
`2830`	`2830`
`2831`	`2831`	`/**`
`2832`		`- * Get url key.`
	`2832`	`+ * Retrieve url key from provided row data.`
`2833`	`2833`	`*`
`2834`	`2834`	`* @param array $rowData`
`2835`	`2835`	`* @return string`