MAGETWO-88054: Move declarative setup from setup to framework

Author: Sergii Kovalenko

dev/tests/setup-integration/_files/Magento/TestSetupDeclarationModule7/revisions/us_to_us/module.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+    <module name="Magento_TestSetupDeclarationModule7" setup_version="2.0.2">
+        <sequence>
+            <module name="Magento_TestSetupDeclarationModule6" />
+        </sequence>
+    </module>
+</config>

dev/tests/setup-integration/framework/Magento/TestFramework/Annotation/ReinstallInstance.php

@@ -6,6 +6,8 @@
 
 namespace Magento\TestFramework\Annotation;
 
+use Magento\Framework\Module\ModuleResource;
+
 /**
  * Handler for applying reinstallMagento annotation.
  */
@@ -26,14 +28,20 @@ public function __construct(\Magento\TestFramework\Application $application)
         $this->application = $application;
     }
 
+    public function startTest()
+    {
+        $this->application->reinitialize();
+    }
+
     /**
      * Handler for 'endTest' event.
      *
      * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function endTest()
     {
-        $this->application->reinitialize();
         $this->application->cleanup();
+        $this->application->reinitialize();
+        ModuleResource::flush();
     }
 }

dev/tests/setup-integration/testsuite/Magento/Setup/BCMultiModuleTest.php

@@ -7,12 +7,14 @@
 namespace Magento\Setup;
 
 use Magento\Framework\Module\DbVersionInfo;
+use Magento\Framework\Module\ModuleList;
 use Magento\Framework\Module\ModuleResource;
 use Magento\Framework\Setup\Declaration\Schema\Db\DbSchemaReaderInterface;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\TableData;
 use Magento\TestFramework\Deploy\TestModuleManager;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\SetupTestCase;
 
 /**
@@ -60,6 +62,7 @@ public function setUp()
         $this->tableData = $objectManager->get(TableData::class);
         $this->moduleResource = $objectManager->get(ModuleResource::class);
         $this->dbSchemaReader = $objectManager->get(DbSchemaReaderInterface::class);
+
     }
 
     /**

dev/tests/setup-integration/testsuite/Magento/Setup/BCPatchTest.php

@@ -53,7 +53,6 @@ public function setUp()
         $this->dbVersionInfo = $objectManager->get(DbVersionInfo::class);
         $this->tableData = $objectManager->get(TableData::class);
         $this->moduleResource = $objectManager->get(ModuleResource::class);
-        $this->moduleResource->flush();
     }
 
     /**

dev/tests/setup-integration/testsuite/Magento/Setup/DataPatchInstallationTest.php

@@ -78,7 +78,7 @@ public function testDataPatchesInstallation()
             'etc'
         );
         $this->movePatches();
-        $this->moduleResource->flush();
+        ModuleResource::flush();
         $this->cliCommad->upgrade();
         self::assertEquals(
             '0.0.3',

lib/internal/Magento/Framework/Module/ModuleResource.php

@@ -10,6 +10,9 @@
 
 /**
  * Resource Model
+ *
+ * @deprecated Declarative schema and data patches replace old functionality and setup_module table
+ * So all resources related to this table, will be deprecated since 2.3.0
  */
 class ModuleResource extends AbstractDb implements ResourceInterface
 {
@@ -140,7 +143,7 @@ public function setDataVersion($moduleName, $version)
      *
      * @return void
      */
-    public function flush()
+    public static function flush()
     {
         self::$dataVersions = null;
         self::$schemaVersions = [];