Merge branch 'MAGETWO-84100' of github.com:magento-trigger/magento2ce into MAGETWO-84100

Author: rganin

dev/tests/integration/framework/Magento/TestFramework/Application.php

@@ -451,16 +451,26 @@ public function run()
     }
 
     /**
-     * Cleanup both the database and the file system
+     * Create install dir for integration framework
      *
      * @return void
      */
-    public function cleanup()
+    public function createInstallDir()
     {
         $this->_ensureDirExists($this->installDir);
         $this->_ensureDirExists($this->_configDir);
 
         $this->copyAppConfigFiles();
+    }
+
+    /**
+     * Cleanup both the database and the file system
+     *
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->createInstallDir();
         /**
          * @see \Magento\Setup\Mvc\Bootstrap\InitParamListener::BOOTSTRAP_PARAM
          */

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

@@ -6,7 +6,6 @@
 
 namespace Magento\TestFramework\Annotation;
 
-use Magento\Framework\Filesystem\Io\File;
 use Magento\TestFramework\Deploy\CliCommand;
 use Magento\TestFramework\Deploy\TestModuleManager;
 
@@ -45,7 +44,10 @@ public function startTest(\PHPUnit\Framework\TestCase $test)
         $annotations = $test->getAnnotations();
         //This annotation can be declared only on method level
         if (isset($annotations['method']['moduleName'])) {
-            $this->cliCommand->introduceModule($annotations['method']['moduleName'][0]);
+            $moduleName = $annotations['method']['moduleName'][0];
+            $this->cliCommand->introduceModule($moduleName);
+            $path = MAGENTO_MODULES_PATH . explode("_", $moduleName)[1] . '/registration.php';
+            include_once $path;
         }
     }
 }

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

@@ -33,8 +33,6 @@ public function __construct(\Magento\TestFramework\Application $application)
      */
     public function endTest()
     {
-        if ($this->application->isInstalled()) {
-            $this->application->cleanup();
-        }
+        $this->application->cleanup();
     }
 }

dev/tests/setup-integration/framework/Magento/TestFramework/Deploy/TestModuleManager.php

@@ -78,7 +78,7 @@ public function updateRevision($moduleName, $revisionName, $fileName, $fileDir)
 
         if (file_exists($oldFile) && file_exists($revisionFile)) {
             unlink($oldFile);
-            rename($revisionFile, $oldFile);
+            copy($revisionFile, $oldFile);
         } else {
             throw new \InvalidArgumentException("Old File or revision files paths are invalid");
         }

dev/tests/setup-integration/framework/bootstrap.php

@@ -73,10 +73,10 @@
         $application,
         new \Magento\TestFramework\Bootstrap\MemoryFactory($shell)
     );
-    $bootstrap->runBootstrap();
-    $application->cleanup();
     //remove test modules files
     include_once __DIR__ . '/../../setup-integration/framework/removeTestModules.php';
+    $bootstrap->runBootstrap();
+    $application->createInstallDir();
     //We do not want to install anything
     $application->initialize([]);
 

dev/tests/setup-integration/phpunit.xml.dist

@@ -37,7 +37,7 @@
         <const name="TESTS_GLOBAL_CONFIG_DIR" value="../../../app/etc"/>
         <const name="TESTS_CLEANUP" value="{{tests_cleanup}}"/>
         <const name="TESTS_MAGENTO_MODE" value="{{app_mode}}"/>
-        <const name="TESTS_ERROR_LOG_LISTENER_LEVEL" value="-1"/>
+        <const name="TESTS_ERROR_LOG_LISTENER_LEVEL" value="1"/>
     </php>
     <!-- Test listeners -->
     <listeners>

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

@@ -38,7 +38,7 @@ class DeclarativeSchemaBuilderTest extends SetupTestCase
     public function setUp()
     {
         $objectManager = Bootstrap::getObjectManager();
-        $this->schemaConfig = $objectManager->create(SchemaConfig::class);
+        $this->schemaConfig = $objectManager->get(SchemaConfig::class);
         $this->moduleManager = $objectManager->get(TestModuleManager::class);
         $this->cliCommad = $objectManager->get(CliCommand::class);
     }

lib/internal/Magento/Framework/Shell.php

@@ -57,6 +57,7 @@ public function execute($command, array $arguments = [])
         exec($command, $output, $exitCode);
         $output = implode(PHP_EOL, $output);
         $this->log($output);
+
         if ($exitCode) {
             $commandError = new \Exception($output, $exitCode);
             throw new Exception\LocalizedException(

setup/src/Magento/Setup/Model/Declaration/Schema/Declaration/ReaderComposite.php

@@ -6,6 +6,7 @@
 
 namespace Magento\Setup\Model\Declaration\Schema\Declaration;
 
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ReaderInterface;
 
 /**
@@ -20,14 +21,21 @@ class ReaderComposite implements ReaderInterface
      */
     private $readers;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * Constructor.
      *
+     * @param DeploymentConfig $deploymentConfig
      * @param ReaderInterface[] $readers
      */
-    public function __construct(array $readers = [])
+    public function __construct(DeploymentConfig $deploymentConfig, array $readers = [])
     {
         $this->readers = $readers;
+        $this->deploymentConfig = $deploymentConfig;
     }
 
     /**