minor #33649 Allow Twig 3 (nicolas-grekas)

This PR was merged into the 4.4 branch. Discussion ---------- Allow Twig 3 | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Needs https://github.com/twigphp/Twig/pull/3156 And https://github.com/twigphp/Twig/pull/3158 Commits ------- 09f4eb5cd8 Allow Twig 3
2019-09-23 16:39:44 +02:00 · 2019-09-23 16:39:44 +02:00 · 8eaa5a86f4
commit 8eaa5a86f4
parent ca108747e3 09f4eb5cd8
21 changed files with 52 additions and 9 deletions
--- a/composer.json
+++ b/composer.json
@ -20,7 +20,7 @@
        "ext-xml": "*",
        "doctrine/event-manager": "~1.0",
        "doctrine/persistence": "~1.0",
-        "twig/twig": "^1.41|^2.10",
+        "twig/twig": "^1.41|^2.10|^3.0",
        "psr/cache": "~1.0",
        "psr/container": "^1.0",
        "psr/link": "^1.0",
--- a/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php
+++ b/src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php
@ -33,6 +33,9 @@ class ProfilerExtension extends BaseProfilerExtension
        $this->events = new \SplObjectStorage();
    }

+    /**
+     * @return void
+     */
    public function enter(Profile $profile)
    {
        if ($this->stopwatch && $profile->isTemplate()) {
@ -42,6 +45,9 @@ class ProfilerExtension extends BaseProfilerExtension
        parent::enter($profile);
    }

+    /**
+     * @return void
+     */
    public function leave(Profile $profile)
    {
        parent::leave($profile);
--- a/src/Symfony/Bridge/Twig/Node/DumpNode.php
+++ b/src/Symfony/Bridge/Twig/Node/DumpNode.php
@ -35,7 +35,7 @@ class DumpNode extends Node
    }

    /**
-     * {@inheritdoc}
+     * @return void
     */
    public function compile(Compiler $compiler)
    {
--- a/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
+++ b/src/Symfony/Bridge/Twig/Node/FormThemeNode.php
@ -27,6 +27,9 @@ class FormThemeNode extends Node
        parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
    }

+    /**
+     * @return void
+     */
    public function compile(Compiler $compiler)
    {
        $compiler
--- a/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php
+++ b/src/Symfony/Bridge/Twig/Node/RenderBlockNode.php
@ -26,6 +26,9 @@ use Twig\Node\Expression\FunctionExpression;
 */
 class RenderBlockNode extends FunctionExpression
 {
+    /**
+     * @return void
+     */
    public function compile(Compiler $compiler)
    {
        $compiler->addDebugInfo($this);
--- a/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
+++ b/src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
@ -23,6 +23,9 @@ use Twig\Node\Expression\FunctionExpression;
 */
 class SearchAndRenderBlockNode extends FunctionExpression
 {
+    /**
+     * @return void
+     */
    public function compile(Compiler $compiler)
    {
        $compiler->addDebugInfo($this);
--- a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php
+++ b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php
@ -29,6 +29,9 @@ class StopwatchNode extends Node
        parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
    }

+    /**
+     * @return void
+     */
    public function compile(Compiler $compiler)
    {
        $compiler
--- a/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
+++ b/src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
@ -27,6 +27,9 @@ class TransDefaultDomainNode extends Node
        parent::__construct(['expr' => $expr], [], $lineno, $tag);
    }

+    /**
+     * @return void
+     */
    public function compile(Compiler $compiler)
    {
        // noop as this node is just a marker for TranslationDefaultDomainNodeVisitor
--- a/src/Symfony/Bridge/Twig/Node/TransNode.php
+++ b/src/Symfony/Bridge/Twig/Node/TransNode.php
@ -48,6 +48,9 @@ class TransNode extends Node
        parent::__construct($nodes, [], $lineno, $tag);
    }

+    /**
+     * @return void
+     */
    public function compile(Compiler $compiler)
    {
        $compiler->addDebugInfo($this);
--- a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
+++ b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@ -32,12 +32,18 @@ class TranslationNodeVisitor extends AbstractNodeVisitor
    private $enabled = false;
    private $messages = [];

+    /**
+     * @return void
+     */
    public function enable()
    {
        $this->enabled = true;
        $this->messages = [];
    }

+    /**
+     * @return void
+     */
    public function disable()
    {
        $this->enabled = false;
--- a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php
+++ b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php
@ -15,6 +15,9 @@ use Twig\Loader\FilesystemLoader;

 class StubFilesystemLoader extends FilesystemLoader
 {
+    /**
+     * @return string|null
+     */
    protected function findTemplate($name, $throw = true)
    {
        // strip away bundle name
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@ -18,7 +18,7 @@
    "require": {
        "php": "^7.1.3",
        "symfony/translation-contracts": "^1.1|^2",
-        "twig/twig": "^1.41|^2.10"
+        "twig/twig": "^1.41|^2.10|^3.0"
    },
    "require-dev": {
        "egulias/email-validator": "^2.1.10",
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@ -60,7 +60,7 @@
        "symfony/property-info": "^3.4|^4.0|^5.0",
        "symfony/web-link": "^4.4|^5.0",
        "phpdocumentor/reflection-docblock": "^3.0|^4.0",
-        "twig/twig": "~1.41|~2.10"
+        "twig/twig": "^1.41|^2.10|^3.0"
    },
    "conflict": {
        "phpdocumentor/reflection-docblock": "<3.0",
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@ -44,7 +44,7 @@
        "symfony/yaml": "^3.4|^4.0|^5.0",
        "symfony/expression-language": "^3.4|^4.0|^5.0",
        "doctrine/doctrine-bundle": "~1.5",
-        "twig/twig": "~1.41|~2.10"
+        "twig/twig": "^1.41|^2.10|^3.0"
    },
    "conflict": {
        "symfony/browser-kit": "<4.2",
--- a/src/Symfony/Bundle/TwigBundle/Loader/NativeFilesystemLoader.php
+++ b/src/Symfony/Bundle/TwigBundle/Loader/NativeFilesystemLoader.php
@ -23,6 +23,8 @@ class NativeFilesystemLoader extends FilesystemLoader
 {
    /**
     * {@inheritdoc}
+     *
+     * @return string|null
     */
    protected function findTemplate($template, $throw = true)
    {
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@ -22,7 +22,7 @@
        "symfony/http-foundation": "^4.3|^5.0",
        "symfony/http-kernel": "^4.4",
        "symfony/polyfill-ctype": "~1.8",
-        "twig/twig": "~1.41|~2.10"
+        "twig/twig": "^1.41|^2.10|^3.0"
    },
    "require-dev": {
        "symfony/asset": "^3.4|^4.0|^5.0",
--- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
@ -15,6 +15,7 @@ use Symfony\Bundle\WebProfilerBundle\Profiler\TemplateManager;
 use Symfony\Bundle\WebProfilerBundle\Tests\TestCase;
 use Symfony\Component\HttpKernel\Profiler\Profile;
 use Twig\Environment;
+use Twig\Source;

 /**
 * Test for TemplateManager class.
@ -107,6 +108,7 @@ class TemplateManagerTest extends TestCase
            $loader = $this->getMockBuilder('Twig\Loader\SourceContextLoaderInterface')->getMock();
        } else {
            $loader = $this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock();
+            $loader->method('getSourceContext')->willReturn(new Source('source-code', 'source-name'));
        }
        $this->twigEnvironment->expects($this->any())->method('getLoader')->willReturn($loader);

--- a/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
+++ b/src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
@ -48,11 +48,17 @@ class WebProfilerExtension extends ProfilerExtension
        $this->dumper->setOutput($this->output = fopen('php://memory', 'r+b'));
    }

+    /**
+     * @return void
+     */
    public function enter(Profile $profile)
    {
        ++$this->stackLevel;
    }

+    /**
+     * @return void
+     */
    public function leave(Profile $profile)
    {
        if (0 === --$this->stackLevel) {
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@ -23,7 +23,7 @@
        "symfony/routing": "^3.4|^4.0|^5.0",
        "symfony/twig-bundle": "^4.2|^5.0",
        "symfony/var-dumper": "^3.4|^4.0|^5.0",
-        "twig/twig": "^1.41|^2.10"
+        "twig/twig": "^1.41|^2.10|^3.0"
    },
    "require-dev": {
        "symfony/console": "^3.4|^4.0|^5.0",
--- a/src/Symfony/Component/HttpKernel/composer.json
+++ b/src/Symfony/Component/HttpKernel/composer.json
@ -42,7 +42,7 @@
        "symfony/translation-contracts": "^1.1|^2",
        "symfony/var-dumper": "^4.1.1|^5.0",
        "psr/cache": "~1.0",
-        "twig/twig": "^1.34|^2.4"
+        "twig/twig": "^1.34|^2.4|^3.0"
    },
    "provide": {
        "psr/log-implementation": "1.0"
--- a/src/Symfony/Component/VarDumper/composer.json
+++ b/src/Symfony/Component/VarDumper/composer.json
@ -24,7 +24,7 @@
        "ext-iconv": "*",
        "symfony/console": "^3.4|^4.0|^5.0",
        "symfony/process": "^4.4|^5.0",
-        "twig/twig": "~1.34|~2.4"
+        "twig/twig": "^1.34|^2.4|^3.0"
    },
    "conflict": {
        "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",