Disallow instanceof ObjectType

Author: ondrejmirtes

phpstan-baseline.neon

@@ -249,6 +249,11 @@ parameters:
 			count: 1
 			path: src/PhpDoc/TypeNodeResolver.php
 
+		-
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			count: 2
+			path: src/PhpDoc/TypeNodeResolver.php
+
 		-
 			message: "#^Dead catch \\- PHPStan\\\\BetterReflection\\\\Identifier\\\\Exception\\\\InvalidIdentifierName is never thrown in the try block\\.$#"
 			count: 2
@@ -678,6 +683,11 @@ parameters:
 			count: 2
 			path: src/Type/Generic/GenericClassStringType.php
 
+		-
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			count: 1
+			path: src/Type/Generic/GenericObjectType.php
+
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\TypeWithClassName is error\\-prone\\. Use Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
 			count: 1
@@ -718,6 +728,11 @@ parameters:
 			count: 1
 			path: src/Type/Generic/TemplateTypeFactory.php
 
+		-
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			count: 1
+			path: src/Type/Generic/TemplateTypeFactory.php
+
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectWithoutClassType is error\\-prone\\. Use Type\\:\\:isObject\\(\\) instead\\.$#"
 			count: 1
@@ -789,6 +804,11 @@ parameters:
 			count: 1
 			path: src/Type/ObjectType.php
 
+		-
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			count: 6
+			path: src/Type/ObjectType.php
+
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectWithoutClassType is error\\-prone\\. Use Type\\:\\:isObject\\(\\) instead\\.$#"
 			count: 3
@@ -947,6 +967,11 @@ parameters:
 			count: 1
 			path: src/Type/Php/StrlenFunctionReturnTypeExtension.php
 
+		-
+			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectType is error\\-prone\\. Use Type\\:\\:isObject\\(\\) or Type\\:\\:getObjectClassNames\\(\\) instead\\.$#"
+			count: 3
+			path: src/Type/StaticType.php
+
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectWithoutClassType is error\\-prone\\. Use Type\\:\\:isObject\\(\\) instead\\.$#"
 			count: 1

src/Rules/Api/ApiInstanceofTypeRule.php

@@ -31,6 +31,7 @@
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\IterableType;
 use PHPStan\Type\NullType;
+use PHPStan\Type\ObjectType;
 use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\TypeWithClassName;
@@ -62,6 +63,7 @@ class ApiInstanceofTypeRule implements Rule
 		CallableType::class => 'Type::isCallable() and Type::getCallableParametersAcceptors()',
 		IterableType::class => 'Type::isIterable()',
 		ObjectWithoutClassType::class => 'Type::isObject()',
+		ObjectType::class => 'Type::isObject() or Type::getObjectClassNames()',
 
 		// accessory types
 		NonEmptyArrayType::class => 'Type::isIterableAtLeastOnce()',

src/Rules/Classes/AllowedSubTypesRule.php

@@ -7,7 +7,6 @@
 use PHPStan\Node\InClassNode;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Type\ObjectType;
 use function array_values;
 use function sprintf;
 
@@ -45,11 +44,11 @@ public function processNode(Node $node, Scope $scope): array
 			}
 
 			foreach ($allowedSubTypes as $allowedSubType) {
-				if (!$allowedSubType instanceof ObjectType) {
+				if (!$allowedSubType->isObject()->yes()) {
 					continue;
 				}
 
-				if ($className === $allowedSubType->getClassName()) {
+				if ($allowedSubType->getObjectClassNames() === [$className]) {
 					continue 2;
 				}
 			}

src/Rules/Classes/LocalTypeAliasesRule.php

@@ -14,7 +14,6 @@
 use PHPStan\Type\CircularTypeAliasErrorType;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\Generic\TemplateType;
-use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverser;
 use function array_key_exists;
@@ -178,7 +177,7 @@ private function isAliasNameValid(string $aliasName, ?NameScope $nameScope): boo
 		}
 
 		$aliasNameResolvedType = $this->typeNodeResolver->resolve(new IdentifierTypeNode($aliasName), $nameScope->bypassTypeAliases());
-		return ($aliasNameResolvedType instanceof ObjectType && !in_array($aliasName, ['self', 'parent'], true))
+		return ($aliasNameResolvedType->isObject()->yes() && !in_array($aliasName, ['self', 'parent'], true))
 			|| $aliasNameResolvedType instanceof TemplateType; // aliases take precedence over type parameters, this is reported by other rules using TemplateTypeCheck
 	}
 

src/Rules/Methods/MethodParameterComparisonHelper.php

@@ -12,7 +12,6 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\IterableType;
 use PHPStan\Type\MixedType;
-use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\VerbosityLevel;
@@ -402,7 +401,7 @@ private function isTypeCompatible(Type $methodParameterType, Type $prototypePara
 				if ($prototypeParameterType instanceof ArrayType) {
 					return true;
 				}
-				if ($prototypeParameterType instanceof ObjectType && $prototypeParameterType->getClassName() === Traversable::class) {
+				if ($prototypeParameterType->isObject()->yes() && $prototypeParameterType->getObjectClassNames() === [Traversable::class]) {
 					return true;
 				}
 			}

src/Type/ParserNodeTypeToPHPStanType.php

@@ -53,7 +53,7 @@ public static function resolve($type, ?ClassReflection $classReflection): Type
 			$types = [];
 			foreach ($type->types as $intersectionTypeType) {
 				$innerType = self::resolve($intersectionTypeType, $classReflection);
-				if (!$innerType instanceof ObjectType) {
+				if (!$innerType->isObject()->yes()) {
 					return new NeverType();
 				}
 

src/Type/TypehintHelper.php

@@ -99,7 +99,7 @@ public static function decideTypeFromReflection(
 			$types = [];
 			foreach ($reflectionType->getTypes() as $innerReflectionType) {
 				$innerType = self::decideTypeFromReflection($innerReflectionType, null, $selfClass, false);
-				if (!$innerType instanceof ObjectType) {
+				if (!$innerType->isObject()->yes()) {
 					return new NeverType();
 				}