ACPT-488

updating unit tests
fixing static test failures

Author: JacobBrownAustin

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogUrlRewrite\Observer;
 
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
@@ -51,25 +50,25 @@ class AfterImportDataObserver implements ObserverInterface
 
     /**
      * @var StoreViewService
-     * @deprecated
+     * @deprecated No longer used.
      */
     protected $storeViewService;
 
     /**
      * @var Product
-     * @deprecated
+     * @deprecated No longer used.
      */
     protected $product;
 
     /**
      * @var array
-     * @deprecated
+     * @deprecated No longer used.
      */
     protected $productsWithStores;
 
     /**
      * @var array
-     * @deprecated
+     * @deprecated No longer used.
      */
     protected $products = [];
 
@@ -197,6 +196,7 @@ class AfterImportDataObserver implements ObserverInterface
      * @param ScopeConfigInterface|null $scopeConfig
      * @param CollectionFactory|null $collectionFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         ProductFactory $catalogProductFactory,
@@ -275,7 +275,7 @@ private function populateForUrlsGeneration(array $bunch) : array
                 }
             }
         }
-        foreach($productIdsMissingUrlKeyByStore as $storeId => $productIds) {
+        foreach ($productIdsMissingUrlKeyByStore as $storeId => $productIds) {
             $this->getUrlKeyAndNameForProductsByIds($productIds, $storeId, $products);
         }
         return $products;
@@ -286,7 +286,7 @@ private function populateForUrlsGeneration(array $bunch) : array
      *
      * @param array $rowData
      * @param Product[] &$products
-     * @return AfterImportDataObserver|null
+     * @return void
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
@@ -450,7 +450,6 @@ private function canonicalUrlRewriteGenerate(array $products)
                 }
             }
         }
-
         return $urls;
     }
 
@@ -579,18 +578,17 @@ private function generateForCustom(UrlRewrite $url, ?Category $category, array $
             if ($url->getRequestPath() === $targetPath) {
                 return [];
             }
-            return [
-                $this->urlRewriteFactory->create()
-                    ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)
-                    ->setEntityId($productId)
-                    ->setRequestPath($url->getRequestPath())
-                    ->setTargetPath($targetPath)
-                    ->setRedirectType($url->getRedirectType())
-                    ->setStoreId($storeId)
-                    ->setDescription($url->getDescription())
-                    ->setIsAutogenerated(0)
-                    ->setMetadata($url->getMetadata())
-            ];
+            $urlRewrite = $this->urlRewriteFactory->create();
+            $urlRewrite->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE);
+            $urlRewrite->setEntityId($productId);
+            $urlRewrite->setRequestPath($url->getRequestPath());
+            $urlRewrite->setTargetPath($targetPath);
+            $urlRewrite->setRedirectType($url->getRedirectType());
+            $urlRewrite->setStoreId($storeId);
+            $urlRewrite->setDescription($url->getDescription());
+            $urlRewrite->setIsAutogenerated(0);
+            $urlRewrite->setMetadata($url->getMetadata());
+            return [$urlRewrite];
         }
         return [];
     }
@@ -681,7 +679,7 @@ private function getParentCategoriesUrlRewrites(array $categoryIds, int $storeId
      *
      * @param int[] $productIds
      * @param int $storeId
-     * @param array[] $products
+     * @param array[] $importedProducts
      * @return void
      */
     private function getUrlKeyAndNameForProductsByIds(array $productIds, int $storeId, array $importedProducts): void