Merge remote-tracking branch 'origin/main' into s3-getfiles

# Conflicts:
#	composer.lock

src/Storage/Device.php

@@ -2,6 +2,8 @@
 
 namespace Utopia\Storage;
 
+use Exception;
+
 abstract class Device
 {
     /**
@@ -95,7 +97,7 @@ abstract public function getPath(string $filename, string $prefix = null): strin
      * @param  array  $metadata
      * @return int
      *
-     * @throws \Exception
+     * @throws Exception
      */
     abstract public function upload(string $source, string $path, int $chunk = 1, int $chunks = 1, array &$metadata = []): int;
 
@@ -113,7 +115,7 @@ abstract public function upload(string $source, string $path, int $chunk = 1, in
      * @param  array  $metadata
      * @return int
      *
-     * @throws \Exception
+     * @throws Exception
      */
     abstract public function uploadData(string $data, string $path, string $contentType, int $chunk = 1, int $chunks = 1, array &$metadata = []): int;
 
@@ -167,6 +169,10 @@ abstract public function write(string $path, string $data, string $contentType):
      */
     public function move(string $source, string $target): bool
     {
+        if ($source === $target) {
+            return false;
+        }
+
         if ($this->transfer($source, $target, $this)) {
             return $this->delete($source);
         }

src/Storage/Device/Local.php

@@ -298,9 +298,15 @@ public function write(string $path, string $data, string $contentType = ''): boo
      * @param  string  $source
      * @param  string  $target
      * @return bool
+     *
+     * @throws Exception
      */
     public function move(string $source, string $target): bool
     {
+        if ($source === $target) {
+            return false;
+        }
+
         if (! \file_exists(\dirname($target))) { // Checks if directory path to file exists
             if (! @\mkdir(\dirname($target), 0755, true)) {
                 throw new Exception('Can\'t create directory '.\dirname($target));

tests/Storage/S3Base.php

@@ -150,6 +150,12 @@ public function testMove()
         $this->object->delete($this->object->getPath('text-for-move-new.txt'));
     }
 
+    public function testMoveIdenticalName()
+    {
+        $file = '/kitten-1.jpg';
+        $this->assertFalse($this->object->move($file, $file));
+    }
+
     public function testDelete()
     {
         $this->assertEquals(true, $this->object->write($this->object->getPath('text-for-delete.txt'), 'Hello World', 'text/plain'));

tests/Storage/StorageTest.php

@@ -39,4 +39,11 @@ public function testExists()
         $this->assertEquals(Storage::exists('disk-b'), true);
         $this->assertEquals(Storage::exists('disk-c'), false);
     }
+
+    public function testMoveIdenticalName()
+    {
+        $file = '/kitten-1.jpg';
+        $device = Storage::getDevice('disk-a');
+        $this->assertFalse($device->move($file, $file));
+    }
 }