[7.x] Add $unique argument to Asset::move() (#14364)

Author: lwekuiper

src/Assets/Asset.php

@@ -745,23 +745,21 @@ public function containerHandle()
      */
     public function rename($filename, $unique = false)
     {
-        if ($unique) {
-            return $this->moveUnique($this->folder(), $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)), '/');
@@ -780,22 +778,7 @@ public function move($folder, $filename = null)
         return $this;
     }
 
-    /**
-     * Move the asset to a different location with a unique filename.
-     *
-     * @param  string  $folder  The folder relative to the container.
-     * @param  string|null  $filename  The new filename, if renaming.
-     * @return $this
-     */
-    public function moveUnique($folder, $filename = null)
-    {
-        $filename = Uploader::getSafeFilename($filename ?: $this->filename());
-        $filename = $this->ensureUniqueFilename($folder, $filename);
-
-        return $this->move($folder, $filename);
-    }
-
-    public function moveQuietly($folder, $filename = null)
+    public function moveQuietly($folder, $filename = null, $unique = false)
     {
         $this->withEvents = false;
 

tests/Assets/AssetTest.php

@@ -1261,7 +1261,7 @@ public function it_doesnt_lowercase_moved_files_when_configured()
     }
 
     #[Test]
-    public function it_can_be_moved_uniquely_to_another_folder_when_conflict_exists()
+    public function it_can_be_moved_to_another_folder_with_a_unique_filename_when_conflict_exists()
     {
         Storage::fake('local');
         $disk = Storage::disk('local');
@@ -1274,7 +1274,7 @@ public function it_can_be_moved_uniquely_to_another_folder_when_conflict_exists(
         $asset = $container->makeAsset('old/asset.txt')->data(['foo' => 'bar']);
         $asset->save();
 
-        $return = $asset->moveUnique('new');
+        $return = $asset->move('new', null, true);
 
         $this->assertEquals($asset, $return);
         $disk->assertMissing('old/asset.txt');
@@ -1283,7 +1283,7 @@ public function it_can_be_moved_uniquely_to_another_folder_when_conflict_exists(
     }
 
     #[Test]
-    public function it_can_be_moved_uniquely_to_another_folder_without_renaming_when_no_conflict()
+    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');
@@ -1294,7 +1294,7 @@ public function it_can_be_moved_uniquely_to_another_folder_without_renaming_when
         $asset = $container->makeAsset('old/asset.txt')->data(['foo' => 'bar']);
         $asset->save();
 
-        $return = $asset->moveUnique('new');
+        $return = $asset->move('new', null, true);
 
         $this->assertEquals($asset, $return);
         $disk->assertMissing('old/asset.txt');