[13.x] Move and copy files that only exist on a read-through disk's fallback (#61272)

* Move and copy files that only exist on a read-through disk's fallback

* Note the fallback read in the copy docblock

Author: sulimanbenhalim

src/Illuminate/Filesystem/ReadThroughFilesystemAdapter.php

@@ -7,6 +7,7 @@
 use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\FilesystemOperator;
+use League\Flysystem\UnableToCopyFile;
 use League\Flysystem\UnableToMoveFile;
 use League\Flysystem\UnableToReadFile;
 
@@ -216,7 +217,7 @@ public function listContents(string $path, bool $deep): iterable
      */
     public function move(string $source, string $destination, Config $config): void
     {
-        $this->primary->move($source, $destination, $config->toArray());
+        $this->moveOnPrimary($source, $destination, $config);
 
         try {
             if ($this->fallback->fileExists($source)) {
@@ -228,11 +229,55 @@ public function move(string $source, string $destination, Config $config): void
     }
 
     /**
-     * Copy a file on the primary filesystem.
+     * Copy a file on the primary filesystem, reading it from the fallback filesystem when necessary.
      */
     public function copy(string $source, string $destination, Config $config): void
     {
-        $this->primary->copy($source, $destination, $config->toArray());
+        if ($this->primary->fileExists($source)) {
+            $this->primary->copy($source, $destination, $config->toArray());
+
+            return;
+        }
+
+        try {
+            $this->copyFromFallback($source, $destination, $config);
+        } catch (FilesystemException $exception) {
+            throw UnableToCopyFile::fromLocationTo($source, $destination, $exception);
+        }
+    }
+
+    /**
+     * Move a file to its destination on the primary filesystem.
+     */
+    protected function moveOnPrimary(string $source, string $destination, Config $config): void
+    {
+        if ($this->primary->fileExists($source)) {
+            $this->primary->move($source, $destination, $config->toArray());
+
+            return;
+        }
+
+        try {
+            $this->copyFromFallback($source, $destination, $config);
+        } catch (FilesystemException $exception) {
+            throw UnableToMoveFile::fromLocationTo($source, $destination, $exception);
+        }
+    }
+
+    /**
+     * Copy a file from the fallback filesystem to the primary filesystem.
+     */
+    protected function copyFromFallback(string $source, string $destination, Config $config): void
+    {
+        $stream = $this->fallback->readStream($source);
+
+        try {
+            $this->primary->writeStream($destination, $stream, $config->toArray());
+        } finally {
+            if (is_resource($stream)) {
+                fclose($stream);
+            }
+        }
     }
 
     /**

tests/Filesystem/FilesystemManagerTest.php

@@ -347,6 +347,86 @@ public function testReadThroughDisksDoNotResurrectMovedFiles()
         $this->assertTrue($readThrough->missing('source.txt'));
     }
 
+    public function testReadThroughDisksMoveFilesThatOnlyExistOnTheFallbackDisk()
+    {
+        $filesystem = $this->readThroughFilesystemManager();
+        $primary = $filesystem->disk('primary');
+        $fallback = $filesystem->disk('fallback');
+        $readThrough = $filesystem->disk('read-through');
+
+        $fallback->put('source.txt', 'contents');
+
+        $this->assertTrue($readThrough->move('source.txt', 'destination.txt'));
+        $this->assertSame('contents', $primary->get('destination.txt'));
+        $this->assertTrue($fallback->missing('source.txt'));
+        $this->assertTrue($readThrough->missing('source.txt'));
+    }
+
+    public function testReadThroughDisksCopyFilesThatOnlyExistOnTheFallbackDisk()
+    {
+        $filesystem = $this->readThroughFilesystemManager();
+        $primary = $filesystem->disk('primary');
+        $fallback = $filesystem->disk('fallback');
+        $readThrough = $filesystem->disk('read-through');
+
+        $fallback->put('source.txt', 'contents');
+
+        $this->assertTrue($readThrough->copy('source.txt', 'destination.txt'));
+        $this->assertSame('contents', $primary->get('destination.txt'));
+        $this->assertSame('contents', $fallback->get('source.txt'));
+        $this->assertSame('contents', $readThrough->get('source.txt'));
+    }
+
+    public function testReadThroughDisksCopyFromTheFallbackDiskWithoutPromotingTheSourceWhenDisabled()
+    {
+        $filesystem = $this->readThroughFilesystemManager([
+            'copy' => false,
+        ]);
+        $primary = $filesystem->disk('primary');
+        $fallback = $filesystem->disk('fallback');
+        $readThrough = $filesystem->disk('read-through');
+
+        $fallback->put('source.txt', 'contents');
+
+        $this->assertTrue($readThrough->copy('source.txt', 'destination.txt'));
+        $this->assertSame('contents', $primary->get('destination.txt'));
+        $this->assertTrue($primary->missing('source.txt'));
+        $this->assertSame('contents', $fallback->get('source.txt'));
+
+        $this->assertTrue($readThrough->move('source.txt', 'moved.txt'));
+        $this->assertSame('contents', $primary->get('moved.txt'));
+        $this->assertTrue($primary->missing('source.txt'));
+        $this->assertTrue($fallback->missing('source.txt'));
+    }
+
+    public function testReadThroughDisksFailToMoveOrCopyMissingFiles()
+    {
+        $filesystem = $this->readThroughFilesystemManager();
+        $readThrough = $filesystem->disk('read-through');
+
+        $this->assertFalse($readThrough->move('missing.txt', 'destination.txt'));
+        $this->assertFalse($readThrough->copy('missing.txt', 'destination.txt'));
+    }
+
+    public function testReadThroughDisksFailToMoveOrCopyWhenThePrimaryDiskIsUnwritable()
+    {
+        $filesystem = $this->readThroughFilesystemManager([
+            'primary' => [
+                'driver' => 'local',
+                'root' => $this->temporaryDirectory('primary'),
+                'read-only' => true,
+            ],
+        ]);
+        $fallback = $filesystem->disk('fallback');
+        $readThrough = $filesystem->disk('read-through');
+
+        $fallback->put('source.txt', 'contents');
+
+        $this->assertFalse($readThrough->move('source.txt', 'destination.txt'));
+        $this->assertFalse($readThrough->copy('source.txt', 'destination.txt'));
+        $this->assertSame('contents', $fallback->get('source.txt'));
+    }
+
     public function testReadThroughDiskPromotionFailuresAreBestEffortByDefault()
     {
         $filesystem = $this->readThroughFilesystemManager([