minor #4664 CS fixes (nicolas-grekas)

This PR was merged into the 3.x branch.

Discussion
----------

CS fixes

Commits
-------

85a4817128 CS fixes

src/Attribute/AsTwigFilter.php

@@ -31,15 +31,15 @@ use Twig\TwigFilter;
 final class AsTwigFilter
 {
     /**
-     * @param non-empty-string $name The name of the filter in Twig.
-     * @param bool|null $needsCharset Whether the filter needs the charset passed as the first argument.
-     * @param bool|null $needsEnvironment Whether the filter needs the environment passed as the first argument, or after the charset.
-     * @param bool|null $needsContext Whether the filter needs the context array passed as the first argument, or after the charset and the environment.
-     * @param string[]|null $isSafe List of formats in which you want the raw output to be printed unescaped.
-     * @param string|array|null $isSafeCallback Function called at compilation time to determine if the filter is safe.
-     * @param string|null $preEscape Some filters may need to work on input that is already escaped or safe
-     * @param string[]|null $preservesSafety Preserves the safety of the value that the filter is applied to.
-     * @param DeprecatedCallableInfo|null $deprecationInfo Information about the deprecation
+     * @param non-empty-string            $name             The name of the filter in Twig
+     * @param bool|null                   $needsCharset     Whether the filter needs the charset passed as the first argument
+     * @param bool|null                   $needsEnvironment Whether the filter needs the environment passed as the first argument, or after the charset
+     * @param bool|null                   $needsContext     Whether the filter needs the context array passed as the first argument, or after the charset and the environment
+     * @param string[]|null               $isSafe           List of formats in which you want the raw output to be printed unescaped
+     * @param string|array|null           $isSafeCallback   Function called at compilation time to determine if the filter is safe
+     * @param string|null                 $preEscape        Some filters may need to work on input that is already escaped or safe
+     * @param string[]|null               $preservesSafety  Preserves the safety of the value that the filter is applied to
+     * @param DeprecatedCallableInfo|null $deprecationInfo  Information about the deprecation
      */
     public function __construct(
         public string $name,

src/Attribute/AsTwigFunction.php

@@ -31,13 +31,13 @@ use Twig\TwigFunction;
 final class AsTwigFunction
 {
     /**
-     * @param non-empty-string $name The name of the function in Twig.
-     * @param bool|null $needsCharset Whether the function needs the charset passed as the first argument.
-     * @param bool|null $needsEnvironment Whether the function needs the environment passed as the first argument, or after the charset.
-     * @param bool|null $needsContext Whether the function needs the context array passed as the first argument, or after the charset and the environment.
-     * @param string[]|null $isSafe List of formats in which you want the raw output to be printed unescaped.
-     * @param string|array|null $isSafeCallback Function called at compilation time to determine if the function is safe.
-     * @param DeprecatedCallableInfo|null $deprecationInfo Information about the deprecation
+     * @param non-empty-string            $name             The name of the function in Twig
+     * @param bool|null                   $needsCharset     Whether the function needs the charset passed as the first argument
+     * @param bool|null                   $needsEnvironment Whether the function needs the environment passed as the first argument, or after the charset
+     * @param bool|null                   $needsContext     Whether the function needs the context array passed as the first argument, or after the charset and the environment
+     * @param string[]|null               $isSafe           List of formats in which you want the raw output to be printed unescaped
+     * @param string|array|null           $isSafeCallback   Function called at compilation time to determine if the function is safe
+     * @param DeprecatedCallableInfo|null $deprecationInfo  Information about the deprecation
      */
     public function __construct(
         public string $name,

src/Attribute/AsTwigTest.php

@@ -31,11 +31,11 @@ use Twig\TwigTest;
 final class AsTwigTest
 {
     /**
-     * @param non-empty-string $name The name of the test in Twig.
-     * @param bool|null $needsCharset Whether the test needs the charset passed as the first argument.
-     * @param bool|null $needsEnvironment Whether the test needs the environment passed as the first argument, or after the charset.
-     * @param bool|null $needsContext Whether the test needs the context array passed as the first argument, or after the charset and the environment.
-     * @param DeprecatedCallableInfo|null $deprecationInfo Information about the deprecation
+     * @param non-empty-string            $name             The name of the test in Twig
+     * @param bool|null                   $needsCharset     Whether the test needs the charset passed as the first argument
+     * @param bool|null                   $needsEnvironment Whether the test needs the environment passed as the first argument, or after the charset
+     * @param bool|null                   $needsContext     Whether the test needs the context array passed as the first argument, or after the charset and the environment
+     * @param DeprecatedCallableInfo|null $deprecationInfo  Information about the deprecation
      */
     public function __construct(
         public string $name,

src/Error/Error.php

@@ -158,7 +158,7 @@ class Error extends \Exception
 
         while ($e = array_pop($exceptions)) {
             $traces = $e->getTrace();
-            array_unshift($traces, ['file' => $e instanceof Error ? $e->phpFile : $e->getFile(), 'line' => $e instanceof Error ? $e->phpLine : $e->getLine()]);
+            array_unshift($traces, ['file' => $e instanceof self ? $e->phpFile : $e->getFile(), 'line' => $e instanceof self ? $e->phpLine : $e->getLine()]);
             while ($trace = array_shift($traces)) {
                 if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) {
                     continue;

src/Extension/AttributeExtension.php

@@ -104,7 +104,7 @@ final class AttributeExtension extends AbstractExtension
                 ]);
 
                 if ($callable->getMinimalNumberOfRequiredArguments() > $method->getNumberOfParameters()) {
-                    throw new \LogicException(sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigFilter, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
+                    throw new \LogicException(\sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigFilter, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
                 }
 
                 $filters[$attribute->name] = $callable;
@@ -125,14 +125,13 @@ final class AttributeExtension extends AbstractExtension
                 ]);
 
                 if ($callable->getMinimalNumberOfRequiredArguments() > $method->getNumberOfParameters()) {
-                    throw new \LogicException(sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigFunction, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
+                    throw new \LogicException(\sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigFunction, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
                 }
 
                 $functions[$attribute->name] = $callable;
             }
 
             foreach ($method->getAttributes(AsTwigTest::class) as $reflectionAttribute) {
-
                 /** @var AsTwigTest $attribute */
                 $attribute = $reflectionAttribute->newInstance();
 
@@ -145,7 +144,7 @@ final class AttributeExtension extends AbstractExtension
                 ]);
 
                 if ($callable->getMinimalNumberOfRequiredArguments() > $method->getNumberOfParameters()) {
-                    throw new \LogicException(sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigTest, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
+                    throw new \LogicException(\sprintf('"%s::%s()" needs at least %d arguments to be used AsTwigTest, but only %d defined.', $reflectionClass->getName(), $method->getName(), $callable->getMinimalNumberOfRequiredArguments(), $method->getNumberOfParameters()));
                 }
 
                 $tests[$attribute->name] = $callable;

src/Node/Expression/Binary/MatchesBinary.php

@@ -13,8 +13,8 @@ namespace Twig\Node\Expression\Binary;
 
 use Twig\Compiler;
 use Twig\Error\SyntaxError;
-use Twig\Node\Expression\ReturnBoolInterface;
 use Twig\Node\Expression\ConstantExpression;
+use Twig\Node\Expression\ReturnBoolInterface;
 use Twig\Node\Node;
 
 class MatchesBinary extends AbstractBinary implements ReturnBoolInterface

src/Node/Expression/FunctionNode/EnumCasesFunction.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Twig\Node\Expression\FunctionNode;
 
 use Twig\Compiler;

src/Node/Expression/FunctionNode/EnumFunction.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Twig\Node\Expression\FunctionNode;
 
 use Twig\Compiler;

src/Node/Expression/GetAttrExpression.php

@@ -125,12 +125,12 @@ class GetAttrExpression extends AbstractExpression implements SupportDefinedTest
         }
     }
 
-    private function changeIgnoreStrictCheck(GetAttrExpression $node): void
+    private function changeIgnoreStrictCheck(self $node): void
     {
         $node->setAttribute('optimizable', false);
         $node->setAttribute('ignore_strict_check', true);
 
-        if ($node->getNode('node') instanceof GetAttrExpression) {
+        if ($node->getNode('node') instanceof self) {
             $this->changeIgnoreStrictCheck($node->getNode('node'));
         }
     }

src/Node/Expression/Test/DefinedTest.php

@@ -15,16 +15,8 @@ use Twig\Attribute\FirstClassTwigCallableReady;
 use Twig\Compiler;
 use Twig\Error\SyntaxError;
 use Twig\Node\Expression\AbstractExpression;
-use Twig\Node\Expression\ArrayExpression;
-use Twig\Node\Expression\BlockReferenceExpression;
-use Twig\Node\Expression\ConstantExpression;
-use Twig\Node\Expression\FunctionExpression;
-use Twig\Node\Expression\GetAttrExpression;
-use Twig\Node\Expression\MacroReferenceExpression;
-use Twig\Node\Expression\MethodCallExpression;
 use Twig\Node\Expression\SupportDefinedTestInterface;
 use Twig\Node\Expression\TestExpression;
-use Twig\Node\Expression\Variable\ContextVariable;
 use Twig\Node\Node;
 use Twig\TwigTest;
 

src/Node/TypesNode.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of Twig.
+ *
+ * (c) Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Twig\Node;
 
 use Twig\Attribute\YieldReady;

src/Resources/debug.php

@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the Symfony package.
+ * This file is part of Twig.
  *
- * (c) Fabien Potencier <fabien@symfony.com>
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Resources/string_loader.php

@@ -1,9 +1,9 @@
 <?php
 
 /*
- * This file is part of the Symfony package.
+ * This file is part of Twig.
  *
- * (c) Fabien Potencier <fabien@symfony.com>
+ * (c) Fabien Potencier
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

src/Runtime/EscaperRuntime.php

@@ -17,7 +17,7 @@ use Twig\Markup;
 
 final class EscaperRuntime implements RuntimeExtensionInterface
 {
-    /** @var array<string, callable(string $string, string $charset): string> */
+    /** @var array<string, callable(string, string): string> */
     private $escapers = [];
 
     /** @internal */

src/Template.php

@@ -270,7 +270,7 @@ abstract class Template
     /**
      * @param string|TemplateWrapper|array<string|TemplateWrapper> $template
      */
-    protected function load(string|TemplateWrapper|array $template, int $line, int|null $index = null): self
+    protected function load(string|TemplateWrapper|array $template, int $line, ?int $index = null): self
     {
         try {
             if (\is_array($template)) {
@@ -315,7 +315,7 @@ abstract class Template
      *
      * @deprecated since Twig 3.21 and will be removed in 4.0. Use Template::load() instead.
      */
-    protected function loadTemplate($template, $templateName = null, int|null $line = null, int|null $index = null): self|TemplateWrapper
+    protected function loadTemplate($template, $templateName = null, ?int $line = null, ?int $index = null): self|TemplateWrapper
     {
         trigger_deprecation('twig/twig', '3.21', 'The "%s" method is deprecated.', __METHOD__);