Clean-up code after PR10288 merge

doctrine · Dec 14, 2022 · a073200 · a073200
1 parent 92a8453
commit a073200
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/DiscriminatorColumn.php b/lib/Doctrine/ORM/Mapping/DiscriminatorColumn.php
@@ -14,6 +14,7 @@ public function __construct(
         public readonly string|null $type = null,
         public readonly int|null $length = null,
         public readonly string|null $columnDefinition = null,
+        /** @var class-string<\BackedEnum>|null */
         public readonly string|null $enumType = null,
     ) {
     }

diff --git a/lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php
@@ -207,14 +207,15 @@ public function loadMetadataForClass(string $className, PersistenceClassMetadata
                 // Evaluate DiscriminatorColumn attribute
                 if (isset($classAttributes[Mapping\DiscriminatorColumn::class])) {
                     $discrColumnAttribute = $classAttributes[Mapping\DiscriminatorColumn::class];
+                    assert($discrColumnAttribute instanceof Mapping\DiscriminatorColumn);
 
                     $metadata->setDiscriminatorColumn(
                         [
-                            'name'             => isset($discrColumnAttribute->name) ? (string) $discrColumnAttribute->name : null,
-                            'type'             => isset($discrColumnAttribute->type) ? (string) $discrColumnAttribute->type : 'string',
-                            'length'           => isset($discrColumnAttribute->length) ? (int) $discrColumnAttribute->length : 255,
-                            'columnDefinition' => isset($discrColumnAttribute->columnDefinition) ? (string) $discrColumnAttribute->columnDefinition : null,
-                            'enumType'         => isset($discrColumnAttribute->enumType) ? (string) $discrColumnAttribute->enumType : null,
+                            'name'             => $discrColumnAttribute->name,
+                            'type'             => $discrColumnAttribute->type ?? 'string',
+                            'length'           => $discrColumnAttribute->length ?? 255,
+                            'columnDefinition' => $discrColumnAttribute->columnDefinition,
+                            'enumType'         => $discrColumnAttribute->enumType,
                         ],
                     );
                 } else {

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -502,7 +502,7 @@
     </PossiblyUndefinedArrayOffset>
   </file>
   <file src="lib/Doctrine/ORM/Mapping/Driver/AttributeDriver.php">
-    <InvalidArgument occurrences="2"/>
+    <InvalidArgument occurrences="1"/>
     <InvalidArrayAccess occurrences="4">
       <code>$value[0]</code>
       <code>$value[0]</code>