Fixup EnumPropertyAccessor::toEnum

doctrine · Nov 3, 2024 · 149a952 · 149a952
1 parent 3a1eb2e
commit 149a952
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/Mapping/PropertyAccessors/EnumPropertyAccessor.php b/src/Mapping/PropertyAccessors/EnumPropertyAccessor.php
@@ -55,13 +55,25 @@ private function fromEnum($enum)
     }
 
     /**
-     * @param int|string|int[]|string[] $value
+     * @param BackedEnum|BackedEnum[]|int|string|int[]|string[] $value
      *
-     * @return ($value is int|string ? BackedEnum : BackedEnum[])
+     * @return ($value is int|string|BackedEnum ? BackedEnum : BackedEnum[])
+     *
+     * @psalm-suppress InvalidReturnStatement
+     * @psalm-suppress PossiblyInvalidArgument
      */
     private function toEnum($value)
     {
+        if ($value instanceof BackedEnum) {
+            return $value;
+        }
+
         if (is_array($value)) {
+            $v = reset($value);
+            if ($v instanceof BackedEnum) {
+                return $value;
+            }
+
             return array_map([$this->enumType, 'from'], $value);
         }