Merge pull request #319 from php-translation/patch-twig

XWB · web-flow · commit 566554a72415 · 2019-07-21T14:33:39.000+02:00
Bump Twig versions
diff --git a/Tests/Unit/Twig/BaseTwigTestCase.php b/Tests/Unit/Twig/BaseTwigTestCase.php
@@ -36,6 +36,6 @@ final protected function parse($file, $debug = false)
         $env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));
         $env->addExtension(new TranslationExtension($translator, $debug));
 
-        return $env->parse($env->tokenize(new Source($content, '')))->getNode('body');
+        return (string) $env->parse($env->tokenize(new Source($content, '')))->getNode('body');
     }
 }
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "php-translation/symfony-storage": "^1.0",
         "php-translation/extractor": "^1.6",
         "nyholm/nsa": "^1.1",
-        "twig/twig": "^1.38,<1.39 || ^2.7,<2.8"
+        "twig/twig": "^1.42 || ^2.11"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^4.2",

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ final protected function parse($file, $debug = false)`
`36`	`36`	`$env->addExtension(new SymfonyTranslationExtension($translator = new IdentityTranslator(new MessageSelector())));`
`37`	`37`	`$env->addExtension(new TranslationExtension($translator, $debug));`
`38`	`38`
`39`		`- return $env->parse($env->tokenize(new Source($content, '')))->getNode('body');`
	`39`	`+ return (string) $env->parse($env->tokenize(new Source($content, '')))->getNode('body');`
`40`	`40`	`}`
`41`	`41`	`}`