Fixed tests

Author: ondrejmirtes

src/Analyser/TypeSpecifier.php

@@ -549,7 +549,7 @@ public function specifyTypesInCondition(
 				$varsToIterate = [$expr->expr];
 			}
 			foreach ($varsToIterate as $var) {
-				$vars[] = $var;
+				$tmpVars = [$var];
 
 				while (
 					$var instanceof ArrayDimFetch
@@ -565,16 +565,16 @@ public function specifyTypesInCondition(
 					} else {
 						$var = $var->var;
 					}
-					$vars[] = $var;
+					$tmpVars[] = $var;
 				}
+
+				$vars = array_merge($vars, array_reverse($tmpVars));
 			}
 
 			if (count($vars) === 0) {
 				throw new \PHPStan\ShouldNotHappenException();
 			}
 
-			$vars = array_reverse($vars);
-
 			$types = null;
 			foreach ($vars as $var) {
 				if ($var instanceof Expr\Variable && is_string($var->name)) {

tests/PHPStan/Rules/Variables/DefinedVariableRuleTest.php

@@ -107,16 +107,28 @@ public function testDefinedVariables(): void
 				'Undefined variable: $variableInEmpty',
 				145,
 			],
+			[
+				'Undefined variable: $negatedVariableInEmpty',
+				152,
+			],
 			[
 				'Undefined variable: $variableInEmpty',
 				155,
 			],
 			[
-				'Variable $negatedVariableInEmpty might not be defined.',
+				'Undefined variable: $negatedVariableInEmpty',
 				156,
 			],
 			[
-				'Variable $variableInIsset might not be defined.',
+				'Undefined variable: $variableInIsset',
+				159,
+			],
+			[
+				'Undefined variable: $anotherVariableInIsset',
+				159,
+			],
+			[
+				'Undefined variable: $variableInIsset',
 				161,
 			],
 			[
@@ -211,6 +223,10 @@ public function testDefinedVariables(): void
 				'Variable $forVariableUsedAndThenDefined might not be defined.',
 				360,
 			],
+			[
+				'Undefined variable: $variableInWhileIsset',
+				365,
+			],
 			[
 				'Undefined variable: $unknownVariablePassedToReset',
 				368,