Fix psalm issues

doctrine · Jul 26, 2023 · e4062ed · e4062ed
1 parent 6ce7fe6
commit e4062ed
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/Tests/Command/CommandTestKernel.php b/Tests/Command/CommandTestKernel.php
@@ -15,7 +15,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\Configurator\RouteConfigurator;
-use Symfony\Component\Routing\RouteCollectionBuilder;
 
 use function sys_get_temp_dir;
 
@@ -32,8 +31,7 @@ public function registerBundles(): array
         ];
     }
 
-    /** @param RouteConfigurator|RouteCollectionBuilder $routes */
-    public function configureRoutes($routes): void
+    public function configureRoutes(RouteConfigurator $routes): void
     {
     }
 

diff --git a/Tests/FixtureIntegrationTest.php b/Tests/FixtureIntegrationTest.php
@@ -21,7 +21,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\Configurator\RouteConfigurator;
-use Symfony\Component\Routing\RouteCollectionBuilder;
 
 use function array_map;
 use function assert;
@@ -310,8 +309,7 @@ public function addServices(callable $callback): void
         $this->servicesCallback = $callback;
     }
 
-    /** @param RouteConfigurator|RouteCollectionBuilder $routes */
-    protected function configureRoutes($routes): void
+    protected function configureRoutes(RouteConfigurator $routes): void
     {
     }
 

diff --git a/composer.json b/composer.json
@@ -42,7 +42,7 @@
         "symfony/stopwatch": "^5.4|^6.2",
         "symfony/validator": "^5.4|^6.2",
         "symfony/yaml": "^5.4|^6.2",
-        "vimeo/psalm": "^5.6"
+        "vimeo/psalm": "^5.12"
     },
     "suggest": {
         "doctrine/data-fixtures": "Load data fixtures"

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.6.0@e784128902dfe01d489c4123d69918a9f3c1eac5">
+<files psalm-version="5.12.0@f90118cdeacd0088e7215e64c0c99ceca819e176">
   <file src="Command/LoadDataFixturesDoctrineODMCommand.php">
     <UndefinedInterfaceMethod>
       <code>ask</code>
@@ -10,6 +10,22 @@
       <code>int</code>
     </InvalidReturnType>
   </file>
+  <file src="DependencyInjection/Configuration.php">
+    <UndefinedInterfaceMethod>
+      <code>arrayNode</code>
+      <code>end</code>
+      <code>scalarNode</code>
+      <code>scalarNode</code>
+    </UndefinedInterfaceMethod>
+    <UndefinedMethod>
+      <code>children</code>
+    </UndefinedMethod>
+  </file>
+  <file src="Form/Type/DocumentType.php">
+    <MethodSignatureMustProvideReturnType>
+      <code>configureOptions</code>
+    </MethodSignatureMustProvideReturnType>
+  </file>
   <file src="Tests/Form/Type/GuesserTestType.php">
     <MissingTemplateParam>
       <code>GuesserTestType</code>

diff --git a/psalm.xml b/psalm.xml
@@ -34,12 +34,4 @@
             <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
-
-    <issueHandlers>
-        <UndefinedDocblockClass>
-            <errorLevel type="info">
-                <referencedClass name="Symfony\Component\Routing\RouteCollectionBuilder" /> <!-- for backwards compatibility with symfony/routing ^4.4 -->
-            </errorLevel>
-        </UndefinedDocblockClass>
-    </issueHandlers>
 </psalm>