Removed atomic classString type, replaced with classString(object)

typhoon-php · Feb 27, 2024 · f8109c1 · f8109c1
1 parent 22f9af6
commit f8109c1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/src/NamedClassStringType.php → src/ClassStringType.php b/src/NamedClassStringType.php → src/ClassStringType.php
@@ -9,14 +9,14 @@
  * @psalm-internal Typhoon\Type
  * @implements Type<non-empty-string>
  */
-final class NamedClassStringType implements Type
+final class ClassStringType implements Type
 {
  public function __construct(
  private readonly Type $object,
  ) {}
 
  public function accept(TypeVisitor $visitor): mixed
  {
- return $visitor->namedClassString($this, $this->object);
+ return $visitor->classString($this, $this->object);
  }
 }
diff --git a/src/DefaultTypeVisitor.php b/src/DefaultTypeVisitor.php
@@ -41,7 +41,7 @@ public function classConstant(Type $self, Type $class, string $name): mixed
  return $this->default($self);
  }
 
- public function classString(Type $self): mixed
+ public function classString(Type $self, Type $object): mixed
  {
  return $this->default($self);
  }
@@ -121,11 +121,6 @@ public function mixed(Type $self): mixed
  return $this->default($self);
  }
 
- public function namedClassString(Type $self, Type $object): mixed
- {
- return $this->default($self);
- }
-
  public function namedObject(Type $self, string $class, array $arguments): mixed
  {
  return $this->default($self);

diff --git a/src/TypeVisitor.php b/src/TypeVisitor.php
@@ -51,10 +51,10 @@ public function callable(Type $self, array $parameters, Type $return): mixed;
  public function classConstant(Type $self, Type $class, string $name): mixed;
 
  /**
- * @param Type<class-string> $self
+ * @param Type<non-empty-string> $self
  * @return TReturn
  */
- public function classString(Type $self): mixed;
+ public function classString(Type $self, Type $object): mixed;
 
  /**
  * @param Type<non-empty-string> $self
@@ -143,12 +143,6 @@ public function literalValue(Type $self, bool|int|float|string $value): mixed;
  */
  public function mixed(Type $self): mixed;
 
- /**
- * @param Type<non-empty-string> $self
- * @return TReturn
- */
- public function namedClassString(Type $self, Type $object): mixed;
-
  /**
  * @param Type<object> $self
  * @param non-empty-string $class

diff --git a/src/types.php b/src/types.php
@@ -162,7 +162,7 @@ public static function classConstant(Type $class, string $name): Type
  */
  public static function classString(Type $object): Type
  {
- return new NamedClassStringType($object);
+ return new ClassStringType($object);
  }
 
  /**
@@ -435,7 +435,7 @@ public function accept(TypeVisitor $visitor): mixed
  self::arrayKey => $visitor->union($this, [self::int, self::string]),
  self::bool => $visitor->bool($this),
  self::callable => $visitor->callable($this, [], self::mixed),
- self::classString => $visitor->classString($this),
+ self::classString => $visitor->classString($this, types::object),
  self::closure => $visitor->closure($this, [], types::mixed),
  self::false => $visitor->literalValue($this, false),
  self::float => $visitor->float($this),