Fix error message on level < 7

Author: ondrejmirtes

phpstan-baseline.neon

@@ -601,11 +601,6 @@ parameters:
 			count: 1
 			path: src/Rules/RuleLevelHelper.php
 
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\ObjectWithoutClassType is error\\-prone and deprecated\\. Use Type\\:\\:isObject\\(\\) instead\\.$#"
-			count: 1
-			path: src/Rules/RuleLevelHelper.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantBooleanType is error\\-prone and deprecated\\. Use Type\\:\\:isTrue\\(\\) or Type\\:\\:isFalse\\(\\) instead\\.$#"
 			count: 1

src/Rules/RuleLevelHelper.php

@@ -14,7 +14,6 @@
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
-use PHPStan\Type\ObjectWithoutClassType;
 use PHPStan\Type\StrictMixedType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
@@ -241,7 +240,7 @@ private function findTypeToCheckImplementation(
 			return new FoundTypeResult(new ErrorType(), [], $errors, null);
 		}
 
-		if (!$this->checkUnionTypes && $type instanceof ObjectWithoutClassType) {
+		if (!$this->checkUnionTypes && $type->isObject()->yes() && count($type->getObjectClassNames()) === 0) {
 			return new FoundTypeResult(new ErrorType(), [], [], null);
 		}
 
@@ -286,17 +285,25 @@ private function findTypeToCheckImplementation(
 		if ($type instanceof IntersectionType) {
 			$newTypes = [];
 
+			$changed = false;
 			foreach ($type->getTypes() as $innerType) {
-				$newTypes[] = $this->findTypeToCheckImplementation(
-					$scope,
-					$var,
-					$innerType,
-					$unknownClassErrorPattern,
-					$unionTypeCriteriaCallback,
-				)->getType();
+				if ($innerType instanceof TemplateMixedType) {
+					$changed = true;
+					$newTypes[] = $this->findTypeToCheckImplementation(
+						$scope,
+						$var,
+						$innerType->toStrictMixedType(),
+						$unknownClassErrorPattern,
+						$unionTypeCriteriaCallback,
+					)->getType();
+					continue;
+				}
+				$newTypes[] = $innerType;
 			}
 
-			return new FoundTypeResult(TypeCombinator::intersect(...$newTypes), $directClassNames, [], null);
+			if ($changed) {
+				return new FoundTypeResult(TypeCombinator::intersect(...$newTypes), $directClassNames, [], null);
+			}
 		}
 
 		$tip = null;

tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php

@@ -169,6 +169,11 @@ public function testAccessProperties(): void
 					'Cannot access property $selfOrNull on TestAccessProperties\RevertNonNullabilityForIsset|null.',
 					407,
 				],
+				[
+					'Access to an undefined property object::$baz.',
+					438,
+					$tipText,
+				],
 			],
 		);
 	}

tests/PHPStan/Rules/Properties/data/access-properties.php

@@ -423,3 +423,20 @@ function mustNotReport(?\stdClass $nullable): bool
 	}
 
 }
+
+class OnObjectAfterIsset
+{
+
+	/**
+	 * @param mixed $m
+	 */
+	public function doFoo($m): void
+	{
+		if (isset($m->foo) && isset($m->bar)) {
+			echo $m->foo;
+			echo $m->bar;
+			echo $m->baz;
+		}
+	}
+
+}