fix sa errors

Author: canvural

phpstan-baseline.neon

@@ -1131,6 +1131,12 @@ parameters:
 			count: 2
 			path: src/Type/Enum/EnumCaseObjectType.php
 
+		-
+			rawMessage: 'Doing instanceof PHPStan\Type\ErrorType is error-prone and deprecated. Use Type::isError() instead.'
+			identifier: phpstanApi.instanceofType
+			count: 1
+			path: src/Type/ErrorType.php
+
 		-
 			rawMessage: 'Doing instanceof PHPStan\Type\ConstantScalarType is error-prone and deprecated. Use Type::isConstantScalarValue() or Type::getConstantScalarTypes() or Type::getConstantScalarValues() instead.'
 			identifier: phpstanApi.instanceofType
@@ -1533,6 +1539,12 @@ parameters:
 			count: 1
 			path: src/Type/ObjectType.php
 
+		-
+			rawMessage: 'Doing instanceof PHPStan\Type\ErrorType is error-prone and deprecated. Use Type::isError() instead.'
+			identifier: phpstanApi.instanceofType
+			count: 4
+			path: src/Type/ObjectType.php
+
 		-
 			rawMessage: Doing instanceof PHPStan\Type\Generic\GenericObjectType is error-prone and deprecated.
 			identifier: phpstanApi.instanceofType

src/Rules/Properties/AccessStaticPropertiesCheck.php

@@ -19,7 +19,6 @@
 use PHPStan\Rules\RuleErrorBuilder;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Type\Constant\ConstantStringType;
-use PHPStan\Type\ErrorType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
@@ -154,7 +153,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
 				static fn (Type $type): bool => $type->canAccessProperties()->yes() && $type->hasStaticProperty($name)->yes(),
 			);
 			$classType = $classTypeResult->getType();
-			if ($classType instanceof ErrorType) {
+			if ($classType->isError()->yes()) {
 				return $classTypeResult->getUnknownClassErrors();
 			}
 		}

src/Type/Generic/TemplateTypeTrait.php

@@ -6,7 +6,6 @@
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\AcceptsResult;
-use PHPStan\Type\ErrorType;
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\IsSuperTypeOfResult;
 use PHPStan\Type\MixedType;
@@ -18,6 +17,7 @@
 use PHPStan\Type\TypeUtils;
 use PHPStan\Type\UnionType;
 use PHPStan\Type\VerbosityLevel;
+use function is_string;
 use function sprintf;
 
 /**
@@ -74,7 +74,7 @@ public function describe(VerbosityLevel $level): string
 			$defaultDescription = '';
 			if ($this->default !== null) {
 				$recursionGuard = RecursionGuard::runOnObjectIdentity($this->default, fn () => $this->default->describe($level));
-				if (!$recursionGuard instanceof ErrorType) {
+				if (is_string($recursionGuard)) {
 					$defaultDescription .= sprintf(' = %s', $recursionGuard);
 				}
 			}

src/Type/ObjectType.php

@@ -156,7 +156,7 @@ public function hasProperty(string $propertyName): TrinaryLogic
 		}
 
 		$classHasProperty = RecursionGuard::run($this, static fn (): bool => $classReflection->hasProperty($propertyName));
-		if ($classHasProperty === true || $classHasProperty instanceof ErrorType) {
+		if ($classHasProperty !== false) {
 			return TrinaryLogic::createYes();
 		}
 
@@ -262,7 +262,7 @@ public function hasInstanceProperty(string $propertyName): TrinaryLogic
 		}
 
 		$classHasProperty = RecursionGuard::run($this, static fn (): bool => $classReflection->hasInstanceProperty($propertyName));
-		if ($classHasProperty === true || $classHasProperty instanceof ErrorType) {
+		if ($classHasProperty !== false) {
 			return TrinaryLogic::createYes();
 		}
 
@@ -368,7 +368,7 @@ public function hasStaticProperty(string $propertyName): TrinaryLogic
 		}
 
 		$classHasProperty = RecursionGuard::run($this, static fn (): bool => $classReflection->hasStaticProperty($propertyName));
-		if ($classHasProperty === true || $classHasProperty instanceof ErrorType) {
+		if ($classHasProperty !== false) {
 			return TrinaryLogic::createYes();
 		}