Support for Twig 3.

derrabus · derrabus · commit af7d80b5f082 · 2019-08-13T17:22:30.000+02:00
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "ext-xml": "*",
         "doctrine/event-manager": "~1.0",
         "doctrine/persistence": "~1.0",
-        "twig/twig": "^2.10",
+        "twig/twig": "^2.10|^3",
         "psr/cache": "~1.0",
         "psr/container": "^1.0",
         "psr/link": "^1.0",
diff --git a/src/Symfony/Bridge/Twig/Extension/AssetExtension.php b/src/Symfony/Bridge/Twig/Extension/AssetExtension.php
@@ -32,7 +32,7 @@ public function __construct(Packages $packages)
     /**
      * {@inheritdoc}
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('asset', [$this, 'getAssetUrl']),
diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -41,7 +41,7 @@ public function __construct($fileLinkFormat, string $projectDir, string $charset
     /**
      * {@inheritdoc}
      */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html']]),
diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
@@ -35,14 +35,14 @@ public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)
         $this->dumper = $dumper;
     }
 
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('dump', [$this, 'dump'], ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),
         ];
     }
 
-    public function getTokenParsers()
+    public function getTokenParsers(): array
     {
         return [new DumpTokenParser()];
     }
diff --git a/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php b/src/Symfony/Bridge/Twig/Extension/ExpressionExtension.php
@@ -25,7 +25,7 @@ class ExpressionExtension extends AbstractExtension
     /**
      * {@inheritdoc}
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('expression', [$this, 'createExpression']),
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -30,7 +30,7 @@ class FormExtension extends AbstractExtension
     /**
      * {@inheritdoc}
      */
