[FrameworkBundle] tweaked regexp

fabpot · fabpot · commit b68624aa7f3e · 2011-04-12T15:19:57.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php
@@ -169,7 +169,7 @@ public function formatFile($file, $line, $text = null)
                 $fileStr = sprintf('<abbr title="%s">kernel.root_dir</abbr>/%s', $this->rootDir, $fileStr);
             }
 
-            $text = "$fileStr line $line";
+            $text = "$fileStr at line $line";
         }
 
         if (false !== $link = $this->getFileLink($file, $line)) {
@@ -196,8 +196,8 @@ public function formatFileFromText($text)
     {
         $that = $this;
 
-        return preg_replace_callback('/in (.*?)(?: on|at)? line (\d+)/', function ($match) use ($that) {
-            return 'in '.$that->formatFile($match[1], $match[2]);
+        return preg_replace_callback('/in (")?(.*?)\1(?: +(?:on|at))? +line (\d+)/', function ($match) use ($that) {
+            return 'in '.$that->formatFile($match[2], $match[3]);
         }, $text);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public function formatFile($file, $line, $text = null)`
`169`	`169`	`$fileStr = sprintf('<abbr title="%s">kernel.root_dir</abbr>/%s', $this->rootDir, $fileStr);`
`170`	`170`	`}`
`171`	`171`
`172`		`- $text = "$fileStr line $line";`
	`172`	`+ $text = "$fileStr at line $line";`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`if (false !== $link = $this->getFileLink($file, $line)) {`
`@@ -196,8 +196,8 @@ public function formatFileFromText($text)`
`196`	`196`	`{`
`197`	`197`	`$that = $this;`
`198`	`198`
`199`		`- return preg_replace_callback('/in (.*?)(?: on\|at)? line (\d+)/', function ($match) use ($that) {`
`200`		`- return 'in '.$that->formatFile($match[1], $match[2]);`
	`199`	`+ return preg_replace_callback('/in (")?(.*?)\1(?: +(?:on\|at))? +line (\d+)/', function ($match) use ($that) {`
	`200`	`+ return 'in '.$that->formatFile($match[2], $match[3]);`
`201`	`201`	`}, $text);`
`202`	`202`	`}`
`203`	`203`