MAGETWO-71890: Magento fails with deploymentConfig present on new install

Author: shiftedreality

app/code/Magento/Deploy/Console/CommandList.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Deploy\Console;
+
+use Magento\Framework\ObjectManagerInterface;
+
+/**
+ * Provides list of commands to be available for uninstalled application
+ */
+class CommandList implements \Magento\Framework\Console\CommandListInterface
+{
+    /**
+     * Object Manager
+     *
+     * @var ObjectManagerInterface
+     */
+    private $objectManager;
+
+    /**
+     * @param ObjectManagerInterface $objectManager Object Manager
+     */
+    public function __construct(ObjectManagerInterface $objectManager)
+    {
+        $this->objectManager = $objectManager;
+    }
+
+    /**
+     * Gets list of command classes
+     *
+     * @return string[]
+     */
+    private function getCommandsClasses()
+    {
+        return [
+            \Magento\Deploy\Console\Command\App\ConfigImportCommand::class,
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getCommands()
+    {
+        $commands = [];
+        foreach ($this->getCommandsClasses() as $class) {
+            if (class_exists($class)) {
+                $commands[] = $this->objectManager->get($class);
+            } else {
+                throw new \Exception('Class ' . $class . ' does not exist');
+            }
+        }
+
+        return $commands;
+    }
+}

app/code/Magento/Deploy/Test/Unit/Console/CommandListTest.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Deploy\Test\Unit\Console;
+
+use Magento\Deploy\Console\Command\App\ConfigImportCommand;
+use Magento\Deploy\Console\CommandList;
+use Magento\Framework\ObjectManagerInterface;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @inheritdoc
+ */
+class CommandListTest extends TestCase
+{
+    /**
+     * @var CommandList
+     */
+    private $model;
+
+    /**
+     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManagerMock;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->objectManagerMock = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->getMockForAbstractClass();
+
+        $this->model = new CommandList(
+            $this->objectManagerMock
+        );
+    }
+
+    public function testGetCommands()
+    {
+        $this->objectManagerMock->expects($this->once())
+            ->method('get')
+            ->withConsecutive([
+                ConfigImportCommand::class,
+            ]);
+
+        $this->model->getCommands();
+    }
+}

app/code/Magento/Deploy/cli_commands.php

@@ -0,0 +1,8 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+if (PHP_SAPI == 'cli') {
+    \Magento\Framework\Console\CommandLocator::register(\Magento\Deploy\Console\CommandList::class);
+}

app/code/Magento/Deploy/composer.json

@@ -17,6 +17,7 @@
     ],
     "autoload": {
         "files": [
+            "cli_commands.php",
             "registration.php"
         ],
         "psr-4": {

setup/src/Magento/Setup/Console/Command/InstallCommand.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Setup\Console\Command;
 
+use Magento\Deploy\Console\Command\App\ConfigImportCommand;
+use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\Setup\Model\InstallerFactory;
@@ -123,6 +125,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $consoleLogger = new ConsoleLogger($output);
         $installer = $this->installerFactory->create($consoleLogger);
         $installer->install($input->getOptions());
+
+        $importConfigCommand = $this->getApplication()->find(ConfigImportCommand::COMMAND_NAME);
+        $arrayInput = new ArrayInput([]);
+        $arrayInput->setInteractive($input->isInteractive());
+        $importConfigCommand->run($arrayInput, $output);
     }
 
     /**

setup/src/Magento/Setup/Test/Unit/Console/Command/InstallCommandTest.php

@@ -6,7 +6,11 @@
 
 namespace Magento\Setup\Test\Unit\Console\Command;
 
+use Magento\Deploy\Console\Command\App\ConfigImportCommand;
 use Magento\Setup\Console\Command\InstallCommand;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Helper\HelperSet;
+use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Tester\CommandTester;
 use Magento\Setup\Model\AdminAccount;
 use Magento\Backend\Setup\ConfigOptionsList as BackendConfigOptionsList;
@@ -38,6 +42,26 @@ class InstallCommandTest extends \PHPUnit\Framework\TestCase
      */
     private $installer;
 
+    /**
+     * @var Application|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $applicationMock;
+
+    /**
+     * @var HelperSet|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $helperSetMock;
+
+    /**
+     * @var InputDefinition|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $definitionMock;
+
+    /**
+     * @var ConfigImportCommand|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $configImportMock;
+
     public function setUp()
     {
         $this->input = [
@@ -88,12 +112,42 @@ public function setUp()
 
         $this->installerFactory = $this->createMock(\Magento\Setup\Model\InstallerFactory::class);
         $this->installer = $this->createMock(\Magento\Setup\Model\Installer::class);
+        $this->applicationMock = $this->getMockBuilder(Application::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->helperSetMock = $this->getMockBuilder(HelperSet::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->definitionMock = $this->getMockBuilder(InputDefinition::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->configImportMock = $this->getMockBuilder(ConfigImportCommand::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->applicationMock->expects($this->any())
+            ->method('getHelperSet')
+            ->willReturn($this->helperSetMock);
+        $this->applicationMock->expects($this->any())
+            ->method('getDefinition')
+            ->willReturn($this->definitionMock);
+        $this->definitionMock->expects($this->any())
+            ->method('getOptions')
+            ->willReturn([]);
+        $this->applicationMock->expects($this->any())
+            ->method('find')
+            ->with(ConfigImportCommand::COMMAND_NAME)
+            ->willReturn($this->configImportMock);
+
         $this->command = new InstallCommand(
             $this->installerFactory,
             $configModel,
             $userConfig,
             $adminUser
         );
+        $this->command->setApplication(
+            $this->applicationMock
+        );
     }
 
     public function testExecute()
@@ -102,6 +156,8 @@ public function testExecute()
             ->method('create')
             ->will($this->returnValue($this->installer));
         $this->installer->expects($this->once())->method('install');
+        $this->configImportMock->expects($this->once())
+            ->method('run');
 
         $commandTester = new CommandTester($this->command);
         $commandTester->execute($this->input);
@@ -134,6 +190,7 @@ private function getOptionsListDeployConfig()
             ->expects($this->any())
             ->method('getName')
             ->will($this->returnValue(BackendConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME));
+
         return [$option1, $option2, $option3, $option4];
     }
 
@@ -164,6 +221,7 @@ private function getOptionsListUserConfig()
             ->expects($this->any())
             ->method('getName')
             ->will($this->returnValue(StoreConfigurationDataMapper::KEY_CURRENCY));
+
         return [$option1, $option2, $option3, $option4];
     }
 
@@ -199,6 +257,7 @@ private function getOptionsListAdminUser()
             ->expects($this->any())
             ->method('getName')
             ->will($this->returnValue(AdminAccount::KEY_LAST_NAME));
+
         return [$option1, $option2, $option3, $option4, $option5];
     }
 
@@ -246,8 +305,8 @@ public function validateDataProvider()
     {
         return [
             'without option' => ['', ''],
-            'normal case'    => ['abcde', ''],
-            '20 chars'       => ['12345678901234567890', '']
+            'normal case' => ['abcde', ''],
+            '20 chars' => ['12345678901234567890', ''],
         ];
     }
 
@@ -258,7 +317,7 @@ public function validateWithExceptionDataProvider()
     {
         return [
             ['123456789012345678901', 'InvalidArgumentException'],
-            ['abcdefghijk12345678fdgsdfgsdfgsdfsgsdfg90abcdefgdfddgsdfg', 'InvalidArgumentException']
+            ['abcdefghijk12345678fdgsdfgsdfgsdfsgsdfg90abcdefgdfddgsdfg', 'InvalidArgumentException'],
         ];
     }
 }