Merge branch '1.x' into 2.x

* 1.x:
  simplified code
  use load() instead of loadTemplate() in tests
  added the possibility to pass a TemplateWrapper to Twig\Environment::load()
This commit is contained in:
Fabien Potencier
2019-03-11 19:58:03 +01:00
13 changed files with 56 additions and 66 deletions
+1 -1
View File
@@ -200,7 +200,7 @@ abstract class IntegrationTestCase extends TestCase
return $prevHandler ? $prevHandler($type, $msg, $file, $line, $context) : false;
});
$template = $twig->loadTemplate('index.twig');
$template = $twig->load('index.twig');
} catch (\Exception $e) {
if (false !== $exception) {
$message = $e->getMessage();