bug #13693 [HttpKernel] Fixed DumpDataCollector: dump.name for Windows file paths (King2500)

fabpot · fabpot · commit 42e6540224a0 · 2015-02-17T09:22:34.000+01:00
This PR was merged into the 2.6 branch. Discussion ---------- [HttpKernel] Fixed DumpDataCollector: dump.name for Windows file paths | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes? | Fixed tickets | | License | MIT | Doc PR | When using VarDumper on Windows files, the automatic "dump.name" generated wrong names. `dump()` call in: ``` F:\HtDocs\demo\src\Acme\Controller\DemoController.php ``` Displayed: ``` dump() in :\HtDocs\demo\src\Acme\Controller\DemoController.php line 35 ``` Expected result is: ``` dump() in DemoController.php line 35 ``` The existing code in line 118 didn't use the variable from the previous line. Commits ------- a025dea Fix dump.name for Windows file paths
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -115,7 +115,7 @@ public function dump(Data $data)
 
         if (false === $name) {
             $name = strtr($file, '\\', '/');
-            $name = substr($file, strrpos($file, '/') + 1);
+            $name = substr($name, strrpos($name, '/') + 1);
         }
 
         $this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt');

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public function dump(Data $data)`
`115`	`115`
`116`	`116`	`if (false === $name) {`
`117`	`117`	`$name = strtr($file, '\\', '/');`
`118`		`- $name = substr($file, strrpos($file, '/') + 1);`
	`118`	`+ $name = substr($name, strrpos($name, '/') + 1);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`$this->data[] = compact('data', 'name', 'file', 'line', 'fileExcerpt');`