minor #20236 [HttpKernel] Fix source links with latests Twig versions (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 0e8b2a391629 · 2016-10-18T11:38:25.000+02:00
This PR was merged into the 2.7 branch. Discussion ---------- [HttpKernel] Fix source links with latests Twig versions | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20224 | License | MIT | Doc PR | - Commits ------- 3c21617 [HttpKernel] Fix source links with latests Twig versions
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -99,11 +99,11 @@ public function dump(Data $data)
                     } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof \Twig_Template) {
                         $template = $trace[$i]['object'];
                         $name = $template->getTemplateName();
-                        $file = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getPath() : false;
                         $src = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : false);
                         $info = $template->getDebugInfo();
-                        if (null !== $src && isset($info[$trace[$i - 1]['line']])) {
+                        if (isset($info[$trace[$i - 1]['line']])) {
                             $line = $info[$trace[$i - 1]['line']];
+                            $file = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getPath() : false;
 
                             if ($src) {
                                 $src = explode("\n", $src);
