Refactored PR to take all options into account during copy actions.

thephpleague · Jun 20, 2016 · 2931850 · 2931850
1 parent a7ff1dc
commit 2931850
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/src/AwsS3Adapter.php b/src/AwsS3Adapter.php
@@ -377,22 +377,15 @@ public function updateStream($path, $resource, Config $config)
      */
     public function copy($path, $newpath)
     {
-        $visibility = $this->getRawVisibility($path);
-
-        $args = [
+        $command = $this->s3Client->getCommand(
+            'copyObject',
+            [
                 'Bucket' => $this->bucket,
                 'Key' => $this->applyPathPrefix($newpath),
                 'CopySource' => urlencode($this->bucket . '/' . $this->applyPathPrefix($path)),
-                'ACL' => $visibility === AdapterInterface::VISIBILITY_PUBLIC ? 'public-read' : 'private',
-            ];
-
-        if (isset($this->options['ServerSideEncryption'])) {
-            $args['ServerSideEncryption'] = $this->options['ServerSideEncryption'];
-        }
-
-        $command = $this->s3Client->getCommand(
-            'copyObject',
-            $args
+                'ACL' => $this->getRawVisibility($path) === AdapterInterface::VISIBILITY_PUBLIC
+                    ? 'public-read' : 'private',
+            ] + $this->options
         );
 
         try {