Handle MetadataDirective gracefully.

thephpleague · Apr 7, 2024 · 49810f2 · 49810f2
1 parent 37d1942
commit 49810f2
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 1 deletion.
diff --git a/src/AwsS3V3/AwsS3V3Adapter.php b/src/AwsS3V3/AwsS3V3Adapter.php
@@ -431,14 +431,17 @@ public function copy(string $source, string $destination, Config $config): void
             );
         }
 
+        $options = $this->createOptionsFromConfig($config);
+        $options['MetadataDirective'] = $config->get('MetadataDirective', 'COPY');
+
         try {
             $this->client->copy(
                 $this->bucket,
                 $this->prefixer->prefixPath($source),
                 $this->bucket,
                 $this->prefixer->prefixPath($destination),
                 $this->visibility->visibilityToAcl($visibility ?: 'private'),
-                $this->createOptionsFromConfig($config)['params']
+                $options,
             );
         } catch (Throwable $exception) {
             throw UnableToCopyFile::fromLocationTo($source, $destination, $exception);

diff --git a/src/AwsS3V3/AwsS3V3AdapterTest.php b/src/AwsS3V3/AwsS3V3AdapterTest.php
@@ -337,6 +337,40 @@ public function moving_with_updated_metadata(): void
         $this->assertSame('text/plain+special', $mimeTypeDestination);
     }
 
+    /**
+     * @test
+     */
+    public function moving_without_updated_metadata(): void
+    {
+        $adapter = $this->adapter();
+        $adapter->write('source.txt', 'contents to be moved', new Config(['ContentType' => 'text/plain']));
+        $mimeTypeSource = $adapter->mimeType('source.txt')->mimeType();
+        $this->assertSame('text/plain', $mimeTypeSource);
+
+        $adapter->move('source.txt', 'destination.txt', new Config(
+            ['ContentType' => 'text/plain+special']
+        ));
+        $mimeTypeDestination = $adapter->mimeType('destination.txt')->mimeType();
+        $this->assertSame('text/plain', $mimeTypeDestination);
+    }
+
+    /**
+     * @test
+     */
+    public function copying_with_updated_metadata(): void
+    {
+        $adapter = $this->adapter();
+        $adapter->write('source.txt', 'contents to be moved', new Config(['ContentType' => 'text/plain']));
+        $mimeTypeSource = $adapter->mimeType('source.txt')->mimeType();
+        $this->assertSame('text/plain', $mimeTypeSource);
+
+        $adapter->copy('source.txt', 'destination.txt', new Config(
+            ['ContentType' => 'text/plain+special', 'MetadataDirective' => 'REPLACE']
+        ));
+        $mimeTypeDestination = $adapter->mimeType('destination.txt')->mimeType();
+        $this->assertSame('text/plain+special', $mimeTypeDestination);
+    }
+
     /**
      * @test
      */