Renamed LiteralIntType to AnyLiteralIntType and LiteralStringType to …

…AnyLiteralStringType (#28)
typhoon-php · Feb 7, 2024 · b6f4e30 · b6f4e30
1 parent 5fbfd03
commit b6f4e30
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/src/LiteralIntType.php → src/AnyLiteralIntType.php b/src/LiteralIntType.php → src/AnyLiteralIntType.php
@@ -9,7 +9,7 @@
  * @psalm-immutable
  * @implements Type<literal-int>
  */
-enum LiteralIntType implements Type
+enum AnyLiteralIntType implements Type
 {
     /**
      * @internal
@@ -19,6 +19,6 @@ enum LiteralIntType implements Type
 
     public function accept(TypeVisitor $visitor): mixed
     {
-        return $visitor->visitLiteralInt($this);
+        return $visitor->visitAnyLiteralInt($this);
     }
 }
diff --git a/src/LiteralStringType.php → src/AnyLiteralStringType.php b/src/LiteralStringType.php → src/AnyLiteralStringType.php
@@ -9,7 +9,7 @@
  * @psalm-immutable
  * @implements Type<literal-string>
  */
-enum LiteralStringType implements Type
+enum AnyLiteralStringType implements Type
 {
     /**
      * @internal
@@ -19,6 +19,6 @@ enum LiteralStringType implements Type
 
     public function accept(TypeVisitor $visitor): mixed
     {
-        return $visitor->visitLiteralString($this);
+        return $visitor->visitAnyLiteralString($this);
     }
 }
diff --git a/src/TypeVisitor.php b/src/TypeVisitor.php
@@ -33,7 +33,7 @@ public function visitBool(BoolType $type): mixed;
     public function visitIntLiteral(IntLiteralType $type): mixed;
 
     /** @return TReturn */
-    public function visitLiteralInt(LiteralIntType $type): mixed;
+    public function visitAnyLiteralInt(AnyLiteralIntType $type): mixed;
 
     /** @return TReturn */
     public function visitIntRange(IntRangeType $type): mixed;
@@ -57,7 +57,7 @@ public function visitFloat(FloatType $type): mixed;
     public function visitStringLiteral(StringLiteralType $type): mixed;
 
     /** @return TReturn */
-    public function visitLiteralString(LiteralStringType $type): mixed;
+    public function visitAnyLiteralString(AnyLiteralStringType $type): mixed;
 
     /** @return TReturn */
     public function visitNumericString(NumericStringType $type): mixed;

diff --git a/src/types.php b/src/types.php
@@ -15,14 +15,14 @@ final class types
     public const false = FalseType::type;
     public const true = TrueType::type;
     public const bool = BoolType::type;
-    public const literalInt = LiteralIntType::type;
+    public const literalInt = AnyLiteralIntType::type;
     public const int = IntType::type;
     public const positiveInt = __positiveInt;
     public const negativeInt = __negativeInt;
     public const nonPositiveInt = __nonPositiveInt;
     public const nonNegativeInt = __nonNegativeInt;
     public const float = FloatType::type;
-    public const literalString = LiteralStringType::type;
+    public const literalString = AnyLiteralStringType::type;
     public const numericString = NumericStringType::type;
     public const classString = ClassStringType::type;
     public const callableString = CallableStringType::type;

diff --git a/tests/PsalmTest.php b/tests/PsalmTest.php
@@ -24,6 +24,8 @@ public static function extractType(Type $_type): mixed
         return null;
     }
 
+    #[TestWith([__DIR__ . '/psalm/AnyLiteralIntType.phpt'])]
+    #[TestWith([__DIR__ . '/psalm/AnyLiteralStringType.phpt'])]
     #[TestWith([__DIR__ . '/psalm/ArrayKeyType.phpt'])]
     #[TestWith([__DIR__ . '/psalm/ArrayShapeType.phpt'])]
     #[TestWith([__DIR__ . '/psalm/ArrayType.phpt'])]
@@ -52,8 +54,6 @@ public static function extractType(Type $_type): mixed
     #[TestWith([__DIR__ . '/psalm/IterableType.phpt'])]
     #[TestWith([__DIR__ . '/psalm/KeyOfType.phpt'])]
     #[TestWith([__DIR__ . '/psalm/ListType.phpt'])]
-    #[TestWith([__DIR__ . '/psalm/LiteralIntType.phpt'])]
-    #[TestWith([__DIR__ . '/psalm/LiteralStringType.phpt'])]
     #[TestWith([__DIR__ . '/psalm/MixedType.phpt'])]
     #[TestWith([__DIR__ . '/psalm/NamedClassStringType.phpt'])]
     #[TestWith([__DIR__ . '/psalm/NamedObjectType.phpt'])]

diff --git a/tests/psalm/LiteralIntType.phpt → tests/psalm/AnyLiteralIntType.phpt b/tests/psalm/LiteralIntType.phpt → tests/psalm/AnyLiteralIntType.phpt
@@ -3,7 +3,7 @@
 
 namespace Typhoon\Type;
 
-$_type = PsalmTest::extractType(LiteralIntType::type);
+$_type = PsalmTest::extractType(AnyLiteralIntType::type);
 /** @psalm-check-type-exact $_type = \literal-int */
 
 --EXPECT--
diff --git a/tests/psalm/LiteralStringType.phpt → tests/psalm/AnyLiteralStringType.phpt b/tests/psalm/LiteralStringType.phpt → tests/psalm/AnyLiteralStringType.phpt
@@ -3,7 +3,7 @@
 
 namespace Typhoon\Type;
 
-$_type = PsalmTest::extractType(LiteralStringType::type);
+$_type = PsalmTest::extractType(AnyLiteralStringType::type);
 /** @psalm-check-type-exact $_type = \literal-string */
 
 --EXPECT--