Fix CS

Author: fabpot

.php-cs-fixer.dist.php

@@ -1,6 +1,10 @@
 <?php
 
-return (new PhpCsFixer\Config())
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+use PhpCsFixer\Runner\Parallel\ParallelConfigFactory;
+
+return (new Config())
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
@@ -11,19 +15,11 @@
         'no_unreachable_default_argument_value' => false,
         'braces' => ['allow_single_line_closure' => true],
         'heredoc_to_nowdoc' => false,
+        'single_line_throw' => false,
         'ordered_imports' => true,
         'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
-        'header_comment' => [
-            'header' => <<<EOF
-                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.
-                EOF
-        ],
     ])
     ->setRiskyAllowed(true)
-    ->setFinder((new PhpCsFixer\Finder())->in(__DIR__))
+    ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setFinder((new Finder())->in(__DIR__))
 ;

bin/generate_operators_precedence.php

@@ -36,7 +36,7 @@
 fwrite($output, '| Precedence | Operator         | Type    | Associativity | Description'.str_repeat(' ', $descriptionLength - 11)." |\n");
 fwrite($output, '+============+==================+=========+===============+'.str_repeat('=', $descriptionLength + 2).'+');
 
-usort($expressionParsers, fn ($a, $b) => $b->getPrecedence() <=> $a->getPrecedence());
+usort($expressionParsers, static fn ($a, $b) => $b->getPrecedence() <=> $a->getPrecedence());
 
 $previous = null;
 foreach ($expressionParsers as $expressionParser) {
@@ -72,7 +72,7 @@
 fwrite($output, '| Precedence | Operator         | Type    | Associativity | Description'.str_repeat(' ', $descriptionLength - 11)." |\n");
 fwrite($output, '+============+==================+=========+===============+'.str_repeat('=', $descriptionLength + 2).'+');
 
-usort($expressionParsers, function ($a, $b) {
+usort($expressionParsers, static function ($a, $b) {
     $aPrecedence = $a->getPrecedenceChange() ? $a->getPrecedenceChange()->getNewPrecedence() : $a->getPrecedence();
     $bPrecedence = $b->getPrecedenceChange() ? $b->getPrecedenceChange()->getNewPrecedence() : $b->getPrecedence();
 

composer.json

@@ -32,7 +32,8 @@
     "require-dev": {
         "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0",
         "psr/container": "^1.0|^2.0",
-        "phpstan/phpstan": "^2.0"
+        "phpstan/phpstan": "^2.0",
+        "php-cs-fixer/shim": "^3.0"
     },
     "autoload": {
         "files": [

doc/_build/build.php

@@ -23,7 +23,7 @@
 (new Application('Twig docs Builder', '1.0'))
     ->register('build-docs')
     ->addOption('disable-cache', null, InputOption::VALUE_NONE, 'Use this option to force a full regeneration of all doc contents')
-    ->setCode(function (InputInterface $input, OutputInterface $output) {
+    ->setCode(static function (InputInterface $input, OutputInterface $output) {
         $io = new SymfonyStyle($input, $output);
         $io->text('Building all Twig docs...');
 

extra/cache-extra/Tests/FunctionalTest.php

@@ -29,7 +29,7 @@ public function testIsCached()
         $twig = $this->createEnvironment(['index' => '{% cache "city;v1" %}{{- city -}}{% endcache %}'], $cache);
 
         $this->assertSame('Paris', $twig->render('index', ['city' => 'Paris']));
-        $value = $cache->get('city;v1', function () { throw new \RuntimeException('Key should be in the cache'); });
+        $value = $cache->get('city;v1', static function () { throw new \RuntimeException('Key should be in the cache'); });
         $this->assertSame('Paris', $value);
     }
 

extra/html-extra/HtmlExtension.php

@@ -114,10 +114,10 @@ public static function htmlClasses(...$args): string
     }
 
     /**
-     * @param string|list<string|null> $base
+     * @param string|list<string|null>                           $base
      * @param array<string, array<string, string|array<string>>> $variants
-     * @param array<array<string, string|array<string>>> $compoundVariants
-     * @param array<string, string>                      $defaultVariant
+     * @param array<array<string, string|array<string>>>         $compoundVariants
+     * @param array<string, string>                              $defaultVariant
      *
      * @internal
      */

extra/markdown-extra/Tests/FunctionalTest.php

@@ -67,17 +67,15 @@ public static function getMarkdownTests()
 
 Great!
 {% endapply %}
-EOF
-                , "<h1>Hello</h1>\n+<p>Great!</p>"],
+EOF, "<h1>Hello</h1>\n+<p>Great!</p>"],
             [<<<EOF
 {% apply markdown_to_html %}
     Hello
     =====
 
     Great!
 {% endapply %}
-EOF
-                , "<h1>Hello</h1>\n+<p>Great!</p>"],
+EOF, "<h1>Hello</h1>\n+<p>Great!</p>"],
             ["{{ include('html')|markdown_to_html }}", "<h1>Hello</h1>\n+<p>Great!</p>"],
         ];
     }

extra/twig-extra-bundle/DependencyInjection/TwigExtraExtension.php

@@ -37,7 +37,6 @@ public function load(array $configs, ContainerBuilder $container)
             $this->doLoad($configs, $container);
         }
     }
-
 }
 
 /**

src/ExpressionParser/Infix/AssignmentExpressionParser.php

@@ -51,12 +51,12 @@ public function parse(Parser $parser, AbstractExpression $left, Token $token): A
         if ($left instanceof ArrayExpression) {
             if ($left->isSequence()) {
                 return new SequenceDestructuringSetBinary($left, $right, $token->getLine());
-            } else {
-                return new ObjectDestructuringSetBinary($left, $right, $token->getLine());
             }
-        } else {
-            return new SetBinary($left, $right, $token->getLine());
+
+            return new ObjectDestructuringSetBinary($left, $right, $token->getLine());
         }
+
+        return new SetBinary($left, $right, $token->getLine());
     }
 
     public function getDescription(): string

src/Extension/CoreExtension.php

@@ -134,7 +134,7 @@ final class CoreExtension extends AbstractExtension
 
     private $dateFormats = ['F j, Y H:i', '%d days'];
     private $numberFormat = [0, '.', ','];
-    private $timezone = null;
+    private $timezone;
 
     /**
      * Sets the default format to be used by the date filter.
@@ -1128,9 +1128,9 @@ public static function compare($a, $b)
             }
             if ((int) $bTrim == $bTrim) {
                 return $a <=> (int) $bTrim;
-            } else {
-                return (float) $a <=> (float) $bTrim;
             }
+
+            return (float) $a <=> (float) $bTrim;
         }
         if (\is_string($a) && \is_int($b)) {
             $aTrim = trim($a, " \t\n\r\v\f");
@@ -1139,9 +1139,9 @@ public static function compare($a, $b)
             }
             if ((int) $aTrim == $aTrim) {
                 return (int) $aTrim <=> $b;
-            } else {
-                return (float) $aTrim <=> (float) $b;
             }
+
+            return (float) $aTrim <=> (float) $b;
         }
 
         // float <=> string
@@ -1179,7 +1179,7 @@ public static function compare($a, $b)
      */
     public static function matches(string $regexp, ?string $str): int
     {
-        set_error_handler(function ($t, $m) use ($regexp) {
+        set_error_handler(static function ($t, $m) use ($regexp) {
             throw new RuntimeError(\sprintf('Regexp "%s" passed to "matches" is not valid', $regexp).substr($m, 12));
         });
         try {
@@ -2148,7 +2148,7 @@ public static function parseParentFunction(Parser $parser, Node $fakeNode, $args
      */
     public static function parseBlockFunction(Parser $parser, Node $fakeNode, $args, int $line): AbstractExpression
     {
-        $fakeFunction = new TwigFunction('block', fn ($name, $template = null) => null);
+        $fakeFunction = new TwigFunction('block', static fn ($name, $template = null) => null);
         $args = (new CallableArgumentsExtractor($fakeNode, $fakeFunction))->extractArguments($args);
 
         return new BlockReferenceExpression($args[0], $args[1] ?? null, $line);
@@ -2159,7 +2159,7 @@ public static function parseBlockFunction(Parser $parser, Node $fakeNode, $args,
      */
     public static function parseAttributeFunction(Parser $parser, Node $fakeNode, $args, int $line): AbstractExpression
     {
-        $fakeFunction = new TwigFunction('attribute', fn ($variable, $attribute, $arguments = null) => null);
+        $fakeFunction = new TwigFunction('attribute', static fn ($variable, $attribute, $arguments = null) => null);
         $args = (new CallableArgumentsExtractor($fakeNode, $fakeFunction))->extractArguments($args);
 
         /*