Merge remote-tracking branch 'origin/1.1.5-develop' into sync_1.1-develop_with_1.1.5-develop

Author: Stanislav Idolov

InventoryAdminUi/Test/Mftf/Test/ElasticSearchLayeredNavigationCustomStockTest.xml

@@ -16,6 +16,7 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
+            <group value="SearchEngineElasticsearch"/>
         </annotations>
 
         <before>
@@ -95,8 +96,6 @@
             <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="customStock" stepKey="deleteCustomStock"/>
 
-            <!--Revert ElasticSearch as search engine.-->
-            <actionGroup ref="ResetSearchEngineConfigurationActionGroup" stepKey="resetCatalogSearchConfiguration"/>
             <magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchDisable"/>
             <magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchDisable"/>
             <actionGroup ref="logout" stepKey="logoutOfAdmin1"/>

InventoryAdminUi/Test/Mftf/Test/ElasticSearchLayeredNavigationTest.xml

@@ -16,8 +16,9 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
+            <group value="SearchEngineElasticsearch"/>
         </annotations>
-        
+
         <before>
             <!-- Assign Main Website to Default Stock -->
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -62,8 +63,7 @@
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
-            <!--Revert ElasticSearch as search engine.-->
-            <actionGroup ref="ResetSearchEngineConfigurationActionGroup" stepKey="resetCatalogSearchConfiguration"/>
+
             <magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchDisable"/>
             <magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchDisable"/>
             <actionGroup ref="logout" stepKey="logoutOfAdmin1"/>

InventoryAdminUi/Test/Mftf/Test/ElasticSearchQuickAdvancedSearchAdditionalStockProductTest.xml

@@ -16,8 +16,9 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
+            <group value="SearchEngineElasticsearch"/>
         </annotations>
-        
+
         <before>
             <!--Create Simple Products.-->
             <createData entity="SimpleSubCategory" stepKey="simpleCategory"/>
@@ -75,8 +76,7 @@
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
-            <!--Revert ElasticSearch as search engine.-->
-            <actionGroup ref="ResetSearchEngineConfigurationActionGroup" stepKey="resetCatalogSearchConfiguration"/>
+
             <magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchDisable"/>
             <magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchDisable"/>
             <actionGroup ref="logout" stepKey="logoutOfAdmin1"/>

InventoryAdminUi/Test/Mftf/Test/ElasticSearchQuickAdvancedSearchDefaultStockProductTest.xml

@@ -16,8 +16,9 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
+            <group value="SearchEngineElasticsearch"/>
         </annotations>
-        
+
         <before>
             <!-- Assign Main Website to Default Stock -->
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
@@ -62,8 +63,7 @@
             <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
-            <!--Revert ElasticSearch as search engine.-->
-            <actionGroup ref="ResetSearchEngineConfigurationActionGroup" stepKey="resetCatalogSearchConfiguration"/>
+
             <magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchDisable"/>
             <magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchDisable"/>
             <actionGroup ref="logout" stepKey="logoutOfAdmin1"/>

InventorySales/Model/AreProductsSalableForRequestedQty.php

@@ -7,46 +7,43 @@
 
 namespace Magento\InventorySales\Model;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\InventorySalesApi\Api\AreProductsSalableForRequestedQtyInterface;
-use Magento\InventorySalesApi\Api\Data\ProductSalabilityErrorInterface;
 use Magento\InventorySalesApi\Api\IsProductSalableForRequestedQtyInterface;
+use Magento\InventorySalesApi\Api\Data\ProductSalableResultInterface;
+use Magento\InventorySalesApi\Api\Data\ProductSalabilityErrorInterface;
 
 /**
  * Verify items are salable for requested quantity.
  */
 class CheckItemsQuantity
 {
     /**
-     * @var AreProductsSalableForRequestedQtyInterface
+     * @var IsProductSalableForRequestedQtyInterface
      */
-    private $areProductsSalableForRequestedQty;
+    private $isProductSalableForRequestedQty;
 
     /**
-     * @param IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQty @deprecated
-     * @param AreProductsSalableForRequestedQtyInterface $areProductsSalableForRequestedQty
+     * @param IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQty
      */
     public function __construct(
-        IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQty,
-        AreProductsSalableForRequestedQtyInterface $areProductsSalableForRequestedQty = null
+        IsProductSalableForRequestedQtyInterface $isProductSalableForRequestedQty
     ) {
-        $this->areProductsSalableForRequestedQty = $areProductsSalableForRequestedQty ?: ObjectManager::getInstance()
-            ->get(AreProductsSalableForRequestedQtyInterface::class);
+        $this->isProductSalableForRequestedQty = $isProductSalableForRequestedQty;
     }
 
     /**
      * Check whether all items salable
      *
-     * @param array $items ['sku' => 'qty', ...]
+     * @param array $items [['sku' => 'qty'], ...]
      * @param int $stockId
      * @return void
      * @throws LocalizedException
      */
     public function execute(array $items, int $stockId): void
     {
-        $result = $this->areProductsSalableForRequestedQty->execute($items, $stockId);
-        foreach ($result->getSalable() as $isSalable) {
+        foreach ($items as $sku => $qty) {
+            /** @var ProductSalableResultInterface $isSalable */
+            $isSalable = $this->isProductSalableForRequestedQty->execute((string)$sku, $stockId, (float)$qty);
             if (false === $isSalable->isSalable()) {
                 $errors = $isSalable->getErrors();
                 /** @var ProductSalabilityErrorInterface $errorMessage */

InventorySales/Model/AreProductsSalableForRequestedQty/ProductsSalableResult.php

@@ -80,8 +80,6 @@
     </type>
     <!-- IsProductSalableForRequestedQtyCondition -->
     <preference for="Magento\InventorySalesApi\Api\IsProductSalableForRequestedQtyInterface" type="IsProductSalableForRequestedQtyConditionChainOnAddToCart"/>
-    <!-- AreProductsSalableForRequestedQtyCondition -->
-    <preference for="Magento\InventorySalesApi\Api\AreProductsSalableForRequestedQtyInterface" type="Magento\InventorySales\Model\AreProductsSalableForRequestedQty"/>
     <!-- IsProductSalableForRequestedQtyConditionOnAddToCart -->
     <virtualType name="IsProductSalableForRequestedQtyConditionChainOnAddToCart" type="Magento\InventorySales\Model\IsProductSalableForRequestedQtyCondition\IsProductSalableForRequestedQtyConditionChain">
         <arguments>
@@ -132,7 +130,7 @@
             </argument>
         </arguments>
     </virtualType>
-    <type name="Magento\InventorySales\Model\AreProductsSalableForRequestedQty">
+    <type name="Magento\InventorySales\Model\CheckItemsQuantity">
         <arguments>
             <argument name="isProductSalableForRequestedQty" xsi:type="object">IsProductSalableForRequestedQtyConditionChainOnPlaceOrder</argument>
         </arguments>
@@ -184,5 +182,4 @@
         <plugin name="process_reservations_after_product_save" type="Magento\InventorySales\Plugin\Catalog\Model\ResourceModel\Product\UpdateReservationsPlugin"/>
         <plugin name="delete_reservations" type="Magento\InventorySales\Plugin\Catalog\Model\ResourceModel\Product\DeleteReservationsPlugin"/>
     </type>
-    <preference for="Magento\InventorySalesApi\Api\Data\ProductsSalableResultInterface" type="Magento\InventorySales\Model\AreProductsSalableForRequestedQty\ProductsSalableResult"/>
 </config>