From c5889c4fac14d8304d047bde320db0c1f0d71a4f Mon Sep 17 00:00:00 2001 From: "iAm[i]nE" Date: Wed, 26 Jan 2022 15:14:52 +0100 Subject: [PATCH] Path resolving fix when 0 is provided --- src/Illuminate/Foundation/Application.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php index d0e6b921b90c..bab4bc615faf 100755 --- a/src/Illuminate/Foundation/Application.php +++ b/src/Illuminate/Foundation/Application.php @@ -339,7 +339,7 @@ public function path($path = '') { $appPath = $this->appPath ?: $this->basePath.DIRECTORY_SEPARATOR.'app'; - return $appPath.($path ? DIRECTORY_SEPARATOR.$path : $path); + return $appPath.($path != '' ? DIRECTORY_SEPARATOR.$path : ''); } /** @@ -365,7 +365,7 @@ public function useAppPath($path) */ public function basePath($path = '') { - return $this->basePath.($path ? DIRECTORY_SEPARATOR.$path : $path); + return $this->basePath.($path != '' ? DIRECTORY_SEPARATOR.$path : ''); } /** @@ -376,7 +376,7 @@ public function basePath($path = '') */ public function bootstrapPath($path = '') { - return $this->basePath.DIRECTORY_SEPARATOR.'bootstrap'.($path ? DIRECTORY_SEPARATOR.$path : $path); + return $this->basePath.DIRECTORY_SEPARATOR.'bootstrap'.($path != '' ? DIRECTORY_SEPARATOR.$path : ''); } /** @@ -387,7 +387,7 @@ public function bootstrapPath($path = '') */ public function configPath($path = '') { - return $this->basePath.DIRECTORY_SEPARATOR.'config'.($path ? DIRECTORY_SEPARATOR.$path : $path); + return $this->basePath.DIRECTORY_SEPARATOR.'config'.($path != '' ? DIRECTORY_SEPARATOR.$path : ''); } /** @@ -398,7 +398,7 @@ public function configPath($path = '') */ public function databasePath($path = '') { - return ($this->databasePath ?: $this->basePath.DIRECTORY_SEPARATOR.'database').($path ? DIRECTORY_SEPARATOR.$path : $path); + return ($this->databasePath ?: $this->basePath.DIRECTORY_SEPARATOR.'database').($path != '' ? DIRECTORY_SEPARATOR.$path : ''); } /** @@ -424,7 +424,7 @@ public function useDatabasePath($path) */ public function langPath($path = '') { - return $this->langPath.($path ? DIRECTORY_SEPARATOR.$path : ''); + return $this->langPath.($path != '' ? DIRECTORY_SEPARATOR.$path : ''); } /** @@ -487,7 +487,7 @@ public function useStoragePath($path) */ public function resourcePath($path = '') { - return $this->basePath.DIRECTORY_SEPARATOR.'resources'.($path ? DIRECTORY_SEPARATOR.$path : $path); + return $this->basePath.DIRECTORY_SEPARATOR.'resources'.($path != '' ? DIRECTORY_SEPARATOR.$path : ''); } /** @@ -502,7 +502,7 @@ public function viewPath($path = '') { $basePath = $this['config']->get('view.paths')[0]; - return rtrim($basePath, DIRECTORY_SEPARATOR).($path ? DIRECTORY_SEPARATOR.$path : $path); + return rtrim($basePath, DIRECTORY_SEPARATOR).($path != '' ? DIRECTORY_SEPARATOR.$path : ''); } /**