Twig 1.35-DEV

WBCE · Sep 3, 2017 · 09aa99d · 09aa99d
1 parent 86a82d7
commit 09aa99d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/wbce/include/Sensio/Twig/CHANGELOG b/wbce/include/Sensio/Twig/CHANGELOG
@@ -1,5 +1,7 @@
-* 1.34.5 (2017-XX-XX)
+* 1.35.0 (2017-XX-XX)
 
+ * fixed use TokenParser to return an empty Node
+ * added RuntimeExtensionInterface
  * added circular reference detection when loading templates
 
 * 1.34.4 (2017-07-04)
@@ -146,7 +148,7 @@
 
  * fixed reserved keywords (forbids true, false, null and none keywords for variables names)
  * fixed support for PHP7 (Throwable support)
- * marked the following methods as being internals on Twig_Environment: 
+ * marked the following methods as being internals on Twig_Environment:
    getFunctions(), getFilters(), getTests(), getFunction(), getFilter(), getTest(),
    getTokenParsers(), getTags(), getNodeVisitors(), getUnaryOperators(), getBinaryOperators(),
    getFunctions(), getFilters(), getGlobals(), initGlobals(), initExtensions(), and initExtension()
@@ -230,7 +232,7 @@
  * fixed limited RCEs when in sandbox mode
  * deprecated Twig_Template::getEnvironment()
  * deprecated the _self variable for usage outside of the from and import tags
- * added Twig_BaseNodeVisitor to ease the compatibility of node visitors 
+ * added Twig_BaseNodeVisitor to ease the compatibility of node visitors
    between 1.x and 2.x
 
 * 1.19.0 (2015-07-31)

diff --git a/wbce/include/Sensio/Twig/lib/Twig/Environment.php b/wbce/include/Sensio/Twig/lib/Twig/Environment.php
@@ -16,11 +16,11 @@
  */
 class Twig_Environment
 {
-    const VERSION = '1.34.5-DEV';
-    const VERSION_ID = 13405;
+    const VERSION = '1.35.0-DEV';
+    const VERSION_ID = 13500;
     const MAJOR_VERSION = 1;
-    const MINOR_VERSION = 34;
-    const RELEASE_VERSION = 5;
+    const MINOR_VERSION = 35;
+    const RELEASE_VERSION = 0;
     const EXTRA_VERSION = 'DEV';
 
     protected $charset;

diff --git a/wbce/include/Sensio/Twig/lib/Twig/TokenParser/Use.php b/wbce/include/Sensio/Twig/lib/Twig/TokenParser/Use.php
@@ -57,6 +57,8 @@ public function parse(Twig_Token $token)
         $stream->expect(Twig_Token::BLOCK_END_TYPE);
 
         $this->parser->addTrait(new Twig_Node(array('template' => $template, 'targets' => new Twig_Node($targets))));
+
+        return new Twig_Node();
     }
 
     public function getTag()