Merge remote-tracking branch 'origin/develop' into saleschannels-integration-with-api

# Conflicts:
#	app/code/Magento/InventorySales/Ui/Component/Listing/Column/SalesChannels.php
#	app/code/Magento/InventorySales/etc/di.xml

Author: Valeriy Nayda

app/code/Magento/InventoryApi/Api/Data/StockExtension.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryApi\Api\Data;
+
+/**
+ * TODO: temporal fix of extension classes generation during installation
+ * Extension class for @see \Magento\InventoryApi\Api\Data\StockInterface
+ */
+class StockExtension extends \Magento\Framework\Api\AbstractSimpleObject implements StockExtensionInterface
+{
+    /**
+     * @return \Magento\InventorySalesApi\Api\Data\SalesChannelInterface[]|null
+     */
+    public function getSalesChannels()
+    {
+        return $this->_get('sales_channels');
+    }
+
+    /**
+     * @param \Magento\InventorySalesApi\Api\Data\SalesChannelInterface[] $salesChannels
+     * @return $this
+     */
+    public function setSalesChannels($salesChannels)
+    {
+        $this->setData('sales_channels', $salesChannels);
+        return $this;
+    }
+}

app/code/Magento/InventoryApi/Api/Data/StockExtensionInterface.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryApi\Api\Data;
+
+/**
+ * TODO: temporal fix of extension classes generation during installation
+ * ExtensionInterface class for @see \Magento\InventoryApi\Api\Data\StockInterface
+ */
+interface StockExtensionInterface extends \Magento\Framework\Api\ExtensionAttributesInterface
+{
+    /**
+     * @return \Magento\InventorySalesApi\Api\Data\SalesChannelInterface[]|null
+     */
+    public function getSalesChannels();
+
+    /**
+     * @param \Magento\InventorySalesApi\Api\Data\SalesChannelInterface[] $salesChannels
+     * @return $this
+     */
+    public function setSalesChannels($salesChannels);
+}

app/code/Magento/InventoryApi/Test/Api/SourceRepository/CreateTest.php

@@ -72,7 +72,7 @@ protected function tearDown()
     {
         /** @var ResourceConnection $connection */
         $connection = Bootstrap::getObjectManager()->get(ResourceConnection::class);
-        $connection->getConnection()->delete('inventory_source', [
+        $connection->getConnection()->delete($connection->getTableName('inventory_source'), [
             SourceInterface::NAME . ' IN (?)' => ['source-name-1'],
         ]);
         parent::tearDown();

app/code/Magento/InventoryApi/Test/Api/SourceRepository/RegionProcessingTest.php

@@ -82,7 +82,7 @@ protected function tearDown()
     {
         /** @var ResourceConnection $connection */
         $connection = Bootstrap::getObjectManager()->get(ResourceConnection::class);
-        $connection->getConnection()->delete('inventory_source', [
+        $connection->getConnection()->delete($connection->getTableName('inventory_source'), [
             SourceInterface::NAME . ' IN (?)' => ['source-name-1'],
         ]);
         parent::tearDown();

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

@@ -6,5 +6,9 @@
  */
 -->
 <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" />
+    <module name="Magento_InventoryCatalog" setup_version="2.0.0">
+        <sequence>
+            <module name="InventorySales"/>
+        </sequence>
+    </module>
 </config>

app/code/Magento/InventorySales/Model/GetAssignedSalesChannelsForStock.php

@@ -11,6 +11,9 @@
 use Magento\InventorySalesApi\Api\Data\SalesChannelInterfaceFactory;
 use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
 
+/**
+ * @inheritdoc
+ */
 class GetAssignedSalesChannelsForStock implements GetAssignedSalesChannelsForStockInterface
 {
     /**

app/code/Magento/InventorySales/Model/GetAssignedSalesChannelsForStockInterface.php

@@ -10,8 +10,8 @@
 use Magento\InventorySalesApi\Api\Data\SalesChannelInterface;
 
 /**
- * TODO: describe SPI
- * Get assigned Sales Channels for Stock
+ * Get assigned Sales Channels for Stock (Service Provider Interface - SPI)
+ * Provide own implementation of this interface if you would like to replace channels management strategy
  *
  * @api
  */

app/code/Magento/InventorySales/Model/OptionSource/WebsiteSource.php

@@ -42,7 +42,7 @@ public function toOptionArray(): array
             }
             $websites[] = [
                 'value' => $website->getCode(),
-                'label' => $website->getName()
+                'label' => $website->getName(),
             ];
         }
         return $websites;

app/code/Magento/InventorySales/Model/ReplaceSalesChannelsOnStockInterface.php renamed to app/code/Magento/InventorySales/Model/ReplaceSalesChannelsForStockInterface.php

@@ -8,14 +8,15 @@
 namespace Magento\InventorySales\Model;
 
 /**
- * TODO: SPI description
+ * Implementation of links replacement between Stock and Sales Channels (Service Provider Interface - SPI)
+ * Provide own implementation of this interface if you would like to replace channels management strategy
  *
  * @api
  */
-interface ReplaceSalesChannelsOnStockInterface
+interface ReplaceSalesChannelsForStockInterface
 {
     /**
-     * Replace existing or non existing Sales Channels for Stock
+     * Replace Sales Channels for Stock
      *
      * @param array $salesChannels
      * @param int $stockId