Merge pull request #2378 from magento-thunder/MAGETWO-89315

Fixed issues:
 - MAGETWO-89315: Magento application compatible without cloud Patches

Author: Yevhen Miroshnychenko

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

@@ -9,6 +9,8 @@
 use Magento\Framework\Backup\Filesystem\Iterator\Filter;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Filter\ExcludeFilter;
+use Magento\Framework\App\State;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Checks permissions to files and folders.
@@ -25,6 +27,11 @@ class FilePermissions
      */
     protected $directoryList;
 
+    /**
+     * @var State
+     */
+    private $state;
+
     /**
      * List of required writable directories for installation
      *
@@ -63,13 +70,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);
     }
 
     /**
@@ -85,8 +95,10 @@ public function getInstallationWritableDirectories()
                 DirectoryList::VAR_DIR,
                 DirectoryList::MEDIA,
                 DirectoryList::STATIC_VIEW,
-                DirectoryList::GENERATED,
             ];
+            if ($this->state->getMode() !== State::MODE_PRODUCTION) {
+                $data[] = DirectoryList::GENERATED;
+            }
             foreach ($data as $code) {
                 $this->installationWritableDirectories[$code] = $this->directoryList->getPath($code);
             }

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->createMock(\Magento\Framework\Filesystem\Directory\Write::class);
         $this->filesystemMock = $this->createMock(\Magento\Framework\Filesystem::class);
+        $this->stateMock = $this->createMock(State::class);
 
         $this->filesystemMock
             ->expects($this->any())
@@ -43,13 +50,21 @@ public function setUp()
 
         $this->filePermissions = new FilePermissions(
             $this->filesystemMock,
-            $this->directoryListMock
+            $this->directoryListMock,
+            $this->stateMock
         );
     }
 
-    public function testGetInstallationWritableDirectories()
+    /**
+     * @param string $mageMode
+     * @dataProvider modeDataProvider
+     */
+    public function testGetInstallationWritableDirectories($mageMode)
     {
         $this->setUpDirectoryListInstallation();
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn($mageMode);
 
         $expected = [
             BP . '/app/etc',
@@ -62,6 +77,23 @@ public function testGetInstallationWritableDirectories()
         $this->assertEquals($expected, $this->filePermissions->getInstallationWritableDirectories());
     }
 
+    public function testGetInstallationWritableDirectoriesInProduction()
+    {
+        $this->setUpDirectoryListInstallationInProduction();
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn(State::MODE_PRODUCTION);
+
+        $expected = [
+            BP . '/app/etc',
+            BP . '/var',
+            BP . '/pub/media',
+            BP . '/pub/static'
+        ];
+
+        $this->assertEquals($expected, $this->filePermissions->getInstallationWritableDirectories());
+    }
+
     public function testGetApplicationNonWritableDirectories()
     {
         $this->directoryListMock
@@ -134,13 +166,18 @@ public function getApplicationCurrentNonWritableDirectoriesDataProvider()
     }
 
     /**
+     * @param string $mageMode
+     * @dataProvider modeDataProvider
      * @covers \Magento\Framework\Setup\FilePermissions::getMissingWritableDirectoriesForInstallation
      * @covers \Magento\Framework\Setup\FilePermissions::getMissingWritablePathsForInstallation
      */
-    public function testGetMissingWritableDirectoriesAndPathsForInstallation()
+    public function testGetMissingWritableDirectoriesAndPathsForInstallation($mageMode)
     {
         $this->setUpDirectoryListInstallation();
         $this->setUpDirectoryWriteInstallation();
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn($mageMode);
 
         $expected = [
             BP . '/var',
@@ -160,6 +197,31 @@ public function testGetMissingWritableDirectoriesAndPathsForInstallation()
         );
     }
 
+    public function testGetMissingWritableDirectoriesAndPathsForInstallationInProduction()
+    {
+        $this->setUpDirectoryListInstallationInProduction();
+        $this->setUpDirectoryWriteInstallation();
+        $this->stateMock->expects($this->once())
+            ->method('getMode')
+            ->willReturn(State::MODE_PRODUCTION);
+
+        $expected = [
+            BP . '/var',
+            BP . '/pub/media',
+            BP . '/pub/static'
+        ];
+
+        $this->assertEquals(
+            $expected,
+            array_values($this->filePermissions->getMissingWritableDirectoriesForInstallation())
+        );
+
+        $this->assertEquals(
+            $expected,
+            array_values($this->filePermissions->getMissingWritablePathsForInstallation())
+        );
+    }
+
     public function testGetMissingWritableDirectoriesForDbUpgrade()
     {
         $directoryMethods = ['isExist', 'isDirectory', 'isReadable', 'isWritable'];
@@ -212,6 +274,16 @@ public function getUnnecessaryWritableDirectoriesForApplicationDataProvider()
     }
 
     public function setUpDirectoryListInstallation()
+    {
+        $this->setUpDirectoryListInstallationInProduction();
+        $this->directoryListMock
+            ->expects($this->at(4))
+            ->method('getPath')
+            ->with(DirectoryList::GENERATED)
+            ->will($this->returnValue(BP . '/generated'));
+    }
+
+    public function setUpDirectoryListInstallationInProduction()
     {
         $this->directoryListMock
             ->expects($this->at(0))
@@ -233,11 +305,6 @@ public function setUpDirectoryListInstallation()
             ->method('getPath')
             ->with(DirectoryList::STATIC_VIEW)
             ->will($this->returnValue(BP . '/pub/static'));
-        $this->directoryListMock
-            ->expects($this->at(4))
-            ->method('getPath')
-            ->with(DirectoryList::GENERATED)
-            ->will($this->returnValue(BP . '/generated'));
     }
 
     public function setUpDirectoryWriteInstallation()
@@ -294,4 +361,15 @@ public function setUpDirectoryWriteInstallation()
             ->method('isWritable')
             ->will($this->returnValue(false));
     }
+
+    /**
+     * @return array
+     */
+    public function modeDataProvider()
+    {
+        return [
+            [State::MODE_DEFAULT],
+            [State::MODE_DEVELOPER],
+        ];
+    }
 }

setup/index.php

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 use Magento\Setup\Application;
+use Magento\Setup\Model\ObjectManagerProvider;
 
 if (PHP_SAPI == 'cli') {
     echo "You cannot run this from the command line." . PHP_EOL .
@@ -32,4 +33,7 @@
 $configuration = require __DIR__ . '/config/application.config.php';
 $bootstrap = new Application();
 $application = $bootstrap->bootstrap($configuration);
+$application->getServiceManager()
+    ->get(ObjectManagerProvider::class)
+    ->setObjectManager(\Magento\Framework\App\Bootstrap::create(BP, $_SERVER)->getObjectManager());
 $application->run();