Psalm 5.3.0 (doctrine#10317)

surexdirect · Dec 19, 2022 · 099e51d · 099e51d
1 parent 5df84d4
commit 099e51d
Show file tree

Hide file tree

Showing 3 changed files with 162 additions and 33 deletions.
diff --git a/composer.json b/composer.json
@@ -48,7 +48,7 @@
         "squizlabs/php_codesniffer": "3.7.1",
         "symfony/cache": "^4.4 || ^5.4 || ^6.0",
         "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
-        "vimeo/psalm": "4.30.0 || 5.2.0"
+        "vimeo/psalm": "4.30.0 || 5.3.0"
     },
     "conflict": {
         "doctrine/annotations": "<1.13 || >= 2.0"

diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -142,6 +142,13 @@
  *     type: int,
  *     unique?: bool,
  * }
+ * @psalm-type DiscriminatorColumnMapping = array{
+ *     name: string,
+ *     fieldName: string,
+ *     type: string,
+ *     length?: int,
+ *     columnDefinition?: string|null,
+ * }
  */
 class ClassMetadataInfo implements ClassMetadata
 {
@@ -574,7 +581,8 @@ class ClassMetadataInfo implements ClassMetadata
      * READ-ONLY: The definition of the discriminator column used in JOINED and SINGLE_TABLE
      * inheritance mappings.
      *
-     * @psalm-var array{name: string, fieldName: string, type: string, length?: int, columnDefinition?: string|null}|null
+     * @var array<string, mixed>
+     * @psalm-var DiscriminatorColumnMapping|null
      */
     public $discriminatorColumn;
 
@@ -3248,7 +3256,10 @@ public function setDiscriminatorColumn($columnDef)
         }
     }
 
-    /** @return array<string, mixed> */
+    /**
+     * @return array<string, mixed>
+     * @psalm-return DiscriminatorColumnMapping
+     */
     final public function getDiscriminatorColumn(): array
     {
         if ($this->discriminatorColumn === null) {