Update psalm to ^5.9

jsor · Apr 20, 2023 · c8e586b · c8e586b
1 parent d9a2bdd
commit c8e586b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
         "doctrine/orm": "^2.9",
         "friendsofphp/php-cs-fixer": "^3.13",
         "phpunit/phpunit": "^9.5",
-        "vimeo/psalm": "^4.10",
+        "vimeo/psalm": "^5.9",
         "symfony/doctrine-bridge": "^5.4 || ^6.0",
         "symfony/doctrine-messenger": "^5.4 || ^6.0"
     },

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

diff --git a/src/Event/DBALSchemaEventSubscriber.php b/src/Event/DBALSchemaEventSubscriber.php
@@ -167,7 +167,7 @@ public function onSchemaAlterTableChangeColumn(SchemaAlterTableChangeColumnEvent
 
     public function onSchemaColumnDefinition(SchemaColumnDefinitionEventArgs $args): void
     {
-        /** @var array{type: string, default: string, field: string, isnotnull: int|bool} $tableColumn */
+        /** @var array{type: string, default: string, field: string, isnotnull: int|bool, comment: string|null} $tableColumn */
         $tableColumn = array_change_key_case($args->getTableColumn(), CASE_LOWER);
         $table = $args->getTable();
 

diff --git a/src/Event/ORMSchemaEventSubscriber.php b/src/Event/ORMSchemaEventSubscriber.php
@@ -33,7 +33,7 @@ public function postGenerateSchemaTable(GenerateSchemaTableEventArgs $args): voi
                 continue;
             }
 
-            /** @var array{primary?: array<string>, indexes?: array<Index>, foreignKeys?: ForeignKeyConstraint|array<ForeignKeyConstraint>} $options */
+            /** @var array{geometry_type?: string|null, srid?: int|string|null} $options */
             $options = $column->getCustomSchemaOptions();
 
             $normalized = $type->getNormalizedPostGISColumnOptions($options);