Merge 5.x into 6.x

Author: SonataCI

composer.json

@@ -48,19 +48,19 @@
         "matthiasnoback/symfony-config-test": "^4.2 || ^5.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1 || ^5.0",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-strict-rules": "^1.0",
-        "phpstan/phpstan-symfony": "^1.0",
+        "phpstan/phpstan": "^1.0 || ^2.0",
+        "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
+        "phpstan/phpstan-strict-rules": "^1.0 || ^2.0",
+        "phpstan/phpstan-symfony": "^1.0 || ^2.0",
         "phpunit/phpunit": "^9.5.13",
-        "psalm/plugin-phpunit": "^0.18",
+        "psalm/plugin-phpunit": "^0.18 || ^0.19",
         "psalm/plugin-symfony": "^5.0",
-        "rector/rector": "^1.1",
+        "rector/rector": "^1.1 || ^2.0",
         "symfony/browser-kit": "^6.4 || ^7.1",
         "symfony/error-handler": "^6.4 || ^7.1",
         "symfony/phpunit-bridge": "^6.4 || ^7.1",
         "symfony/stopwatch": "^6.4 || ^7.1",
-        "vimeo/psalm": "^5.8"
+        "vimeo/psalm": "^5.8 || ^6.10"
     },
     "conflict": {
         "knplabs/knp-menu-bundle": "<3.0"

psalm.xml

@@ -15,5 +15,6 @@
         <!-- Psalm equivalent of PHPStan config `treatPhpDocTypesAsCertain: false` -->
         <DocblockTypeContradiction errorLevel="suppress"/>
         <RedundantConditionGivenDocblockType errorLevel="suppress"/>
+        <MissingOverrideAttribute errorLevel="suppress"/>
     </issueHandlers>
 </psalm>

src/Templating/Helper/BlockHelper.php

@@ -35,6 +35,10 @@
  *         css: string[],
  *     }
  * }
+ *
+ * NEXT_MAJOR: Change this class to final.
+ *
+ * @final since 5.2.0
  */
 class BlockHelper
 {

src/Util/RecursiveBlockIterator.php

@@ -40,11 +40,17 @@ public function __construct($array)
      */
     public function getChildren(): self
     {
-        return new self($this->current()->getChildren());
+        $current = $this->current();
+        \assert(null !== $current);
+
+        return new self($current->getChildren());
     }
 
     public function hasChildren(): bool
     {
-        return $this->current()->hasChild();
+        $current = $this->current();
+        \assert(null !== $current);
+
+        return $current->hasChild();
     }
 }

tests/Twig/Extension/BlockExtensionTest.php

@@ -47,7 +47,7 @@ protected function setUp(): void
     }
 
     /**
-     * @return iterable<array-key, array{string, array<mixed>, string}>
+     * @return iterable<array-key, array{string, list<mixed>, string}>
      */
     public static function provideFunctionCases(): iterable
     {
@@ -69,7 +69,7 @@ public static function provideFunctionCases(): iterable
     }
 
     /**
-     * @param mixed[] $args
+     * @param list<mixed> $args
      *
      * @dataProvider provideFunctionCases
      */
@@ -80,7 +80,7 @@ public function testFunction(string $name, array $args, string $expectedMethod):
             ->with(...$args);
 
         /** @psalm-suppress InternalMethod */
-        $func = $this->env->getFunction($name);
+        $func = $this->env->getFunction($name); // @phpstan-ignore method.internal
 
         static::assertInstanceOf(TwigFunction::class, $func);