Add support

VincentLanglet · VincentLanglet · commit 2916d0f89c91 · 2025-12-19T09:58:39.000+01:00
diff --git a/composer.json b/composer.json
@@ -33,26 +33,26 @@
         "sonata-project/seo-bundle": "^3.4",
         "sonata-project/twig-extensions": "^1.3 || ^2.0",
         "symfony-cmf/routing-bundle": "^2.1 || ^3.0",
-        "symfony/config": "^6.4 || ^7.1",
-        "symfony/console": "^6.4 || ^7.1",
-        "symfony/dependency-injection": "^6.4 || ^7.1",
+        "symfony/config": "^6.4 || ^7.3 || ^8.0",
+        "symfony/console": "^6.4 || ^7.3 || ^8.0",
+        "symfony/dependency-injection": "^6.4 || ^7.3 || ^8.0",
         "symfony/deprecation-contracts": "^3.0.0",
-        "symfony/form": "^6.4 || ^7.1",
-        "symfony/framework-bundle": "^6.4 || ^7.1",
-        "symfony/http-foundation": "^6.4 || ^7.1",
-        "symfony/http-kernel": "^6.4 || ^7.1",
-        "symfony/intl": "^6.4 || ^7.1",
-        "symfony/options-resolver": "^6.4 || ^7.1",
-        "symfony/process": "^6.4 || ^7.1",
-        "symfony/property-access": "^6.4 || ^7.1",
-        "symfony/property-info": "^6.4 || ^7.1",
-        "symfony/routing": "^6.4 || ^7.1",
-        "symfony/runtime": "^6.4 || ^7.1",
-        "symfony/security-core": "^6.4 || ^7.1",
-        "symfony/security-http": "^6.4 || ^7.1",
-        "symfony/serializer": "^6.4 || ^7.1",
-        "symfony/string": "^6.4 || ^7.1",
-        "symfony/validator": "^6.4 || ^7.1",
+        "symfony/form": "^6.4 || ^7.3 || ^8.0",
+        "symfony/framework-bundle": "^6.4 || ^7.3 || ^8.0",
+        "symfony/http-foundation": "^6.4 || ^7.3 || ^8.0",
+        "symfony/http-kernel": "^6.4 || ^7.3 || ^8.0",
+        "symfony/intl": "^6.4 || ^7.3 || ^8.0",
+        "symfony/options-resolver": "^6.4 || ^7.3 || ^8.0",
+        "symfony/process": "^6.4 || ^7.3 || ^8.0",
+        "symfony/property-access": "^6.4 || ^7.3 || ^8.0",
+        "symfony/property-info": "^6.4 || ^7.3 || ^8.0",
+        "symfony/routing": "^6.4 || ^7.3 || ^8.0",
+        "symfony/runtime": "^6.4 || ^7.3 || ^8.0",
+        "symfony/security-core": "^6.4 || ^7.3 || ^8.0",
+        "symfony/security-http": "^6.4 || ^7.3 || ^8.0",
+        "symfony/serializer": "^6.4 || ^7.3 || ^8.0",
+        "symfony/string": "^6.4 || ^7.3 || ^8.0",
+        "symfony/validator": "^6.4 || ^7.3 || ^8.0",
         "twig/string-extra": "^3.0",
         "twig/twig": "^3.0"
     },
@@ -68,20 +68,16 @@
         "phpstan/phpstan-strict-rules": "^1.3 || ^2.0",
         "phpstan/phpstan-symfony": "^1.0 || ^2.0",
         "phpunit/phpunit": "^11.5.38 || ^12.3.10",
-        "psalm/plugin-phpunit": "^0.19",
-        "psalm/plugin-symfony": "^5.0",
         "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/browser-kit": "^6.4 || ^7.3 || ^8.0",
+        "symfony/css-selector": "^6.4 || ^7.3 || ^8.0",
+        "symfony/filesystem": "^6.4 || ^7.3 || ^8.0",
         "symfony/panther": "^2.2",
