bumped min version of Twig to 1.11.0

fabpot · fabpot · commit 2f4ac5e3d1ba · 2012-12-13T15:33:46.000+01:00
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.3",
         "doctrine/common": ">2.2,<2.4-dev",
-        "twig/twig": ">=1.9.1,<2.0-dev"
+        "twig/twig": ">=1.11.0,<2.0-dev"
     },
     "replace": {
         "symfony/browser-kit": "self.version",
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php b/src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
@@ -107,12 +107,10 @@ protected function getNames(Profile $profile)
                 $template = substr($template, 0, -10);
             }
 
-// FIXME when Twig is able to check for template existence
-/*
-            if (!$this->twig->exists($template.'.html.twig')) {
+            if (!$this->twig->getLoader()->exists($template.'.html.twig')) {
                 throw new \UnexpectedValueException(sprintf('The profiler template "%s.html.twig" for data collector "%s" does not exist.', $template, $name));
             }
-*/
+
             $templates[$name] = $template.'.html.twig';
         }
 

Original file line number	Diff line number	Diff line change
`@@ -107,12 +107,10 @@ protected function getNames(Profile $profile)`
`107`	`107`	`$template = substr($template, 0, -10);`
`108`	`108`	`}`
`109`	`109`
`110`		`-// FIXME when Twig is able to check for template existence`
`111`		`-/*`
`112`		`- if (!$this->twig->exists($template.'.html.twig')) {`
	`110`	`+ if (!$this->twig->getLoader()->exists($template.'.html.twig')) {`
`113`	`111`	`throw new \UnexpectedValueException(sprintf('The profiler template "%s.html.twig" for data collector "%s" does not exist.', $template, $name));`
`114`	`112`	`}`
`115`		`-*/`
	`113`	`+`
`116`	`114`	`$templates[$name] = $template.'.html.twig';`
`117`	`115`	`}`
`118`	`116`