Merge remote-tracking branch 'origin/MDVA-305' into 2.0.6_backlog

Author: Yaroslav Voronoy

setup/src/Magento/Setup/Controller/Install.php

@@ -48,6 +48,11 @@ class Install extends AbstractActionController
      */
     protected $sampleDataState;
 
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * Default Constructor
      *
@@ -89,6 +94,7 @@ public function startAction()
         $this->log->clear();
         $json = new JsonModel;
         try {
+            $this->checkForPriorInstall();
             $data = array_merge(
                 $this->importDeploymentConfigForm(),
                 $this->importUserConfigForm(),
@@ -106,6 +112,7 @@ public function startAction()
             $json->setVariable('messages', $this->installer->getInstallInfo()[Installer::INFO_MESSAGE]);
         } catch (\Exception $e) {
             $this->log->logError($e);
+            $json->setVariable('messages', $e->getMessage());
             $json->setVariable('success', false);
         }
         return $json;
@@ -145,6 +152,19 @@ public function progressAction()
         return $json->setVariables(['progress' => $percent, 'success' => $success, 'console' => $contents]);
     }
 
+    /**
+     * Checks for prior install
+     *
+     * @return void
+     * @throws \Magento\Setup\Exception
+     */
+    private function checkForPriorInstall()
+    {
+        if ($this->getDeploymentConfig()->isAvailable()) {
+            throw new \Magento\Setup\Exception('Magento application is already installed.');
+        }
+    }
+
     /**
      * Maps data from request to format of deployment config model
      *
@@ -242,4 +262,20 @@ private function importAdminUserForm()
         $result[AdminAccount::KEY_LAST_NAME] = $result[AdminAccount::KEY_USER];
         return $result;
     }
+
+    /**
+     * Get Deployment Config
+     *
+     * @return \Magento\Framework\App\DeploymentConfig
+     *
+     * @deprecated
+     */
+    private function getDeploymentConfig()
+    {
+        if ($this->deploymentConfig === null) {
+            $this->deploymentConfig = $this->installer->getObjectManagerProvider()->get()
+                ->get(\Magento\Framework\App\DeploymentConfig::class);
+        }
+        return $this->deploymentConfig;
+    }
 }

setup/src/Magento/Setup/Model/Installer.php

@@ -488,6 +488,16 @@ public function installDeploymentConfig($data)
         $this->objectManagerProvider->reset();
     }
 
+    /**
+     * Get Object Manager Provider
+     *
+     * @return ObjectManagerProvider
+     */
+    public function getObjectManagerProvider()
+    {
+        return $this->objectManagerProvider;
+    }
+
     /**
      * Set up setup_module table to register modules' versions, skip this process if it already exists
      *

setup/src/Magento/Setup/Test/Unit/Controller/InstallTest.php

@@ -35,13 +35,19 @@ class InstallTest extends \PHPUnit_Framework_TestCase
      */
     private $sampleDataState;
 
+    /**
+     * @var \Magento\Framework\App\DeploymentConfig|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $deploymentConfig;
+
     public function setUp()
     {
         $this->webLogger = $this->getMock('\Magento\Setup\Model\WebLogger', [], [], '', false);
         $installerFactory = $this->getMock('\Magento\Setup\Model\InstallerFactory', [], [], '', false);
         $this->installer = $this->getMock('\Magento\Setup\Model\Installer', [], [], '', false);
         $this->progressFactory = $this->getMock('\Magento\Setup\Model\Installer\ProgressFactory', [], [], '', false);
         $this->sampleDataState = $this->getMock('\Magento\Framework\Setup\SampleData\State', [], [], '', false);
+        $this->deploymentConfig = $this->getMock('\Magento\Framework\App\DeploymentConfig', [], [], '', false);
 
         $installerFactory->expects($this->once())->method('create')->with($this->webLogger)
             ->willReturn($this->installer);
@@ -51,6 +57,11 @@ public function setUp()
             $this->progressFactory,
             $this->sampleDataState
         );
+
+        $deploymentConfigReflection = new \ReflectionClass(get_class($this->controller));
+        $deploymentConfigReflectionProperty = $deploymentConfigReflection->getProperty('deploymentConfig');
+        $deploymentConfigReflectionProperty->setAccessible(true);
+        $deploymentConfigReflectionProperty->setValue($this->controller, $this->deploymentConfig);
     }
 
     public function testIndexAction()
@@ -65,6 +76,7 @@ public function testStartAction()
         $this->webLogger->expects($this->once())->method('clear');
         $this->installer->expects($this->once())->method('install');
         $this->installer->expects($this->exactly(2))->method('getInstallInfo');
+        $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(false);
         $jsonModel = $this->controller->startAction();
         $this->assertInstanceOf('\Zend\View\Model\JsonModel', $jsonModel);
         $variables = $jsonModel->getVariables();
@@ -74,9 +86,23 @@ public function testStartAction()
         $this->assertTrue($variables['success']);
     }
 
-    public function testStartActionException()
+    public function testStartActionPriorInstallException()
+    {
+        $this->webLogger->expects($this->once())->method('clear');
+        $this->installer->expects($this->never())->method('install');
+        $this->installer->expects($this->never())->method('getInstallInfo');
+        $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(true);
+        $jsonModel = $this->controller->startAction();
+        $this->assertInstanceOf('\Zend\View\Model\JsonModel', $jsonModel);
+        $variables = $jsonModel->getVariables();
+        $this->assertArrayHasKey('success', $variables);
+        $this->assertArrayHasKey('messages', $variables);
+        $this->assertFalse($variables['success']);
+    }
+    public function testStartActionInstallException()
     {
         $this->webLogger->expects($this->once())->method('clear');
+        $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(false);
         $this->installer->expects($this->once())->method('install')
             ->willThrowException($this->getMock('\Exception'));
         $jsonModel = $this->controller->startAction();
@@ -87,6 +113,7 @@ public function testStartActionWithSampleDataError()
     {
         $this->webLogger->expects($this->once())->method('clear');
         $this->webLogger->expects($this->never())->method('logError');
+        $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(false);
         $this->installer->method('install');
         $this->sampleDataState->expects($this->once())->method('hasError')->willReturn(true);
         $jsonModel = $this->controller->startAction();