Updated to use collectionFactory to generate collections instead of DI

Author: Graham Wharton

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

@@ -8,7 +8,7 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Visibility;
-use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogUrlRewrite\Model\ProductScopeRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlPathGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
@@ -59,9 +59,9 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
     private $deleteEntitiesFromStores;
 
     /**
-     * @var Collection
+     * @var CollectionFactory
      */
-    private $productCollection;
+    private $collectionFactory;
 
     /**
      * @param ProductUrlRewriteGenerator $productUrlRewriteGenerator
@@ -70,7 +70,7 @@ class ProductProcessUrlRewriteSavingObserver implements ObserverInterface
      * @param StoreManagerInterface $storeManager
      * @param ProductScopeRewriteGenerator $productScopeRewriteGenerator
      * @param DeleteEntitiesFromStores $deleteEntitiesFromStores
-     * @param Collection $productCollection
+     * @param CollectionFactory $collectionFactory
      */
     public function __construct(
         ProductUrlRewriteGenerator $productUrlRewriteGenerator,
@@ -79,15 +79,15 @@ public function __construct(
         StoreManagerInterface $storeManager,
         ProductScopeRewriteGenerator $productScopeRewriteGenerator,
         DeleteEntitiesFromStores $deleteEntitiesFromStores,
-        Collection $productCollection
+        CollectionFactory $collectionFactory
     ) {
         $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
         $this->urlPersist = $urlPersist;
         $this->productUrlPathGenerator = $productUrlPathGenerator;
         $this->storeManager = $storeManager;
         $this->productScopeRewriteGenerator = $productScopeRewriteGenerator;
         $this->deleteEntitiesFromStores = $deleteEntitiesFromStores;
-        $this->productCollection = $productCollection;
+        $this->collectionFactory = $collectionFactory;
     }
 
     /**
@@ -117,7 +117,8 @@ public function execute(Observer $observer)
 
             $storeIdsToRemove = [];
             $productWebsiteMap = array_flip($product->getWebsiteIds());
-            $storeVisibilities = $this->productCollection->getAllAttributeValues(ProductInterface::VISIBILITY);
+            $storeVisibilities = $this->collectionFactory->create()
+                    ->getAllAttributeValues(ProductInterface::VISIBILITY);
             if ($this->productScopeRewriteGenerator->isGlobalScope($product->getStoreId())) {
                 //Remove any rewrite URLs for websites the product is not in, or is not visible in. Global Scope.
                 foreach ($this->storeManager->getStores() as $store) {

app/code/Magento/CatalogUrlRewrite/Test/Unit/Observer/ProductProcessUrlRewriteSavingObserverTest.php

@@ -7,6 +7,7 @@
 namespace Magento\CatalogUrlRewrite\Test\Unit\Observer;
 
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogUrlRewrite\Model\ProductScopeRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
@@ -106,6 +107,11 @@ class ProductProcessUrlRewriteSavingObserverTest extends TestCase
      */
     private $productCollection;
 
+    /**
+     * @var CollectionFactory|MockObject
+     */
+    private $collectionFactory;
+
     /**
      * Set up
      * Website_ID = 0 -> Store_ID = 0
@@ -129,10 +135,17 @@ protected function setUp()
 
         $this->product = $this->initialiseProduct();
 
+        $this->collectionFactory = $this->createPartialMock(
+            CollectionFactory::class,
+            ['create']
+        );
         $this->productCollection = $this->createPartialMock(
             Collection::class,
             ['getAllAttributeValues']
         );
+        $this->collectionFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->productCollection);
 
         $this->deleteEntitiesFromStores = $this->createPartialMock(
             DeleteEntitiesFromStores::class,
@@ -192,7 +205,7 @@ protected function setUp()
                 'storeWebsiteRelation' => $this->storeWebsiteRelation,
                 'deleteEntitiesFromStores' => $this->deleteEntitiesFromStores,
                 'productScopeRewriteGenerator' => $this->productScopeRewriteGenerator,
-                'productCollection' => $this->productCollection
+                'collectionFactory' => $this->collectionFactory
             ]
         );
     }