fix: properly handle full namespaced enum type in docblock

CuyZ · Jan 25, 2025 · eb8816c · eb8816c
1 parent 716c8b3
commit eb8816c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/Type/Parser/Exception/Enum/EnumCaseNotFound.php b/src/Type/Parser/Exception/Enum/EnumCaseNotFound.php
@@ -6,13 +6,12 @@
 
 use CuyZ\Valinor\Type\Parser\Exception\InvalidType;
 use RuntimeException;
-use UnitEnum;
 
 /** @internal */
 final class EnumCaseNotFound extends RuntimeException implements InvalidType
 {
     /**
-     * @param class-string<UnitEnum> $enumName
+     * @param class-string $enumName
      */
     public function __construct(string $enumName, string $pattern)
     {

diff --git a/src/Type/Types/EnumType.php b/src/Type/Types/EnumType.php
@@ -32,7 +32,8 @@ final class EnumType implements ClassType
      */
     public function __construct(string $enumName, string $pattern, array $cases)
     {
-        $this->enumName = $enumName;
+        // @phpstan-ignore assign.propertyType (it is still an enum class-string)
+        $this->enumName = ltrim($enumName, '\\');
         $this->pattern = $pattern;
 
         if (empty($cases)) {

diff --git a/tests/Integration/Mapping/Object/EnumValuesMappingTest.php b/tests/Integration/Mapping/Object/EnumValuesMappingTest.php
@@ -18,6 +18,7 @@ public function test_values_are_mapped_properly(): void
         $source = [
             'pureEnumWithFirstValue' => 'FOO',
             'pureEnumWithSecondValue' => 'BAR',
+            'pureEnumWithFullNamespace' => 'FOO',
             'pureEnumWithPattern' => 'BAZ',
             'backedStringEnum' => 'foo',
             'backedStringEnumWithPattern' => 'baz',
@@ -34,6 +35,7 @@ public function test_values_are_mapped_properly(): void
 
             self::assertSame(PureEnum::FOO, $result->pureEnumWithFirstValue);
             self::assertSame(PureEnum::BAR, $result->pureEnumWithSecondValue);
+            self::assertSame(PureEnum::FOO, $result->pureEnumWithFullNamespace);
             self::assertSame(PureEnum::BAZ, $result->pureEnumWithPattern);
             self::assertSame(BackedStringEnum::FOO, $result->backedStringEnum);
             self::assertSame(BackedStringEnum::BAZ, $result->backedStringEnumWithPattern);
@@ -115,6 +117,9 @@ class EnumValues
 
     public PureEnum $pureEnumWithSecondValue;
 
+    /** @var \CuyZ\Valinor\Tests\Fixture\Enum\PureEnum */
+    public mixed $pureEnumWithFullNamespace;
+
     /** @var PureEnum::BA* */
     public PureEnum $pureEnumWithPattern;
 
@@ -132,13 +137,15 @@ class EnumValues
 class EnumValuesWithConstructor extends EnumValues
 {
     /**
+     * @param \CuyZ\Valinor\Tests\Fixture\Enum\PureEnum $pureEnumWithFullNamespace
      * @param PureEnum::BA* $pureEnumWithPattern
      * @param BackedStringEnum::BA* $backedStringEnumWithPattern
      * @param BackedIntegerEnum::BA* $backedIntegerEnumWithPattern
      */
     public function __construct(
         PureEnum $pureEnumWithFirstValue,
         PureEnum $pureEnumWithSecondValue,
+        mixed $pureEnumWithFullNamespace,
         PureEnum $pureEnumWithPattern,
         BackedStringEnum $backedStringEnum,
         BackedStringEnum $backedStringEnumWithPattern,
@@ -147,6 +154,7 @@ public function __construct(
     ) {
         $this->pureEnumWithFirstValue = $pureEnumWithFirstValue;
         $this->pureEnumWithSecondValue = $pureEnumWithSecondValue;
+        $this->pureEnumWithFullNamespace = $pureEnumWithFullNamespace;
         $this->pureEnumWithPattern = $pureEnumWithPattern;
         $this->backedStringEnum = $backedStringEnum;
         $this->backedIntegerEnum = $backedIntegerEnum;