fixes after rebase

Author: canvural

phpstan-baseline.neon

@@ -1473,12 +1473,6 @@ 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/Analyser/Traverser/GenericTypeTemplateTraverser.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Analyser\Traverser;
 
-use PHPStan\Type\ErrorType;
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeHelper;
 use PHPStan\Type\Generic\TemplateTypeMap;
@@ -25,7 +24,7 @@ public function traverse(Type $type, callable $traverse): Type
 	{
 		if ($type instanceof TemplateType && !$type->isArgument()) {
 			$newType = $this->resolvedTemplateTypeMap->getType($type->getName());
-			if ($newType === null || $newType instanceof ErrorType) {
+			if ($newType === null || $newType->isError()->yes()) {
 				return $type->getDefault() ?? $type->getBound();
 			}
 

src/Type/ObjectType.php

@@ -57,6 +57,7 @@
 use function count;
 use function implode;
 use function in_array;
+use function is_array;
 use function sprintf;
 use function strtolower;
 
@@ -226,7 +227,7 @@ public function getUnresolvedPropertyPrototype(string $propertyName, ClassMember
 		}
 
 		$property = RecursionGuard::run($this, static fn () => $nakedClassReflection->getProperty($propertyName, $scope));
-		if ($property instanceof ErrorType) {
+		if (!$property instanceof ExtendedPropertyReflection) {
 			$property = new DummyPropertyReflection($propertyName);
 
 			return new CallbackUnresolvedPropertyPrototypeReflection(
@@ -332,7 +333,7 @@ public function getUnresolvedInstancePropertyPrototype(string $propertyName, Cla
 		}
 
 		$property = RecursionGuard::run($this, static fn () => $nakedClassReflection->getInstanceProperty($propertyName, $scope));
-		if ($property instanceof ErrorType) {
+		if (! $property instanceof ExtendedPropertyReflection) {
 			$property = new DummyPropertyReflection($propertyName);
 
 			return new CallbackUnresolvedPropertyPrototypeReflection(
@@ -414,7 +415,7 @@ public function getUnresolvedStaticPropertyPrototype(string $propertyName, Class
 		}
 
 		$property = RecursionGuard::run($this, static fn () => $nakedClassReflection->getStaticProperty($propertyName));
-		if ($property instanceof ErrorType) {
+		if (!$property instanceof ExtendedPropertyReflection) {
 			$property = new DummyPropertyReflection($propertyName);
 
 			return new CallbackUnresolvedPropertyPrototypeReflection(
@@ -1548,7 +1549,7 @@ public function isCallable(): TrinaryLogic
 		if ($parametersAcceptors === null) {
 			return TrinaryLogic::createNo();
 		}
-		if ($parametersAcceptors instanceof ErrorType) {
+		if (! is_array($parametersAcceptors)) {
 			return TrinaryLogic::createNo();
 		}
 

src/Type/Php/ArrayCombineHelper.php

@@ -11,7 +11,6 @@
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\ConstantScalarType;
-use PHPStan\Type\ErrorType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\Type;
@@ -78,7 +77,7 @@ public function getReturnAndThrowType(Expr $firstArg, Expr $secondArg, Scope $sc
 			$itemType = $keysParamType->getIterableValueType();
 
 			if ($itemType->isInteger()->no()) {
-				if ($itemType->toString() instanceof ErrorType) {
+				if ($itemType->toString()->isError()->yes()) {
 					return [new NeverType(), TrinaryLogic::createNo()];
 				}
 
@@ -116,7 +115,7 @@ private function sanitizeConstantArrayKeyTypes(array $types): ?array
 		$sanitizedTypes = [];
 
 		foreach ($types as $type) {
-			if (!$type->isInteger()->yes() && ! $type->toString() instanceof ErrorType) {
+			if (!$type->isInteger()->yes() && ! $type->toString()->isError()->yes()) {
 				$type = $type->toString();
 			}