feat(assets): add unique argument to Asset::move()

Author: lwekuiper

src/Assets/Asset.php

@@ -743,21 +743,21 @@ public function containerHandle()
      */
     public function rename($filename, $unique = false)
     {
-        $filename = $unique ? $this->ensureUniqueFilename($this->folder(), $filename) : $filename;
-
-        return $this->move($this->folder(), $filename);
+        return $this->move($this->folder(), $filename, $unique);
     }
 
     /**
      * Move the asset to a different location.
      *
      * @param  string  $folder  The folder relative to the container.
      * @param  string|null  $filename  The new filename, if renaming.
+     * @param  bool  $unique  Whether to ensure the filename is unique.
      * @return $this
      */
-    public function move($folder, $filename = null)
+    public function move($folder, $filename = null, $unique = false)
     {
         $filename = Uploader::getSafeFilename($filename ?: $this->filename());
+        $filename = $unique ? $this->ensureUniqueFilename($folder, $filename) : $filename;
         $oldPath = $this->path();
         $oldMetaPath = $this->metaPath();
         $newPath = Str::removeLeft(Path::tidy($folder.'/'.$filename.'.'.pathinfo($oldPath, PATHINFO_EXTENSION)), '/');

tests/Assets/AssetTest.php

@@ -1238,6 +1238,70 @@ public function it_doesnt_lowercase_moved_files_when_configured()
         ], $container->assets('/', true)->map->path()->all());
     }
 
+    #[Test]
+    public function it_can_be_moved_to_another_folder_with_a_unique_filename_when_conflict_exists()
+    {
+        Storage::fake('local');
+        $disk = Storage::disk('local');
+        $disk->put('old/asset.txt', 'The asset contents');
+        $disk->put('new/asset.txt', 'Existing asset');
+        $disk->put('new/asset-1.txt', 'Another existing asset');
+        $container = Facades\AssetContainer::make('test')->disk('local');
+        Facades\AssetContainer::shouldReceive('save')->with($container);
+        Facades\AssetContainer::shouldReceive('findByHandle')->with('test')->andReturn($container);
+        $asset = $container->makeAsset('old/asset.txt')->data(['foo' => 'bar']);
+        $asset->save();
+
+        $return = $asset->move('new', null, true);
+
+        $this->assertEquals($asset, $return);
+        $disk->assertMissing('old/asset.txt');
+        $disk->assertExists('new/asset-2.txt');
+        $this->assertEquals('new/asset-2.txt', $asset->path());
+    }
+
+    #[Test]
+    public function it_can_be_moved_to_another_folder_with_a_unique_filename_without_renaming_when_no_conflict()
+    {
+        Storage::fake('local');
+        $disk = Storage::disk('local');
+        $disk->put('old/asset.txt', 'The asset contents');
+        $container = Facades\AssetContainer::make('test')->disk('local');
+        Facades\AssetContainer::shouldReceive('save')->with($container);
+        Facades\AssetContainer::shouldReceive('findByHandle')->with('test')->andReturn($container);
+        $asset = $container->makeAsset('old/asset.txt')->data(['foo' => 'bar']);
+        $asset->save();
+
+        $return = $asset->move('new', null, true);
+
+        $this->assertEquals($asset, $return);
+        $disk->assertMissing('old/asset.txt');
+        $disk->assertExists('new/asset.txt');
+        $this->assertEquals('new/asset.txt', $asset->path());
+    }
+
+    #[Test]
+    public function it_does_not_ensure_unique_filename_when_moving_by_default()
+    {
+        Storage::fake('local');
+        $disk = Storage::disk('local');
+        $disk->put('old/asset.txt', 'The asset contents');
+        $disk->put('new/asset.txt', 'Existing asset');
+        $container = Facades\AssetContainer::make('test')->disk('local');
+        Facades\AssetContainer::shouldReceive('save')->with($container);
+        Facades\AssetContainer::shouldReceive('findByHandle')->with('test')->andReturn($container);
+        $asset = $container->makeAsset('old/asset.txt')->data(['foo' => 'bar']);
+        $asset->save();
+
+        $return = $asset->move('new');
+
+        $this->assertEquals($asset, $return);
+        $disk->assertMissing('old/asset.txt');
+        // Without unique flag, it overwrites the existing file
+        $disk->assertExists('new/asset.txt');
+        $this->assertEquals('new/asset.txt', $asset->path());
+    }
+
     #[Test]
     public function it_renames()
     {