Merging scopes in root scope - create maybe-existent variables from the other scope too

ondrejmirtes · ondrejmirtes · commit 310cb839326b · 2020-11-11T12:33:46.000+01:00
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -3353,6 +3353,14 @@ public function mergeWith(?self $otherScope): self
 
 				$ourVariableTypes[$name] = VariableTypeHolder::createMaybe(new MixedType());
 			}
+
+			foreach (array_keys($ourVariableTypes) as $name) {
+				if (array_key_exists($name, $theirVariableTypes)) {
+					continue;
+				}
+
+				$theirVariableTypes[$name] = VariableTypeHolder::createMaybe(new MixedType());
+			}
 		}
 
 		return $this->scopeFactory->create(
diff --git a/tests/PHPStan/Rules/DeadCode/UnreachableStatementRuleTest.php b/tests/PHPStan/Rules/DeadCode/UnreachableStatementRuleTest.php
@@ -80,4 +80,16 @@ public function testBugWithoutGitHubIssue1(bool $treatPhpDocTypesAsCertain): voi
 		$this->analyse([__DIR__ . '/data/bug-without-issue-1.php'], []);
 	}
 
+	public function testBug4070(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-4070.php'], []);
+	}
+
+	public function testBug4070Two(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->analyse([__DIR__ . '/data/bug-4070_2.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/DeadCode/data/bug-4070.php b/tests/PHPStan/Rules/DeadCode/data/bug-4070.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Bug4070;
+
+array_shift($argv);
+
+while ($argv) {
+	$arg = array_shift($argv);
+	if ($arg === 'foo') {
+		continue;
+	}
+	die();
+}
+
+echo "finished\n";
diff --git a/tests/PHPStan/Rules/DeadCode/data/bug-4070_2.php b/tests/PHPStan/Rules/DeadCode/data/bug-4070_2.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Bug4070Two;
+
+function () {
+	array_shift($argv);
+
+	while ($argv) {
+		$arg = array_shift($argv);
+		if ($arg === 'foo') {
+			continue;
+		}
+		die();
+	}
+
+	echo "finished\n";
+};
diff --git a/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php b/tests/PHPStan/Rules/Functions/CallToFunctionParametersRuleTest.php
@@ -398,10 +398,6 @@ public function testUnpackOperator(): void
 	public function testFunctionWithNumericParameterThatCreatedByAddition(): void
 	{
 		$this->analyse([__DIR__ . '/data/function-with-int-parameter-that-created-by-addition.php'], [
-			[
-				'Parameter #1 $num of function dechex expects int, float|int given.',
-				9,
-			],
 			[
 				'Parameter #1 $num of function dechex expects int, float|int given.',
 				40,

Original file line number	Diff line number	Diff line change
`@@ -3353,6 +3353,14 @@ public function mergeWith(?self $otherScope): self`
`3353`	`3353`
`3354`	`3354`	`$ourVariableTypes[$name] = VariableTypeHolder::createMaybe(new MixedType());`
`3355`	`3355`	`}`
	`3356`	`+`
	`3357`	`+ foreach (array_keys($ourVariableTypes) as $name) {`
	`3358`	`+ if (array_key_exists($name, $theirVariableTypes)) {`
	`3359`	`+ continue;`
	`3360`	`+ }`
	`3361`	`+`
	`3362`	`+ $theirVariableTypes[$name] = VariableTypeHolder::createMaybe(new MixedType());`
	`3363`	`+ }`
`3356`	`3364`	`}`
`3357`	`3365`
`3358`	`3366`	`return $this->scopeFactory->create(`
Original file line number	Diff line number	Diff line change
`@@ -398,10 +398,6 @@ public function testUnpackOperator(): void`
`398`	`398`	`public function testFunctionWithNumericParameterThatCreatedByAddition(): void`
`399`	`399`	`{`
`400`	`400`	`$this->analyse([__DIR__ . '/data/function-with-int-parameter-that-created-by-addition.php'], [`
`401`		`- [`
`402`		`- 'Parameter #1 $num of function dechex expects int, float\|int given.',`
`403`		`- 9,`
`404`		`- ],`
`405`	`401`	`[`
`406`	`402`	`'Parameter #1 $num of function dechex expects int, float\|int given.',`
`407`	`403`	`40,`