Bump phpstan and psalm (#1805)

VincentLanglet · web-flow · commit f792083af8d0 · 2025-05-08T23:54:33.000+02:00
diff --git a/composer.json b/composer.json
@@ -61,21 +61,21 @@
         "matthiasnoback/symfony-dependency-injection-test": "^4.1.1 || ^5.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpdoc-parser": "^1.0",
-        "phpstan/phpstan": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-strict-rules": "^1.3",
-        "phpstan/phpstan-symfony": "^1.0",
+        "phpstan/phpstan": "^1.0 || ^2.0",
+        "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
+        "phpstan/phpstan-strict-rules": "^1.3 || ^2.0",
+        "phpstan/phpstan-symfony": "^1.0 || ^2.0",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^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/css-selector": "^6.4 || ^7.1",
         "symfony/filesystem": "^6.4 || ^7.1",
         "symfony/panther": "^2.0.1",
         "symfony/phpunit-bridge": "^7.1",
         "symfony/yaml": "^6.4 || ^7.1",
-        "vimeo/psalm": "^5.0"
+        "vimeo/psalm": "^5.0 || ^6.10"
     },
     "conflict": {
         "doctrine/dbal": "<3.4",
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -22,3 +22,9 @@ parameters:
             message: "#^Parameter \\#2 \\.\\.\\.\\$arrays of function array_merge expects array, array\\<string, bool\\|string\\>\\|Sonata\\\\PageBundle\\\\Model\\\\PageInterface\\|Sonata\\\\PageBundle\\\\Model\\\\SiteInterface\\|null given\\.$#"
             count: 1
             path: src/Form/Type/PageSelectorType.php
+        -
+            message: '#^Call to internal method Symfony\\Component\\HttpFoundation\\Request\:\:get\(\) from outside its root namespace Symfony.$#'
+            path: .
+        -
+            message: '#^Call to method (s|g)et\(\) of internal class Symfony\\Bundle\\FrameworkBundle\\Test\\TestContainer from outside its root namespace Symfony.$#'
+            path: tests/
diff --git a/psalm.xml b/psalm.xml
@@ -15,12 +15,6 @@
         <!-- Psalm equivalent of PHPStan config `treatPhpDocTypesAsCertain: false` -->
         <DocblockTypeContradiction errorLevel="suppress"/>
         <RedundantConditionGivenDocblockType errorLevel="suppress"/>
-        <UndefinedDocblockClass>
-            <errorLevel type="suppress">
-                <!-- https://github.com/symfony/symfony/issues/45609 -->
-                <referencedClass name="UnitEnum"/>
-            </errorLevel>
-        </UndefinedDocblockClass>
         <InternalClass errorLevel="suppress"/>
         <InternalMethod errorLevel="suppress"/>
         <InternalProperty errorLevel="suppress"/>
@@ -31,5 +25,6 @@
             </errorLevel>
         </UndefinedInterfaceMethod>
         <MissingClassConstType errorLevel="suppress"/>
+        <MissingOverrideAttribute errorLevel="suppress"/>
     </issueHandlers>
 </psalm>
diff --git a/src/Admin/SharedBlockAdmin.php b/src/Admin/SharedBlockAdmin.php
@@ -50,6 +50,7 @@ protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterfa
         // Filter on blocks without page and parents
         $queryBuilder = $query->getQueryBuilder();
         $rootAlias = current($queryBuilder->getRootAliases());
+        \assert(false !== $rootAlias);
         $queryBuilder->andWhere($queryBuilder->expr()->isNull($rootAlias.'.page'));
         $queryBuilder->andWhere($queryBuilder->expr()->isNull($rootAlias.'.parent'));
 
diff --git a/src/Template/Matrix/Parser.php b/src/Template/Matrix/Parser.php
@@ -30,6 +30,8 @@
 final class Parser
 {
     /**
+     * @psalm-suppress InvalidOperand
+     *
      * @param array<string> $mapping
      *
      * @throws \InvalidArgumentException
diff --git a/src/Twig/PageRuntime.php b/src/Twig/PageRuntime.php
@@ -31,6 +31,11 @@
 use Twig\Error\SyntaxError;
 use Twig\Extension\RuntimeExtensionInterface;
 
+/**
+ * NEXT_MAJOR: Declare this class as final.
+ *
+ * @final since 4.9.0
+ */
 class PageRuntime implements RuntimeExtensionInterface
 {
     /**
diff --git a/src/Validator/Constraints/UniqueUrl.php b/src/Validator/Constraints/UniqueUrl.php
@@ -17,6 +17,10 @@
 
 /**
  * @Annotation
+ *
+ * NEXT_MAJOR: Declare this class as final.
+ *
+ * @final since 4.9.0
  */
 class UniqueUrl extends Constraint
 {
diff --git a/tests/App/Entity/SonataPageBlock.php b/tests/App/Entity/SonataPageBlock.php
@@ -17,6 +17,9 @@
 use Doctrine\ORM\Mapping as ORM;
 use Sonata\PageBundle\Entity\BaseBlock;
 
+/**
+ * @psalm-suppress ClassMustBeFinal
+ */
 #[ORM\Entity]
 #[ORM\Table(name: 'page__block')]
 class SonataPageBlock extends BaseBlock
diff --git a/tests/App/Entity/SonataPagePage.php b/tests/App/Entity/SonataPagePage.php
@@ -17,6 +17,9 @@
 use Doctrine\ORM\Mapping as ORM;
 use Sonata\PageBundle\Entity\BasePage;
 
+/**
+ * @psalm-suppress ClassMustBeFinal
+ */
 #[ORM\Entity]
 #[ORM\Table(name: 'page__page')]
 #[ORM\HasLifecycleCallbacks]
diff --git a/tests/App/Entity/SonataPageSite.php b/tests/App/Entity/SonataPageSite.php
@@ -17,6 +17,9 @@
 use Doctrine\ORM\Mapping as ORM;
 use Sonata\PageBundle\Entity\BaseSite;
 
+/**
+ * @psalm-suppress ClassMustBeFinal
+ */
 #[ORM\Entity]
 #[ORM\Table(name: 'page__site')]
 #[ORM\HasLifecycleCallbacks]
diff --git a/tests/App/Entity/SonataPageSnapshot.php b/tests/App/Entity/SonataPageSnapshot.php
@@ -17,6 +17,9 @@
 use Doctrine\ORM\Mapping as ORM;
 use Sonata\PageBundle\Entity\BaseSnapshot;
 
+/**
+ * @psalm-suppress ClassMustBeFinal
+ */
 #[ORM\Entity]
 #[ORM\Table(name: 'page__snapshot')]
 #[ORM\Index(name: 'idx_snapshot_dates_enabled', columns: ['publication_date_start', 'publication_date_end', 'enabled'])]
diff --git a/tests/CmsManager/CmsPageManagerTest.php b/tests/CmsManager/CmsPageManagerTest.php
@@ -224,7 +224,7 @@ public function testGetPageWithoutParamException(): void
     private function getMockBlockInteractor(): BlockInteractorInterface
     {
         $mock = $this->createMock(BlockInteractorInterface::class);
-        $mock->method('createNewContainer')->willReturnCallback(static function (array $options) {
+        $mock->method('createNewContainer')->willReturnCallback(static function (array $options): PageBlockInterface {
             $block = new CmsBlock();
             $block->setSettings($options);
 
diff --git a/tests/Entity/SnapshotManagerTest.php b/tests/Entity/SnapshotManagerTest.php
@@ -130,7 +130,7 @@ public function testEnableSnapshots(): void
         $platform->method('getDateTimeFormatString')->willReturn('Y-m-d H:i:s');
         $connection->method('getDatabasePlatform')->willReturn($platform);
         $connection->method('getParams')->willReturn([]);
-        $unit->method('getSingleIdentifierValue')->willReturnCallback(static function (object $entity) {
+        $unit->method('getSingleIdentifierValue')->willReturnCallback(static function (object $entity): mixed {
             if ($entity instanceof \DateTimeInterface) {
                 throw new MappingException();
             }
@@ -139,7 +139,7 @@ public function testEnableSnapshots(): void
         });
 
         $metaDataFactory->method('hasMetadataFor')
-            ->willReturnCallback(static fn (string $class) => SonataPageSnapshot::class === $class);
+            ->willReturnCallback(static fn (string $class): bool => SonataPageSnapshot::class === $class);
         $metaDataFactory->method('getMetadataFor')->with(SonataPageSnapshot::class)->willReturn($classMetadata);
 
         $this->entityManager->expects(static::once())->method('persist')->with($snapshot);
diff --git a/tests/Entity/TransformerTest.php b/tests/Entity/TransformerTest.php
@@ -58,7 +58,7 @@ protected function setUp(): void
         $this->pageManager->method('getClass')->willReturn(SonataPagePage::class);
 
         $this->blockManager = $this->createMock(ManagerInterface::class);
-        $this->blockManager->method('create')->willReturnCallback(static fn () => new SonataPageBlock());
+        $this->blockManager->method('create')->willReturnCallback(static fn (): object => new SonataPageBlock());
         $this->blockManager->method('getClass')->willReturn(SonataPageBlock::class);
 
         $this->transformer = $this->setUpTransformer();
@@ -162,7 +162,7 @@ public function testLoadSnapshotToPage(): void
      */
     public function testLoadBlock(array $content): void
     {
-        $this->blockManager->method('create')->willReturnCallback(static fn () => new SonataPageBlock());
+        $this->blockManager->method('create')->willReturnCallback(static fn (): PageBlockInterface => new SonataPageBlock());
 
         $block = $this->transformer->loadBlock($content, new SonataPagePage());
 
diff --git a/tests/Runtime/SonataPagePathRuntimeTest.php b/tests/Runtime/SonataPagePathRuntimeTest.php
@@ -25,7 +25,7 @@
  *
  * NEXT_MAJOR: Remove this class
  */
-class SonataPagePathRuntimeTest extends TestCase
+final class SonataPagePathRuntimeTest extends TestCase
 {
     public function testGetRunnerWithHttpKernel(): void
     {
diff --git a/tests/Service/CleanupSnapshotServiceTest.php b/tests/Service/CleanupSnapshotServiceTest.php
@@ -21,7 +21,7 @@
 use Sonata\PageBundle\Model\SnapshotManagerInterface;
 use Sonata\PageBundle\Service\CleanupSnapshotService;
 
-class CleanupSnapshotServiceTest extends TestCase
+final class CleanupSnapshotServiceTest extends TestCase
 {
     public function testCallCleanupQuery(): void
     {

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@`
`30`	`30`	`final class Parser`
`31`	`31`	`{`
`32`	`32`	`/**`
	`33`	`+ * @psalm-suppress InvalidOperand`
	`34`	`+ *`
`33`	`35`	`* @param array<string> $mapping`
`34`	`36`	`*`
`35`	`37`	`* @throws \InvalidArgumentException`