mixed enums

Author: Enno Woortmann

src/SchemaProcessor/PostProcessor/EnumPostProcessor.php

@@ -202,7 +202,7 @@ private function renderEnum(
         $cases = [];
 
         foreach ($values as $value) {
-            $cases[ucfirst($map ? array_search($value, $map) : $value)] = var_export($value, true);
+            $cases[ucfirst($map ? array_search($value, $map, true) : $value)] = var_export($value, true);
         }
 
         $backedType = null;

src/SchemaProcessor/PostProcessor/Templates/Enum.phptpl

@@ -4,6 +4,10 @@ declare(strict_types=1);
 
 namespace {{ namespace }};
 
+{% if not backedType %}
+    use ValueError;
+{% endif %}
+
 enum {{ name }}{% if backedType %}: {{ backedType }}{% endif %} {
     {% foreach cases as case, value %}
         case {{ case }}{% if backedType %} = {{ value }}{% endif %};
@@ -12,16 +16,25 @@ enum {{ name }}{% if backedType %}: {{ backedType }}{% endif %} {
     {% if not backedType %}
         public static function from(mixed $value): self
         {
-            switch ($value) {
+            switch (true) {
                 {% foreach cases as case, value %}
-                    case {{ value }}: return self::{{ case }};
+                    case $value === {{ value }}: return self::{{ case }};
                 {% endforeach %}
                 default: throw new ValueError(
                     sprintf('Invalid enum value %s for enum %s', var_export($value, true), self::class)
                 );
             }
         }
 
+        public static function tryFrom(mixed $value): ?self
+        {
+            try {
+                return self::from($value);
+            } catch (ValueError) {
+                return null;
+            }
+        }
+
         public function value(): mixed
         {
             switch ($this) {

tests/PostProcessor/EnumPostProcessorTest.php

@@ -13,8 +13,9 @@
 use PHPModelGenerator\SchemaProcessor\PostProcessor\EnumPostProcessor;
 use PHPModelGenerator\Tests\AbstractPHPModelGeneratorTest;
 use ReflectionEnum;
+use UnitEnum;
 
-// TODO: mixed enums, multiple enums, enum redirect
+// TODO: multiple enums, enum redirect
 class EnumPostProcessorTest extends AbstractPHPModelGeneratorTest
 {
     /**
@@ -267,6 +268,65 @@ public function testIntOnlyEnum(): void
         $object->setProperty(1);
     }
 
+    /**
+     * @requires PHP >= 8.1
+     */
+    public function testMixedEnum(): void
+    {
+        $this->addPostProcessor();
+
+        $className = $this->generateClassFromFileTemplate(
+            'EnumPropertyMapped.json',
+            ['["Hans", 100, true]', '{"a": "Hans", "b": 100, "c": true}'],
+            (new GeneratorConfiguration())->setImmutable(false)->setCollectErrors(false),
+            false
+        );
+
+        $this->includeGeneratedEnums(1);
+
+        $object = new $className(['property' => 'Hans']);
+        $this->assertSame('Hans', $object->getProperty()->value());
+
+        $object->setProperty(100);
+        $this->assertSame(100, $object->getProperty()->value());
+
+        $object->setProperty(null);
+        $this->assertNull($object->getProperty());
+
+        $returnType = $this->getReturnType($object, 'getProperty');
+        $this->assertTrue($returnType->allowsNull());
+        $enum = $returnType->getName();
+
+        $this->assertTrue(enum_exists($enum));
+        $reflectionEnum = new ReflectionEnum($enum);
+        $enumName = $reflectionEnum->getShortName();
+
+        $this->assertEqualsCanonicalizing(
+            [$enumName, 'null'],
+            explode('|', $this->getReturnTypeAnnotation($object, 'getProperty'))
+        );
+
+        $this->assertNull($reflectionEnum->getBackingType());
+
+        $this->assertEqualsCanonicalizing(
+            ['A', 'B', 'C'],
+            array_map(function (UnitEnum $value): string { return $value->name; }, $enum::cases())
+        );
+
+        $object->setProperty($enum::C);
+        $this->assertSame(true, $object->getProperty()->value());
+
+        $this->assertNull($this->getParameterType($object, 'setProperty'));
+
+        $this->assertSame($enum::A, $enum::from('Hans'));
+        $this->assertSame($enum::A, $enum::tryFrom('Hans'));
+        $this->assertNull($enum::tryFrom('Dieter'));
+
+        $this->expectException(EnumException::class);
+        $this->expectExceptionMessage('Invalid value for property declined by enum constraint');
+        $object->setProperty(1);
+    }
+
     /**
      * @requires PHP >= 8.1
      */