Updated Filesystem to check for glob() error.

RobLoach · Aug 9, 2015 · ea1d0f8 · ea1d0f8
1 parent 0553c9b
commit ea1d0f8
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/ComponentInstaller/Util/Filesystem.php b/src/ComponentInstaller/Util/Filesystem.php
@@ -37,9 +37,12 @@ public function recursiveGlob($pattern, $flags = 0)
 
         // Check if this is to be recursive.
         if (strpos($pattern, '**') !== FALSE) {
-             foreach (glob(dirname($pattern).DIRECTORY_SEPARATOR.'*', GLOB_ONLYDIR|GLOB_NOSORT) as $dir) {
-                 $files = array_merge($files, $this->recursiveGlob($dir.DIRECTORY_SEPARATOR.basename($pattern), $flags));
-             }
+            $dirs = glob(dirname($pattern).DIRECTORY_SEPARATOR.'*', GLOB_ONLYDIR|GLOB_NOSORT);
+            if ($dirs) {
+                foreach ($dirs as $dir) {
+                    $files = array_merge($files, $this->recursiveGlob($dir.DIRECTORY_SEPARATOR.basename($pattern), $flags));
+                }
+            }
         }
 
         return $files;