Merge remote-tracking branch 'mainline/merchant_beta' into MAGETWO-45429-mb

Author: Sergey Semenov

app/code/Magento/CatalogUrlRewrite/Model/Product/Plugin/Import.php

@@ -183,7 +183,8 @@ protected function groupUrls($urls)
     {
         $groups =[];
         foreach ($urls as $url) {
-            $key = sprintf('%s-%s',
+            $key = sprintf(
+                '%s-%s',
                 $url->getEntityId(),
                 $url->getStoreId()
             );
@@ -222,13 +223,13 @@ protected function replaceUrls(array $productUrls)
     /**
      * Add increment to every URL in array
      *
-     * @param $productUrls
-     * @param $increment
+     * @param array $productUrls
+     * @param int $increment
      * @return $this
      */
     protected function addIncrementToUrls(array & $productUrls, $increment)
     {
-        foreach($productUrls as $productUrl) {
+        foreach ($productUrls as $productUrl) {
             $requestPath = substr($productUrl->getRequestPath(), 0, -strlen($productUrl->getUrlSuffix()));
             $requestPath = sprintf('%s-%s%s', $requestPath, $increment, $productUrl->getUrlSuffix());
             $productUrl->setRequestPath($requestPath);

app/code/Magento/UrlRewrite/Service/V1/Data/UrlRewrite.php

@@ -39,7 +39,7 @@ class UrlRewrite extends AbstractSimpleObject
 
     /**
      * URL suffix for rewrite (used in import)
-     * @var
+     * @var string
      */
     protected $urlSuffix;