One-part encapsed string is correctly converted to string

phpstan · Jan 3, 2023 · dc77608 · dc77608
1 parent 4e35f59
commit dc77608
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -1092,7 +1092,7 @@ private function resolveType(string $exprString, Expr $node): Type
 			foreach ($node->parts as $part) {
 				$partType = $part instanceof EncapsedStringPart
 					? new ConstantStringType($part->value)
-					: $this->getType($part);
+					: $this->getType($part)->toString();
 				if ($resultType === null) {
 					$resultType = $partType;
 

diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -2916,7 +2916,7 @@ public function dataBinaryOperations(): array
 				'"$fooString bar"',
 			],
 			[
-				'*ERROR*',
+				'non-falsy-string',
 				'"$std bar"',
 			],
 			[

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1156,6 +1156,7 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/pathinfo.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8568.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/DeadCode/data/bug-8620.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8635.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/bug-8635.php b/tests/PHPStan/Analyser/data/bug-8635.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Bug8635;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	public function EchoInt(int $value): void
+	{
+		assertType('numeric-string', "$value");
+	}
+}