DevKit updates for 4.x branch (#8357)

SonataCI · VincentLanglet · web-flow · commit 2b699f8a880a · 2025-11-30T10:49:17.000+01:00
Co-authored-by: Vincent Langlet &lt;vincentlanglet@hotmail.fr&gt;
diff --git a/.gitattributes b/.gitattributes
@@ -13,8 +13,6 @@ rector.php export-ignore
 phpstan.neon.dist export-ignore
 phpstan-baseline.neon export-ignore
 phpstan-console-application.php export-ignore
-psalm.xml export-ignore
-psalm-baseline.xml export-ignore
 package.json export-ignore
 package-lock.json export-ignore
 postcss.config.js export-ignore
diff --git a/.github/workflows/lint.yaml b/.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:
diff --git a/.github/workflows/qa.yaml b/.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
 
@@ -41,30 +41,6 @@ jobs:
             - name: PHPStan
               run: vendor/bin/phpstan --no-progress --memory-limit=1G analyse --error-format=github
 
-    psalm:
-        name: Psalm
-
-        runs-on: ubuntu-latest
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-
-            - name: Install PHP with extensions
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: '8.4'
-                  coverage: none
-                  tools: composer:v2
-
-            - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v3
-              with:
-                  dependency-versions: highest
-
-            - name: Psalm
-              run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.4
-
     rector:
         name: Rector
 
@@ -77,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
 
diff --git a/.github/workflows/symfony-lint.yaml b/.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
 
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -30,34 +30,39 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '8.1'
                     - '8.2'
                     - '8.3'
                     - '8.4'
+                    - '8.5'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
                 variant: [normal]
                 include:
-                    - php-version: '8.1'
+                    - php-version: '8.2'
                       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
diff --git a/.gitignore b/.gitignore
@@ -10,5 +10,6 @@ composer.lock
 phpunit.xml
 phpstan.neon
 /.phpunit.result.cache
+tests/App/config/reference.php
 /docs/_build/
 npm-debug.log
diff --git a/Makefile b/Makefile
@@ -116,10 +116,6 @@ phpstan:
 	vendor/bin/phpstan --memory-limit=1G analyse
 .PHONY: phpstan
 
-psalm:
-	vendor/bin/psalm --php-version=8.4
-.PHONY: psalm
-
 rector:
 	vendor/bin/rector
 .PHONY: rector
diff --git a/README.md b/README.md
@@ -10,7 +10,6 @@ The missing Symfony Admin Generator
 
 [![Latest Stable Version](https://poser.pugx.org/sonata-project/admin-bundle/v/stable)](https://packagist.org/packages/sonata-project/admin-bundle)
 [![Latest Unstable Version](https://poser.pugx.org/sonata-project/admin-bundle/v/unstable)](https://packagist.org/packages/sonata-project/admin-bundle)
-[![Psalm Type Coverage][shepherd_stable_badge]][shepherd_stable_link]
 [![License](https://poser.pugx.org/sonata-project/admin-bundle/license)](https://packagist.org/packages/sonata-project/admin-bundle)
 
 [![Total Downloads](https://poser.pugx.org/sonata-project/admin-bundle/downloads)](https://packagist.org/packages/sonata-project/admin-bundle)
diff --git a/rector.php b/rector.php
@@ -33,7 +33,7 @@
     ]);
 
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_81,
+        LevelSetList::UP_TO_PHP_82,
         PHPUnitSetList::PHPUNIT_100,
         PHPUnitSetList::PHPUNIT_CODE_QUALITY,
     ]);
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -182,6 +182,8 @@ 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/Mapper/BaseGroupedMapper.php b/src/Mapper/BaseGroupedMapper.php
@@ -155,6 +155,7 @@ final public function with(string $name, array $options = []): self
             $this->setGroups($groups);
             $tabs = $this->getTabs();
         }
+        \assert(null !== $this->currentTab);
 
         if (null !== $this->currentGroup && isset($tabs[$this->currentTab]) && !\in_array($this->currentGroup, $tabs[$this->currentTab]['groups'], true)) {
             $tabs[$this->currentTab]['groups'][] = $this->currentGroup;
diff --git a/tests/App/Builder/ListBuilder.php b/tests/App/Builder/ListBuilder.php
@@ -51,6 +51,10 @@ public function addField(FieldDescriptionCollection $list, ?string $type, FieldD
 
     private function getTemplate(?string $type): ?string
     {
+        if (null === $type) {
+            return null;
+        }
+
         return TemplateRegistryInterface::LIST_TEMPLATES[$type] ?? null;
     }
 }
diff --git a/tests/App/Builder/ShowBuilder.php b/tests/App/Builder/ShowBuilder.php
@@ -45,6 +45,10 @@ public function addField(FieldDescriptionCollection $list, ?string $type, FieldD
 
     private function getTemplate(?string $type): ?string
     {
+        if (null === $type) {
+            return null;
+        }
+
         return TemplateRegistryInterface::SHOW_TEMPLATES[$type] ?? null;
     }
 }
diff --git a/tests/Command/CommandHelper.php b/tests/Command/CommandHelper.php
@@ -23,6 +23,7 @@ final class CommandHelper
 {
     public static function addCommandToApplication(Application $application, callable|Command $command): void
     {
+        /* @phpstan-ignore-next-line function.alreadyNarrowedType */
         if (method_exists($application, 'addCommand')) {
             $application->addCommand($command);
         } else {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -31,10 +31,5 @@
 }
 
 if (file_exists($file = __DIR__.'/custom_bootstrap.php')) {
-    /**
-     * @psalm-suppress MissingFile,UnusedPsalmSuppress
-     *
-     * @see https://github.com/vimeo/psalm/issues/3886
-     */
     require_once $file;
 }

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,8 @@ final class Configuration implements ConfigurationInterface`
`182`	`182`	`* @psalm-suppress UndefinedInterfaceMethod`
`183`	`183`	`*`
`184`	`184`	`* @see https://github.com/psalm/psalm-plugin-symfony/issues/174`
	`185`	`+ *`
	`186`	`+ * @return TreeBuilder<'array'>`
`185`	`187`	`*/`
`186`	`188`	`public function getConfigTreeBuilder(): TreeBuilder`
`187`	`189`	`{`