bug #24710 [TwigBridge] Fix template paths in profiler (ro0NL)

fabpot · fabpot · commit 98dae3edb1ba · 2017-10-28T15:07:58.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [TwigBridge] Fix template paths in profiler | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes/no | Fixed tickets | #24540 | License | MIT | Doc PR | symfony/symfony-docs#...  Fixes the profiler being unavailable with non filesystem templates. ![image](https://user-images.githubusercontent.com/1047696/32117680-87866354-bb4f-11e7-9cb9-428ad6751a1e.png) Commits ------- c9174df [TwigBridge] Fix template paths in profiler
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -63,9 +63,18 @@ public function lateCollect()
         $this->data['template_paths'] = array();
 
         $templateFinder = function (Profile $profile) use (&$templateFinder) {
-            if ($profile->isTemplate() && $template = $this->twig->load($profile->getName())->getSourceContext()->getPath()) {
-                $this->data['template_paths'][$profile->getName()] = $template;
+            if ($profile->isTemplate()) {
+                try {
+                    $template = $this->twig->load($name = $profile->getName());
+                } catch (\Twig_Error_Loader $e) {
+                    $template = null;
+                }
+
+                if (null !== $template && '' !== $path = $template->getSourceContext()->getPath()) {
+                    $this->data['template_paths'][$name] = $path;
+                }
             }
+
             foreach ($profile as $p) {
                 $templateFinder($p);
             }
