Merge remote-tracking branch '38394/patch-4' into novcomprs

Author: engcom-Charlie

lib/internal/Magento/Framework/Filesystem/Glob.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Framework\Filesystem;
@@ -19,6 +19,19 @@ class Glob extends LaminasGlob
      */
     private static $cache = [];
 
+    /**
+     * Clear the static cache for glob patterns.
+     * This method should be used primarily in testing environments
+     * or long-running processes where file system changes occur
+     * between glob() calls and fresh results are required.
+     *
+     * @return void
+     */
+    public static function clearCache(): void
+    {
+        self::$cache = [];
+    }
+
     /**
      * Find path names matching a pattern.
      *

lib/internal/Magento/Framework/Test/Unit/Filesystem/GlobTest.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Test\Unit\Filesystem;
+
+use Magento\Framework\Filesystem\Glob;
+use PHPUnit\Framework\TestCase;
+
+class GlobTest extends TestCase
+{
+    public function testClearCache(): void
+    {
+        $dir = __DIR__ . '/_files/glob';
+        $pattern = $dir . '/*.txt';
+        $testFile = $dir . '/c.txt';
+        try {
+            if (is_file($testFile)) {
+                unlink($testFile);
+            }
+            $this->assert(['a.txt', 'b.txt'], Glob::glob($pattern));
+            touch($testFile);
+            $this->assert(['a.txt', 'b.txt'], Glob::glob($pattern));
+            Glob::clearCache();
+            $this->assert(['a.txt', 'b.txt', 'c.txt'], Glob::glob($pattern));
+        } finally {
+            if (is_file($testFile)) {
+                unlink($testFile);
+            }
+        }
+    }
+
+    private function assert(array $expected, array $results): void
+    {
+        $results = array_map(static function (string $file): string {
+            return substr($file, strrpos($file, '/') + 1);
+        }, $results);
+        $missing = array_diff($expected, $results);
+        $this->assertEmpty($missing, 'Missing files: ' . implode(', ', $missing));
+        $unexpected = array_diff($results, $expected);
+        $this->assertEmpty($unexpected, 'Unexpected files: ' . implode(', ', $unexpected));
+    }
+}

lib/internal/Magento/Framework/Test/Unit/Filesystem/_files/glob/a.txt

@@ -0,0 +1 @@
+Text file

lib/internal/Magento/Framework/Test/Unit/Filesystem/_files/glob/b.txt

@@ -0,0 +1 @@
+Text file