[HttpKernel] Fix source links with latests Twig versions

nicolas-grekas · nicolas-grekas · commit 5721fcd40fb8 · 2016-10-12T18:38:22.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php
@@ -97,21 +97,42 @@ public function dump(Data $data)
 
                         break;
                     } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof \Twig_Template) {
-                        $info = $trace[$i]['object'];
-                        $name = $info->getTemplateName();
-                        $src = method_exists($info, 'getSource') ? $info->getSource() : $info->getEnvironment()->getLoader()->getSource($name);
-                        $info = $info->getDebugInfo();
-                        if (null !== $src && isset($info[$trace[$i - 1]['line']])) {
-                            $file = false;
+                        $template = $trace[$i]['object'];
+                        $name = $template->getTemplateName();
+                        $info = $template->getDebugInfo();
+                        try {
+                            $src = method_exists($template, 'getSource') ? $template->getSource() : $template->getEnvironment()->getLoader()->getSource($name);
+                        } catch (\Twig_Error_Loader $e) {
+                            $src = false;
+                        }
+                        if (isset($info[$trace[$i - 1]['line']])) {
                             $line = $info[$trace[$i - 1]['line']];
-                            $src = explode("\n", $src);
-                            $fileExcerpt = array();
 
-                            for ($i = max($line - 3, 1), $max = min($line + 3, count($src)); $i <= $max; ++$i) {
-                                $fileExcerpt[] = '<li'.($i === $line ? ' class="selected"' : '').'><code>'.$this->htmlEncode($src[$i - 1]).'</code></li>';
+                            if (isset($info['file'])) {
+                                $file = $info['file'];
+                            } elseif (method_exists($template, 'getEnvironment') && $template->getEnvironment()->getLoader() instanceof \Twig_Loader_Filesystem) {
+                                try {
+                                    $file = $template->getEnvironment()->getLoader()->getCacheKey($name);
+                                } catch (\Twig_Error_Loader $e) {
+                                    $file = false;
+                                }
+                            } else {
+                                $file = false;
+                            }
+                            if ($file && !file_exists($file)) {
+                                $file = false;
                             }
 
-                            $fileExcerpt = '<ol start="'.max($line - 3, 1).'">'.implode("\n", $fileExcerpt).'</ol>';
+                            if ($src) {
+                                $src = explode("\n", $src);
+                                $fileExcerpt = array();
+
+                                for ($i = max($line - 3, 1), $max = min($line + 3, count($src)); $i <= $max; ++$i) {
+                                    $fileExcerpt[] = '<li'.($i === $line ? ' class="selected"' : '').'><code>'.$this->htmlEncode($src[$i - 1]).'</code></li>';
+                                }
+
+                                $fileExcerpt = '<ol start="'.max($line - 3, 1).'">'.implode("\n", $fileExcerpt).'</ol>';
+                            }
                         }
                         break;
                     }
