fix/improve filesystem visibility

ixocreate · Apr 27, 2021 · 2f8108f · 2f8108f
1 parent ec400ce
commit 2f8108f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/Option/LocalOption.php b/src/Option/LocalOption.php
@@ -15,6 +15,7 @@
 use Ixocreate\ServiceManager\ServiceManagerInterface;
 use League\Flysystem\Local\LocalFilesystemAdapter;
 use League\Flysystem\UnixVisibility\PortableVisibilityConverter;
+use League\Flysystem\Visibility;
 
 final class LocalOption implements OptionInterface
 {
@@ -202,7 +203,8 @@ public function create(string $name, ServiceManagerInterface $serviceManager): A
             $this->config['permission']['file']['public'],
             $this->config['permission']['file']['private'],
             $this->config['permission']['dir']['public'],
-            $this->config['permission']['dir']['private']
+            $this->config['permission']['dir']['private'],
+            Visibility::PUBLIC
         );
 
         return new Adapter(

diff --git a/src/Option/S3Option.php b/src/Option/S3Option.php
@@ -25,6 +25,7 @@ final class S3Option implements OptionInterface
         'version' => 'latest',
         'bucketName' => '',
         'initialPath' => '',
+        'visibility' => null,
         'options' => [],
     ];
 
@@ -78,6 +79,16 @@ public function bucketName(): string
         return $this->config['bucketName'];
     }
 
+    public function setVisibility(string $visibility): void
+    {
+        $this->config['visibility'] = $visibility;
+    }
+
+    public function visibility(): ?string
+    {
+        return $this->config['visibility'];
+    }
+
     public function setInitialPath(string $initialPath): void
     {
         $this->config['initialPath'] = $initialPath;
@@ -145,6 +156,12 @@ public function unserialize($serialized)
      */
     public function create(string $name, ServiceManagerInterface $serviceManager): AdapterInterface
     {
+        $visibility = null;
+        if ($this->visibility() !== null) {
+            $visibility = $this->visibility();
+            $visibility = new $visibility();
+        }
+
         return new Adapter(
             new AwsS3V3Adapter(
                 new S3Client([
@@ -157,7 +174,7 @@ public function create(string $name, ServiceManagerInterface $serviceManager): A
                 ]),
                 $this->bucketName(),
                 $this->initialPath(),
-                null,
+                $visibility,
                 null,
                 $this->options()
             )