-        "symfony/yaml": "^6.4 || ^7.1",
-        "vimeo/psalm": "^5.0 || ^6.10"
+        "symfony/yaml": "^6.4 || ^7.3 || ^8.0",
     },
     "conflict": {
         "doctrine/dbal": "<3.4",
-        "doctrine/orm": "<2.14",
-        "symfony/dom-crawler": ">7.4"
+        "doctrine/orm": "<2.14"
     },
     "suggest": {
         "twig/extra-bundle": "Auto configures the Twig Intl extension"
diff --git a/src/Admin/SharedBlockAdmin.php b/src/Admin/SharedBlockAdmin.php
@@ -39,11 +39,6 @@ protected function generateBaseRouteName(bool $isChildAdmin = false): string
         return \sprintf('%s_%s', parent::generateBaseRouteName($isChildAdmin), 'shared');
     }
 
-    /**
-     * @psalm-suppress LessSpecificReturnStatement, MoreSpecificReturnType
-     *
-     * @see https://github.com/vimeo/psalm/issues/8429
-     */
     protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterface
     {
         \assert($query instanceof ORMProxyQueryInterface);
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -25,10 +25,6 @@
 final class Configuration implements ConfigurationInterface
 {
     /**
-     * @psalm-suppress UndefinedInterfaceMethod
-     *
-     * @see https://github.com/psalm/psalm-plugin-symfony/issues/174
-     *
      * @return TreeBuilder<'array'>
      */
     public function getConfigTreeBuilder(): TreeBuilder
diff --git a/src/Entity/Transformer.php b/src/Entity/Transformer.php
@@ -151,7 +151,6 @@ public function create(PageInterface $page, ?SnapshotInterface $snapshot = null)
             $content = array_filter($data, static fn ($v): bool => null !== $v);
         }
 
-        /** @psalm-suppress ArgumentTypeCoercion */
         $snapshot->setContent($content);
 
         return $snapshot;
diff --git a/src/Form/Type/PageSelectorType.php b/src/Form/Type/PageSelectorType.php
@@ -23,8 +23,6 @@
 
 /**
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
- *
- * @psalm-suppress MissingTemplateParam
  */
 final class PageSelectorType extends AbstractType
 {
@@ -71,7 +69,6 @@ public function getBlockPrefix(): string
      *         hierarchy: string
      *     }
      * }> $options
