adjust copied test for static testing - issue 5551

mvorisek · mvorisek · commit 0cf42395d8df · 2024-08-27T10:35:58.000+02:00
diff --git a/tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php
@@ -211,23 +211,23 @@ public function testBug3777(): void
 
 		$this->analyse([__DIR__ . '/data/bug-3777-static.php'], [
 			[
-				'Property Bug3777Static\Bar::$foo (Bug3777Static\Foo<stdClass>) does not accept Bug3777Static\Fooo<object>.',
+				'Static property Bug3777Static\Bar::$foo (Bug3777Static\Foo<stdClass>) does not accept Bug3777Static\Fooo<object>.',
 				58,
 			],
 			[
-				'Property Bug3777Static\Ipsum::$ipsum (Bug3777Static\Lorem<stdClass, Exception>) does not accept Bug3777Static\Lorem<Exception, stdClass>.',
+				'Static property Bug3777Static\Ipsum::$ipsum (Bug3777Static\Lorem<stdClass, Exception>) does not accept Bug3777Static\Lorem<Exception, stdClass>.',
 				95,
 			],
 			[
-				'Property Bug3777Static\Ipsum2::$lorem2 (Bug3777Static\Lorem2<stdClass, Exception>) does not accept Bug3777Static\Lorem2<stdClass, object>.',
+				'Static property Bug3777Static\Ipsum2::$lorem2 (Bug3777Static\Lorem2<stdClass, Exception>) does not accept Bug3777Static\Lorem2<stdClass, object>.',
 				129,
 			],
 			[
-				'Property Bug3777Static\Ipsum2::$ipsum2 (Bug3777Static\Lorem2<stdClass, Exception>) does not accept Bug3777Static\Lorem2<Exception, object>.',
+				'Static property Bug3777Static\Ipsum2::$ipsum2 (Bug3777Static\Lorem2<stdClass, Exception>) does not accept Bug3777Static\Lorem2<Exception, object>.',
 				131,
 			],
 			[
-				'Property Bug3777Static\Ipsum3::$ipsum3 (Bug3777Static\Lorem3<stdClass, Exception>) does not accept Bug3777Static\Lorem3<Exception, stdClass>.',
+				'Static property Bug3777Static\Ipsum3::$ipsum3 (Bug3777Static\Lorem3<stdClass, Exception>) does not accept Bug3777Static\Lorem3<Exception, stdClass>.',
 				168,
 			],
 		]);
diff --git a/tests/PHPStan/Rules/Properties/data/bug-3777-static.php b/tests/PHPStan/Rules/Properties/data/bug-3777-static.php
@@ -9,12 +9,12 @@ class HelloWorld
 	/**
 	 * @var \SplObjectStorage<\DateTimeImmutable, null>
 	 */
-	public $dates;
+	public static $dates;
 
 	public function __construct()
 	{
-		$this->dates = new \SplObjectStorage();
-		assertType('SplObjectStorage<DateTimeImmutable, null>', $this->dates);
+		static::$dates = new \SplObjectStorage();
+		assertType('SplObjectStorage<DateTimeImmutable, null>', static::$dates);
 	}
 }
 
@@ -39,24 +39,24 @@ class Bar
 {
 
 	/** @var Foo<\stdClass> */
-	private $foo;
+	private static $foo;
 
 	/** @var Fooo<\stdClass> */
-	private $fooo;
+	private static $fooo;
 
 	public function __construct()
 	{
-		$this->foo = new Foo();
-		assertType('Bug3777Static\Foo<stdClass>', $this->foo);
+		static::$foo = new Foo();
+		assertType('Bug3777Static\Foo<stdClass>', static::$foo);
 
-		$this->fooo = new Fooo();
-		assertType('Bug3777Static\Fooo<stdClass>', $this->fooo);
+		static::$fooo = new Fooo();
+		assertType('Bug3777Static\Fooo<stdClass>', static::$fooo);
 	}
 
 	public function doBar()
 	{
-		$this->foo = new Fooo();
-		assertType('Bug3777Static\Fooo<object>', $this->foo);
+		static::$foo = new Fooo();
+		assertType('Bug3777Static\Fooo<object>', static::$foo);
 	}
 
 }
