fix regression tests

Author: staabm

tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php

@@ -1432,26 +1432,6 @@ public function testBug14318(): void
 		$this->analyse([__DIR__ . '/data/bug-14318.php'], []);
 	}
 
-	public function testBug11284(): void
-	{
-		$this->cliArgumentsVariablesRegistered = true;
-		$this->polluteScopeWithLoopInitialAssignments = false;
-		$this->checkMaybeUndefinedVariables = true;
-		$this->polluteScopeWithAlwaysIterableForeach = true;
-
-		$this->analyse([__DIR__ . '/data/bug-11284.php'], []);
-	}
-
-	public function testBug7806(): void
-	{
-		$this->cliArgumentsVariablesRegistered = true;
-		$this->polluteScopeWithLoopInitialAssignments = false;
-		$this->checkMaybeUndefinedVariables = true;
-		$this->polluteScopeWithAlwaysIterableForeach = true;
-
-		$this->analyse([__DIR__ . '/data/bug-7806.php'], []);
-	}
-
 	#[RequiresPhp('>= 8.0')]
 	public function testBug14274(): void
 	{

tests/PHPStan/Rules/Variables/EmptyRuleTest.php

@@ -209,6 +209,20 @@ public function testBug10367(): void
 		$this->analyse([__DIR__ . '/data/bug-10367.php'], []);
 	}
 
+	public function testBug11284(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+
+		$this->analyse([__DIR__ . '/data/bug-11284.php'], []);
+	}
+
+	public function testBug7806(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+
+		$this->analyse([__DIR__ . '/data/bug-7806.php'], []);
+	}
+
 	#[RequiresPhp('>= 8.0')]
 	public function testIssetAfterRememberedConstructor(): void
 	{

tests/PHPStan/Rules/Variables/data/bug-7806.php

@@ -2,18 +2,28 @@
 
 namespace Bug7806;
 
-class HelloWorld
-{
+class Test {
+	/**
+	 * @param array<string>|null $reasons
+	 * @throws \Exception
+	 */
+	function check(array &$reasons = null): void {
+		$fileName = time() % 2 ? "abc":null;
+		if (!$fileName) {
+			$reasons[] = sprintf("Dependency check fail");
+			throw new \Exception("check failed");
+		}
+	}
 
-	public function test(): void
-	{
+	function test():void {
 		try {
-			preg_match('/pattern/', 'subject', $reasons);
-		} catch (\Throwable $e) {
+			$this->check($reasons);
+			printf("ok\n");
+		} catch (\Exception $e) {
 			if (!empty($reasons)) {
-				echo implode(', ', $reasons);
+				$e = new \Exception("Dependency check failed: " . implode(', ', $reasons), 0, $e);
 			}
+			throw new \Exception("Failed", 0, $e);
 		}
 	}
-
 }