From 897615ee0dfcf3aa597275561cdedeb4dea7d080 Mon Sep 17 00:00:00 2001 From: Smaine Milianni Date: Thu, 9 Aug 2018 22:49:22 +0200 Subject: [PATCH] change baseUrl to basePath to fix wrong profiler url --- .../Component/HttpKernel/Debug/FileLinkFormatter.php | 2 +- .../HttpKernel/Tests/Debug/FileLinkFormatterTest.php | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php index 4d4ae9b003..b3c2595b0d 100644 --- a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php +++ b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php @@ -100,7 +100,7 @@ class FileLinkFormatter implements \Serializable } return array( - $request->getSchemeAndHttpHost().$request->getBaseUrl().$this->urlFormat, + $request->getSchemeAndHttpHost().$request->getBasePath().$this->urlFormat, $this->baseDir.\DIRECTORY_SEPARATOR, '', ); } diff --git a/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php b/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php index e14780ac68..5c93bd90e3 100644 --- a/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php +++ b/src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php @@ -37,7 +37,6 @@ class FileLinkFormatterTest extends TestCase public function testWhenFileLinkFormatAndRequest() { $file = __DIR__.\DIRECTORY_SEPARATOR.'file.php'; - $baseDir = __DIR__; $requestStack = new RequestStack(); $request = new Request(); $requestStack->push($request); @@ -56,12 +55,12 @@ class FileLinkFormatterTest extends TestCase $request->server->set('SERVER_NAME', 'www.example.org'); $request->server->set('SERVER_PORT', 80); - $request->server->set('SCRIPT_NAME', '/app.php'); - $request->server->set('SCRIPT_FILENAME', '/web/app.php'); - $request->server->set('REQUEST_URI', '/app.php/example'); + $request->server->set('SCRIPT_NAME', '/index.php'); + $request->server->set('SCRIPT_FILENAME', '/public/index.php'); + $request->server->set('REQUEST_URI', '/index.php/example'); $sut = new FileLinkFormatter(null, $requestStack, __DIR__, '/_profiler/open?file=%f&line=%l#line%l'); - $this->assertSame('http://www.example.org/app.php/_profiler/open?file=file.php&line=3#line3', $sut->format($file, 3)); + $this->assertSame('http://www.example.org/_profiler/open?file=file.php&line=3#line3', $sut->format($file, 3)); } }