simplify

phpstan · Oct 31, 2023 · a293912 · a293912
1 parent b68a40d
commit a293912
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/Type/Constant/ConstantStringType.php b/src/Type/Constant/ConstantStringType.php
@@ -34,7 +34,6 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
-use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\StaticType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Traits\ConstantScalarTypeTrait;
@@ -152,9 +151,6 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 			}
 
 			$genericType = $type->getGenericType();
-			if ($genericType instanceof MixedType) {
-				return TrinaryLogic::createMaybe();
-			}
 			if ($genericType instanceof StaticType) {
 				$genericType = $genericType->getStaticObjectType();
 			}

diff --git a/src/Type/Generic/GenericClassStringType.php b/src/Type/Generic/GenericClassStringType.php
@@ -12,7 +12,6 @@
 use PHPStan\Type\CompoundType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\IntersectionType;
-use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\ObjectWithoutClassType;
@@ -92,11 +91,11 @@ public function isSuperTypeOf(Type $type): TrinaryLogic
 		}
 
 		if ($type instanceof ConstantStringType) {
-			$genericType = $this->type;
-			if ($genericType instanceof MixedType) {
-				return $type->isClassStringType();
+			if ($type->isClassStringType()->no()) {
+				return TrinaryLogic::createNo();
 			}
 
+			$genericType = $this->type;
 			if ($genericType instanceof StaticType) {
 				$genericType = $genericType->getStaticObjectType();
 			}