Merge pull request #630 from magento-troll/MerchantBetaBugFixes

[Merchant Beta][MX] Bugfixes

Author: slopukhov

app/code/Magento/CatalogInventory/Helper/Stock.php

@@ -5,21 +5,16 @@
  */
 namespace Magento\CatalogInventory\Helper;
 
-use Magento\CatalogInventory\Api\StockRegistryInterface;
+use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Framework\ObjectManagerInterface;
+use Magento\CatalogInventory\Model\Resource\Stock\StatusFactory;
 
 /**
  * Class Stock
  */
 class Stock
 {
-    /**
-     * @var StockRegistryInterface
-     */
-    protected $stockRegistry;
-
     /**
      * Store model manager
      *
@@ -40,26 +35,31 @@ class Stock
     protected $stockStatusResource;
 
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var StatusFactory
+     */
+    protected $stockStatusFactory;
+
+    /**
+     * @var StockRegistryProviderInterface
      */
-    protected $objectManger;
+    private $stockRegistryProvider;
 
     /**
-     * @param StockRegistryInterface $stockRegistry
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
-     * @param ObjectManagerInterface $objectManager
+     * @param StatusFactory $stockStatusFactory
+     * @param StockRegistryProviderInterface $stockRegistryProvider
      */
     public function __construct(
-        StockRegistryInterface $stockRegistry,
         StoreManagerInterface $storeManager,
         ScopeConfigInterface $scopeConfig,
-        ObjectManagerInterface $objectManager
+        StatusFactory $stockStatusFactory,
+        StockRegistryProviderInterface $stockRegistryProvider
     ) {
-        $this->stockRegistry = $stockRegistry;
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
-        $this->objectManger = $objectManager;
+        $this->stockStatusFactory  = $stockStatusFactory;
+        $this->stockRegistryProvider = $stockRegistryProvider;
     }
 
     /**
@@ -73,7 +73,7 @@ public function assignStatusToProduct(\Magento\Catalog\Model\Product $product, $
     {
         if ($stockStatus === null) {
             $websiteId = $product->getStore()->getWebsiteId();
-            $stockStatus = $this->stockRegistry->getStockStatus($product->getId(), $websiteId);
+            $stockStatus = $this->stockRegistryProvider->getStockStatus($product->getId(), $websiteId);
             $status = $stockStatus->getStockStatus();
         }
         $product->setIsSalable($status);
@@ -90,10 +90,9 @@ public function addStockStatusToProducts(
         \Magento\Catalog\Model\Resource\Collection\AbstractCollection $productCollection
     ) {
         $websiteId = $this->storeManager->getStore($productCollection->getStoreId())->getWebsiteId();
-        $productIds = [];
         foreach ($productCollection as $product) {
             $productId = $product->getId();
-            $stockStatus = $this->stockRegistry->getStockStatus($productId, $websiteId);
+            $stockStatus = $this->stockRegistryProvider->getStockStatus($productId, $websiteId);
             $status = $stockStatus->getStockStatus();
             $product->setIsSalable($status);
         }
@@ -162,9 +161,7 @@ public function addIsInStockFilterToCollection($collection)
     protected function getStockStatusResource()
     {
         if (empty($this->stockStatusResource)) {
-            $this->stockStatusResource = $this->objectManger->get(
-                'Magento\CatalogInventory\Model\Resource\Stock\Status'
-            );
+            $this->stockStatusResource = $this->stockStatusFactory->create();
         }
         return $this->stockStatusResource;
     }

app/code/Magento/CatalogInventory/Test/Unit/Helper/StockTest.php

@@ -18,34 +18,29 @@ class StockTest extends \PHPUnit_Framework_TestCase
     protected $stock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface
      */
-    protected $stockRegistryMock;
+    protected $stockRegistryProviderMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Store\Model\StoreManagerInterface
      */
     protected $storeManagerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\Config\ScopeConfigInterface
      */
     protected $scopeConfigMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\CatalogInventory\Model\Resource\Stock\StatusFactory
      */
-    protected $productFactoryMock;
-
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $objectManagerMock;
+    protected $statusFactoryMock;
 
     protected function setUp()
     {
-        $this->stockRegistryMock = $this->getMockBuilder(
-            'Magento\CatalogInventory\Api\StockRegistryInterface'
+        $this->stockRegistryProviderMock = $this->getMockBuilder(
+            'Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface'
         )
             ->disableOriginalConstructor()
             ->getMock();
@@ -55,14 +50,15 @@ protected function setUp()
         $this->scopeConfigMock = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\App\ObjectManager')
+        $this->statusFactoryMock = $this->getMockBuilder('Magento\CatalogInventory\Model\Resource\Stock\StatusFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $this->stock = new Stock(
-            $this->stockRegistryMock,
             $this->storeManagerMock,
             $this->scopeConfigMock,
-            $this->objectManagerMock
+            $this->statusFactoryMock,
+            $this->stockRegistryProviderMock
         );
     }
 
@@ -77,7 +73,7 @@ public function testAssignStatusToProduct()
         $stockStatusMock->expects($this->any())
             ->method('getStockStatus')
             ->willReturn($status);
-        $this->stockRegistryMock->expects($this->any())
+        $this->stockRegistryProviderMock->expects($this->any())
             ->method('getStockStatus')
             ->willReturn($stockStatusMock);
         $storeMock = $this->getMockBuilder('Magento\Store\Model\Store')
@@ -142,7 +138,7 @@ public function testAddStockStatusToProducts()
         $this->storeManagerMock->expects($this->once())
             ->method('getStore')
             ->willReturn($storeMock);
-        $this->stockRegistryMock->expects($this->once())
+        $this->stockRegistryProviderMock->expects($this->once())
             ->method('getStockStatus')
             ->withAnyParameters()
             ->willReturn($stockStatusMock);
@@ -192,8 +188,8 @@ public function testAddStockStatusToSelect()
         $stockStatusMock->expects($this->once())
             ->method('addStockStatusToSelect')
             ->with($selectMock, $websiteMock);
-        $this->objectManagerMock->expects($this->once())
-            ->method('get')
+        $this->statusFactoryMock->expects($this->once())
+            ->method('create')
             ->willReturn($stockStatusMock);
 
         $this->assertNull($this->stock->addStockStatusToSelect($selectMock, $websiteMock));
@@ -211,8 +207,8 @@ public function testAddIsInStockFilterToCollection()
         $stockStatusMock->expects($this->once())
             ->method('addIsInStockFilterToCollection')
             ->with($collectionMock);
-        $this->objectManagerMock->expects($this->once())
-            ->method('get')
+        $this->statusFactoryMock->expects($this->once())
+            ->method('create')
             ->willReturn($stockStatusMock);
 
         $this->assertNull($this->stock->addIsInStockFilterToCollection($collectionMock));