Merge remote-tracking branch 'origin/feature/override-visibility-on-c…

…opy'

src/AwsS3Adapter.php

@@ -59,6 +59,11 @@ class AwsS3Adapter extends AbstractAdapter implements CanOverwriteFiles
      */
     protected $options = [];
 
+    /**
+     * @var string
+     */
+    protected $overrideVisibilityOnCopy;
+
     /**
      * Constructor.
      *
@@ -72,6 +77,12 @@ public function __construct(S3Client $client, $bucket, $prefix = '', array $opti
         $this->s3Client = $client;
         $this->bucket = $bucket;
         $this->setPathPrefix($prefix);
+
+        if (array_key_exists('override_visibility_on_copy', $options)) {
+            $this->overrideVisibilityOnCopy = $options['override_visibility_on_copy'] === AdapterInterface::VISIBILITY_PUBLIC
+                ? 'public-read' : 'private';
+            unset($options['force_visibility']);
+        }
         $this->options = $options;
     }
 
@@ -390,14 +401,19 @@ public function updateStream($path, $resource, Config $config)
      */
     public function copy($path, $newpath)
     {
+        if ($this->overrideVisibilityOnCopy) {
+            $acl = $this->overrideVisibilityOnCopy;
+        } else {
+            $acl = $this->getRawVisibility($path) === AdapterInterface::VISIBILITY_PUBLIC ? 'public-read' : 'private';
+        }
+
         $command = $this->s3Client->getCommand(
             'copyObject',
             [
                 'Bucket' => $this->bucket,
                 'Key' => $this->applyPathPrefix($newpath),
                 'CopySource' => urlencode($this->bucket . '/' . $this->applyPathPrefix($path)),
-                'ACL' => $this->getRawVisibility($path) === AdapterInterface::VISIBILITY_PUBLIC
-                    ? 'public-read' : 'private',
+                'ACL' => $acl,
             ] + $this->options
         );