symfony
diff --git a/‎composer.json
Lines changed: 1 addition & 1 deletion b/‎composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php
Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Extension/ProfilerExtension.php
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Node/DumpNode.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Twig/Node/DumpNode.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bridge/Twig/Node/FormThemeNode.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Node/FormThemeNode.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Node/RenderBlockNode.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Node/RenderBlockNode.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Node/SearchAndRenderBlockNode.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Node/StopwatchNode.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Node/StopwatchNode.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Node/TransDefaultDomainNode.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Node/TransNode.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Node/TransNode.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php
Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php
Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Bridge/Twig/composer.json
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bridge/Twig/composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/composer.json
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/SecurityBundle/composer.json
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/SecurityBundle/composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/TwigBundle/Loader/NativeFilesystemLoader.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Bundle/TwigBundle/Loader/NativeFilesystemLoader.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/TwigBundle/composer.json
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/TwigBundle/composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Bundle/WebProfilerBundle/Tests/Profiler/TemplateManagerTest.php
Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Bundle/WebProfilerBundle/Twig/WebProfilerExtension.php
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/WebProfilerBundle/composer.json
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/WebProfilerBundle/composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/composer.json
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpKernel/composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/VarDumper/composer.json
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/VarDumper/composer.json
Lines changed: 1 addition & 1 deletion
@@ -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",
 
@@ -33,6 +33,9 @@ public function __construct(Profile $profile, Stopwatch $stopwatch = null)
         $this->events = new \SplObjectStorage();
     }
 
+    /**
+     * @return void
+     */
     public function enter(Profile $profile)
     {
         if ($this->stopwatch && $profile->isTemplate()) {
@@ -42,6 +45,9 @@ public function enter(Profile $profile)
         parent::enter($profile);
     }
 
+    /**
+     * @return void
+     */
     public function leave(Profile $profile)
     {
         parent::leave($profile);
 
@@ -35,7 +35,7 @@ public function __construct($varPrefix, Node $values = null, int $lineno, string
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
     public function compile(Compiler $compiler)
     {
 
@@ -27,6 +27,9 @@ public function __construct(Node $form, Node $resources, int $lineno, string $ta
         parent::__construct(['form' => $form, 'resources' => $resources], ['only' => $only], $lineno, $tag);
     }
 
+    /**
+     * @return void
+     */
     public function compile(Compiler $compiler)
     {
         $compiler
 
@@ -26,6 +26,9 @@
  */
 class RenderBlockNode extends FunctionExpression
 {
+    /**
+     * @return void
+     */
     public function compile(Compiler $compiler)
     {
         $compiler->addDebugInfo($this);
 
@@ -23,6 +23,9 @@
  */
 class SearchAndRenderBlockNode extends FunctionExpression
 {
+    /**
+     * @return void
+     */
     public function compile(Compiler $compiler)
     {
         $compiler->addDebugInfo($this);
 
@@ -29,6 +29,9 @@ public function __construct(Node $name, Node $body, AssignNameExpression $var, i
         parent::__construct(['body' => $body, 'name' => $name, 'var' => $var], [], $lineno, $tag);
     }
 
+    /**
+     * @return void
+     */
     public function compile(Compiler $compiler)
     {
         $compiler
 
@@ -27,6 +27,9 @@ public function __construct(AbstractExpression $expr, int $lineno = 0, string $t
         parent::__construct(['expr' => $expr], [], $lineno, $tag);
     }
 
+    /**
+     * @return void
+     */
     public function compile(Compiler $compiler)
     {
         // noop as this node is just a marker for TranslationDefaultDomainNodeVisitor
 
@@ -48,6 +48,9 @@ public function __construct(Node $body, Node $domain = null, AbstractExpression
         parent::__construct($nodes, [], $lineno, $tag);
     }
 
+    /**
+     * @return void
+     */
     public function compile(Compiler $compiler)
     {
         $compiler->addDebugInfo($this);
 
@@ -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;
 
@@ -15,6 +15,9 @@
 
 class StubFilesystemLoader extends FilesystemLoader
 {
+    /**
+     * @return string|null
+     */
     protected function findTemplate($name, $throw = true)
     {
         // strip away bundle name
 
@@ -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",
 
@@ -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",
 
@@ -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",
 
@@ -23,6 +23,8 @@ class NativeFilesystemLoader extends FilesystemLoader
 {
     /**
      * {@inheritdoc}
+     *
+     * @return string|null
      */
     protected function findTemplate($template, $throw = true)
     {
 
@@ -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",
 
@@ -15,6 +15,7 @@
 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 @@ protected function mockTwigEnvironment()
             $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);
 
 
@@ -48,11 +48,17 @@ public function __construct(HtmlDumper $dumper = null)
         $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) {
 
@@ -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",
 
@@ -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"
 
@@ -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",