Fixed bug with uncertain variables merging in root scope

ondrejmirtes · ondrejmirtes · commit ebce7de8ea59 · 2020-10-12T13:29:11.000+02:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -335,14 +335,19 @@ private function getVariableTypes(): array
 		return $this->variableTypes;
 	}
 
+	private function isRootScope(): bool
+	{
+		return $this->function === null && !$this->isInAnonymousFunction();
+	}
+
 	public function hasVariableType(string $variableName): TrinaryLogic
 	{
 		if ($this->isGlobalVariable($variableName)) {
 			return TrinaryLogic::createYes();
 		}
 
 		if (!isset($this->variableTypes[$variableName])) {
-			if ($this->function === null && !$this->isInAnonymousFunction()) {
+			if ($this->isRootScope()) {
 				return TrinaryLogic::createMaybe();
 			}
 
@@ -3200,6 +3205,18 @@ public function mergeWith(?self $otherScope): self
 			return new VariableTypeHolder($type, TrinaryLogic::createYes());
 		};
 
+		$ourVariableTypes = $this->getVariableTypes();
+		$theirVariableTypes = $otherScope->getVariableTypes();
+		if ($this->isRootScope()) {
+			foreach (array_keys($theirVariableTypes) as $name) {
+				if (array_key_exists($name, $ourVariableTypes)) {
+					continue;
+				}
+
+				$ourVariableTypes[$name] = VariableTypeHolder::createMaybe(new MixedType());
+			}
+		}
+
 		return $this->scopeFactory->create(
 			$this->context,
 			$this->isDeclareStrictTypes(),
@@ -3209,7 +3226,7 @@ public function mergeWith(?self $otherScope): self
 			)),
 			$this->getFunction(),
 			$this->getNamespace(),
-			$this->mergeVariableHolders($this->getVariableTypes(), $otherScope->getVariableTypes()),
+			$this->mergeVariableHolders($ourVariableTypes, $theirVariableTypes),
 			$this->mergeVariableHolders($this->moreSpecificTypes, $otherScope->moreSpecificTypes),
 			$this->inClosureBindScopeClass,
 			$this->anonymousFunctionReflection,
diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -10136,6 +10136,11 @@ public function dataBug1014(): array
 		return $this->gatherAssertTypes(__DIR__ . '/data/bug-1014.php');
 	}
 
+	public function dataBugFromPr339(): array
+	{
+		return $this->gatherAssertTypes(__DIR__ . '/data/bug-pr-339.php');
+	}
+
 	/**
 	 * @dataProvider dataBug2574
 	 * @dataProvider dataBug2577
@@ -10211,6 +10216,7 @@ public function dataBug1014(): array
 	 * @dataProvider dataBug3548
 	 * @dataProvider dataBug3866
 	 * @dataProvider dataBug1014
+	 * @dataProvider dataBugFromPr339
 	 * @param string $assertType
 	 * @param string $file
 	 * @param mixed ...$args
diff --git a/tests/PHPStan/Analyser/data/bug-pr-339.php b/tests/PHPStan/Analyser/data/bug-pr-339.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace BugPr339;
+
+use PHPStan\TrinaryLogic;
+use function PHPStan\Analyser\assertType;
+use function PHPStan\Analyser\assertVariableCertainty;
+
+assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+assertVariableCertainty(TrinaryLogic::createMaybe(), $c);
+assertType('mixed', $a);
+assertType('mixed', $c);
+
+if ($a || $c) {
+	assertVariableCertainty(TrinaryLogic::createMaybe(), $a);
+	assertVariableCertainty(TrinaryLogic::createMaybe(), $c);
+	assertType('mixed', $a);
+	assertType('mixed', $c);
+	if ($a) {
+		assertType("mixed~0|0.0|''|'0'|array()|false|null", $a);
+		assertType('mixed', $c);
+		assertVariableCertainty(TrinaryLogic::createYes(), $a);
+	}
+
+	if ($c) {
+		assertType('mixed', $a);
+		assertType("mixed~0|0.0|''|'0'|array()|false|null", $c);
+		assertVariableCertainty(TrinaryLogic::createYes(), $c);
+	}
+} else {
+	assertType("0|0.0|''|'0'|array()|false|null", $a);
+	assertType("0|0.0|''|'0'|array()|false|null", $c);
+}
