Merge remote-tracking branch 'mainline/develop' into api-sprint-61-pr

Author: Cari Spruiell

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/checkboxes/tree.phtml

@@ -10,7 +10,7 @@
 
 <?php $_divId = 'tree-div_' . time() ?>
 <div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
-<script id="ie-deferred-loader" defer="defer" src=""></script>
+<script id="ie-deferred-loader" defer="defer" src="//:"></script>
 <script>
     require([
         'jquery',

app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/widget/tree.phtml

@@ -11,7 +11,7 @@
 <?php $_divId = 'tree' . $block->getId() ?>
 <div id="<?php /* @escapeNotVerified */ echo $_divId ?>" class="tree"></div>
 <!--[if IE]>
-<script id="ie-deferred-loader" defer="defer" src=""></script>
+<script id="ie-deferred-loader" defer="defer" src="//:"></script>
 <![endif]-->
 <script>
 require(['jquery', "prototype", "extjs/ext-tree-checkbox"], function(jQuery){

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/set/main.phtml

@@ -38,7 +38,7 @@
             <span class="title"><?php /* @escapeNotVerified */ echo __('Unassigned Attributes') ?></span>
         </div>
         <div id="tree-div2" class="attribute-set-tree"></div>
-        <script id="ie-deferred-loader" defer="defer" src=""></script>
+        <script id="ie-deferred-loader" defer="defer" src="//:"></script>
         <script>
             define("tree-panel",
                 [

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1963,7 +1963,7 @@ protected function _saveStockItem()
                 $productIdsToReindex[] = $row['product_id'];
 
                 $row['website_id'] = $this->stockConfiguration->getDefaultScopeId();
-                $row['stock_id'] = $this->stockRegistry->getStock()->getStockId();
+                $row['stock_id'] = $this->stockRegistry->getStock($row['website_id'])->getStockId();
 
                 $stockItemDo = $this->stockRegistry->getStockItem($row['product_id'], $row['website_id']);
                 $existStockData = $stockItemDo->getData();

app/code/Magento/CatalogInventory/Api/StockRegistryInterface.php

@@ -12,10 +12,10 @@
 interface StockRegistryInterface
 {
     /**
-     * @param int|null $stockId
+     * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
      */
-    public function getStock($stockId = null);
+    public function getStock($scopeId = null);
 
     /**
      * @param int $productId

app/code/Magento/CatalogInventory/Api/StockStatusCriteriaInterface.php

@@ -15,31 +15,31 @@ interface StockStatusCriteriaInterface extends \Magento\Framework\Api\CriteriaIn
      * Add Criteria object
      *
      * @param \Magento\CatalogInventory\Api\StockStatusCriteriaInterface $criteria
-     * @return void
+     * @return bool
      */
     public function addCriteria(\Magento\CatalogInventory\Api\StockStatusCriteriaInterface $criteria);
 
     /**
      * Filter by scope(s)
      *
      * @param int $scope
-     * @return void
+     * @return bool
      */
     public function setScopeFilter($scope);
 
     /**
      * Add product(s) filter
      *
      * @param int $products
-     * @return void
+     * @return bool
      */
     public function setProductsFilter($products);
 
     /**
      * Add filter by quantity
      *
      * @param float $qty
-     * @return void
+     * @return bool
      */
     public function setQtyFilter($qty);
 }

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

@@ -6,7 +6,6 @@
 namespace Magento\CatalogInventory\Helper;
 
 use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
-use Magento\CatalogInventory\Model\Spi\StockResolverInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\CatalogInventory\Model\ResourceModel\Stock\StatusFactory;
@@ -48,45 +47,36 @@ class Stock
      */
     private $stockRegistryProvider;
 
-    /**
-     * @var StockResolverInterface
-     */
-    protected $stockResolver;
-
     /**
      * @param StoreManagerInterface $storeManager
      * @param ScopeConfigInterface $scopeConfig
      * @param StatusFactory $stockStatusFactory
      * @param StockRegistryProviderInterface $stockRegistryProvider
-     * @param StockResolverInterface $stockResolver
      */
     public function __construct(
         StoreManagerInterface $storeManager,
         ScopeConfigInterface $scopeConfig,
         StatusFactory $stockStatusFactory,
-        StockRegistryProviderInterface $stockRegistryProvider,
-        StockResolverInterface $stockResolver
+        StockRegistryProviderInterface $stockRegistryProvider
     ) {
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
         $this->stockStatusFactory  = $stockStatusFactory;
         $this->stockRegistryProvider = $stockRegistryProvider;
-        $this->stockResolver = $stockResolver;
     }
 
     /**
      * Assign stock status information to product
      *
      * @param Product $product
-     * @param int $stockStatus
+     * @param int $status
      * @return void
      */
-    public function assignStatusToProduct(Product $product, $stockStatus = null)
+    public function assignStatusToProduct(Product $product, $status = null)
     {
-        if ($stockStatus === null) {
-            $productId = $product->getId();
-            $stockId = $this->stockResolver->getStockId($productId, $product->getStore()->getWebsiteId());
-            $stockStatus = $this->stockRegistryProvider->getStockStatus($productId, $stockId);
+        if ($status === null) {
+            $websiteId = $product->getStore()->getWebsiteId();
+            $stockStatus = $this->stockRegistryProvider->getStockStatus($product->getId(), $websiteId);
             $status = $stockStatus->getStockStatus();
         }
         $product->setIsSalable($status);
@@ -103,8 +93,7 @@ public function addStockStatusToProducts(AbstractCollection $productCollection)
         $websiteId = $this->storeManager->getStore($productCollection->getStoreId())->getWebsiteId();
         foreach ($productCollection as $product) {
             $productId = $product->getId();
-            $stockId = $this->stockResolver->getStockId($productId, $websiteId);
-            $stockStatus = $this->stockRegistryProvider->getStockStatus($productId, $stockId);
+            $stockStatus = $this->stockRegistryProvider->getStockStatus($productId, $websiteId);
             $status = $stockStatus->getStockStatus();
             $product->setIsSalable($status);
         }

app/code/Magento/CatalogInventory/Model/Spi/StockRegistryProviderInterface.php

@@ -11,22 +11,22 @@
 interface StockRegistryProviderInterface
 {
     /**
-     * @param int|null $stockId
+     * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
      */
-    public function getStock($stockId);
+    public function getStock($scopeId);
 
     /**
      * @param int $productId
-     * @param int $stockId
+     * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
      */
-    public function getStockItem($productId, $stockId);
+    public function getStockItem($productId, $scopeId);
 
     /**
      * @param int $productId
-     * @param int $stockId
+     * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
      */
-    public function getStockStatus($productId, $stockId);
+    public function getStockStatus($productId, $scopeId);
 }

app/code/Magento/CatalogInventory/Model/Spi/StockResolverInterface.php

@@ -177,7 +177,7 @@ public function getStockId()
     {
         $stockId = $this->getData(static::STOCK_ID);
         if ($stockId === null) {
-            $stockId = $this->stockRegistry->getStock()->getStockId();
+            $stockId = $this->stockRegistry->getStock($this->getWebsiteId())->getStockId();
         }
         return (int) $stockId;
     }