Moved globbing to FileSystemUtils implementing the GlobIterator

Author: indykoning

src/Patch/SourceLoaders/PatchesSearch.php

@@ -102,15 +102,13 @@ public function load(\Composer\Package\PackageInterface $package, $source)
         $basePath = $this->getInstallPath($package);
         $results = array();
 
-        foreach ($source as $sourceGlob) {
-            foreach (glob($sourceGlob) as $item) {
-                $paths = $this->fileSystemUtils->collectFilePathsRecursively(
-                    $basePath . DIRECTORY_SEPARATOR . $item,
-                    sprintf('/%s/i', PluginConfig::PATCH_FILE_REGEX_MATCHER)
-                );
+        foreach ($source as $item) {
+            $paths = $this->fileSystemUtils->collectFilePathsRecursively(
+                $basePath . DIRECTORY_SEPARATOR . $item,
+                sprintf('/%s/i', PluginConfig::PATCH_FILE_REGEX_MATCHER)
+            );
 
-                $results[] = $this->createPatchDefinitions($basePath, $paths);
-            }
+            $results[] = $this->createPatchDefinitions($basePath, $paths);
         }
 
         return $results;

src/Utils/FileSystemUtils.php

@@ -9,13 +9,47 @@ class FileSystemUtils
 {
     public function collectFilePathsRecursively($rootPath, $pattern)
     {
-        $paths = $this->collectPathsRecursively($rootPath, $pattern);
+        if (strpos($rootPath, '*') !== false || strpos($rootPath, '?') !== false) {
+            $paths = $this->collectGlobs($rootPath, $pattern);
+        } else {
+            $paths = $this->collectPathsRecursively($rootPath, $pattern);
+        }
 
         return array_filter($paths, function ($item) {
             return is_file($item);
         });
     }
 
+    public function collectGlobs($rootPath, $pattern)
+    {
+        $iterator = new \GlobIterator($rootPath);
+
+        $files = array();
+
+        foreach ($iterator as $info) {
+            if($info->isDir()) {
+                $files = [...$files, ...$this->collectPathsRecursively($info->getRealPath(), $pattern)];
+                continue;
+            }
+
+            if (!$info->isFile() || !preg_match($pattern, $info->getRealPath())) {
+                continue;
+            }
+
+            $path = $info->getRealPath();
+            $files[$path] = $path;
+        }
+
+        $sequence = array_keys($files);
+
+        natsort($sequence);
+
+        return array_replace(
+            array_flip($sequence),
+            $files
+        );
+    }
+
     public function collectPathsRecursively($rootPath, $pattern)
     {
         if (!is_dir($rootPath)) {