-     * @psalm-param Options $options
      */
     private function getChoices(Options $options): array
     {
diff --git a/src/Form/Type/PageTypeChoiceType.php b/src/Form/Type/PageTypeChoiceType.php
@@ -20,8 +20,6 @@
 
 /**
  * @author Olivier Paradis <paradis.olivier@gmail.com>
- *
- * @psalm-suppress MissingTemplateParam
  */
 final class PageTypeChoiceType extends AbstractType
 {
diff --git a/src/Form/Type/TemplateChoiceType.php b/src/Form/Type/TemplateChoiceType.php
@@ -20,8 +20,6 @@
 
 /**
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
- *
- * @psalm-suppress MissingTemplateParam
  */
 final class TemplateChoiceType extends AbstractType
 {
diff --git a/src/Model/Page.php b/src/Model/Page.php
@@ -543,8 +543,6 @@ public function isInternal(): bool
 
     /**
      * @return array<string, string>
-     *
-     * @psalm-suppress PossiblyUndefinedArrayOffset
      */
     private function getHeadersAsArray(string $rawHeaders): array
     {
diff --git a/src/Model/SnapshotChildrenCollection.php b/src/Model/SnapshotChildrenCollection.php
@@ -20,8 +20,6 @@
  *
  * @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
  *
- * @psalm-suppress PropertyNotSetInConstructor
- *
  * @see $collection property is initialized in the doInitialize method
  */
 final class SnapshotChildrenCollection extends AbstractLazyCollection
diff --git a/src/Serializer/BlockTypeExtractor.php b/src/Serializer/BlockTypeExtractor.php
@@ -18,9 +18,6 @@
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 use Symfony\Component\TypeInfo\Type;
 
-/**
- * @psalm-suppress DeprecatedClass
- */
 final class BlockTypeExtractor implements PropertyTypeExtractorInterface
 {
     public const NULLABLE_STRINGS = [
diff --git a/src/Serializer/InterfaceTypeExtractor.php b/src/Serializer/InterfaceTypeExtractor.php
@@ -19,9 +19,6 @@
 use Symfony\Component\PropertyInfo\Type as LegacyType;
 use Symfony\Component\TypeInfo\Type;
 
-/**
- * @psalm-suppress DeprecatedClass
- */
 final class InterfaceTypeExtractor implements PropertyTypeExtractorInterface
 {
     /**
diff --git a/src/Template/Matrix/Parser.php b/src/Template/Matrix/Parser.php
@@ -30,8 +30,6 @@
 final class Parser
 {
     /**
-     * @psalm-suppress InvalidOperand
-     *
      * @param array<string> $mapping
      *
      * @throws \InvalidArgumentException
diff --git a/tests/App/Entity/SonataPageBlock.php b/tests/App/Entity/SonataPageBlock.php
@@ -17,9 +17,6 @@
 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,9 +17,6 @@
 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,9 +17,6 @@
 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,9 +17,6 @@
 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/Entity/SnapshotManagerTest.php b/tests/Entity/SnapshotManagerTest.php
@@ -113,7 +113,6 @@ public function testEnableSnapshots(): void
                 $classMetadata->addInheritedFieldMapping(FieldMapping::fromMappingArray($fieldMapping));
             } else {
                 /**
-                 * @psalm-suppress InvalidArgument
                  * @phpstan-ignore-next-line
                  */
                 $classMetadata->addInheritedFieldMapping($fieldMapping);
diff --git a/tests/Request/RequestFactoryTest.php b/tests/Request/RequestFactoryTest.php
@@ -21,8 +21,6 @@
 
 /**
  * NEXT_MAJOR: Remove this class.
- *
- * @psalm-suppress DeprecatedClass,DeprecatedMethod
  */
 #[IgnoreDeprecations]
 final class RequestFactoryTest extends TestCase

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,6 @@ protected function generateBaseRouteName(bool $isChildAdmin = false): string`
`39`	`39`	`return \sprintf('%s_%s', parent::generateBaseRouteName($isChildAdmin), 'shared');`
`40`	`40`	`}`
`41`	`41`
`42`		`- /**`
`43`		`- * @psalm-suppress LessSpecificReturnStatement, MoreSpecificReturnType`
`44`		`- *`
`45`		`- * @see https://github.com/vimeo/psalm/issues/8429`
`46`		`- */`
`47`	`42`	`protected function configureQuery(ProxyQueryInterface $query): ProxyQueryInterface`
`48`	`43`	`{`
`49`	`44`	`\assert($query instanceof ORMProxyQueryInterface);`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,6 @@ public function create(PageInterface $page, ?SnapshotInterface $snapshot = null)`
`151`	`151`	`$content = array_filter($data, static fn ($v): bool => null !== $v);`
`152`	`152`	`}`
`153`	`153`
`154`		`- /** @psalm-suppress ArgumentTypeCoercion */`
`155`	`154`	`$snapshot->setContent($content);`
`156`	`155`
`157`	`156`	`return $snapshot;`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`
`21`	`21`	`/**`
`22`	`22`	`* @author Olivier Paradis <paradis.olivier@gmail.com>`
`23`		`- *`
`24`		`- * @psalm-suppress MissingTemplateParam`
`25`	`23`	`*/`
`26`	`24`	`final class PageTypeChoiceType extends AbstractType`
`27`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -543,8 +543,6 @@ public function isInternal(): bool`
`543`	`543`
`544`	`544`	`/**`
`545`	`545`	`* @return array<string, string>`
`546`		`- *`
`547`		`- * @psalm-suppress PossiblyUndefinedArrayOffset`
`548`	`546`	`*/`
`549`	`547`	`private function getHeadersAsArray(string $rawHeaders): array`
`550`	`548`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,6 @@`
`18`	`18`	`use Symfony\Component\PropertyInfo\Type as LegacyType;`
`19`	`19`	`use Symfony\Component\TypeInfo\Type;`
`20`	`20`
`21`		`-/**`
`22`		`- * @psalm-suppress DeprecatedClass`
`23`		`- */`
`24`	`21`	`final class BlockTypeExtractor implements PropertyTypeExtractorInterface`
`25`	`22`	`{`
`26`	`23`	`public const NULLABLE_STRINGS = [`