[HttpKernel] fix link to source generation

nicolas-grekas · nicolas-grekas · commit 4a4b62bf4d01 · 2019-06-06T11:21:46.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -68,7 +68,7 @@ public function format($file, $line)
      */
     public function __sleep(): array
     {
-        $this->getFileLinkFormat();
+        $this->fileLinkFormat = $this->getFileLinkFormat();
 
         return ['fileLinkFormat'];
     }
@@ -87,17 +87,19 @@ public static function generateUrlFormat(UrlGeneratorInterface $router, $routeNa
 
     private function getFileLinkFormat()
     {
+        if ($this->fileLinkFormat) {
+            return $this->fileLinkFormat;
+        }
+
         if ($this->requestStack && $this->baseDir && $this->urlFormat) {
             $request = $this->requestStack->getMasterRequest();
 
             if ($request instanceof Request && (!$this->urlFormat instanceof \Closure || $this->urlFormat = ($this->urlFormat)())) {
-                $this->fileLinkFormat = [
+                return [
                     $request->getSchemeAndHttpHost().$request->getBasePath().$this->urlFormat,
                     $this->baseDir.\DIRECTORY_SEPARATOR, '',
                 ];
             }
         }
-
-        return $this->fileLinkFormat;
     }
 }

Origina E31F l file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function format($file, $line)`
`68`	`68`	`*/`
`69`	`69`	`public function __sleep(): array`
`70`	`70`	`{`
`71`		`- $this->getFileLinkFormat();`
	`71`	`+ $this->fileLinkFormat = $this->getFileLinkFormat();`
`72`	`72`
`73`	`73`	`return ['fileLinkFormat'];`
`74`	`74`	`}`
`@@ -87,17 +87,19 @@ public static function generateUrlFormat(UrlGeneratorInterface $router, $routeNa`
`87`	`87`
`88`	`88`	`private function getFileLinkFormat()`
`89`	`89`	`{`
	`90`	`+ if ($this->fileLinkFormat) {`
	`91`	`+ return $this->fileLinkFormat;`
	`92`	`+ }`
	`93`	`+`
`90`	`94`	`if ($this->requestStack && $this->baseDir && $this->urlFormat) {`
`91`	`95`	`$request = $this->requestStack->getMasterRequest();`
`92`	`96`
`93`	`97`	`if ($request instanceof Request && (!$this->urlFormat instanceof \Closure \|\| $this->urlFormat = ($this->urlFormat)())) {`
`94`		`- $this->fileLinkFormat = [`
	`98`	`+ return [`
`95`	`99`	`$request->getSchemeAndHttpHost().$request->getBasePath().$this->urlFormat,`
`96`	`100`	`$this->baseDir.\DIRECTORY_SEPARATOR, '',`
`97`	`101`	`];`
`98`	`102`	`}`
`99`	`103`	`}`
`100`		`-`
`101`		`- return $this->fileLinkFormat;`
`102`	`104`	`}`
`103`	`105`	`}`