Support for Stringable (PHP 8)

ondrejmirtes · ondrejmirtes · commit 3143833c4f3b · 2020-10-27T19:06:46.000+01:00
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
 		"nette/utils": "^3.1.3",
 		"nikic/php-parser": "4.10.2",
 		"ondram/ci-detector": "^3.4.0",
-		"ondrejmirtes/better-reflection": "4.3.39",
+		"ondrejmirtes/better-reflection": "4.3.40",
 		"phpdocumentor/reflection-docblock": "4.3.4",
 		"phpstan/php-8-stubs": "^0.1.6",
 		"phpstan/phpdoc-parser": "^0.4.9",
diff --git a/composer.lock b/composer.lock
diff --git a/src/DependencyInjection/ContainerFactory.php b/src/DependencyInjection/ContainerFactory.php
@@ -7,6 +7,7 @@
 use PHPStan\Broker\Broker;
 use PHPStan\Command\CommandHelper;
 use PHPStan\File\FileHelper;
+use PHPStan\Php\PhpVersion;
 use Roave\BetterReflection\BetterReflection;
 use Roave\BetterReflection\SourceLocator\SourceStubber\PhpStormStubsSourceStubber;
 use function sys_get_temp_dir;
@@ -101,6 +102,8 @@ public function create(
 
 		$container = $configurator->createContainer();
 
+		BetterReflection::$phpVersion = $container->getByType(PhpVersion::class)->getVersionId();
+
 		// @phpstan-ignore-next-line
 		BetterReflection::populate(
 			$container->getService('betterReflectionSourceLocator'),
diff --git a/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php b/tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php
@@ -1502,4 +1502,16 @@ public function testBug3683(): void
 		]);
 	}
 
+	public function testStringable(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->analyse([__DIR__ . '/data/stringable.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/stringable.php b/tests/PHPStan/Rules/Methods/data/stringable.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace TestStringables;
+
+use Stringable;
+
+class Foo
+{
+
+	public function __toString(): string
+	{
+		return 'foo';
+	}
+
+}
+
+class Bar implements Stringable
+{
+
+	public function __toString(): string
+	{
+		return 'foo';
+	}
+
+}
+
+interface Lorem extends Stringable
+{
+
+}
+
+class Baz
+{
+
+	public function doFoo(Stringable $s): void
+	{
+
+	}
+
+	public function doBar(Lorem $l): void
+	{
+		$this->doFoo(new Foo());
+		$this->doFoo(new Bar());
+		$this->doFoo($l);
+		$this->doBaz($l);
+	}
+
+	public function doBaz(string $s): void
+	{
+
+	}
+
+}
