Refactor tests

Author: ondrejmirtes

tests/PHPStan/Rules/Properties/AccessPropertiesFromArrayRuleTest.php

@@ -30,4 +30,36 @@ public function testRule(): void
 		]);
 	}
 
+	public function testRuleExpressionNames(): void
+	{
+		$this->analyse([__DIR__ . '/data/properties-from-variable-into-object.php'], [
+			[
+				'Access to an undefined property PropertiesFromVariableIntoObject\Foo::$noop.',
+				26,
+			],
+		]);
+	}
+
+	public function testRuleExpressionNames2(): void
+	{
+		$this->analyse([__DIR__ . '/data/properties-from-array-into-object.php'], [
+			[
+				'Access to an undefined property PropertiesFromArrayIntoObject\Foo::$noop.',
+				42,
+			],
+			[
+				'Access to an undefined property PropertiesFromArrayIntoObject\Foo::$noop.',
+				54,
+			],
+			[
+				'Access to an undefined property PropertiesFromArrayIntoObject\Foo::$noop.',
+				69,
+			],
+			[
+				'Access to an undefined property PropertiesFromArrayIntoObject\Foo::$noop.',
+				110,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Properties/AccessPropertiesFromVariableRuleTest.php

@@ -186,4 +186,14 @@ public function testClassExists(): void
 		$this->analyse([__DIR__ . '/data/static-properties-class-exists.php'], []);
 	}
 
+	public function testRuleExpressionNames(): void
+	{
+		$this->analyse([__DIR__ . '/data/properties-from-array-into-static-object.php'], [
+			[
+				'Cannot access static property $noop on PropertiesFromArrayIntoStaticObject\Foo.',
+				29,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Properties/AccessPropertiesInAssignRuleTest.php

@@ -91,4 +91,60 @@ public function testBug1216(): void
 		]);
 	}
 
+	public function testTypesAssignedToPropertiesExpressionNames(): void
+	{
+		$this->analyse([__DIR__ . '/data/properties-from-array-into-object.php'], [
+			[
+				'Property PropertiesFromArrayIntoObject\Foo::$lall (int) does not accept string.',
+				42,
+			],
+			[
+				'Property PropertiesFromArrayIntoObject\Foo::$lall (int) does not accept string.',
+				54,
+			],
+			[
+				'Property PropertiesFromArrayIntoObject\Foo::$test (int|null) does not accept stdClass.',
+				66,
+			],
+			[
+				'Property PropertiesFromArrayIntoObject\Foo::$lall (int) does not accept string.',
+				69,
+			],
+			[
+				'Property PropertiesFromArrayIntoObject\Foo::$foo (string) does not accept int.',
+				73,
+			],
+			[
+				'Property PropertiesFromArrayIntoObject\Foo::$foo (string) does not accept float.',
+				83,
+			],
+			[
+				'Property PropertiesFromArrayIntoObject\Foo::$lall (int) does not accept string.',
+				110,
+			],
+			[
+				'Property PropertiesFromArrayIntoObject\FooBar::$foo (string) does not accept float.',
+				147,
+			],
+		]);
+	}
+
+	public function testTypesAssignedToStaticPropertiesExpressionNames(): void
+	{
+		$this->analyse([__DIR__ . '/data/properties-from-array-into-static-object.php'], [
+			[
+				'Static property PropertiesFromArrayIntoStaticObject\Foo::$lall (stdClass|null) does not accept string.',
+				29,
+			],
+			[
+				'Static property PropertiesFromArrayIntoStaticObject\Foo::$foo (string) does not accept float.',
+				36,
+			],
+			[
+				'Static property PropertiesFromArrayIntoStaticObject\FooBar::$foo (string) does not accept float.',
+				72,
+			],
+		]);
+	}
+
 }