enum support fixes

valantic · Apr 23, 2024 · 6933824 · 6933824
1 parent b483228
commit 6933824
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/src/Model/Component/Property/EnumPropertyDoc.php b/src/Model/Component/Property/EnumPropertyDoc.php
@@ -6,18 +6,21 @@
 
 class EnumPropertyDoc extends AbstractPropertyDoc
 {
+    /**
+     * @var array<int, string>
+     */
     protected array $enumOptions = [];
 
     /**
-     * @return string[]
+     * @return array<int, string>
      */
     public function getEnumOptions(): array
     {
         return $this->enumOptions;
     }
 
     /**
-     * @param string[] $enumOptions
+     * @param array<int, string> $enumOptions
      */
     public function setEnumOptions(array $enumOptions): self
     {

diff --git a/src/Service/DataTypeParser/EnumParser.php b/src/Service/DataTypeParser/EnumParser.php
@@ -8,17 +8,20 @@
 use Valantic\PimcoreApiDocumentationBundle\Enum\DataTypeEnum;
 use Valantic\PimcoreApiDocumentationBundle\Model\Component\Property\AbstractPropertyDoc;
 use Valantic\PimcoreApiDocumentationBundle\Model\Component\Property\EnumPropertyDoc;
-use Valantic\PimcoreApiDocumentationBundle\Model\Component\Property\SimplePropertyDoc;
 
 /**
- * @implements DataTypeParserInterface<SimplePropertyDoc>
+ * @implements DataTypeParserInterface<EnumPropertyDoc>
  */
 class EnumParser implements DataTypeParserInterface
 {
     public function parse(\ReflectionProperty $reflectionProperty): AbstractPropertyDoc
     {
         $propertyDoc = new EnumPropertyDoc();
 
+        if (!$reflectionProperty->getType() instanceof \ReflectionNamedType) {
+            return $propertyDoc;
+        }
+
         $propertyTypeName = $reflectionProperty->getType()->getName();
 
         if (!is_subclass_of($propertyTypeName, \UnitEnum::class)) {
@@ -29,17 +32,17 @@ public function parse(\ReflectionProperty $reflectionProperty): AbstractProperty
 
         foreach ($propertyTypeName::cases() as $enumCase) {
             if ($enumCase instanceof \BackedEnum) {
-                $enumOptions[] = $enumCase->value;
+                $enumOptions[] = (string) $enumCase->value;
             } else {
-                $enumOptions[] = $enumCase->name;
+                $enumOptions[] = (string) $enumCase->name;
             }
         }
 
         $propertyDoc
             ->setName($reflectionProperty->getName())
             ->setType(DataTypeEnum::STRING->value)
             ->setEnumOptions($enumOptions)
-            ->setNullable($reflectionProperty->getType()?->allowsNull() ?? true);
+            ->setNullable($reflectionProperty->getType()->allowsNull() ?? true);
 
         return $propertyDoc;
     }