strval accepts Stringable

ondrejmirtes · ondrejmirtes · commit 3a4cd59e46e7 · 2023-05-09T15:51:02.000+02:00
diff --git a/resources/functionMap.php b/resources/functionMap.php
@@ -11807,7 +11807,7 @@
 'strtoupper' => ['string', 'str'=>'string'],
 'strtr' => ['string', 'str'=>'string', 'from'=>'string', 'to'=>'string'],
 'strtr\'1' => ['string', 'str'=>'string', 'replace_pairs'=>'array'],
-'strval' => ['string', 'var'=>'scalar|resource|null'],
+'strval' => ['string', 'var'=>'__stringAndStringable|int|float|bool|resource|null'],
 'substr' => ['__benevolent<string|false>', 'string'=>'string', 'start'=>'int', 'length='=>'int'],
 'substr_compare' => ['int<-1, 1>|false', 'main_str'=>'string', 'str'=>'string', 'offset'=>'int', 'length='=>'int', 'case_sensitivity='=>'bool'],
 'substr_count' => ['0|positive-int', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'length='=>'int'],
diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
@@ -1329,4 +1329,13 @@ public function testFilterInputType(): void
 		$this->analyse([__DIR__ . '/data/filter-input-type.php'], $errors);
 	}
 
+	public function testBug9283(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0');
+		}
+
+		$this->analyse([__DIR__ . '/data/bug-9283.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Functions/data/bug-9283.php b/tests/PHPStan/Rules/Functions/data/bug-9283.php
@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1); // lint >= 8.0
+
+namespace Bug9283;
+
+/**
+ * @param \Stringable $obj
+ */
+function test(object $obj): string {
+	return strval($obj);
+}

Original file line number	Diff line number	Diff line change
`@@ -1329,4 +1329,13 @@ public function testFilterInputType(): void`
`1329`	`1329`	`$this->analyse([__DIR__ . '/data/filter-input-type.php'], $errors);`
`1330`	`1330`	`}`
`1331`	`1331`
	`1332`	`+ public function testBug9283(): void`
	`1333`	`+ {`
	`1334`	`+ if (PHP_VERSION_ID < 80000) {`
	`1335`	`+ $this->markTestSkipped('Test requires PHP 8.0');`
	`1336`	`+ }`
	`1337`	`+`
	`1338`	`+ $this->analyse([__DIR__ . '/data/bug-9283.php'], []);`
	`1339`	`+ }`
	`1340`	`+`
`1332`	`1341`	`}`