MAGETWO-45311: Remove dependency on Website for Cataloginventory

 - Reverted website to criteria filters array

Author: aohorodnyk

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

@@ -1943,7 +1943,7 @@ protected function _saveStockItem()
                 $row['product_id'] = $this->skuProcessor->getNewSku($rowData[self::COL_SKU])['entity_id'];
                 $productIdsToReindex[] = $row['product_id'];
 
-                $row['website_id'] = $this->stockConfiguration->getDefaultWebsiteId();
+                $row['website_id'] = $this->stockConfiguration->getDefaultScopeId();
                 $row['stock_id'] = $this->stockRegistry->getStock($row['website_id'])->getStockId();
 
                 $stockItemDo = $this->stockRegistry->getStockItem($row['product_id'], $row['website_id']);

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php

@@ -47,7 +47,7 @@ public function setStockFilter($stock)
      */
     public function setScopeFilter($scope)
     {
-        $this->data['scope_filter'] = $scope;
+        $this->data['website_filter'] = $scope;
         return true;
     }
 

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php

@@ -29,7 +29,7 @@ public function __construct($mapper = '')
      */
     public function setScopeFilter($scope)
     {
-        $this->data['scope_filter'] = $scope;
+        $this->data['website_filter'] = $scope;
     }
 
     /**

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/StockCriteria.php

@@ -27,7 +27,7 @@ public function __construct($mapper = '')
      */
     public function setScopeFilter($scope)
     {
-        $this->data['scope_filter'] = $scope;
+        $this->data['website_filter'] = $scope;
         return true;
     }