Merge pull request magento#729 from magento-engcom/enhanced-declarati…

…ve-schema-compatibility Enhanced Declarative Schema Compatibility
fe-lix- · Mar 27, 2018 · 8c8cfa1 · 8c8cfa1
2 parents 73237b2 + c7d0d29
commit 8c8cfa1
Show file tree

Hide file tree

Showing 22 changed files with 266 additions and 344 deletions.
diff --git a/...to/InventoryCatalog/Setup/InstallData.php → ...p/Patch/Schema/InitializeDefaultStock.php b/...to/InventoryCatalog/Setup/InstallData.php → ...p/Patch/Schema/InitializeDefaultStock.php
@@ -5,21 +5,17 @@
  */
 declare(strict_types=1);
 
-namespace Magento\InventoryCatalog\Setup;
+namespace Magento\InventoryCatalog\Setup\Patch\Schema;
 
-use Magento\Framework\Setup\InstallDataInterface;
-use Magento\Framework\Setup\ModuleDataSetupInterface;
-use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
 use Magento\InventoryCatalog\Setup\Operation\AssignDefaultSourceToDefaultStock;
 use Magento\InventoryCatalog\Setup\Operation\CreateDefaultSource;
 use Magento\InventoryCatalog\Setup\Operation\CreateDefaultStock;
-use Magento\InventoryCatalog\Setup\Operation\ReindexDefaultStock;
-use Magento\InventoryCatalog\Setup\Operation\UpdateInventorySourceItem;
 
 /**
- * Install Default Source, Stock and link them together
+ * Patch schema with information about default stock
  */