@@ -83,17 +83,17 @@ class Ipsum
 {
 
 	/** @var Lorem<\stdClass, \Exception> */
-	private $lorem;
+	private static $lorem;
 
 	/** @var Lorem<\stdClass, \Exception> */
-	private $ipsum;
+	private static $ipsum;
 
 	public function __construct()
 	{
-		$this->lorem = new Lorem(new \stdClass, new \Exception());
-		assertType('Bug3777Static\Lorem<stdClass, Exception>', $this->lorem);
-		$this->ipsum = new Lorem(new \Exception(), new \stdClass);
-		assertType('Bug3777Static\Lorem<Exception, stdClass>', $this->ipsum);
+		static::$lorem = new Lorem(new \stdClass, new \Exception());
+		assertType('Bug3777Static\Lorem<stdClass, Exception>', static::$lorem);
+		static::$ipsum = new Lorem(new \Exception(), new \stdClass);
+		assertType('Bug3777Static\Lorem<Exception, stdClass>', static::$ipsum);
 	}
 
 }
@@ -119,17 +119,17 @@ class Ipsum2
 {
 
 	/** @var Lorem2<\stdClass, \Exception> */
-	private $lorem2;
+	private static $lorem2;
 
 	/** @var Lorem2<\stdClass, \Exception> */
-	private $ipsum2;
+	private static $ipsum2;
 
 	public function __construct()
 	{
-		$this->lorem2 = new Lorem2(new \stdClass);
-		assertType('Bug3777Static\Lorem2<stdClass, object>', $this->lorem2);
-		$this->ipsum2 = new Lorem2(new \Exception());
-		assertType('Bug3777Static\Lorem2<Exception, object>', $this->ipsum2);
+		static::$lorem2 = new Lorem2(new \stdClass);
+		assertType('Bug3777Static\Lorem2<stdClass, object>', static::$lorem2);
+		static::$ipsum2 = new Lorem2(new \Exception());
+		assertType('Bug3777Static\Lorem2<Exception, object>', static::$ipsum2);
 	}
 
 }
