MAGETWO-43265: An exception if try to get to the Web Wizard without writable file permissions

- instantiating DeploymentConfig via Zend Service Locator
- Changed tests according to changes

Author: Ivan Gavryshko

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

@@ -9,7 +9,7 @@
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\ViewModel;
 use Magento\Setup\Model\ObjectManagerProvider;
-use Magento\Setup\Model\ApplicationStatus;
+use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Main controller of the Setup Wizard
@@ -22,28 +22,28 @@ class Index extends AbstractActionController
     private $objectManagerProvider;
 
     /**
-     * @var \Magento\Setup\Model\ApplicationStatus
+     * @var \Magento\Framework\App\DeploymentConfig
      */
-    private $applicationStatus;
+    private $deploymentConfig;
 
     /**
      * @param ObjectManagerProvider $objectManagerProvider
-     * @param ApplicationStatus $applicationStatus
+     * @param DeploymentConfig $deploymentConfig
      */
     public function __construct(
         ObjectManagerProvider $objectManagerProvider,
-        ApplicationStatus $applicationStatus
+        DeploymentConfig $deploymentConfig
     ) {
         $this->objectManagerProvider = $objectManagerProvider;
-        $this->applicationStatus = $applicationStatus;
+        $this->deploymentConfig = $deploymentConfig;
     }
 
     /**
      * @return ViewModel|\Zend\Http\Response
      */
     public function indexAction()
     {
-        if ($this->applicationStatus->isApplicationInstalled()) {
+        if ($this->deploymentConfig->isAvailable()) {
             $objectManager = $this->objectManagerProvider->get();
             /** @var \Magento\Framework\App\State $adminAppState */
             $adminAppState = $objectManager->get('Magento\Framework\App\State');

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

@@ -7,6 +7,7 @@
 namespace Magento\Setup\Model;
 
 use Zend\ServiceManager\ServiceLocatorInterface;
+use Magento\Framework\App\DeploymentConfig;
 
 class Navigation
 {
@@ -34,10 +35,11 @@ class Navigation
 
     /**
      * @param ServiceLocatorInterface $serviceLocator
+     * @param DeploymentConfig $deploymentConfig
      */
-    public function __construct(ServiceLocatorInterface $serviceLocator, ApplicationStatus $applicationStatus)
+    public function __construct(ServiceLocatorInterface $serviceLocator, DeploymentConfig $deploymentConfig)
     {
-        if ($applicationStatus->isApplicationInstalled()) {
+        if ($deploymentConfig->isAvailable()) {
             $this->navStates = $serviceLocator->get('config')[self::NAV_UPDATER];
             $this->navType = self::NAV_UPDATER;
             $this->titles = $serviceLocator->get('config')[self::NAV_UPDATER . 'Titles'];

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

@@ -21,9 +21,10 @@ class IndexTest extends \PHPUnit_Framework_TestCase
     private $objectManager;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\ApplicationStatus
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\DeploymentConfig
      */
-    private $applicationStatus;
+    private $deploymentConfig;
+
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\State
@@ -45,8 +46,8 @@ public function setUp()
             '',
             false
         );
-        $this->applicationStatus = $this->getMock(
-            'Magento\Setup\Model\ApplicationStatus',
+        $this->deploymentConfig = $this->getMock(
+            'Magento\Framework\App\DeploymentConfig',
             [],
             [],
             '',
@@ -70,7 +71,7 @@ public function setUp()
 
     public function testIndexActionInstalled()
     {
-        $this->applicationStatus->expects($this->once())->method('isApplicationInstalled')->willReturn(true);
+        $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(true);
         $this->objectManagerProvider->expects($this->once())->method('get')->willReturn($this->objectManager);
         $this->appState->expects($this->once())->method('setAreaCode');
         $this->auth->expects($this->once())->method('isLoggedIn');
@@ -85,18 +86,18 @@ public function testIndexActionInstalled()
                 )
             );
         /** @var $controller Index */
-        $controller = new Index($this->objectManagerProvider, $this->applicationStatus);
+        $controller = new Index($this->objectManagerProvider, $this->deploymentConfig);
         $viewModel = $controller->indexAction();
         $this->assertInstanceOf('Zend\View\Model\ViewModel', $viewModel);
         $this->assertFalse($viewModel->terminate());
     }
 
     public function testIndexActionNotInstalled()
     {
-        $this->applicationStatus->expects($this->once())->method('isApplicationInstalled')->willReturn(false);
+        $this->deploymentConfig->expects($this->once())->method('isAvailable')->willReturn(false);
         $this->objectManagerProvider->expects($this->exactly(0))->method('get');
         /** @var $controller Index */
-        $controller = new Index($this->objectManagerProvider, $this->applicationStatus);
+        $controller = new Index($this->objectManagerProvider, $this->deploymentConfig);
         $viewModel = $controller->indexAction();
         $this->assertInstanceOf('Zend\View\Model\ViewModel', $viewModel);
         $this->assertFalse($viewModel->terminate());

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

@@ -16,9 +16,9 @@ class NavigationTest extends \PHPUnit_Framework_TestCase
     private $serviceLocatorMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Setup\Model\ApplicationStatus
+     * @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\DeploymentConfig
      */
-    private $applicationStatus;
+    private $deploymentConfig;
 
     /**
      * @var Navigation
@@ -48,14 +48,14 @@ public function setUp()
                     ['main' => false],
                 ]
             ]));
-        $this->applicationStatus = $this->getMock(
-            'Magento\Setup\Model\ApplicationStatus',
+        $this->deploymentConfig = $this->getMock(
+            'Magento\Framework\App\DeploymentConfig',
             [],
             [],
             '',
             false
         );
-        $this->navigation = new Navigation($this->serviceLocatorMock, $this->applicationStatus);
+        $this->navigation = new Navigation($this->serviceLocatorMock, $this->deploymentConfig);
     }
 
     public function testGetType()