Merge remote-tracking branch 'ogresCE/MAGETWO-44552-Readiness-Check-Recursive' into PR_Branch

Author: mazhalai

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

@@ -7,6 +7,7 @@
 namespace Magento\Setup\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Backup\Filesystem\Iterator\Filter;
 use Magento\Framework\Filesystem;
 
 class FilePermissions
@@ -118,25 +119,32 @@ public function getInstallationCurrentWritableDirectories()
     }
 
     /**
-     * Check all sub-directories
+     * Check all sub-directories and files except for var/generation and var/di
      *
      * @param string $directory
      * @return bool
      */
     private function checkRecursiveDirectories($directory)
     {
-        $skipDirs = ['..', '.'];
         $directoryIterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($directory),
-            \RecursiveIteratorIterator::LEAVES_ONLY | \RecursiveIteratorIterator::CATCH_GET_CHILD
+            new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),
+            \RecursiveIteratorIterator::CHILD_FIRST
         );
-        foreach ($directoryIterator as $subDirectory) {
-            if (in_array($subDirectory->getFilename(), $skipDirs)) {
-                continue;
-            }
-            if ($subDirectory->isDir() && !$subDirectory->isWritable()) {
-                return false;
+        $noWritableFilesFolders = [
+            $this->directoryList->getPath(DirectoryList::GENERATION) . '/',
+            $this->directoryList->getPath(DirectoryList::DI) .'/'
+        ];
+
+        $directoryIterator = new Filter($directoryIterator, $noWritableFilesFolders);
+
+        try {
+            foreach ($directoryIterator as $subDirectory) {
+                if (!$subDirectory->isWritable()) {
+                    return false;
+                }
             }
+        } catch (\UnexpectedValueException $e) {
+            return false;
         }
         return true;
     }