DevKit updates for 4.x branch

.github/workflows/lint.yaml

@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -53,7 +53,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2, composer-normalize:2
               env:

.github/workflows/qa.yaml

@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -53,7 +53,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 

.github/workflows/symfony-lint.yaml

@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -53,7 +53,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -77,7 +77,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -101,7 +101,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 

.github/workflows/test.yaml

@@ -28,11 +28,13 @@ jobs:
             SYMFONY_REQUIRE: ${{matrix.symfony-require}}
 
         strategy:
+            fail-fast: false
             matrix:
                 php-version:
                     - '8.2'
                     - '8.3'
                     - '8.4'
+                    - '8.5'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
@@ -42,21 +44,26 @@ jobs:
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
-                    - php-version: '8.4'
+                    - php-version: '8.5'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 6.4.*
                       variant: symfony/symfony:"6.4.*"
-                    - php-version: '8.4'
+                    - php-version: '8.5'
                       dependencies: highest
                       allowed-to-fail: false
-                      symfony-require: 7.1.*
-                      variant: symfony/symfony:"7.1.*"
-                    - php-version: '8.4'
+                      symfony-require: 7.3.*
+                      variant: symfony/symfony:"7.3.*"
+                    - php-version: '8.5'
                       dependencies: highest
                       allowed-to-fail: false
-                      symfony-require: 7.2.*
-                      variant: symfony/symfony:"7.2.*"
+                      symfony-require: 7.4.*
+                      variant: symfony/symfony:"7.4.*"
+                    - php-version: '8.5'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 8.0.*
+                      variant: symfony/symfony:"8.0.*"
 
         steps:
             - name: Checkout

.gitignore

@@ -10,8 +10,8 @@ composer.lock
 phpunit.xml
 phpstan.neon
 /.phpunit.result.cache
+tests/App/config/reference.php
 /docs/_build/
 /drivers
 /tests/App/public/bundles
-tests/App/config/reference.php
 npm-debug.log

.php-cs-fixer.dist.php

@@ -78,6 +78,7 @@
     ->setFinder($finder)
     ->setRiskyAllowed(true)
     ->setRules($rules)
-    ->setUsingCache(true);
+    ->setUsingCache(true)
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect());
 
 return $config;

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"

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);

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

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;

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
     {

src/Form/Type/PageTypeChoiceType.php

@@ -20,8 +20,6 @@
 
 /**
  * @author Olivier Paradis <paradis.olivier@gmail.com>
- *
- * @psalm-suppress MissingTemplateParam
  */
 final class PageTypeChoiceType extends AbstractType
 {

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
 {

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
     {

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

src/Resources/config/routing/exceptions.php

@@ -17,6 +17,7 @@
 return static function (RoutingConfigurator $routes) {
     foreach (debug_backtrace() as $trace) {
         if (isset($trace['object'], $trace['args'])
+            /* @phpstan-ignore class.notFound */
             && $trace['object'] instanceof XmlFileLoader
             && $trace['args'][0] === __DIR__.'/exceptions.php'
             && $trace['args'][3] === __DIR__.'/exceptions.xml'

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 = [
@@ -41,20 +38,20 @@
      *
      * @return LegacyType[]|null
      */
     public function getTypes(string $class, string $property, array $context = []): ?array
     {
         if ($class !== $this->blockClass) {
             return null;
         }
         if ('position' === $property) {
             return [
                 new LegacyType(LegacyType::BUILTIN_TYPE_INT, true),
                 new LegacyType(LegacyType::BUILTIN_TYPE_STRING, true),
             ];
         }
         if ('enabled' === $property) {
             return [
                 new LegacyType(LegacyType::BUILTIN_TYPE_BOOL, true),
                 new LegacyType(LegacyType::BUILTIN_TYPE_INT, true),
                 new LegacyType(LegacyType::BUILTIN_TYPE_STRING, true),
             ];

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
 {
     /**

src/Template/Matrix/Parser.php

@@ -30,8 +30,6 @@
 final class Parser
 {
     /**
-     * @psalm-suppress InvalidOperand
-     *
      * @param array<string> $mapping
      *
      * @throws \InvalidArgumentException

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

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]

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]

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'])]

tests/Entity/SnapshotManagerTest.php

@@ -112,8 +112,7 @@ public function testEnableSnapshots(): void
             if (class_exists(FieldMapping::class)) {
                 $classMetadata->addInheritedFieldMapping(FieldMapping::fromMappingArray($fieldMapping));
             } else {
-                /**
-                 * @psalm-suppress InvalidArgument
+                /*
                  * @phpstan-ignore-next-line
                  */
                 $classMetadata->addInheritedFieldMapping($fieldMapping);

tests/Request/RequestFactoryTest.php

@@ -21,8 +21,6 @@
 
 /**
  * NEXT_MAJOR: Remove this class.
- *
- * @psalm-suppress DeprecatedClass,DeprecatedMethod
  */
 #[IgnoreDeprecations]
 final class RequestFactoryTest extends TestCase