fix: bug in recursive delete based on glob (#2332)

* fix: bug in recursive delete based on glob

* fix: rm on windows"

Author: norberttech

src/lib/filesystem/src/Flow/Filesystem/Local/NativeLocalFilesystem.php

@@ -10,7 +10,8 @@
 use Flow\Filesystem\Exception\{InvalidArgumentException, InvalidSchemeException, RuntimeException};
 use Flow\Filesystem\Path\Filter\OnlyFiles;
 use Flow\Filesystem\Stream\{NativeLocalDestinationStream, NativeLocalSourceStream};
-use Webmozart\Glob\Iterator\GlobIterator;
+use Webmozart\Glob\Glob;
+use Webmozart\Glob\Iterator\{GlobFilterIterator, GlobIterator};
 
 /**
  * This implementation is based on the native PHP filesystem functions documented here: https://www.php.net/manual/en/book.filesystem.php
@@ -129,7 +130,7 @@ public function rm(Path $path) : bool
 
         $deletedCount = 0;
 
-        foreach (new GlobIterator($path->path()) as $filePath) {
+        foreach ($this->matchChildFirst($path->path()) as $filePath) {
             $filePath = type_string()->assert($filePath);
 
             if (\is_dir($filePath)) {
@@ -188,6 +189,38 @@ public function writeTo(Path $path) : DestinationStream
         return NativeLocalDestinationStream::openBlank($path);
     }
 
+    /**
+     * Lazy iterator over glob matches in CHILD_FIRST order so callers can safely delete each match
+     * without confusing webmozart/glob's internal RecursiveIteratorIterator (which descends with SELF_FIRST).
+     */
+    private function matchChildFirst(string $glob) : \Iterator
+    {
+        $glob = self::canonicalizePath($glob);
+        $basePath = Glob::getBasePath($glob);
+
+        if (!\is_dir($basePath)) {
+            return new \EmptyIterator();
+        }
+
+        $recursive = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator(
+                $basePath,
+                \RecursiveDirectoryIterator::CURRENT_AS_PATHNAME | \RecursiveDirectoryIterator::SKIP_DOTS
+            ),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+
+        return new GlobFilterIterator(
+            $glob,
+            (static function () use ($recursive) {
+                foreach ($recursive as $path) {
+                    yield self::canonicalizePath(type_string()->assert($path));
+                }
+            })(),
+            GlobFilterIterator::FILTER_VALUE
+        );
+    }
+
     private function rmdir(string $dirPath) : void
     {
         if (!\is_dir($dirPath)) {
@@ -221,13 +254,21 @@ private function rmdir(string $dirPath) : void
         \rmdir($dirPath);
     }
 
+    private static function canonicalizePath(string $path) : string
+    {
+        return type_string()->cast(\preg_replace('#/+#', '/', \str_replace('\\', '/', $path)));
+    }
+
     private static function statFor(Path $path, string $absolutePath) : FileStatus
     {
         $isFile = \is_file($absolutePath);
-        $size = $isFile ? (\filesize($absolutePath) ?: null) : null;
         $mtime = \filemtime($absolutePath);
-        $lastModifiedAt = $mtime !== false ? new \DateTimeImmutable('@' . $mtime) : null;
 
-        return new FileStatus($path, $isFile, $size, $lastModifiedAt);
+        return new FileStatus(
+            $path,
+            $isFile,
+            $isFile ? (\filesize($absolutePath) ?: null) : null,
+            $mtime !== false ? new \DateTimeImmutable('@' . $mtime) : null
+        );
     }
 }

src/lib/filesystem/tests/Flow/Filesystem/Tests/Integration/NativeLocalFilesystemTest.php

@@ -451,6 +451,42 @@ public function test_removing_folder_pattern() : void
         self::assertNull($fs->status(path(__DIR__ . '/var/nested/orders/orders_01.csv')));
     }
 
+    public function test_removing_pattern_with_redundant_slashes() : void
+    {
+        $fs = native_local_filesystem();
+
+        $resource = \fopen(__DIR__ . '/Fixtures/orders.csv', 'rb');
+        self::assertIsResource($resource);
+        $fs->writeTo(path(__DIR__ . '/var/redundant_slash/file.txt'))->fromResource($resource);
+
+        $fs->rm(path(__DIR__ . '/var/redundant_slash//*.txt'));
+
+        self::assertNull($fs->status(path(__DIR__ . '/var/redundant_slash/file.txt')));
+    }
+
+    public function test_removing_recursive_pattern_with_nested_directories() : void
+    {
+        $fs = native_local_filesystem();
+
+        $resource1 = \fopen(__DIR__ . '/Fixtures/orders.csv', 'rb');
+        self::assertIsResource($resource1);
+        $fs->writeTo(path(__DIR__ . '/var/recursive_rm/dir_a/file1.txt'))->fromResource($resource1);
+
+        $resource2 = \fopen(__DIR__ . '/Fixtures/orders.csv', 'rb');
+        self::assertIsResource($resource2);
+        $fs->writeTo(path(__DIR__ . '/var/recursive_rm/dir_a/nested/file2.txt'))->fromResource($resource2);
+
+        $resource3 = \fopen(__DIR__ . '/Fixtures/orders.csv', 'rb');
+        self::assertIsResource($resource3);
+        $fs->writeTo(path(__DIR__ . '/var/recursive_rm/dir_b/file3.txt'))->fromResource($resource3);
+
+        $fs->rm(path(__DIR__ . '/var/recursive_rm/**/*'));
+
+        self::assertNull($fs->status(path(__DIR__ . '/var/recursive_rm/dir_a/file1.txt')));
+        self::assertNull($fs->status(path(__DIR__ . '/var/recursive_rm/dir_a/nested/file2.txt')));
+        self::assertNull($fs->status(path(__DIR__ . '/var/recursive_rm/dir_b/file3.txt')));
+    }
+
     public function test_rm_rejects_mismatched_scheme() : void
     {
         $this->expectException(InvalidSchemeException::class);