diff --git a/src/Environment.php b/src/Environment.php index 1546e4b31..a0b74eb29 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -863,7 +863,7 @@ class Environment /** * @internal * - * @return array}> + * @return array}> */ public function getUnaryOperators(): array { @@ -873,7 +873,7 @@ class Environment /** * @internal * - * @return array, associativity: ExpressionParser::OPERATOR_*}> + * @return array, associativity: ExpressionParser::OPERATOR_*}> */ public function getBinaryOperators(): array { diff --git a/src/Extension/ExtensionInterface.php b/src/Extension/ExtensionInterface.php index 717ef9cec..d51cd3ee2 100644 --- a/src/Extension/ExtensionInterface.php +++ b/src/Extension/ExtensionInterface.php @@ -12,7 +12,8 @@ namespace Twig\Extension; use Twig\ExpressionParser; -use Twig\Node\Expression\AbstractExpression; +use Twig\Node\Expression\Binary\AbstractBinary; +use Twig\Node\Expression\Unary\AbstractUnary; use Twig\NodeVisitor\NodeVisitorInterface; use Twig\OperatorPrecedenceChange; use Twig\TokenParser\TokenParserInterface; @@ -68,8 +69,8 @@ interface ExtensionInterface * @return array First array of unary operators, second array of binary operators * * @psalm-return array{ - * array}>, - * array, associativity: ExpressionParser::OPERATOR_*}> + * array}>, + * array, associativity: ExpressionParser::OPERATOR_*}> * } */ public function getOperators(); diff --git a/src/ExtensionSet.php b/src/ExtensionSet.php index 99fcfe56b..e8b3174cf 100644 --- a/src/ExtensionSet.php +++ b/src/ExtensionSet.php @@ -15,7 +15,8 @@ use Twig\Error\RuntimeError; use Twig\Extension\ExtensionInterface; use Twig\Extension\GlobalsInterface; use Twig\Extension\StagingExtension; -use Twig\Node\Expression\AbstractExpression; +use Twig\Node\Expression\Binary\AbstractBinary; +use Twig\Node\Expression\Unary\AbstractUnary; use Twig\NodeVisitor\NodeVisitorInterface; use Twig\TokenParser\TokenParserInterface; @@ -44,9 +45,9 @@ final class ExtensionSet private $functions; /** @var array */ private $dynamicFunctions; - /** @var array}> */ + /** @var array}> */ private $unaryOperators; - /** @var array, associativity: ExpressionParser::OPERATOR_*}> */ + /** @var array, associativity: ExpressionParser::OPERATOR_*}> */ private $binaryOperators; /** @var array|null */ private $globals; @@ -385,7 +386,7 @@ final class ExtensionSet } /** - * @return array}> + * @return array}> */ public function getUnaryOperators(): array { @@ -397,7 +398,7 @@ final class ExtensionSet } /** - * @return array, associativity: ExpressionParser::OPERATOR_*}> + * @return array, associativity: ExpressionParser::OPERATOR_*}> */ public function getBinaryOperators(): array {