-class InstallData implements InstallDataInterface
+class InitializeDefaultStock implements SchemaPatchInterface
 {
     /**
      * @var CreateDefaultSource
@@ -36,47 +32,46 @@ class InstallData implements InstallDataInterface
      */
     private $assignDefaultSourceToDefaultStock;
 
-    /**
-     * @var UpdateInventorySourceItem
-     */
-    private $updateInventorySourceItem;
-
-    /**
-     * @var ReindexDefaultStock
-     */
-    private $reindexDefaultStock;
-
     /**
      * @param CreateDefaultSource $createDefaultSource
      * @param CreateDefaultStock $createDefaultStock
      * @param AssignDefaultSourceToDefaultStock $assignDefaultSourceToDefaultStock
-     * @param UpdateInventorySourceItem $updateInventorySourceItem
-     * @param ReindexDefaultStock $reindexDefaultStock
      */
     public function __construct(
         CreateDefaultSource $createDefaultSource,
         CreateDefaultStock $createDefaultStock,
-        AssignDefaultSourceToDefaultStock $assignDefaultSourceToDefaultStock,
-        UpdateInventorySourceItem $updateInventorySourceItem,
-        ReindexDefaultStock $reindexDefaultStock
+        AssignDefaultSourceToDefaultStock $assignDefaultSourceToDefaultStock
     ) {
         $this->createDefaultSource = $createDefaultSource;
         $this->createDefaultStock = $createDefaultStock;
         $this->assignDefaultSourceToDefaultStock = $assignDefaultSourceToDefaultStock;
-        $this->updateInventorySourceItem = $updateInventorySourceItem;
-        $this->reindexDefaultStock = $reindexDefaultStock;
     }
 
     /**
-     * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @inheritDoc
      */
-    public function install(ModuleDataSetupInterface $setup, ModuleContextInterface $context)
+    public function apply()
     {
         $this->createDefaultSource->execute();
         $this->createDefaultStock->execute();
         $this->assignDefaultSourceToDefaultStock->execute();
-        $this->updateInventorySourceItem->execute($setup);
-        $this->reindexDefaultStock->execute();
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies()
+    {
+        return [];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases()
+    {
+        return [];
     }
 }
diff --git a/app/code/Magento/InventoryCatalog/Setup/Patch/Schema/ReindexDefaultSource.php b/app/code/Magento/InventoryCatalog/Setup/Patch/Schema/ReindexDefaultSource.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Setup\Patch\Schema;
+
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
+use Magento\InventoryCatalog\Setup\Operation\ReindexDefaultStock as Operation;
+
+/**
+ * Patch Inventory Source Items with Inventory Stock Item Data
+ */
+class ReindexDefaultSource implements SchemaPatchInterface
+{
+    /**
+     * @var Operation
+     */
+    private $operation;
+
+    /**
+     * @param Operation $operation
+     */
+    public function __construct(Operation $operation)
+    {
+        $this->operation = $operation;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply()
+    {
+        $this->operation->execute();
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            UpdateInventorySourceItem::class
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/app/code/Magento/InventoryCatalog/Setup/Patch/Schema/UpdateInventorySourceItem.php b/app/code/Magento/InventoryCatalog/Setup/Patch/Schema/UpdateInventorySourceItem.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\InventoryCatalog\Setup\Patch\Schema;
+
+use Magento\Framework\Setup\ModuleDataSetupInterface;
+use Magento\Framework\Setup\Patch\SchemaPatchInterface;
+use Magento\InventoryCatalog\Setup\Operation\UpdateInventorySourceItem as Operation;
+
+/**
+ * Patch Inventory Source Items with Inventory Stock Item Data
+ */
+class UpdateInventorySourceItem implements SchemaPatchInterface
+{
+    /**
+     * @var ModuleDataSetupInterface
+     */
+    private $moduleDataSetup;
+
+    /**
+     * @var Operation
+     */
+    private $operation;
+
+    /**
+     * @param ModuleDataSetupInterface $moduleDataSetup
+     * @param Operation $operation
+     */
+    public function __construct(
+        ModuleDataSetupInterface $moduleDataSetup,
+        Operation $operation
+    ) {
+        $this->moduleDataSetup = $moduleDataSetup;
+        $this->operation = $operation;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function apply()
+    {
+        $this->operation->execute($this->moduleDataSetup);
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public static function getDependencies()
+    {
+        return [
+            InitializeDefaultStock::class,
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function getAliases()
+    {
+        return [];
+    }
+}
diff --git a/...de/Magento/InventoryLowQuantityNotification/Model/ResourceModel/LowQuantityCollection.php b/...de/Magento/InventoryLowQuantityNotification/Model/ResourceModel/LowQuantityCollection.php
@@ -22,7 +22,6 @@
 use Magento\InventoryApi\Api\Data\SourceInterface;
 use Magento\InventoryApi\Api\Data\SourceItemInterface;
 use Magento\InventoryConfiguration\Model\GetAllowedProductTypesForSourceItemsInterface;
-use Magento\InventoryLowQuantityNotification\Setup\Operation\CreateSourceConfigurationTable;
 use Magento\InventoryLowQuantityNotificationApi\Api\Data\SourceItemConfigurationInterface;
 use Psr\Log\LoggerInterface;
 
@@ -147,9 +146,7 @@ private function joinCatalogProduct()
      */
     private function joinInventoryConfiguration()
     {
-        $sourceItemConfigurationTable = $this->getTable(
-            CreateSourceConfigurationTable::TABLE_NAME_SOURCE_ITEM_CONFIGURATION
-        );
+        $sourceItemConfigurationTable = $this->getTable('inventory_low_stock_notification_configuration');
 
         $this->getSelect()->joinInner(
             ['notification_configuration' => $sourceItemConfigurationTable],

diff --git a/...o/InventoryLowQuantityNotification/Model/ResourceModel/Rss/NotifyStock/ApplyBaseJoins.php b/...o/InventoryLowQuantityNotification/Model/ResourceModel/Rss/NotifyStock/ApplyBaseJoins.php
@@ -15,7 +15,6 @@
 use Magento\Inventory\Model\ResourceModel\SourceItem;
 use Magento\InventoryApi\Api\Data\SourceInterface;
 use Magento\InventoryApi\Api\Data\SourceItemInterface;
-use Magento\InventoryLowQuantityNotification\Setup\Operation\CreateSourceConfigurationTable;
 use Magento\InventoryLowQuantityNotificationApi\Api\Data\SourceItemConfigurationInterface;
 
 class ApplyBaseJoins
@@ -41,7 +40,7 @@ public function __construct(
      */
     public function execute(Select $select)
     {
-        $sourceItemConfigurationTable = CreateSourceConfigurationTable::TABLE_NAME_SOURCE_ITEM_CONFIGURATION;
+        $sourceItemConfigurationTable = 'inventory_low_stock_notification_configuration';
         $configurationJoinCondition =
             'source_item_config.' . SourceItemConfigurationInterface::SKU . ' = product.' . ProductInterface::SKU . ' '
             . Select::SQL_AND

diff --git a/...o/InventoryLowQuantityNotification/Model/ResourceModel/SourceItemConfiguration/Delete.php b/...o/InventoryLowQuantityNotification/Model/ResourceModel/SourceItemConfiguration/Delete.php
@@ -8,7 +8,6 @@
 namespace Magento\InventoryLowQuantityNotification\Model\ResourceModel\SourceItemConfiguration;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\InventoryLowQuantityNotification\Setup\Operation\CreateSourceConfigurationTable;
 use Magento\InventoryLowQuantityNotificationApi\Api\Data\SourceItemConfigurationInterface;
 
 /**
@@ -39,7 +38,7 @@ public function execute(string $sourceCode, string $sku)
     {
         $connection = $this->resourceConnection->getConnection();
         $sourceItemConfigurationTable = $this->resourceConnection
-            ->getTableName(CreateSourceConfigurationTable::TABLE_NAME_SOURCE_ITEM_CONFIGURATION);
+            ->getTableName('inventory_low_stock_notification_configuration');
 
         $connection->delete($sourceItemConfigurationTable, [
             SourceItemConfigurationInterface::SOURCE_CODE . ' = ?' => $sourceCode,

diff --git a/.../InventoryLowQuantityNotification/Model/ResourceModel/SourceItemConfiguration/GetData.php b/.../InventoryLowQuantityNotification/Model/ResourceModel/SourceItemConfiguration/GetData.php
@@ -8,7 +8,6 @@
 namespace Magento\InventoryLowQuantityNotification\Model\ResourceModel\SourceItemConfiguration;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\InventoryLowQuantityNotification\Setup\Operation\CreateSourceConfigurationTable;
 use Magento\InventoryLowQuantityNotificationApi\Api\Data\SourceItemConfigurationInterface;
 
 /**
@@ -38,7 +37,7 @@ public function execute(string $sourceCode, string $sku)
     {
         $connection = $this->resourceConnection->getConnection();
         $sourceItemConfigurationTable = $this->resourceConnection
-            ->getTableName(CreateSourceConfigurationTable::TABLE_NAME_SOURCE_ITEM_CONFIGURATION);
+            ->getTableName('inventory_low_stock_notification_configuration');
 
         $select = $connection->select()
             ->from($sourceItemConfigurationTable)

diff --git a/...ntoryLowQuantityNotification/Model/ResourceModel/SourceItemConfiguration/SaveMultiple.php b/...ntoryLowQuantityNotification/Model/ResourceModel/SourceItemConfiguration/SaveMultiple.php
@@ -8,7 +8,6 @@
 namespace Magento\InventoryLowQuantityNotification\Model\ResourceModel\SourceItemConfiguration;
 
 use Magento\Framework\App\ResourceConnection;
-use Magento\InventoryLowQuantityNotification\Setup\Operation\CreateSourceConfigurationTable;
 use Magento\InventoryLowQuantityNotificationApi\Api\Data\SourceItemConfigurationInterface;
 
 /**
@@ -42,7 +41,7 @@ public function execute(array $sourceItemConfigurations)
         }
         $connection = $this->resourceConnection->getConnection();
         $tableName = $this->resourceConnection
-            ->getTableName(CreateSourceConfigurationTable::TABLE_NAME_SOURCE_ITEM_CONFIGURATION);
+            ->getTableName('inventory_low_stock_notification_configuration');
 
         $columnsSql = $this->buildColumnsSqlPart([
             SourceItemConfigurationInterface::SOURCE_CODE,