Countable stub for bleedingEdge

ondrejmirtes · ondrejmirtes · commit 1e77aed8176a · 2022-02-23T11:33:12.000+01:00
diff --git a/conf/bleedingEdge.neon b/conf/bleedingEdge.neon
@@ -2,3 +2,5 @@ parameters:
 	featureToggles:
 		bleedingEdge: true
 		skipCheckGenericClasses: []
+	stubFiles:
+		- ../stubs/bleedingEdge/Countable.stub
diff --git a/stubs/bleedingEdge/Countable.stub b/stubs/bleedingEdge/Countable.stub
@@ -0,0 +1,9 @@
+<?php
+
+interface Countable
+{
+    /**
+     * @return 0|positive-int
+     */
+    public function count(): int;
+}
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -712,6 +712,9 @@ public function dataFileAsserts(): iterable
 		}
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6672.php');
+
+		require_once __DIR__ . '/data/countable.php';
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/countable.php');
 	}
 
 	/**
diff --git a/tests/PHPStan/Analyser/data/countable.php b/tests/PHPStan/Analyser/data/countable.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace CountablePhpDocInheritance;
+
+use function PHPStan\Testing\assertType;
+
+class Foo implements \Countable {
+	public function count() : int {
+		return 0;
+	}
+
+	static public function doFoo() {
+		$foo = new Foo();
+		assertType('int<0, max>', $foo->count());
+	}
+}
+
diff --git a/tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php b/tests/PHPStan/Rules/Methods/MethodSignatureRuleTest.php
@@ -210,7 +210,15 @@ public function testBug3997(): void
 		$this->reportStatic = true;
 		$this->analyse([__DIR__ . '/data/bug-3997.php'], [
 			[
-				'Return type (string) of method Bug3997\Ipsum::count() should be compatible with return type (int) of method Countable::count()',
+				'Return type (int) of method Bug3997\Baz::count() should be covariant with return type (int<0, max>) of method Countable::count()',
+				PHP_VERSION_ID >= 80000 || self::$useStaticReflectionProvider ? 35 : 36,
+			],
+			[
+				'Return type (int) of method Bug3997\Lorem::count() should be covariant with return type (int<0, max>) of method Countable::count()',
+				PHP_VERSION_ID >= 80000 || self::$useStaticReflectionProvider ? 49 : 50,
+			],
+			[
+				'Return type (string) of method Bug3997\Ipsum::count() should be compatible with return type (int<0, max>) of method Countable::count()',
 				PHP_VERSION_ID >= 80000 || self::$useStaticReflectionProvider ? 63 : 64,
 			],
 		]);
diff --git a/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php b/tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php
@@ -377,11 +377,11 @@ public function testBug3997(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-3997.php'], [
 			[
-				'Method Bug3997\Foo::count() should return int but returns string.',
+				"Method Bug3997\Foo::count() should return int<0, max> but returns 'foo'.",
 				13,
 			],
 			[
-				'Method Bug3997\Bar::count() should return int but returns string.',
+				"Method Bug3997\Bar::count() should return int<0, max> but returns 'foo'.",
 				24,
 			],
 			[

Original file line number	Diff line number	Diff line change
`@@ -712,6 +712,9 @@ public function dataFileAsserts(): iterable`
`712`	`712`	`}`
`713`	`713`
`714`	`714`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-6672.php');`
	`715`	`+`
	`716`	`+ require_once __DIR__ . '/data/countable.php';`
	`717`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/countable.php');`
`715`	`718`	`}`
`716`	`719`
`717`	`720`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -377,11 +377,11 @@ public function testBug3997(): void`
`377`	`377`	`{`
`378`	`378`	`$this->analyse([__DIR__ . '/data/bug-3997.php'], [`
`379`	`379`	`[`
`380`		`- 'Method Bug3997\Foo::count() should return int but returns string.',`
	`380`	`+ "Method Bug3997\Foo::count() should return int<0, max> but returns 'foo'.",`
`381`	`381`	`13,`
`382`	`382`	`],`
`383`	`383`	`[`
`384`		`- 'Method Bug3997\Bar::count() should return int but returns string.',`
	`384`	`+ "Method Bug3997\Bar::count() should return int<0, max> but returns 'foo'.",`
`385`	`385`	`24,`
`386`	`386`	`],`
`387`	`387`	`[`