From 56030a0a8bb599965c1e0093672316c18302b0da Mon Sep 17 00:00:00 2001 From: kor3k Date: Mon, 26 Aug 2019 03:27:29 +0200 Subject: [PATCH 1/2] fix undefined index in stat metadata --- src/Flysystem/Plugin/Stat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Flysystem/Plugin/Stat.php b/src/Flysystem/Plugin/Stat.php index 94bd492..fc3ab48 100644 --- a/src/Flysystem/Plugin/Stat.php +++ b/src/Flysystem/Plugin/Stat.php @@ -154,7 +154,7 @@ protected function mergeMeta(array $metadata) $ret['gid'] = $this->uid->getGid(); $ret['mode'] = $metadata['type'] === 'dir' ? 040000 : 0100000; - $ret['mode'] += $this->permissions[$metadata['type']][$metadata['visibility']]; + $ret['mode'] += empty($this->permissions[$metadata['type']][$metadata['visibility']]) ? $metadata['visibility'] : $this->permissions[$metadata['type']][$metadata['visibility']]; if (isset($metadata['size'])) { $ret['size'] = (int) $metadata['size']; From a001b0e7c451771b0c63a25d04e8ef73dbb56c96 Mon Sep 17 00:00:00 2001 From: kor3k Date: Tue, 27 Aug 2019 17:31:28 +0200 Subject: [PATCH 2/2] fix undefined index in stat metadata - use intval --- src/Flysystem/Plugin/Stat.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Flysystem/Plugin/Stat.php b/src/Flysystem/Plugin/Stat.php index fc3ab48..426e585 100644 --- a/src/Flysystem/Plugin/Stat.php +++ b/src/Flysystem/Plugin/Stat.php @@ -154,7 +154,7 @@ protected function mergeMeta(array $metadata) $ret['gid'] = $this->uid->getGid(); $ret['mode'] = $metadata['type'] === 'dir' ? 040000 : 0100000; - $ret['mode'] += empty($this->permissions[$metadata['type']][$metadata['visibility']]) ? $metadata['visibility'] : $this->permissions[$metadata['type']][$metadata['visibility']]; + $ret['mode'] += empty($this->permissions[$metadata['type']][$metadata['visibility']]) ? intval($metadata['visibility'], 8) : $this->permissions[$metadata['type']][$metadata['visibility']]; if (isset($metadata['size'])) { $ret['size'] = (int) $metadata['size'];