Merge pull request #2875 from magento-thunder/MAGETWO-93265

Fixed issues:
- MAGETWO-93265: Change the depth of a recursive check of directory write permissions

Author: arhiopterecs

dev/tests/integration/testsuite/Magento/Setup/Model/FilePermissionsTest.php

@@ -0,0 +1,82 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Model;
+
+use Magento\Framework\Setup\FilePermissions;
+use Magento\Framework\Filesystem;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\State;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+
+/**
+ * @magentoAppIsolation enabled
+ */
+class FilePermissionsTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var FilePermissions
+     */
+    private $filePermissions;
+
+    /**
+     * @var WriteInterface
+     */
+    private $varDirectoryWriter;
+
+    /**
+     * @var string
+     */
+    private $testDir = 'test';
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var Filesystem $filesystem */
+        $filesystem = $objectManager->get(Filesystem::class);
+        $this->varDirectoryWriter = $filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
+
+        $this->filePermissions = $objectManager->create(FilePermissions::class, [
+            'filesystem' => $filesystem,
+            'directoryList' => $objectManager->get(DirectoryList::class),
+            'state' => $objectManager->get(State::class),
+        ]);
+    }
+
+    /**
+     * Checks the depth of recursive check permissions
+     */
+    public function testDeepOfRecursiveCheckPermissions()
+    {
+        $dirs = [
+            'dir1',
+            'dir2/dir21',
+            'dir2/dir22/dir221',
+            'dir3/dir31/dir311/dir3111',
+        ];
+        foreach ($dirs as $dir) {
+            $pathToReadOnlyDir = $this->testDir . '/' . $dir;
+            $this->varDirectoryWriter->create($pathToReadOnlyDir);
+            $this->varDirectoryWriter->changePermissionsRecursively($pathToReadOnlyDir, 0555, 0444);
+        }
+        $missingWritablePathsForInstallation = $this->filePermissions->getMissingWritablePathsForInstallation();
+        $this->assertCount(1, $missingWritablePathsForInstallation);
+        $this->assertEquals('dir1', basename($missingWritablePathsForInstallation[0]));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function tearDown()
+    {
+        if ($this->varDirectoryWriter->isExist($this->testDir)) {
+            $this->varDirectoryWriter->delete($this->testDir);
+        }
+    }
+}

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

@@ -12,6 +12,9 @@
 use Magento\Framework\App\State;
 use Magento\Framework\App\ObjectManager;
 
+/**
+ * Checks permissions to files and folders.
+ */
 class FilePermissions
 {
     /**
@@ -147,6 +150,7 @@ public function getInstallationCurrentWritableDirectories()
      */
     private function checkRecursiveDirectories($directory)
     {
+        /** @var $directoryIterator \RecursiveIteratorIterator   */
         $directoryIterator = new \RecursiveIteratorIterator(
             new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),
             \RecursiveIteratorIterator::CHILD_FIRST
@@ -168,6 +172,8 @@ private function checkRecursiveDirectories($directory)
             ]
         );
 
+        $directoryIterator->setMaxDepth(1);
+
         $foundNonWritable = false;
 
         try {