From: Dan Brown Date: Wed, 4 May 2022 20:19:46 +0000 (+0100) Subject: Applied styleci changes X-Git-Tag: v22.04.1~1^2 X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/93ef8c97b6d53eee37bd58f41a64053b0a43ac32 Applied styleci changes --- diff --git a/app/Http/Request.php b/app/Http/Request.php index fa368f3bc..4cbdf34ba 100644 --- a/app/Http/Request.php +++ b/app/Http/Request.php @@ -36,6 +36,7 @@ class Request extends LaravelRequest if ($appUrl) { $parsedBaseUrl = rtrim(implode('/', array_slice(explode('/', $appUrl), 3)), '/'); + return empty($parsedBaseUrl) ? '' : ('/' . $parsedBaseUrl); } diff --git a/tests/UrlTest.php b/tests/UrlTest.php index 2313e02f4..13f9d9e0c 100644 --- a/tests/UrlTest.php +++ b/tests/UrlTest.php @@ -48,5 +48,4 @@ class UrlTest extends TestCase $this->assertEquals('/settings', $bsRequest->getPathInfo()); $this->assertEquals('https://donkey.example.com/settings', $bsRequest->getUri()); } - }