-    public function getTokenParsers()
+    public function getTokenParsers(): array
     {
         return [
             // {% form_theme form "SomeBundle::widgets.twig" %}
@@ -41,7 +41,7 @@ public function getTokenParsers()
     /**
      * {@inheritdoc}
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('form_widget', null, ['node_class' => 'Symfony\Bridge\Twig\Node\SearchAndRenderBlockNode', 'is_safe' => ['html']]),
@@ -61,7 +61,7 @@ public function getFunctions()
     /**
      * {@inheritdoc}
      */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('humanize', ['Symfony\Component\Form\FormRenderer', 'humanize']),
@@ -72,7 +72,7 @@ public function getFilters()
     /**
      * {@inheritdoc}
      */
-    public function getTests()
+    public function getTests(): array
     {
         return [
             new TwigTest('selectedchoice', 'Symfony\Bridge\Twig\Extension\twig_is_selected_choice'),
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
@@ -33,7 +33,7 @@ public function __construct(UrlHelper $urlHelper)
     /**
      * {@inheritdoc}
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('absolute_url', [$this, 'generateAbsoluteUrl']),
diff --git a/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php b/src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php
@@ -22,7 +22,7 @@
  */
 class HttpKernelExtension extends AbstractExtension
 {
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('render', [HttpKernelRuntime::class, 'renderFragment'], ['is_safe' => ['html']]),
diff --git a/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php b/src/Symfony/Bridge/Twig/Extension/LogoutUrlExtension.php
@@ -32,7 +32,7 @@ public function __construct(LogoutUrlGenerator $generator)
     /**
      * {@inheritdoc}
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('logout_url', [$this, 'getLogoutUrl']),
diff --git a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php
@@ -31,7 +31,7 @@ public function __construct(Profile $profile, Stopwatch $stopwatch = null)
         $this->events = new \SplObjectStorage();
     }
 
-    public function enter(Profile $profile)
+    public function enter(Profile $profile): void
     {
         if ($this->stopwatch && $profile->isTemplate()) {
             $this->events[$profile] = $this->stopwatch->start($profile->getName(), 'template');
@@ -40,7 +40,7 @@ public function enter(Profile $profile)
         parent::enter($profile);
     }
 
-    public function leave(Profile $profile)
+    public function leave(Profile $profile): void
     {
         parent::leave($profile);
 
diff --git a/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php b/src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
@@ -37,7 +37,7 @@ public function __construct(UrlGeneratorInterface $generator)
      *
      * @return array An array of functions
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
diff --git a/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php b/src/Symfony/Bridge/Twig/Extension/SecurityExtension.php
@@ -51,7 +51,7 @@ public function isGranted($role, object $object = null, string $field = null)
     /**
      * {@inheritdoc}
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('is_granted', [$this, 'isGranted']),
diff --git a/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php b/src/Symfony/Bridge/Twig/Extension/StopwatchExtension.php
@@ -36,7 +36,7 @@ public function getStopwatch()
         return $this->stopwatch;
     }
 
-    public function getTokenParsers()
+    public function getTokenParsers(): array
     {
         return [
             /*
diff --git a/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php b/src/Symfony/Bridge/Twig/Extension/WebLinkExtension.php
@@ -34,7 +34,7 @@ public function __construct(RequestStack $requestStack)
     /**
      * {@inheritdoc}
      */
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('link', [$this, 'link']),
diff --git a/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php b/src/Symfony/Bridge/Twig/Extension/WorkflowExtension.php
@@ -31,7 +31,7 @@ public function __construct(Registry $workflowRegistry)
         $this->workflowRegistry = $workflowRegistry;
     }
 
-    public function getFunctions()
+    public function getFunctions(): array
     {
         return [
             new TwigFunction('workflow_can', [$this, 'canTransition']),
diff --git a/src/Symfony/Bridge/Twig/Extension/YamlExtension.php b/src/Symfony/Bridge/Twig/Extension/YamlExtension.php
@@ -26,7 +26,7 @@ class YamlExtension extends AbstractExtension
     /**
      * {@inheritdoc}
      */
-    public function getFilters()
+    public function getFilters(): array
     {
         return [
             new TwigFilter('yaml_encode', [$this, 'encode']),
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php b/src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php
@@ -149,7 +149,7 @@ protected function loadResourcesFromTheme(string $cacheKey, &$theme)
     {
         if (!$theme instanceof Template) {
             /* @var Template $theme */
-            $theme = $this->environment->loadTemplate($theme);
+            $theme = $this->environment->load($theme)->unwrap();
         }
 
         if (null === $this->template) {
diff --git a/src/Symfony/Bridge/Twig/Node/DumpNode.php b/src/Symfony/Bridge/Twig/Node/DumpNode.php
@@ -35,7 +35,7 @@ public function __construct($varPrefix, Node $values = null, int $lineno, string
     /**
      * {@inheritdoc}
      */
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->write("if (\$this->env->isDebug()) {\n")
diff --git a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
@@ -25,7 +25,7 @@ public function __construct(Node $form, Node $resources, int $lineno, string $ta
         parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->addDebugInfo($this)
diff --git a/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php b/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php
@@ -24,7 +24,7 @@
  */
 class RenderBlockNode extends FunctionExpression
 {
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
         $arguments = iterator_to_array($this->getNode('arguments'));
diff --git a/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php b/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
@@ -21,7 +21,7 @@
  */
 class SearchAndRenderBlockNode extends FunctionExpression
 {
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
         $compiler->raw('$this->env->getRuntime(\'Symfony\Component\Form\FormRenderer\')->searchAndRenderBlock(');
diff --git a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php
@@ -27,7 +27,7 @@ public function __construct(Node $name, Node $body, AssignNameExpression $var, i
         parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler
             ->addDebugInfo($this)
diff --git a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
@@ -25,7 +25,7 @@ public function __construct(AbstractExpression $expr, int $lineno = 0, string $t
         parent::__construct(['expr' => $expr], [], $lineno, $tag);
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         // noop as this node is just a marker for TranslationDefaultDomainNodeVisitor
     }
diff --git a/src/Symfony/Bridge/Twig/Node/TransNode.php b/src/Symfony/Bridge/Twig/Node/TransNode.php
@@ -46,7 +46,7 @@ public function __construct(Node $body, Node $domain = null, AbstractExpression
         parent::__construct($nodes, [], $lineno, $tag);
     }
 
-    public function compile(Compiler $compiler)
+    public function compile(Compiler $compiler): void
     {
         $compiler->addDebugInfo($this);
 
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php
@@ -40,7 +40,7 @@ public function __construct()
     /**
      * {@inheritdoc}
      */
-    protected function doEnterNode(Node $node, Environment $env)
+    protected function doEnterNode(Node $node, Environment $env): Node
     {
         if ($node instanceof BlockNode || $node instanceof ModuleNode) {
             $this->scope = $this->scope->enter();
@@ -92,7 +92,7 @@ protected function doEnterNode(Node $node, Environment $env)
     /**
      * {@inheritdoc}
      */
-    protected function doLeaveNode(Node $node, Environment $env)
+    protected function doLeaveNode(Node $node, Environment $env): ?Node
     {
         if ($node instanceof TransDefaultDomainNode) {
             return null;
@@ -108,7 +108,7 @@ protected function doLeaveNode(Node $node, Environment $env)
     /**
      * {@inheritdoc}
      */
-    public function getPriority()
+    public function getPriority(): int
     {
         return -10;
     }
diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -50,7 +50,7 @@ public function getMessages()
     /**
      * {@inheritdoc}
      */
-    protected function doEnterNode(Node $node, Environment $env)
+    protected function doEnterNode(Node $node, Environment $env): Node
     {
         if (!$this->enabled) {
             return $node;
@@ -90,15 +90,15 @@ protected function doEnterNode(Node $node, Environment $env)
     /**
      * {@inheritdoc}
      */
-    protected function doLeaveNode(Node $node, Environment $env)
+    protected function doLeaveNode(Node $node, Environment $env): ?Node
     {
         return $node;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getPriority()
+    public function getPriority(): int
     {
         return 0;
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/TranslationExtensionTest.php
@@ -201,6 +201,6 @@ protected function getTemplate($template, $translator = null)
         $twig = new Environment($loader, ['debug' => true, 'cache' => false]);
         $twig->addExtension(new TranslationExtension($translator));
 
-        return $twig->loadTemplate('index');
+        return $twig->load('index')->unwrap();
     }
 }
diff --git a/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/DumpTokenParser.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Twig\TokenParser;
 
 use Symfony\Bridge\Twig\Node\DumpNode;
+use Twig\Node\Node;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
@@ -31,7 +32,7 @@ class DumpTokenParser extends AbstractTokenParser
     /**
      * {@inheritdoc}
      */
-    public function parse(Token $token)
+    public function parse(Token $token): Node
     {
         $values = null;
         if (!$this->parser->getStream()->test(Token::BLOCK_END_TYPE)) {
@@ -45,7 +46,7 @@ public function parse(Token $token)
     /**
      * {@inheritdoc}
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'dump';
     }
diff --git a/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/FormThemeTokenParser.php
@@ -29,7 +29,7 @@ class FormThemeTokenParser extends AbstractTokenParser
      *
      * @return Node
      */
-    public function parse(Token $token)
+    public function parse(Token $token): Node
     {
         $lineno = $token->getLine();
         $stream = $this->parser->getStream();
@@ -61,7 +61,7 @@ public function parse(Token $token)
      *
      * @return string The tag name
      */
-    public function getTag()
+    public function getTag(): string
     {
         return 'form_theme';
     }
diff --git a/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/StopwatchTokenParser.php
@@ -13,6 +13,7 @@
 
 use Symfony\Bridge\Twig\Node\StopwatchNode;
 use Twig\Node\Expression\AssignNameExpression;
+use Twig\Node\Node;
 use Twig\Token;
 use Twig\TokenParser\AbstractTokenParser;
 
@@ -30,7 +31,7 @@ public function __construct(bool $stopwatchIsAvailable)
         $this->stopwatchIsAvailable = $stopwatchIsAvailable;
     }
 
-    public function parse(Token $token)
+    public function parse(Token $token): Node
     {
         $lineno = $token->getLine();
         $stream = $this->parser->getStream();
@@ -56,7 +57,7 @@ public function decideStopwatchEnd(Token $token)
         return $token->test('endstopwatch');
     }
 
-    public function getTag()
+    public function getTag(): string
     {
         return 'stopwatch';
     }
diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransDefaultDomainTokenParser.php
diff --git a/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php b/src/Symfony/Bridge/Twig/TokenParser/TransTokenParser.php
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
diff --git a/src/Symfony/Component/VarDumper/composer.json b/src/Symfony/Component/VarDumper/composer.json

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(Packages $packages)`
`32`	`32`	`/**`
`33`	`33`	`* {@inheritdoc}`
`34`	`34`	`*/`
`35`		`- public function getFunctions()`
	`35`	`+ public function getFunctions(): array`
`36`	`36`	`{`
`37`	`37`	`return [`
`38`	`38`	`new TwigFunction('asset', [$this, 'getAssetUrl']),`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function __construct($fileLinkFormat, string $projectDir, string $charset`
`41`	`41`	`/**`
`42`	`42`	`* {@inheritdoc}`
`43`	`43`	`*/`
`44`		`- public function getFilters()`
	`44`	`+ public function getFilters(): array`
`45`	`45`	`{`
`46`	`46`	`return [`
`47`	`47`	`new TwigFilter('abbr_class', [$this, 'abbrClass'], ['is_safe' => ['html']]),`
Original file line number	Diff line number	Diff line change
`@@ -35,14 +35,14 @@ public function __construct(ClonerInterface $cloner, HtmlDumper $dumper = null)`
`35`	`35`	`$this->dumper = $dumper;`
`36`	`36`	`}`
`37`	`37`
`38`		`- public function getFunctions()`
	`38`	`+ public function getFunctions(): array`
`39`	`39`	`{`
`40`	`40`	`return [`
`41`	`41`	`new TwigFunction('dump', [$this, 'dump'], ['is_safe' => ['html'], 'needs_context' => true, 'needs_environment' => true]),`
`42`	`42`	`];`
`43`	`43`	`}`
`44`	`44`
`45`		`- public function getTokenParsers()`
	`45`	`+ public function getTokenParsers(): array`
`46`	`46`	`{`
`47`	`47`	`return [new DumpTokenParser()];`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ExpressionExtension extends AbstractExtension`
`25`	`25`	`/**`
`26`	`26`	`* {@inheritdoc}`
`27`	`27`	`*/`
`28`		`- public function getFunctions()`
	`28`	`+ public function getFunctions(): array`
`29`	`29`	`{`
`30`	`30`	`return [`
`31`	`31`	`new TwigFunction('expression', [$this, 'createExpression']),`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public function __construct(UrlHelper $urlHelper)`
`33`	`33`	`/**`
`34`	`34`	`* {@inheritdoc}`
`35`	`35`	`*/`
`36`		`- public function getFunctions()`
	`36`	`+ public function getFunctions(): array`
`37`	`37`	`{`
`38`	`38`	`return [`
`39`	`39`	`new TwigFunction('absolute_url', [$this, 'generateAbsoluteUrl']),`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*/`
`23`	`23`	`class HttpKernelExtension extends AbstractExtension`
`24`	`24`	`{`
`25`		`- public function getFunctions()`
	`25`	`+ public function getFunctions(): array`
`26`	`26`	`{`
`27`	`27`	`return [`
`28`	`28`	`new TwigFunction('render', [HttpKernelRuntime::class, 'renderFragment'], ['is_safe' => ['html']]),`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function __construct(Profile $profile, Stopwatch $stopwatch = null)`
`31`	`31`	`$this->events = new \SplObjectStorage();`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function enter(Profile $profile)`
	`34`	`+ public function enter(Profile $profile): void`
`35`	`35`	`{`
`36`	`36`	`if ($this->stopwatch && $profile->isTemplate()) {`
`37`	`37`	`$this->events[$profile] = $this->stopwatch->start($profile->getName(), 'template');`
`@@ -40,7 +40,7 @@ public function enter(Profile $profile)`
`40`	`40`	`parent::enter($profile);`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function leave(Profile $profile)`
	`43`	`+ public function leave(Profile $profile): void`
`44`	`44`	`{`
`45`	`45`	`parent::leave($profile);`
`46`	`46`