From b6a3e3a9519e0adc52fb1bd75e1f4974a554c011 Mon Sep 17 00:00:00 2001 From: josephlewisnz <57464168+josephlewisnz@users.noreply.github.com> Date: Wed, 14 Jun 2023 15:46:23 +1200 Subject: [PATCH] added an additional filter to remove empty array items (#10803) * ENH Added filter to remove empty/null from Path::join parts This is to ensure null values are removed and trim() deprecated warnings are not thrown Fixes #10802 * FIX revert public signature Co-authored-by: Steve Boyd --------- Co-authored-by: Steve Boyd --- src/Core/Path.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/Path.php b/src/Core/Path.php index 8ca98f4c4..ac19475ba 100644 --- a/src/Core/Path.php +++ b/src/Core/Path.php @@ -30,7 +30,7 @@ class Path } // Cleanup and join all parts - $parts = array_filter(array_map('trim', $parts ?? [])); + $parts = array_filter(array_map('trim', array_filter($parts ?? []))); $fullPath = static::normalise(implode(DIRECTORY_SEPARATOR, $parts)); // Protect against directory traversal vulnerability (OTG-AUTHZ-001)