Merge 3.x into 4.x

sonata-project · Mar 13, 2023 · 19f835f · 19f835f
2 parents 87d132d + a4048d3
commit 19f835f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -50,16 +50,16 @@
         "phpstan/phpstan-strict-rules": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^9.5",
-        "psalm/plugin-phpunit": "^0.17",
-        "psalm/plugin-symfony": "^4.0",
+        "psalm/plugin-phpunit": "^0.18",
+        "psalm/plugin-symfony": "^4.0 || ^5.0",
         "rector/rector": "^0.15",
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",
         "symfony/browser-kit": "^4.4 || ^5.4 || ^6.2",
         "symfony/css-selector": "^4.4 || ^5.4 || ^6.2",
         "symfony/doctrine-bridge": "^4.4.48 || ^5.4 || ^6.2",
         "symfony/filesystem": "^4.4 || ^5.4 || ^6.2",
         "symfony/phpunit-bridge": "^6.2",
-        "vimeo/psalm": "^4.3.2",
+        "vimeo/psalm": "^4.3.2 || ^5.8",
         "weirdan/doctrine-psalm-plugin": "^2.0"
     },
     "conflict": {

diff --git a/psalm.xml b/psalm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" errorLevel="2" findUnusedPsalmSuppress="true" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">
+<psalm xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" errorLevel="2" findUnusedPsalmSuppress="true" findUnusedBaselineEntry="true" findUnusedCode="false" xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">
     <projectFiles>
         <directory name="src"/>
         <directory name="tests"/>

diff --git a/src/DependencyInjection/Compiler/AdminExtensionCompilerPass.php b/src/DependencyInjection/Compiler/AdminExtensionCompilerPass.php
@@ -24,6 +24,9 @@
  */
 final class AdminExtensionCompilerPass implements CompilerPassInterface
 {
+    /**
+     * @psalm-suppress RedundantCondition -- https://github.com/vimeo/psalm/issues/9489
+     */
     public function process(ContainerBuilder $container): void
     {
         $translationTargets = $container->getParameter('sonata_translation.targets');

diff --git a/tests/Admin/Extension/AbstractTranslatableAdminExtensionTest.php b/tests/Admin/Extension/AbstractTranslatableAdminExtensionTest.php
@@ -42,7 +42,9 @@ public function get(): string
             }
         };
 
-        $this->extension = new class($this->translatableChecker, $localeProvider) extends AbstractTranslatableAdminExtension {};
+        $this->extension = new /**
+             * @template-extends AbstractTranslatableAdminExtension<object>
+             */ class($this->translatableChecker, $localeProvider) extends AbstractTranslatableAdminExtension {};
     }
 
     public function testSetsPersistentParameters(): void