Fix

Author: VincentLanglet

src/Rules/Properties/AccessPropertiesCheck.php

@@ -130,7 +130,8 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
 		}
 
 		$has = $type->hasInstanceProperty($name);
-		if ($has->maybe()) {
+		$hasStatic = $type->hasStaticProperty($name);
+		if ($has->maybe() && !$hasStatic->yes()) {
 			if ($scope->isUndefinedExpressionAllowed($node)) {
 				if (!$this->checkDynamicProperties) {
 					return [];
@@ -202,7 +203,7 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
 				}
 			}
 
-			if ($type->hasStaticProperty($name)->yes()) {
+			if ($hasStatic->yes()) {
 				return [
 					RuleErrorBuilder::message(sprintf(
 						'Non-static access to static property %s::$%s.',

src/Type/ObjectType.php

@@ -328,7 +328,12 @@ public function getUnresolvedInstancePropertyPrototype(string $propertyName, Cla
 			throw new ClassNotFoundException($this->className);
 		}
 
-		$property = RecursionGuard::run($this, static fn () => $nakedClassReflection->getInstanceProperty($propertyName, $scope));
+		if (!$nakedClassReflection->hasInstanceProperty($propertyName)) {
+			$property = new ErrorType();
+		} else {
+			$property = RecursionGuard::run($this, static fn () => $nakedClassReflection->getInstanceProperty($propertyName, $scope));
+		}
+
 		if ($property instanceof ErrorType) {
 			$property = new DummyPropertyReflection($propertyName);
 
@@ -410,7 +415,12 @@ public function getUnresolvedStaticPropertyPrototype(string $propertyName, Class
 			throw new ClassNotFoundException($this->className);
 		}
 
-		$property = RecursionGuard::run($this, static fn () => $nakedClassReflection->getStaticProperty($propertyName));
+		if (!$nakedClassReflection->hasStaticProperty($propertyName)) {
+			$property = new ErrorType();
+		} else {
+			$property = RecursionGuard::run($this, static fn () => $nakedClassReflection->getStaticProperty($propertyName));
+		}
+
 		if ($property instanceof ErrorType) {
 			$property = new DummyPropertyReflection($propertyName);
 

tests/PHPStan/Rules/Properties/AccessStaticPropertiesRuleTest.php

@@ -317,4 +317,26 @@ public function testBug12775(): void
 		$this->analyse([__DIR__ . '/data/bug-12775.php'], []);
 	}
 
+	public function testBug8668Bis(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-8668-bis.php'], [
+			[
+				'Static access to instance property Bug8668Bis\Sample::$sample.',
+				9,
+			],
+			[
+				'Static access to instance property Bug8668Bis\Sample::$sample.',
+				10,
+			],
+			[
+				'Static access to instance property Bug8668Bis\Sample2::$sample.',
+				20,
+			],
+			[
+				'Static access to instance property Bug8668Bis\Sample2::$sample.',
+				21,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Properties/data/bug-8668-bis.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Bug8668Bis;
+
+class Sample {
+	private string $sample = 'abc';
+
+	public function test(): void {
+		echo self::$sample;
+		echo isset(self::$sample);
+
+		echo $this->sample; // ok
+	}
+}
+
+class Sample2 {
+	private $sample = 'abc';
+
+	public function test(): void {
+		echo self::$sample;
+		echo isset(self::$sample);
+
+		echo $this->sample; // ok
+	}
+}