@@ -156,17 +156,17 @@ class Ipsum3
 {
 
 	/** @var Lorem3<\stdClass, \Exception> */
-	private $lorem3;
+	private static $lorem3;
 
 	/** @var Lorem3<\stdClass, \Exception> */
-	private $ipsum3;
+	private static $ipsum3;
 
 	public function __construct()
 	{
-		$this->lorem3 = new Lorem3(new \stdClass, new \Exception());
-		assertType('Bug3777Static\Lorem3<stdClass, Exception>', $this->lorem3);
-		$this->ipsum3 = new Lorem3(new \Exception(), new \stdClass());
-		assertType('Bug3777Static\Lorem3<Exception, stdClass>', $this->ipsum3);
+		static::$lorem3 = new Lorem3(new \stdClass, new \Exception());
+		assertType('Bug3777Static\Lorem3<stdClass, Exception>', static::$lorem3);
+		static::$ipsum3 = new Lorem3(new \Exception(), new \stdClass());
+		assertType('Bug3777Static\Lorem3<Exception, stdClass>', static::$ipsum3);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -211,23 +211,23 @@ public function testBug3777(): void`
`211`	`211`
`212`	`212`	`$this->analyse([__DIR__ . '/data/bug-3777-static.php'], [`
`213`	`213`	`[`
`214`		`- 'Property Bug3777Static\Bar::$foo (Bug3777Static\Foo<stdClass>) does not accept Bug3777Static\Fooo<object>.',`
	`214`	`+ 'Static property Bug3777Static\Bar::$foo (Bug3777Static\Foo<stdClass>) does not accept Bug3777Static\Fooo<object>.',`
`215`	`215`	`58,`
`216`	`216`	`],`
`217`	`217`	`[`
`218`		`- 'Property Bug3777Static\Ipsum::$ipsum (Bug3777Static\Lorem<stdClass, Exception>) does not accept Bug3777Static\Lorem<Exception, stdClass>.',`
	`218`	`+ 'Static property Bug3777Static\Ipsum::$ipsum (Bug3777Static\Lorem<stdClass, Exception>) does not accept Bug3777Static\Lorem<Exception, stdClass>.',`
`219`	`219`	`95,`
`220`	`220`	`],`
`221`	`221`	`[`
`222`		`- 'Property Bug3777Static\Ipsum2::$lorem2 (Bug3777Static\Lorem2<stdClass, Exception>) does not accept Bug3777Static\Lorem2<stdClass, object>.',`
	`222`	`+ 'Static property Bug3777Static\Ipsum2::$lorem2 (Bug3777Static\Lorem2<stdClass, Exception>) does not accept Bug3777Static\Lorem2<stdClass, object>.',`
`223`	`223`	`129,`
`224`	`224`	`],`
`225`	`225`	`[`
`226`		`- 'Property Bug3777Static\Ipsum2::$ipsum2 (Bug3777Static\Lorem2<stdClass, Exception>) does not accept Bug3777Static\Lorem2<Exception, object>.',`
	`226`	`+ 'Static property Bug3777Static\Ipsum2::$ipsum2 (Bug3777Static\Lorem2<stdClass, Exception>) does not accept Bug3777Static\Lorem2<Exception, object>.',`
`227`	`227`	`131,`
`228`	`228`	`],`
`229`	`229`	`[`
`230`		`- 'Property Bug3777Static\Ipsum3::$ipsum3 (Bug3777Static\Lorem3<stdClass, Exception>) does not accept Bug3777Static\Lorem3<Exception, stdClass>.',`
	`230`	`+ 'Static property Bug3777Static\Ipsum3::$ipsum3 (Bug3777Static\Lorem3<stdClass, Exception>) does not accept Bug3777Static\Lorem3<Exception, stdClass>.',`
`231`	`231`	`168,`
`232`	`232`	`],`
`233`	`233`	`]);`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@ class HelloWorld`
`9`	`9`	`/**`
`10`	`10`	`* @var \SplObjectStorage<\DateTimeImmutable, null>`
`11`	`11`	`*/`
`12`		`- public $dates;`
	`12`	`+ public static $dates;`
`13`	`13`
`14`	`14`	`public function __construct()`
`15`	`15`	`{`
`16`		`- $this->dates = new \SplObjectStorage();`
`17`		`- assertType('SplObjectStorage<DateTimeImmutable, null>', $this->dates);`
	`16`	`+ static::$dates = new \SplObjectStorage();`
	`17`	`+ assertType('SplObjectStorage<DateTimeImmutable, null>', static::$dates);`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
`@@ -39,24 +39,24 @@ class Bar`
`39`	`39`	`{`
`40`	`40`
`41`	`41`	`/** @var Foo<\stdClass> */`
`42`		`- private $foo;`
	`42`	`+ private static $foo;`
`43`	`43`
`44`	`44`	`/** @var Fooo<\stdClass> */`
`45`		`- private $fooo;`
	`45`	`+ private static $fooo;`
`46`	`46`
`47`	`47`	`public function __construct()`
`48`	`48`	`{`
`49`		`- $this->foo = new Foo();`
`50`		`- assertType('Bug3777Static\Foo<stdClass>', $this->foo);`
	`49`	`+ static::$foo = new Foo();`
	`50`	`+ assertType('Bug3777Static\Foo<stdClass>', static::$foo);`
`51`	`51`
`52`		`- $this->fooo = new Fooo();`
`53`		`- assertType('Bug3777Static\Fooo<stdClass>', $this->fooo);`
	`52`	`+ static::$fooo = new Fooo();`
	`53`	`+ assertType('Bug3777Static\Fooo<stdClass>', static::$fooo);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public function doBar()`
`57`	`57`	`{`
`58`		`- $this->foo = new Fooo();`
`59`		`- assertType('Bug3777Static\Fooo<object>', $this->foo);`
	`58`	`+ static::$foo = new Fooo();`
	`59`	`+ assertType('Bug3777Static\Fooo<object>', static::$foo);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`}`
`@@ -83,17 +83,17 @@ class Ipsum`
`83`	`83`	`{`
`84`	`84`
`85`	`85`	`/** @var Lorem<\stdClass, \Exception> */`
`86`		`- private $lorem;`
	`86`	`+ private static $lorem;`
`87`	`87`
`88`	`88`	`/** @var Lorem<\stdClass, \Exception> */`
`89`		`- private $ipsum;`
	`89`	`+ private static $ipsum;`
`90`	`90`
`91`	`91`	`public function __construct()`
`92`	`92`	`{`
`93`		`- $this->lorem = new Lorem(new \stdClass, new \Exception());`
`94`		`- assertType('Bug3777Static\Lorem<stdClass, Exception>', $this->lorem);`
`95`		`- $this->ipsum = new Lorem(new \Exception(), new \stdClass);`
`96`		`- assertType('Bug3777Static\Lorem<Exception, stdClass>', $this->ipsum);`
	`93`	`+ static::$lorem = new Lorem(new \stdClass, new \Exception());`
	`94`	`+ assertType('Bug3777Static\Lorem<stdClass, Exception>', static::$lorem);`
	`95`	`+ static::$ipsum = new Lorem(new \Exception(), new \stdClass);`
	`96`	`+ assertType('Bug3777Static\Lorem<Exception, stdClass>', static::$ipsum);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`}`
`@@ -119,17 +119,17 @@ class Ipsum2`
`119`	`119`	`{`
`120`	`120`
`121`	`121`	`/** @var Lorem2<\stdClass, \Exception> */`
`122`		`- private $lorem2;`
	`122`	`+ private static $lorem2;`
`123`	`123`
`124`	`124`	`/** @var Lorem2<\stdClass, \Exception> */`
`125`		`- private $ipsum2;`
	`125`	`+ private static $ipsum2;`
`126`	`126`
`127`	`127`	`public function __construct()`
`128`	`128`	`{`
`129`		`- $this->lorem2 = new Lorem2(new \stdClass);`
`130`		`- assertType('Bug3777Static\Lorem2<stdClass, object>', $this->lorem2);`
`131`		`- $this->ipsum2 = new Lorem2(new \Exception());`
`132`		`- assertType('Bug3777Static\Lorem2<Exception, object>', $this->ipsum2);`
	`129`	`+ static::$lorem2 = new Lorem2(new \stdClass);`
	`130`	`+ assertType('Bug3777Static\Lorem2<stdClass, object>', static::$lorem2);`
	`131`	`+ static::$ipsum2 = new Lorem2(new \Exception());`
	`132`	`+ assertType('Bug3777Static\Lorem2<Exception, object>', static::$ipsum2);`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`}`
`@@ -156,17 +156,17 @@ class Ipsum3`
`156`	`156`	`{`
`157`	`157`
`158`	`158`	`/** @var Lorem3<\stdClass, \Exception> */`
`159`		`- private $lorem3;`
	`159`	`+ private static $lorem3;`
`160`	`160`
`161`	`161`	`/** @var Lorem3<\stdClass, \Exception> */`
`162`		`- private $ipsum3;`
	`162`	`+ private static $ipsum3;`
`163`	`163`
`164`	`164`	`public function __construct()`
`165`	`165`	`{`
`166`		`- $this->lorem3 = new Lorem3(new \stdClass, new \Exception());`
`167`		`- assertType('Bug3777Static\Lorem3<stdClass, Exception>', $this->lorem3);`
`168`		`- $this->ipsum3 = new Lorem3(new \Exception(), new \stdClass());`
`169`		`- assertType('Bug3777Static\Lorem3<Exception, stdClass>', $this->ipsum3);`
	`166`	`+ static::$lorem3 = new Lorem3(new \stdClass, new \Exception());`
	`167`	`+ assertType('Bug3777Static\Lorem3<stdClass, Exception>', static::$lorem3);`
	`168`	`+ static::$ipsum3 = new Lorem3(new \Exception(), new \stdClass());`
	`169`	`+ assertType('Bug3777Static\Lorem3<Exception, stdClass>', static::$ipsum3);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`}`