Merge pull request #815 from reflexions/master

streamtw · web-flow · commit 5928d1a2fd68 · 2019-10-19T01:05:05.000+08:00
don't try to set ACL on directory if filesystem doesn't support them
diff --git a/src/LfmStorageRepository.php b/src/LfmStorageRepository.php
@@ -57,7 +57,11 @@ public function makeDirectory()
     {
         $this->disk->makeDirectory($this->path, ...func_get_args());
 
-        $this->disk->setVisibility($this->path, 'public');
+        // some filesystems (e.g. Google Storage, S3?) don't let you set ACLs on directories (because they don't exist)
+        // https://cloud.google.com/storage/docs/naming#object-considerations
+        if ($this->disk->has($this->path)) {
+            $this->disk->setVisibility($this->path, 'public');
+        }
     }
 
     public function extension()

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,11 @@ public function makeDirectory()`
`57`	`57`	`{`
`58`	`58`	`$this->disk->makeDirectory($this->path, ...func_get_args());`
`59`	`59`
`60`		`- $this->disk->setVisibility($this->path, 'public');`
	`60`	`+ // some filesystems (e.g. Google Storage, S3?) don't let you set ACLs on directories (because they don't exist)`
	`61`	`+ // https://cloud.google.com/storage/docs/naming#object-considerations`
	`62`	`+ if ($this->disk->has($this->path)) {`
	`63`	`+ $this->disk->setVisibility($this->path, 'public');`
	`64`	`+ }`
`61`	`65`	`}`
`62`	`66`
`63`	`67`	`public function extension()`