[8.x] Run clearstatcache after deleting file and asserting `Storage…

…` using exists/missing (#40257) * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]>
laravel · Jan 5, 2022 · 8c293f9 · 8c293f9
1 parent ab29010
commit 8c293f9
Show file tree

Hide file tree

Showing 5 changed files with 146 additions and 1 deletion.
diff --git a/src/Illuminate/Filesystem/Filesystem.php b/src/Illuminate/Filesystem/Filesystem.php
@@ -282,7 +282,9 @@ public function delete($paths)
 
         foreach ($paths as $path) {
             try {
-                if (! @unlink($path)) {
+                if (@unlink($path)) {
+                    clearstatcache(false, $path);
+                } else {
                     $success = false;
                 }
             } catch (ErrorException $e) {

diff --git a/src/Illuminate/Filesystem/FilesystemAdapter.php b/src/Illuminate/Filesystem/FilesystemAdapter.php
@@ -72,6 +72,8 @@ public function __construct(FilesystemInterface $driver)
      */
     public function assertExists($path, $content = null)
     {
+        clearstatcache();
+
         $paths = Arr::wrap($path);
 
         foreach ($paths as $path) {
@@ -101,6 +103,8 @@ public function assertExists($path, $content = null)
      */
     public function assertMissing($path)
     {
+        clearstatcache();
+
         $paths = Arr::wrap($path);
 
         foreach ($paths as $path) {

diff --git a/tests/Integration/Filesystem/FilesystemTest.php b/tests/Integration/Filesystem/FilesystemTest.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Filesystem;
+
+use Illuminate\Support\Facades\File;
+use Orchestra\Testbench\TestCase;
+use Symfony\Component\Process\Process;
+
+/**
+ * @requires OS Linux|Darwin
+ */
+class FilesystemTest extends TestCase
+{
+    protected $stubFile;
+
+    protected function setUp(): void
+    {
+        $this->afterApplicationCreated(function () {
+            File::put($file = storage_path('app/public/StardewTaylor.png'), File::get(__DIR__.'/Fixtures/StardewTaylor.png'));
+            $this->stubFile = $file;
+        });
+
+        $this->beforeApplicationDestroyed(function () {
+            if (File::exists($this->stubFile)) {
+                File::delete($this->stubFile);
+            }
+        });
+
+        parent::setUp();
+    }
+
+    public function testItCanDeleteViaFilesystemShouldUpdatesFileExists()
+    {
+        $this->assertTrue(File::exists($this->stubFile));
+        $this->assertTrue(File::isFile($this->stubFile));
+
+        File::delete($this->stubFile);
+
+        $this->assertFalse(File::exists($this->stubFile));
+    }
+
+    public function testItCanDeleteViaFilesystemRequiresManualClearStatCacheOnFileExistsFromDifferentProcess()
+    {
+        $this->assertTrue(File::exists($this->stubFile));
+        $this->assertTrue(File::isFile($this->stubFile));
+
+        Process::fromShellCommandline("rm {$this->stubFile}")->run();
+
+        clearstatcache(true, $this->stubFile);
+        $this->assertFalse(File::exists($this->stubFile));
+    }
+
+    public function testItCanDeleteViaFilesystemShouldUpdatesIsFile()
+    {
+        $this->assertTrue(File::exists($this->stubFile));
+        $this->assertTrue(File::isFile($this->stubFile));
+
+        File::delete($this->stubFile);
+
+        $this->assertFalse(File::isFile($this->stubFile));
+    }
+
+    public function testItCanDeleteViaFilesystemRequiresManualClearStatCacheOnIsFileFromDifferentProcess()
+    {
+        $this->assertTrue(File::exists($this->stubFile));
+        $this->assertTrue(File::isFile($this->stubFile));
+
+        Process::fromShellCommandline("rm {$this->stubFile}")->run();
+
+        clearstatcache(true, $this->stubFile);
+        $this->assertFalse(File::isFile($this->stubFile));
+    }
+}
diff --git a/tests/Integration/Filesystem/Fixtures/StardewTaylor.png b/tests/Integration/Filesystem/Fixtures/StardewTaylor.png
diff --git a/tests/Integration/Filesystem/StorageTest.php b/tests/Integration/Filesystem/StorageTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Filesystem;
+
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
+use Orchestra\Testbench\TestCase;
+use Symfony\Component\Process\Process;
+
+/**
+ * @requires OS Linux|Darwin
+ */
+class StorageTest extends TestCase
+{
+    protected $stubFile;
+
+    protected function setUp(): void
+    {
+        $this->afterApplicationCreated(function () {
+            File::put($file = storage_path('app/public/StardewTaylor.png'), File::get(__DIR__.'/Fixtures/StardewTaylor.png'));
+            $this->stubFile = $file;
+        });
+
+        $this->beforeApplicationDestroyed(function () {
+            if (File::exists($this->stubFile)) {
+                File::delete($this->stubFile);
+            }
+        });
+
+        parent::setUp();
+    }
+
+    public function testItCanDeleteViaStorage()
+    {
+        Storage::disk('public')->assertExists('StardewTaylor.png');
+        $this->assertTrue(Storage::disk('public')->exists('StardewTaylor.png'));
+
+        Storage::disk('public')->delete('StardewTaylor.png');
+
+        Storage::disk('public')->assertMissing('StardewTaylor.png');
+        $this->assertFalse(Storage::disk('public')->exists('StardewTaylor.png'));
+    }
+
+    public function testItCanDeleteViaFilesystemShouldUpdatesStorage()
+    {
+        Storage::disk('public')->assertExists('StardewTaylor.png');
+        $this->assertTrue(Storage::disk('public')->exists('StardewTaylor.png'));
+
+        File::delete($this->stubFile);
+
+        Storage::disk('public')->assertMissing('StardewTaylor.png');
+        $this->assertFalse(Storage::disk('public')->exists('StardewTaylor.png'));
+    }
+
+    public function testItCanDeleteViaFilesystemRequiresManualClearStatCacheOnStorageFromDifferentProcess()
+    {
+        Storage::disk('public')->assertExists('StardewTaylor.png');
+        $this->assertTrue(Storage::disk('public')->exists('StardewTaylor.png'));
+
+        Process::fromShellCommandline("rm {$this->stubFile}")->run();
+
+        clearstatcache(true, $this->stubFile);
+        Storage::disk('public')->assertMissing('StardewTaylor.png');
+        $this->assertFalse(Storage::disk('public')->exists('StardewTaylor.png'));
+    }
+}