code review

KnpLabs · Jun 6, 2019 · 03f6a04 · 03f6a04
1 parent 3d639c1
commit 03f6a04
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/spec/Gaufrette/Adapter/OpenStackSpec.php b/spec/Gaufrette/Adapter/OpenStackSpec.php
@@ -255,6 +255,7 @@ function it_throws_storage_failure_while_deleting(Container $container, StorageO
 
     function it_renames_file(Container $container, StorageObject $source, StorageObject $dest)
     {
+        $container->objectExists('source')->willReturn(true);
         $container->objectExists('dest')->willReturn(false);
 
         $container->getObject('source')->willReturn($source);
@@ -273,8 +274,16 @@ function it_renames_file(Container $container, StorageObject $source, StorageObj
         $this->rename('source', 'dest')->shouldNotThrow();
     }
 
+    function it_throws_storage_failure_when_source_does_not_exist_during_rename(Container $container)
+    {
+        $container->objectExists('source')->willReturn(false);
+
+        $this->shouldThrow('Gaufrette\Exception\StorageFailure')->duringrename('source', 'dest');
+    }
+
     function it_throws_storage_failure_when_dest_already_exists_during_rename(Container $container)
     {
+        $container->objectExists('source')->willReturn(true);
         $container->objectExists('dest')->willReturn(true);
 
         $this->shouldThrow('Gaufrette\Exception\StorageFailure')->duringrename('source', 'dest');

diff --git a/spec/Gaufrette/FilesystemSpec.php b/spec/Gaufrette/FilesystemSpec.php
@@ -77,7 +77,7 @@ function it_fails_when_a_storage_failure_happens_during_rename(Adapter $adapter)
     {
         $adapter->exists('filename')->willReturn(true);
         $adapter->exists('otherFilename')->willReturn(false);
-        $adapter->rename('filename', 'otherFilename')->willThrow(StorageFailure::unexpectedFailure('rename', []));
+        $adapter->rename('filename', 'otherFilename')->willThrow(StorageFailure::class);
 
         $this
             ->shouldThrow(StorageFailure::class)

diff --git a/src/Gaufrette/Adapter/OpenStack.php b/src/Gaufrette/Adapter/OpenStack.php
@@ -224,7 +224,7 @@ public function delete($key)
      */
     public function rename($sourceKey, $targetKey)
     {
-        if ($this->exists($targetKey)) {
+        if (!$this->exists($sourceKey) || $this->exists($targetKey)) {
             throw StorageFailure::unexpectedFailure(
                 'rename',
                 ['sourceKey' => $sourceKey, 'targetKey' => $targetKey]