Merge pull request #2406 from magento-thunder/MAGETWO-89747

Fixed issues:
 - MAGETWO-89747: [Backport 2.1.x] Magento application compatible with cloud

Author: Yevhen Miroshnychenko

lib/internal/Magento/Framework/Console/Cli.php

@@ -17,6 +17,7 @@
 use Magento\Framework\Shell\ComplexParameter;
 use Magento\Setup\Console\CompilerPreparation;
 use \Magento\Framework\App\ProductMetadata;
+use Magento\Framework\App\State;
 
 /**
  * Magento 2 CLI Application. This is the hood for all command line tools supported by Magento
@@ -47,6 +48,11 @@ class Cli extends SymfonyApplication
      */
     private $initException;
 
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * @param string $name  application name
      * @param string $version application version
@@ -56,15 +62,7 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
     {
         $this->serviceManager = \Zend\Mvc\Application::init(require BP . '/setup/config/application.config.php')
             ->getServiceManager();
-        $generationDirectoryAccess = new GenerationDirectoryAccess($this->serviceManager);
-        if (!$generationDirectoryAccess->check()) {
-            $output = new ConsoleOutput();
-            $output->writeln(
-                '<error>Command line user does not have read and write permissions on var/generation directory.  Please'
-                . ' address this issue before using Magento command line.</error>'
-            );
-            exit(0);
-        }
+
         /**
          * Temporary workaround until the compiler is able to clear the generation directory
          * @todo remove after MAGETWO-44493 resolved
@@ -74,6 +72,21 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
             $compilerPreparation->handleCompilerEnvironment();
         }
 
+        $bootstrapParam = new ComplexParameter(self::INPUT_KEY_BOOTSTRAP);
+        $params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
+        $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
+        $bootstrap = Bootstrap::create(BP, $params);
+        $this->objectManager = $bootstrap->getObjectManager();
+
+        if ($this->checkGenerationDirectoryAccess()) {
+            $output = new ConsoleOutput();
+            $output->writeln(
+                '<error>Command line user does not have read and write permissions on var/generation directory.  Please'
+                . ' address this issue before using Magento command line.</error>'
+            );
+            exit(0);
+        }
+
         if ($version == 'UNKNOWN') {
             $directoryList      = new DirectoryList(BP);
             $composerJsonFinder = new ComposerJsonFinder($directoryList);
@@ -83,6 +96,22 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
         parent::__construct($name, $version);
     }
 
+    /**
+     * Check generation directory access.
+     *
+     * Skip and return true if production mode is enabled.
+     *
+     * @return bool
+     */
+    private function checkGenerationDirectoryAccess()
+    {
+        $generationDirectoryAccess = new GenerationDirectoryAccess($this->serviceManager);
+        /** @var State $state */
+        $state = $this->objectManager->create(State::class);
+
+        return $state->getMode() !== State::MODE_PRODUCTION && !$generationDirectoryAccess->check();
+    }
+
     /**
      * Process an error happened during initialization of commands, if any
      *
@@ -121,31 +150,25 @@ protected function getApplicationCommands()
     {
         $commands = [];
         try {
-            $bootstrapParam = new ComplexParameter(self::INPUT_KEY_BOOTSTRAP);
-            $params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
-            $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
-            $bootstrap = Bootstrap::create(BP, $params);
-            $objectManager = $bootstrap->getObjectManager();
-
             // Specialized setup command list available before and after M2 install
             if (class_exists('Magento\Setup\Console\CommandList')
                 && class_exists('Magento\Setup\Model\ObjectManagerProvider')
             ) {
                 /** @var \Magento\Setup\Model\ObjectManagerProvider $omProvider */
                 $omProvider = $this->serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class);
-                $omProvider->setObjectManager($objectManager);
+                $omProvider->setObjectManager($this->objectManager);
                 $setupCommandList = new \Magento\Setup\Console\CommandList($this->serviceManager);
                 $commands = array_merge($commands, $setupCommandList->getCommands());
             }
 
             // Allowing instances of all modular commands only after M2 install
-            if ($objectManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
+            if ($this->objectManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
                 /** @var \Magento\Framework\Console\CommandListInterface $commandList */
-                $commandList = $objectManager->create(\Magento\Framework\Console\CommandListInterface::class);
+                $commandList = $this->objectManager->create(\Magento\Framework\Console\CommandListInterface::class);
                 $commands = array_merge($commands, $commandList->getCommands());
             }
 
-            $commands = array_merge($commands, $this->getVendorCommands($objectManager));
+            $commands = array_merge($commands, $this->getVendorCommands($this->objectManager));
         } catch (\Exception $e) {
             $this->initException = $e;
         }

lib/internal/Magento/Framework/Setup/FilePermissions.php

