From 9a0f896cd036ccdb29f899f0bdb82496f7af8770 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 14 Feb 2025 13:03:18 +0100 Subject: [PATCH] Fix CS --- src/ExpressionParser/Infix/FilterExpressionParser.php | 1 - src/ExpressionParser/Prefix/LiteralExpressionParser.php | 1 - src/Extension/CoreExtension.php | 2 +- src/Extension/EscaperExtension.php | 2 +- src/Extension/ExtensionInterface.php | 1 - src/ExtensionSet.php | 6 ------ src/Node/ForElseNode.php | 2 +- src/Token.php | 3 --- 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/ExpressionParser/Infix/FilterExpressionParser.php b/src/ExpressionParser/Infix/FilterExpressionParser.php index b224168ff..d7d106a24 100644 --- a/src/ExpressionParser/Infix/FilterExpressionParser.php +++ b/src/ExpressionParser/Infix/FilterExpressionParser.php @@ -15,7 +15,6 @@ use Twig\ExpressionParser\AbstractExpressionParser; use Twig\ExpressionParser\ExpressionParserDescriptionInterface; use Twig\ExpressionParser\InfixAssociativity; use Twig\ExpressionParser\InfixExpressionParserInterface; -use Twig\ExpressionParser\PrecedenceChange; use Twig\Node\EmptyNode; use Twig\Node\Expression\AbstractExpression; use Twig\Parser; diff --git a/src/ExpressionParser/Prefix/LiteralExpressionParser.php b/src/ExpressionParser/Prefix/LiteralExpressionParser.php index 53ed86e0f..8a81bfcd3 100644 --- a/src/ExpressionParser/Prefix/LiteralExpressionParser.php +++ b/src/ExpressionParser/Prefix/LiteralExpressionParser.php @@ -83,7 +83,6 @@ final class LiteralExpressionParser extends AbstractExpressionParser implements default => throw new SyntaxError(\sprintf('Unexpected token "%s" of value "%s".', $token->toEnglish(), $token->getValue()), $token->getLine(), $stream->getSourceContext()), }; - // no break case $token->test(Token::OPERATOR_TYPE): if ('[' === $token->getValue()) { return $this->parseSequenceExpression($parser); diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php index 5492b20bd..34318548f 100644 --- a/src/Extension/CoreExtension.php +++ b/src/Extension/CoreExtension.php @@ -80,8 +80,8 @@ use Twig\Node\Expression\Test\SameasTest; use Twig\Node\Expression\Unary\NegUnary; use Twig\Node\Expression\Unary\NotUnary; use Twig\Node\Expression\Unary\PosUnary; -use Twig\Node\Expression\Variable\ContextVariable; use Twig\Node\Expression\Unary\SpreadUnary; +use Twig\Node\Expression\Variable\ContextVariable; use Twig\Node\Node; use Twig\Parser; use Twig\Sandbox\SecurityNotAllowedMethodError; diff --git a/src/Extension/EscaperExtension.php b/src/Extension/EscaperExtension.php index 5b71d9611..564e5a510 100644 --- a/src/Extension/EscaperExtension.php +++ b/src/Extension/EscaperExtension.php @@ -28,7 +28,7 @@ final class EscaperExtension extends AbstractExtension * @see setDefaultStrategy() */ public function __construct( - private $defaultStrategy = 'html' + private $defaultStrategy = 'html', ) { $this->setDefaultStrategy($defaultStrategy); } diff --git a/src/Extension/ExtensionInterface.php b/src/Extension/ExtensionInterface.php index 554609fe8..3d603470f 100644 --- a/src/Extension/ExtensionInterface.php +++ b/src/Extension/ExtensionInterface.php @@ -12,7 +12,6 @@ namespace Twig\Extension; use Twig\ExpressionParser\ExpressionParserInterface; -use Twig\ExpressionParser\PrecedenceChange; use Twig\NodeVisitor\NodeVisitorInterface; use Twig\TokenParser\TokenParserInterface; use Twig\TwigFilter; diff --git a/src/ExtensionSet.php b/src/ExtensionSet.php index 6cc179583..d9109a32e 100644 --- a/src/ExtensionSet.php +++ b/src/ExtensionSet.php @@ -13,16 +13,10 @@ namespace Twig; use Twig\Error\RuntimeError; use Twig\ExpressionParser\ExpressionParsers; -use Twig\ExpressionParser\Infix\BinaryOperatorExpressionParser; -use Twig\ExpressionParser\InfixAssociativity; -use Twig\ExpressionParser\InfixExpressionParserInterface; -use Twig\ExpressionParser\PrecedenceChange; -use Twig\ExpressionParser\Prefix\UnaryOperatorExpressionParser; use Twig\Extension\ExtensionInterface; use Twig\Extension\GlobalsInterface; use Twig\Extension\LastModifiedExtensionInterface; use Twig\Extension\StagingExtension; -use Twig\Node\Expression\AbstractExpression; use Twig\NodeVisitor\NodeVisitorInterface; use Twig\TokenParser\TokenParserInterface; diff --git a/src/Node/ForElseNode.php b/src/Node/ForElseNode.php index f7c5d07e0..aec8c4d85 100644 --- a/src/Node/ForElseNode.php +++ b/src/Node/ForElseNode.php @@ -36,6 +36,6 @@ class ForElseNode extends Node ->subcompile($this->getNode('body')) ->outdent() ->write("}\n") - ; + ; } } diff --git a/src/Token.php b/src/Token.php index 064af96e1..f932ceb7f 100644 --- a/src/Token.php +++ b/src/Token.php @@ -73,9 +73,6 @@ final class Token return $this->lineno; } - /** - * @return mixed - */ public function getValue() { return $this->value;