PHP 8.2: Non-final classes without #[AllowDynamicProperties] might …

…still have dynamic properties Closes phpstan/phpstan#8727 Closes phpstan/phpstan#8474
phpstan · Jan 18, 2023 · 051b06e · 051b06e
1 parent 279c781
commit 051b06e
Show file tree

Hide file tree

Showing 11 changed files with 248 additions and 34 deletions.
diff --git a/src/Type/ObjectType.php b/src/Type/ObjectType.php
@@ -143,6 +143,10 @@ public function hasProperty(string $propertyName): TrinaryLogic
 			return TrinaryLogic::createMaybe();
 		}
 
+		if (!$classReflection->isFinal()) {
+			return TrinaryLogic::createMaybe();
+		}
+
 		return TrinaryLogic::createNo();
 	}
 

diff --git a/tests/PHPStan/Analyser/data/array-column-php82.php b/tests/PHPStan/Analyser/data/array-column-php82.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ArrayColumn;
+namespace ArrayColumn82;
 
 use DOMElement;
 use function PHPStan\Testing\assertType;
@@ -175,10 +175,10 @@ public function testImprecise5(array $array): void
 		assertType('list<string>', array_column($array, 'nodeName'));
 		assertType('array<string, string>', array_column($array, 'nodeName', 'tagName'));
 		assertType('array<string, DOMElement>', array_column($array, null, 'tagName'));
-		assertType('array{}', array_column($array, 'foo'));
-		assertType('array{}', array_column($array, 'foo', 'tagName'));
-		assertType('array<*NEVER*, string>', array_column($array, 'nodeName', 'foo'));
-		assertType('array<*NEVER*, DOMElement>', array_column($array, null, 'foo'));
+		assertType('list<mixed>', array_column($array, 'foo'));
+		assertType('array<string, mixed>', array_column($array, 'foo', 'tagName'));
+		assertType('array<int|string, string>', array_column($array, 'nodeName', 'foo'));
+		assertType('array<int|string, DOMElement>', array_column($array, null, 'foo'));
 	}
 
 	/** @param non-empty-array<int, DOMElement> $array */
@@ -187,10 +187,10 @@ public function testObjects1(array $array): void
 		assertType('non-empty-list<string>', array_column($array, 'nodeName'));
 		assertType('non-empty-array<string, string>', array_column($array, 'nodeName', 'tagName'));
 		assertType('non-empty-array<string, DOMElement>', array_column($array, null, 'tagName'));
-		assertType('array{}', array_column($array, 'foo'));
-		assertType('array{}', array_column($array, 'foo', 'tagName'));
-		assertType('non-empty-array<*NEVER*, string>', array_column($array, 'nodeName', 'foo'));
-		assertType('non-empty-array<*NEVER*, DOMElement>', array_column($array, null, 'foo'));
+		assertType('list<mixed>', array_column($array, 'foo'));
+		assertType('array<string, mixed>', array_column($array, 'foo', 'tagName'));
+		assertType('non-empty-array<int|string, string>', array_column($array, 'nodeName', 'foo'));
+		assertType('non-empty-array<int|string, DOMElement>', array_column($array, null, 'foo'));
 	}
 
 	/** @param array{DOMElement} $array */
@@ -199,10 +199,22 @@ public function testObjects2(array $array): void
 		assertType('array{string}', array_column($array, 'nodeName'));
 		assertType('non-empty-array<string, string>', array_column($array, 'nodeName', 'tagName'));
 		assertType('non-empty-array<string, DOMElement>', array_column($array, null, 'tagName'));
-		assertType('array{*NEVER*}', array_column($array, 'foo'));
-		assertType('non-empty-array<string, *NEVER*>', array_column($array, 'foo', 'tagName'));
-		assertType('non-empty-array<*NEVER*, string>', array_column($array, 'nodeName', 'foo'));
-		assertType('non-empty-array<*NEVER*, DOMElement>', array_column($array, null, 'foo'));
+		assertType('list<mixed>', array_column($array, 'foo'));
+		assertType('array<string, mixed>', array_column($array, 'foo', 'tagName'));
+		assertType('non-empty-array<int|string, string>', array_column($array, 'nodeName', 'foo'));
+		assertType('non-empty-array<int|string, DOMElement>', array_column($array, null, 'foo'));
+	}
+
+}
+
+final class Foo
+{
+
+	/** @param array<int, self> $a */
+	public function doFoo(array $a): void
+	{
+		assertType('array{}', array_column($a, 'nodeName'));
+		assertType('array{}', array_column($a, 'nodeName', 'tagName'));
 	}
 
 }
