Another refactor, optimal way for receiving the object

Author: Rus0

app/code/Magento/Wishlist/Model/Wishlist.php

@@ -12,6 +12,8 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\CatalogInventory\Model\Configuration;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\ObjectManager;
@@ -152,6 +154,11 @@ class Wishlist extends AbstractModel implements IdentityInterface
      */
     private $scopeConfig;
 
+    /**
+     * @var StockRegistryInterface|null
+     */
+    private $stockRegistry;
+
     /**
      * Constructor
      *
@@ -172,6 +179,7 @@ class Wishlist extends AbstractModel implements IdentityInterface
      * @param bool $useCurrentWebsite
      * @param array $data
      * @param Json|null $serializer
+     * @param StockRegistryInterface|null $stockRegistry
      * @param ScopeConfigInterface|null $scopeConfig
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -193,6 +201,7 @@ public function __construct(
         $useCurrentWebsite = true,
         array $data = [],
         Json $serializer = null,
+        StockRegistryInterface $stockRegistry = null,
         ScopeConfigInterface $scopeConfig = null
     ) {
         $this->_useCurrentWebsite = $useCurrentWebsite;
@@ -209,6 +218,7 @@ public function __construct(
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->productRepository = $productRepository;
         $this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+        $this->stockRegistry = $stockRegistry ?: ObjectManager::getInstance()->get(StockRegistryInterface::class);
     }
 
     /**
@@ -447,7 +457,7 @@ public function addNewItem($product, $buyRequest = null, $forciblySetQty = false
             throw new LocalizedException(__('Cannot specify product.'));
         }
 
-        if ($this->isInStock($product)) {
+        if ($this->isInStock($productId)) {
             throw new LocalizedException(__('Cannot add product without stock to wishlist.'));
         }
 
@@ -642,13 +652,13 @@ public function isSalable()
     /**
      * Retrieve if product has stock or config is set for showing out of stock products
      *
-     * @param \Magento\Catalog\Api\Data\ProductInterface $product
+     * @param int $productId
      * @return bool
      */
-    public function isInStock(\Magento\Catalog\Api\Data\ProductInterface $product)
+    private function isInStock($productId)
     {
-        /** @var \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem */
-        $stockItem = $product->getExtensionAttributes()->getStockItem();
+        /** @var StockItemInterface $stockItem */
+        $stockItem = $this->stockRegistry->getStockItem($productId);
         $showOutOfStock = $this->scopeConfig->isSetFlag(
             Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
             ScopeInterface::SCOPE_STORE

app/code/Magento/Wishlist/Test/Unit/Model/WishlistTest.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\CatalogInventory\Api\StockRegistryInterface;
 use Magento\CatalogInventory\Model\Stock\Item as StockItem;
 use Magento\CatalogInventory\Model\Stock\StockItemRepository;
 use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -123,12 +124,12 @@ class WishlistTest extends TestCase
     /**
      * @var StockItemRepository|PHPUnit_Framework_MockObject_MockObject
      */
-    private $stockItemRepository;
+    private $scopeConfig;
 
     /**
-     * @var StockItemRepository|PHPUnit_Framework_MockObject_MockObject
+     * @var StockRegistryInterface|PHPUnit_Framework_MockObject_MockObject
      */
-    private $scopeConfig;
+    private $stockRegistry;
 
     protected function setUp()
     {
@@ -177,7 +178,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->productRepository = $this->createMock(ProductRepositoryInterface::class);
-        $this->stockItemRepository = $this->createMock(StockItemRepository::class);
+        $this->stockRegistry = $this->createMock(StockRegistryInterface::class);
         $this->scopeConfig = $this->createMock(ScopeConfigInterface::class);
 
         $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)
@@ -209,7 +210,7 @@ protected function setUp()
             false,
             [],
             $this->serializer,
-            $this->stockItemRepository,
+            $this->stockRegistry,
             $this->scopeConfig
         );
     }
@@ -280,7 +281,9 @@ public function testUpdateItem($itemId, $buyRequest, $param)
 
         $stockItem = $this->getMockBuilder(StockItem::class)->disableOriginalConstructor()->getMock();
         $stockItem->expects($this->any())->method('getIsInStock')->will($this->returnValue(true));
-        $this->stockItemRepository->expects($this->any())->method('get')->will($this->returnValue($stockItem));
+        $this->stockRegistry->expects($this->any())
+            ->method('getStockItem')
+            ->will($this->returnValue($stockItem));
 
         $instanceType = $this->getMockBuilder(AbstractType::class)
             ->disableOriginalConstructor()
@@ -289,9 +292,7 @@ public function testUpdateItem($itemId, $buyRequest, $param)
             ->method('processConfiguration')
             ->will(
                 $this->returnValue(
-                    $this->getMockBuilder(
-                        Product::class
-                    )->disableOriginalConstructor()->getMock()
+                    $this->getMockBuilder(Product::class)->disableOriginalConstructor()->getMock()
                 )
             );
 
@@ -413,7 +414,10 @@ function ($value) {
             StockItem::class
         )->disableOriginalConstructor()->getMock();
         $stockItem->expects($this->any())->method('getIsInStock')->will($this->returnValue(true));
-        $this->stockItemRepository->expects($this->any())->method('get')->will($this->returnValue($stockItem));
+
+        $this->stockRegistry->expects($this->any())
+            ->method('getStockItem')
+            ->will($this->returnValue($stockItem));
 
         $this->assertEquals($result, $this->wishlist->addNewItem($productMock, $buyRequest));
     }