WIP: TASK rename EnumType to EnumInstanceType

Author: mhsdesign

src/TypeSystem/Resolver/Match/MatchTypeResolver.php

@@ -28,7 +28,7 @@
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumMemberType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumInstanceType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\UnionType\UnionType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
@@ -87,7 +87,7 @@ private function resolveTypeOfBooleanMatch(MatchNode $matchNode): TypeInterface
         }
     }
 
-    private function resolveTypeOfEnumMatch(MatchNode $matchNode, EnumType $subjectEnumType): TypeInterface
+    private function resolveTypeOfEnumMatch(MatchNode $matchNode, EnumInstanceType $subjectEnumType): TypeInterface
     {
         $expressionTypeResolver = new ExpressionTypeResolver(
             scope: $this->scope
@@ -149,7 +149,7 @@ public function resolveTypeOf(MatchNode $matchNode): TypeInterface
 
         return match (true) {
             BooleanType::get()->is($typeOfSubject) => $this->resolveTypeOfBooleanMatch($matchNode),
-            $typeOfSubject instanceof EnumType => $this->resolveTypeOfEnumMatch($matchNode, $typeOfSubject),
+            $typeOfSubject instanceof EnumInstanceType => $this->resolveTypeOfEnumMatch($matchNode, $typeOfSubject),
             default => throw new \Exception('@TODO: Not handled ' . $typeOfSubject::class)
         };
     }

src/TypeSystem/Type/EnumType/EnumType.php …ystem/Type/EnumType/EnumInstanceType.phpsrc/TypeSystem/Type/EnumType/EnumType.php renamed to src/TypeSystem/Type/EnumType/EnumInstanceType.php src/TypeSystem/Type/EnumType/EnumType.php renamed to src/TypeSystem/Type/EnumType/EnumInstanceType.php

@@ -24,7 +24,7 @@
 
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class EnumType implements TypeInterface
+final class EnumInstanceType implements TypeInterface
 {
     use EnumTrait;
 }

src/TypeSystem/Type/EnumType/EnumMemberType.php

@@ -27,7 +27,7 @@
 final class EnumMemberType implements TypeInterface
 {
     public function __construct(
-        public readonly EnumType|EnumStaticType $enumType,
+        public readonly EnumInstanceType|EnumStaticType $enumType,
         public readonly string $memberName,
         public readonly ?TypeInterface $memberBackedValueType
     ) {

src/TypeSystem/Type/EnumType/EnumStaticType.php

@@ -28,8 +28,8 @@ final class EnumStaticType implements TypeInterface
 {
     use EnumTrait;
 
-    public function toEnumInstanceType(): EnumType
+    public function toEnumInstanceType(): EnumInstanceType
     {
-        return new EnumType($this->moduleId, $this->enumName, $this->membersWithType);
+        return new EnumInstanceType($this->moduleId, $this->enumName, $this->membersWithType);
     }
 }

src/TypeSystem/Type/EnumType/EnumTrait.php

@@ -83,7 +83,7 @@ public function getMemberType(string $memberName): EnumMemberType
     public function is(TypeInterface $other): bool
     {
         return match ($other::class) {
-            EnumType::class, EnumStaticType::class =>
+            EnumInstanceType::class, EnumStaticType::class =>
                 $this->moduleId === $other->moduleId
                 && $this->enumName === $other->enumName,
             default => false

…ypeSystem/Type/EnumType/EnumTypeTest.php …m/Type/EnumType/EnumInstanceTypeTest.phptest/Unit/TypeSystem/Type/EnumType/EnumTypeTest.php renamed to test/Unit/TypeSystem/Type/EnumType/EnumInstanceTypeTest.php test/Unit/TypeSystem/Type/EnumType/EnumTypeTest.php renamed to test/Unit/TypeSystem/Type/EnumType/EnumInstanceTypeTest.php

@@ -24,10 +24,10 @@
 
 use PackageFactory\ComponentEngine\Module\ModuleId;
 use PackageFactory\ComponentEngine\Parser\Ast\EnumDeclarationNode;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumInstanceType;
 use PHPUnit\Framework\TestCase;
 
-final class EnumTypeTest extends TestCase
+final class EnumInstanceTypeTest extends TestCase
 {
     /**
      * @test
@@ -38,12 +38,12 @@ public function canBeCreatedFromEnumDeclarationNode(): void
         $enumDeclarationNode = EnumDeclarationNode::fromString(
             'enum Foo { BAR BAZ }'
         );
-        $enumType = EnumType::fromModuleIdAndDeclaration(
+        $enumType = EnumInstanceType::fromModuleIdAndDeclaration(
             ModuleId::fromString("module-a"),
             $enumDeclarationNode
         );
 
-        $this->assertInstanceOf(EnumType::class, $enumType);
+        $this->assertInstanceOf(EnumInstanceType::class, $enumType);
     }
 
     /**
@@ -55,7 +55,7 @@ public function providesNameOfTheEnum(): void
         $enumDeclarationNode = EnumDeclarationNode::fromString(
             'enum SomeEnum {}'
         );
-        $enumType = EnumType::fromModuleIdAndDeclaration(
+        $enumType = EnumInstanceType::fromModuleIdAndDeclaration(
             ModuleId::fromString("module-a"),
             $enumDeclarationNode
         );