Fix hard dependency of InventoryCatalog on Inventory module

app/code/Magento/InventoryCatalog/Model/SourceItem/SourceItemsSave.php → app/code/Magento/Inventory/Model/SourceItem/Command/Handler/SourceItemsSaveHandler.php

@@ -5,20 +5,21 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InventoryCatalog\Model\SourceItem;
+namespace Magento\Inventory\Model\SourceItem\Command\Handler;
 
+use Exception;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Validation\ValidationException;
 use Magento\Inventory\Model\ResourceModel\SourceItem\SaveMultiple;
 use Magento\Inventory\Model\SourceItem\Validator\SourceItemsValidator;
-use Magento\InventoryApi\Api\SourceItemsSaveInterface;
+use Magento\InventoryApi\Api\Data\SourceItemInterface;
 use Psr\Log\LoggerInterface;
 
 /**
- * @inheritdoc
+ * Class SourceItemsSaveHandler
  */
-class SourceItemsSave implements SourceItemsSaveInterface
+class SourceItemsSaveHandler
 {
     /**
      * @var SourceItemsValidator
@@ -51,7 +52,13 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Save Multiple Source item data
+     *
+     * @param SourceItemInterface[] $sourceItems
+     * @return void
+     * @throws InputException
+     * @throws ValidationException
+     * @throws CouldNotSaveException
      */
     public function execute(array $sourceItems)
     {
@@ -66,7 +73,7 @@ public function execute(array $sourceItems)
 
         try {
             $this->saveMultiple->execute($sourceItems);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             $this->logger->error($e->getMessage());
             throw new CouldNotSaveException(__('Could not save Source Item'), $e);
         }

app/code/Magento/Inventory/Model/SourceItem/Command/SourceItemsSave.php

@@ -7,68 +7,32 @@
 
 namespace Magento\Inventory\Model\SourceItem\Command;
 
-use Magento\Framework\Exception\CouldNotSaveException;
-use Magento\Framework\Exception\InputException;
-use Magento\Framework\Validation\ValidationException;
-use Magento\Inventory\Model\ResourceModel\SourceItem\SaveMultiple;
-use Magento\Inventory\Model\SourceItem\Validator\SourceItemsValidator;
+use Magento\Inventory\Model\SourceItem\Command\Handler\SourceItemsSaveHandler;
 use Magento\InventoryApi\Api\SourceItemsSaveInterface;
-use Psr\Log\LoggerInterface;
 
 /**
  * @inheritdoc
  */
 class SourceItemsSave implements SourceItemsSaveInterface
 {
     /**
-     * @var SourceItemsValidator
+     * @var SourceItemsSaveHandler
      */
-    private $sourceItemsValidator;
+    private $sourceItemsSaveHandler;
 
     /**
-     * @var SaveMultiple
+     * @param SourceItemsSaveHandler $sourceItemsSaveHandler
      */
-    private $saveMultiple;
-
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @param SourceItemsValidator $sourceItemsValidator
-     * @param SaveMultiple $saveMultiple
-     * @param LoggerInterface $logger
-     */
-    public function __construct(
-        SourceItemsValidator $sourceItemsValidator,
-        SaveMultiple $saveMultiple,
-        LoggerInterface $logger
-    ) {
-        $this->sourceItemsValidator = $sourceItemsValidator;
-        $this->saveMultiple = $saveMultiple;
-        $this->logger = $logger;
+    public function __construct(SourceItemsSaveHandler $sourceItemsSaveHandler)
+    {
+        $this->sourceItemsSaveHandler = $sourceItemsSaveHandler;
     }
 
     /**
      * @inheritdoc
      */
     public function execute(array $sourceItems)
     {
-        if (empty($sourceItems)) {
-            throw new InputException(__('Input data is empty'));
-        }
-
-        $validationResult = $this->sourceItemsValidator->validate($sourceItems);
-        if (!$validationResult->isValid()) {
-            throw new ValidationException(__('Validation Failed'), null, 0, $validationResult);
-        }
-
-        try {
-            $this->saveMultiple->execute($sourceItems);
-        } catch (\Exception $e) {
-            $this->logger->error($e->getMessage());
-            throw new CouldNotSaveException(__('Could not save Source Item'), $e);
-        }
+        $this->sourceItemsSaveHandler->execute($sourceItems);
     }
 }

app/code/Magento/Inventory/Model/SourceItem/Command/SourceItemsSaveWithoutLegacySynchronization.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Inventory\Model\SourceItem\Command;
+
+use Magento\Inventory\Model\SourceItem\Command\Handler\SourceItemsSaveHandler;
+use Magento\InventoryApi\Api\SourceItemsSaveInterface;
+
+/**
+ * @inheritdoc
+ */
+class SourceItemsSaveWithoutLegacySynchronization implements SourceItemsSaveInterface
+{
+    /**
+     * @var SourceItemsSaveHandler
+     */
+    private $sourceItemsSaveHandler;
+
+    /**
+     * @param SourceItemsSaveHandler $sourceItemsSaveHandler
+     */
+    public function __construct(SourceItemsSaveHandler $sourceItemsSaveHandler)
+    {
+        $this->sourceItemsSaveHandler = $sourceItemsSaveHandler;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(array $sourceItems)
+    {
+        $this->sourceItemsSaveHandler->execute($sourceItems);
+    }
+}

app/code/Magento/InventoryCatalog/Model/UpdateSourceItemBasedOnLegacyStockItem.php

@@ -62,7 +62,6 @@ class UpdateSourceItemBasedOnLegacyStockItem
      * @param DefaultSourceProviderInterface $defaultSourceProvider
      * @param ResourceConnection $resourceConnection
      * @param GetSkusByProductIdsInterface $getSkusByProductIds
-
      */
     public function __construct(
         SourceItemRepositoryInterface $sourceItemRepository,

app/code/Magento/InventoryCatalog/composer.json

@@ -6,17 +6,16 @@
     "magento/framework": "*",
     "magento/module-catalog": "*",
     "magento/module-catalog-inventory": "*",
-    "magento/module-inventory": "*",
     "magento/module-inventory-api": "*",
     "magento/module-inventory-catalog-api": "*",
     "magento/module-store": "*",
+    "magento/module-inventory": "*",
     "magento/module-inventory-configuration-api": "*",
     "magento/module-inventory-indexer": "*",
     "magento/module-inventory-sales-api": "*"
   },
   "suggest": {
-    "magento/module-inventory-reservations-api": "*",
-    "magento/module-inventory": "*"
+    "magento/module-inventory-reservations-api": "*"
   },
   "type": "magento2-module",
   "license": [

app/code/Magento/InventoryCatalog/etc/di.xml

@@ -67,10 +67,10 @@
     </type>
     <type name="Magento\InventoryCatalog\Model\UpdateSourceItemBasedOnLegacyStockItem">
         <arguments>
-            <argument name="sourceItemsSave" xsi:type="object">Magento\InventoryCatalog\Model\SourceItem\SourceItemsSave</argument>
+            <argument name="sourceItemsSave" xsi:type="object">Magento\Inventory\Model\SourceItem\Command\SourceItemsSaveWithoutLegacySynchronization</argument>
         </arguments>
     </type>
-    <type name="Magento\InventoryCatalog\Model\SourceItem\SourceItemsSave">
+    <type name="Magento\Inventory\Model\SourceItem\Command\SourceItemsSaveWithoutLegacySynchronization">
         <plugin name="set_data_to_legacy_catalog_inventory_at_source_items_save" disabled="true"/>
     </type>
 </config>

app/code/Magento/InventoryCatalog/etc/module.xml

@@ -6,9 +6,5 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_InventoryCatalog" setup_version="1.0.0" >
-        <sequence>
-            <module name="Magento_Inventory"/>
-        </sequence>
-    </module>
+    <module name="Magento_InventoryCatalog" setup_version="1.0.0" />
 </config>