@@ -9,6 +9,8 @@
 use Magento\Framework\Backup\Filesystem\Iterator\Filter;
 use Magento\Framework\Filesystem\Filter\ExcludeFilter;
 use Magento\Framework\Filesystem;
+use Magento\Framework\App\State;
+use Magento\Framework\App\ObjectManager;
 
 class FilePermissions
 {
@@ -22,6 +24,11 @@ class FilePermissions
      */
     protected $directoryList;
 
+    /**
+     * @var State
+     */
+    private $state;
+
     /**
      * List of required writable directories for installation
      *
@@ -60,13 +67,16 @@ class FilePermissions
     /**
      * @param Filesystem $filesystem
      * @param DirectoryList $directoryList
+     * @param State $state
      */
     public function __construct(
         Filesystem $filesystem,
-        DirectoryList $directoryList
+        DirectoryList $directoryList,
+        State $state = null
     ) {
         $this->filesystem = $filesystem;
         $this->directoryList = $directoryList;
+        $this->state = $state ?: ObjectManager::getInstance()->get(State::class);
     }
 
     /**
@@ -141,12 +151,15 @@ private function checkRecursiveDirectories($directory)
             new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),
             \RecursiveIteratorIterator::CHILD_FIRST
         );
-        $noWritableFilesFolders = [
-            $this->directoryList->getPath(DirectoryList::GENERATION) . '/',
-            $this->directoryList->getPath(DirectoryList::DI) . '/',
-        ];
 
-        $directoryIterator = new Filter($directoryIterator, $noWritableFilesFolders);
+        $generationPath = $this->directoryList->getPath(DirectoryList::GENERATION);
+        $diPath = $this->directoryList->getPath(DirectoryList::DI);
+
+        if ($this->state->getMode() === State::MODE_PRODUCTION) {
+            $directoryIterator = new ExcludeFilter($directoryIterator, [$generationPath, $diPath]);
+        } else {
+            $directoryIterator = new Filter($directoryIterator, [$generationPath . '/', $diPath . '/']);
+        }
 
         $directoryIterator = new ExcludeFilter(
             $directoryIterator,

lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php

@@ -7,6 +7,7 @@
 
 use \Magento\Framework\Setup\FilePermissions;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\State;
 
 class FilePermissionsTest extends \PHPUnit_Framework_TestCase
 {
@@ -25,6 +26,11 @@ class FilePermissionsTest extends \PHPUnit_Framework_TestCase
      */
     private $directoryListMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|State
+     */
+    private $stateMock;
+
     /**
      * @var FilePermissions
      */
@@ -34,6 +40,7 @@ public function setUp()
     {
         $this->directoryWriteMock = $this->getMock('Magento\Framework\Filesystem\Directory\Write', [], [], '', false);
         $this->filesystemMock = $this->getMock('Magento\Framework\Filesystem', [], [], '', false);
+        $this->stateMock = $this->getMock(State::class, [], [], '', false);
 
         $this->filesystemMock
             ->expects($this->any())
@@ -43,7 +50,8 @@ public function setUp()
 
         $this->filePermissions = new FilePermissions(
             $this->filesystemMock,
-            $this->directoryListMock
+            $this->directoryListMock,
+            $this->stateMock
         );
     }
 
@@ -219,6 +227,7 @@ public function setUpDirectoryListInstallation()
             ->method('getPath')
             ->with(DirectoryList::STATIC_VIEW)
             ->will($this->returnValue(BP . '/pub/static'));
+
     }
 
     public function setUpDirectoryWriteInstallation()

setup/index.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+use Zend\Mvc\Application;
+use Magento\Setup\Model\ObjectManagerProvider;
 
 if (PHP_SAPI == 'cli') {
     echo "You cannot run this from the command line." . PHP_EOL .
@@ -28,4 +30,8 @@
 $handler = new \Magento\Framework\App\ErrorHandler();
 set_error_handler([$handler, 'handler']);
 
-\Zend\Mvc\Application::init(require __DIR__ . '/config/application.config.php')->run();
+$application = Application::init(require __DIR__ . '/config/application.config.php');
+$application->getServiceManager()
+    ->get(ObjectManagerProvider::class)
+    ->setObjectManager(\Magento\Framework\App\Bootstrap::create(BP, $_SERVER)->getObjectManager());
+$application->run();

setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php

@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Setup\Mvc\Bootstrap;
 
 use Magento\Framework\App\Bootstrap as AppBootstrap;
@@ -137,8 +136,7 @@ public function authPreDispatch($event)
                 /** @var \Magento\Backend\Model\Auth $auth */
                 $authentication = $objectManager->get(\Magento\Backend\Model\Auth::class);
 
-                if (
-                    !$authentication->isLoggedIn() ||
+                if (!$authentication->isLoggedIn() ||
                     !$adminSession->isAllowed('Magento_Backend::setup_wizard')
                 ) {
                     $adminSession->destroy();