From d423710bfa14668c481337071fff79e62152aa8c Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sun, 3 Jul 2022 21:06:29 -0400 Subject: [PATCH 1/5] Restore Laravel 6 behavior to public visibility for local driver --- src/Filesystem/FilesystemManager.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/Filesystem/FilesystemManager.php b/src/Filesystem/FilesystemManager.php index 330ac14e2..ccc6f93e3 100644 --- a/src/Filesystem/FilesystemManager.php +++ b/src/Filesystem/FilesystemManager.php @@ -22,4 +22,16 @@ public function identify($disk) } return $configName; } + + protected function resolve($name, $config = null) + { + if (is_null($config)) { + $config = $this->getConfig($name); + } + if ($name === 'local') { + $config['visibility'] = 'public'; + } + + return parent::resolve($name, $config); + } } From fba530f5580eab3208278a0013230e8a880daccd Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Fri, 8 Jul 2022 15:47:21 -0600 Subject: [PATCH 2/5] Update src/Filesystem/FilesystemManager.php --- src/Filesystem/FilesystemManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Filesystem/FilesystemManager.php b/src/Filesystem/FilesystemManager.php index ccc6f93e3..9dca6f3af 100644 --- a/src/Filesystem/FilesystemManager.php +++ b/src/Filesystem/FilesystemManager.php @@ -28,7 +28,7 @@ protected function resolve($name, $config = null) if (is_null($config)) { $config = $this->getConfig($name); } - if ($name === 'local') { + if ($config['driver'] === 'local' && empty($config['visibility'])) $config['visibility'] = 'public'; } From 02cb26d9a33d450abec034a45182467ea5a9cd89 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Fri, 8 Jul 2022 15:48:23 -0600 Subject: [PATCH 3/5] Update src/Filesystem/FilesystemManager.php --- src/Filesystem/FilesystemManager.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Filesystem/FilesystemManager.php b/src/Filesystem/FilesystemManager.php index 9dca6f3af..5319b2a79 100644 --- a/src/Filesystem/FilesystemManager.php +++ b/src/Filesystem/FilesystemManager.php @@ -23,6 +23,9 @@ public function identify($disk) return $configName; } + /** + * @inheritDoc + */ protected function resolve($name, $config = null) { if (is_null($config)) { From 480d02ba26207eec12898dd06deb32ad9f315a32 Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Fri, 8 Jul 2022 15:49:21 -0600 Subject: [PATCH 4/5] Update src/Filesystem/FilesystemManager.php --- src/Filesystem/FilesystemManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Filesystem/FilesystemManager.php b/src/Filesystem/FilesystemManager.php index 5319b2a79..06acff75f 100644 --- a/src/Filesystem/FilesystemManager.php +++ b/src/Filesystem/FilesystemManager.php @@ -31,7 +31,7 @@ protected function resolve($name, $config = null) if (is_null($config)) { $config = $this->getConfig($name); } - if ($config['driver'] === 'local' && empty($config['visibility'])) + if ($config['driver'] === 'local' && empty($config['visibility'])) { $config['visibility'] = 'public'; } From a84725d84a7d35ab270fd9e866d25ee4c450ad0c Mon Sep 17 00:00:00 2001 From: Luke Towers Date: Fri, 8 Jul 2022 15:51:29 -0600 Subject: [PATCH 5/5] Update src/Filesystem/FilesystemManager.php --- src/Filesystem/FilesystemManager.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Filesystem/FilesystemManager.php b/src/Filesystem/FilesystemManager.php index 06acff75f..af7dfcbe9 100644 --- a/src/Filesystem/FilesystemManager.php +++ b/src/Filesystem/FilesystemManager.php @@ -31,6 +31,9 @@ protected function resolve($name, $config = null) if (is_null($config)) { $config = $this->getConfig($name); } + + // Default local drivers to public visibility for backwards compatibility + // see https://github.com/wintercms/winter/issues/503 if ($config['driver'] === 'local' && empty($config['visibility'])) { $config['visibility'] = 'public'; }