Simplified concatenating strings to prevent combinatorial explosion

phpstan · Jul 6, 2018 · 7190ec9 · 7190ec9
1 parent c29225f
commit 7190ec9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/src/Analyser/Scope.php b/src/Analyser/Scope.php
@@ -616,18 +616,8 @@ private function resolveType(Expr $node): Type
 				return new ErrorType();
 			}
 
-			$leftConstantStrings = TypeUtils::getConstantStrings($leftStringType);
-			$rightConstantStrings = TypeUtils::getConstantStrings($rightStringType);
-
-			if (count($leftConstantStrings) > 0 && count($rightConstantStrings) > 0) {
-				$resultTypes = [];
-				foreach ($leftConstantStrings as $leftType) {
-					foreach ($rightConstantStrings as $rightType) {
-						$resultTypes[] = $leftType->append($rightType);
-					}
-				}
-
-				return TypeCombinator::union(...$resultTypes);
+			if ($leftStringType instanceof ConstantStringType && $rightStringType instanceof ConstantStringType) {
+				return $leftStringType->append($rightStringType);
 			}
 
 			return new StringType();

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -2588,15 +2588,15 @@ public function dataBinaryOperations(): array
 				'$decrementedFooString',
 			],
 			[
-				'\'barbar\'|\'barfoo\'|\'foobar\'|\'foofoo\'',
+				'string',
 				'$conditionalString . $conditionalString',
 			],
 			[
-				'\'baripsum\'|\'barlorem\'|\'fooipsum\'|\'foolorem\'',
+				'string',
 				'$conditionalString . $anotherConditionalString',
 			],
 			[
-				'\'ipsumbar\'|\'ipsumfoo\'|\'lorembar\'|\'loremfoo\'',
+				'string',
 				'$anotherConditionalString . $conditionalString',
 			],
 			[