diff --git a/tests/PHPStan/Analyser/data/array-column.php b/tests/PHPStan/Analyser/data/array-column.php
@@ -220,3 +220,15 @@ public function testObjects2(array $array): void
 	}
 
 }
+
+final class Foo
+{
+
+	/** @param array<int, self> $a */
+	public function doFoo(array $a): void
+	{
+		assertType('list<mixed>', array_column($a, 'nodeName'));
+		assertType('array<int|string, mixed>', array_column($a, 'nodeName', 'tagName'));
+	}
+
+}
diff --git a/tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php b/tests/PHPStan/Rules/Comparison/ImpossibleCheckTypeFunctionCallRuleTest.php
@@ -657,4 +657,18 @@ public function testDocblockAssertEquality(): void
 		]);
 	}
 
+	public function testBug8727(): void
+	{
+		$this->checkAlwaysTrueCheckTypeFunctionCall = true;
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-8727.php'], []);
+	}
+
+	public function testBug8474(): void
+	{
+		$this->checkAlwaysTrueCheckTypeFunctionCall = true;
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-8474.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-8474.php b/tests/PHPStan/Rules/Comparison/data/bug-8474.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Bug8474;
+
+class World {}
+class HelloWorld extends World {
+	public string $hello = 'world';
+}
+
+function hello(World $world): bool {
+	return property_exists($world, 'hello');
+}
+
+class Alpha
+{
+	public function __construct()
+	{
+		if (property_exists($this, 'data')) {
+			$this->data = 'Hello';
+		}
+	}
+}
+
+class Beta extends Alpha
+{
+	/** @var string|null */
+	public $data = null;
+}
+
+class Delta extends Alpha
+{
+}
diff --git a/tests/PHPStan/Rules/Comparison/data/bug-8727.php b/tests/PHPStan/Rules/Comparison/data/bug-8727.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Bug8727;
+
+abstract class Foo
+{
+	abstract public function hello(): void;
+
+	protected function message(): string
+	{
+		if (property_exists($this, 'lala')) {
+			return 'Lala!';
+		}
+
+		return 'Hello!';
+	}
+}
+
+class Bar extends Foo {
+	protected bool $lala = true;
+
+	public function hello(): void
+	{
+		echo $this->message();
+	}
+}
diff --git a/tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/AccessPropertiesRuleTest.php
@@ -5,6 +5,7 @@
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleLevelHelper;
 use PHPStan\Testing\RuleTestCase;
+use function array_merge;
 use const PHP_VERSION_ID;
 
 /**
@@ -564,6 +565,13 @@ public function testBug3659(): void
 	public function dataDynamicProperties(): array
 	{
 		$errors = [
+			[
+				'Access to an undefined property DynamicProperties\Baz::$dynamicProperty.',
+				23,
+			],
+		];
+
+		$errorsWithMore = array_merge([
 			[
 				'Access to an undefined property DynamicProperties\Foo::$dynamicProperty.',
 				9,
@@ -588,24 +596,48 @@ public function dataDynamicProperties(): array
 				'Access to an undefined property DynamicProperties\Bar::$dynamicProperty.',
 				16,
 			],
+		], $errors);
+
+		$errorsWithMore = array_merge($errorsWithMore, [
 			[
 				'Access to an undefined property DynamicProperties\Baz::$dynamicProperty.',
-				23,
+				26,
 			],
-		];
+			[
+				'Access to an undefined property DynamicProperties\Baz::$dynamicProperty.',
+				27,
+			],
+			[
+				'Access to an undefined property DynamicProperties\Baz::$dynamicProperty.',
+				28,
+			],
+		]);
 
-		$errorsWithMore = $errors;
-		$errorsWithMore[] = [
-			'Access to an undefined property DynamicProperties\Baz::$dynamicProperty.',
-			26,
-		];
-		$errorsWithMore[] = [
-			'Access to an undefined property DynamicProperties\Baz::$dynamicProperty.',
-			27,
-		];
-		$errorsWithMore[] = [
-			'Access to an undefined property DynamicProperties\Baz::$dynamicProperty.',
-			28,
+		$otherErrors = [
+			[
+				'Access to an undefined property DynamicProperties\FinalFoo::$dynamicProperty.',
+				36,
+			],
+			[
+				'Access to an undefined property DynamicProperties\FinalFoo::$dynamicProperty.',
+				37,
+			],
+			[
+				'Access to an undefined property DynamicProperties\FinalFoo::$dynamicProperty.',
+				38,
+			],
+			[
+				'Access to an undefined property DynamicProperties\FinalBar::$dynamicProperty.',
+				41,
+			],
+			[
+				'Access to an undefined property DynamicProperties\FinalBar::$dynamicProperty.',
+				42,
+			],
+			[
+				'Access to an undefined property DynamicProperties\FinalBar::$dynamicProperty.',
+				43,
+			],
 		];
 
 		return [
@@ -614,8 +646,8 @@ public function dataDynamicProperties(): array
 					'Access to an undefined property DynamicProperties\Baz::$dynamicProperty.',
 					23,
 				],
-			] : $errors],
-			[true, $errorsWithMore],
+			] : array_merge($errors, $otherErrors)],
+			[true, array_merge($errorsWithMore, $otherErrors)],
 		];
 	}
 
@@ -675,15 +707,25 @@ public function testPhp82AndDynamicProperties(bool $b): void
 				'Access to an undefined property Php82DynamicProperties\ClassA::$properties.',
 				34,
 			];
+			if ($b) {
+				$errors[] = [
+					'Access to an undefined property Php82DynamicProperties\HelloWorld::$world.',
+					71,
+				];
+			}
 			$errors[] = [
-				'Access to an undefined property Php82DynamicProperties\HelloWorld::$world.',
-				71,
+				'Access to an undefined property Php82DynamicProperties\FinalHelloWorld::$world.',
+				105,
 			];
 		} elseif ($b) {
 			$errors[] = [
 				'Access to an undefined property Php82DynamicProperties\HelloWorld::$world.',
 				71,
 			];
+			$errors[] = [
+				'Access to an undefined property Php82DynamicProperties\FinalHelloWorld::$world.',
+				105,
+			];
 		}
 		$this->checkThisOnly = false;
 		$this->checkUnionTypes = true;

diff --git a/tests/PHPStan/Rules/Properties/AccessStaticPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/AccessStaticPropertiesRuleTest.php
@@ -373,6 +373,10 @@ public function testAccessStaticPropertiesPhp82(): void
 				'Cannot access static property $anotherProperty on ClassOrString|false.',
 				150,
 			],
+			[
+				'Static access to instance property ClassOrString::$instanceProperty.',
+				152,
+			],
 			[
 				'Access to an undefined static property AccessInIsset::$foo.',
 				178,

diff --git a/tests/PHPStan/Rules/Properties/data/dynamic-properties.php b/tests/PHPStan/Rules/Properties/data/dynamic-properties.php
@@ -29,3 +29,17 @@ public function doBar() {
 	}
 }
 
+final class FinalBar {}
+
+final class FinalFoo {
+	public function doBar() {
+		isset($this->dynamicProperty);
+		empty($this->dynamicProperty);
+			$this->dynamicProperty ?? 'test';
+
+		$bar = new FinalBar();
+		isset($bar->dynamicProperty);
+		empty($bar->dynamicProperty);
+			$bar->dynamicProperty ?? 'test';
+	}
+}
diff --git a/tests/PHPStan/Rules/Properties/data/php-82-dynamic-properties.php b/tests/PHPStan/Rules/Properties/data/php-82-dynamic-properties.php
@@ -73,3 +73,37 @@ function (): void {
 		echo $hello->world;
 	}
 };
+
+final class FinalHelloWorld
+{
+	public function __get(string $attribute): mixed
+	{
+		if($attribute == "world")
+		{
+			return "Hello World";
+		}
+		throw new \Exception("Attribute '{$attribute}' is invalid");
+	}
+
+
+	public function __isset(string $attribute)
+	{
+		try {
+			if (!isset($this->{$attribute})) {
+				$x = $this->{$attribute};
+			}
+
+			return isset($this->{$attribute});
+		} catch (\Exception $e) {
+			return false;
+		}
+	}
+}
+
+function (): void {
+	$hello = new FinalHelloWorld();
+	if(isset($hello->world))
+	{
+		echo $hello->world;
+	}
+};