diff --git a/src/Local/LocalFilesystemAdapter.php b/src/Local/LocalFilesystemAdapter.php index 2b2e095dd..bfb845194 100644 --- a/src/Local/LocalFilesystemAdapter.php +++ b/src/Local/LocalFilesystemAdapter.php @@ -352,7 +352,7 @@ public function createDirectory(string $path, Config $config): void { $this->ensureRootDirectoryExists(); $location = $this->prefixer->prefixPath($path); - $visibility = $config->get(Config::OPTION_VISIBILITY, $config->get(Config::OPTION_DIRECTORY_VISIBILITY)); + $visibility = $config->get(Config::OPTION_DIRECTORY_VISIBILITY, $config->get(Config::OPTION_VISIBILITY)); $permissions = $this->resolveDirectoryVisibility($visibility); if (is_dir($location)) { diff --git a/src/Local/LocalFilesystemAdapterTest.php b/src/Local/LocalFilesystemAdapterTest.php index fb5895744..899742223 100644 --- a/src/Local/LocalFilesystemAdapterTest.php +++ b/src/Local/LocalFilesystemAdapterTest.php @@ -501,9 +501,10 @@ public function creating_a_directory(): void $this->assertDirectoryExists(static::ROOT . '/public_dir_public_files'); $this->assertFileHasPermissions(static::ROOT . '/public_dir_public_files', 0755); + # when creating a directory is it correct to assume directory_visibility has precedence over visibility ? $adapter->createDirectory('public_dir_private_files', new Config(['visibility' => 'private', 'directory_visibility' => 'public'])); $this->assertDirectoryExists(static::ROOT . '/public_dir_private_files'); - $this->assertFileHasPermissions(static::ROOT . '/public_dir_private_files', 0700); # should this not be 0755 for directory_visibility=public + $this->assertFileHasPermissions(static::ROOT . '/public_dir_private_files', 0755); # should this not be 0755 instead of 0700 } @@ -550,7 +551,9 @@ public function creating_a_directory_write_a_file(): void $adapter->createDirectory('public_dir_private_files', $config = new Config(['visibility' => 'private', 'directory_visibility' => 'public'])); $this->assertDirectoryExists(static::ROOT . '/public_dir_private_files'); - $this->assertFileHasPermissions(static::ROOT . '/public_dir_private_files', 0700); # should this not be 0755 for directory_visibility=public + + # when creating a directory is it correct to assume directory_visibility has precedence over visibility ? + $this->assertFileHasPermissions(static::ROOT . '/public_dir_private_files', 0755); $adapter->write('/public_dir_private_files/file.txt', 'contents', $config); $this->assertFileContains(static::ROOT . '/public_dir_private_files/file.txt', 'contents'); $this->assertFileHasPermissions(static::ROOT . '/public_dir_private_files/file.txt', 0600);