Merge pull request #1 from EstudioNexos/master

Upgraded for usage with latest twig
djboris88 · Jan 16, 2024 · 3becd7a · 3becd7a
2 parents 9fdf6b3 + 14ab6d6
commit 3becd7a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
 	},
 	"require": {
 		"php": ">=5.6",
-		"twig/twig": "^1.14|^2.0|^3.0"
+		"twig/twig": "^2.0|^3.0"
 	},
 	"require-dev": {
 		"symfony/framework-bundle": "^2.7|^3.2",

diff --git a/src/Extension/CommentedIncludeExtension.php b/src/Extension/CommentedIncludeExtension.php
@@ -11,12 +11,12 @@
 namespace Djboris88\Twig\Extension;
 
 use Djboris88\Twig\TokenParser\CommentedIncludeTokenParser;
-use Twig_Extension;
+use Twig\Extension\AbstractExtension;
 
 /**
  * @author Boris Đemrovski <djboris88@gmail.com>
  */
-class CommentedIncludeExtension extends Twig_Extension
+class CommentedIncludeExtension extends AbstractExtension
 {
 
 	/**
@@ -27,7 +27,7 @@ public function getName() {
 	}
 
 	/**
-	 * @return array|\Twig_TokenParserInterface[]
+	 * @return array|\CommentedIncludeTokenParser[]
 	 */
 	public function getTokenParsers()
 	{

diff --git a/src/Node/CommentedIncludeNode.php b/src/Node/CommentedIncludeNode.php
@@ -12,7 +12,7 @@
 
 use Twig\Node\IncludeNode;
 use Twig\Node\NodeOutputInterface;
-use Twig_Compiler;
+use Twig\Compiler;
 
 /**
  * @author Boris Đemrovski <djboris88@gmail.com>
@@ -23,7 +23,7 @@ class CommentedIncludeNode extends IncludeNode implements NodeOutputInterface
 	/**
 	 * @param \Twig_Compiler $compiler
 	 */
-	public function compile(Twig_Compiler $compiler)
+	public function compile(Compiler $compiler): void
 	{
 		$compiler->addDebugInfo($this);
 

diff --git a/src/TokenParser/CommentedIncludeTokenParser.php b/src/TokenParser/CommentedIncludeTokenParser.php
@@ -12,7 +12,8 @@
 
 use Djboris88\Twig\Node\CommentedIncludeNode;
 use Twig\TokenParser\IncludeTokenParser;
-use Twig_Token;
+use Twig\Token;
+
 
 /**
  * @author Boris Đemrovski <djboris88@gmail.com>
@@ -24,7 +25,7 @@ class CommentedIncludeTokenParser extends IncludeTokenParser
 	 *
 	 * @return \Djboris88\Twig\Node\CommentedIncludeNode
 	 */
-	public function parse(Twig_Token $token)
+	public function parse(Token $token): CommentedIncludeNode
 	{
 		$expr = $this->parser->getExpressionParser()->parseExpression();