Fix huge issue with template existence check

Orbitale · Oct 23, 2017 · 69f13f7 · 69f13f7
1 parent 45217d4
commit 69f13f7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/EventListener/LayoutsListener.php b/EventListener/LayoutsListener.php
@@ -86,7 +86,7 @@ public function setRequestLayout(GetResponseEvent $event)
             } while (null === $finalLayout && count($layouts));
         }
 
-        if (null === $finalLayout || !$this->twig->exists($finalLayout['resource'])) {
+        if (null === $finalLayout || !$this->twig->getLoader()->exists($finalLayout['resource'])) {
             throw new \Twig_Error_Loader(sprintf(
                 'Unable to find template %s for layout %s. The "layout" parameter must be a valid twig view to be used as a layout.',
                 $finalLayout['resource'], $finalLayout['name']

diff --git a/Tests/Fixtures/App/config/config_test.yaml b/Tests/Fixtures/App/config/config_test.yaml
@@ -7,7 +7,6 @@ framework:
     secret:     secret
     translator: { fallbacks:['fr'] }
     router:     { resource: "%kernel.root_dir%/config/routing.yaml" }
-    templating: { engines: ['twig'] }
     session:
         storage_id: session.storage.mock_file