Revert Fix scope generalization

This reverts commit 8db1083.
phpstan · Jan 13, 2022 · 28923f6 · 28923f6
1 parent 8db1083
commit 28923f6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -4765,6 +4765,8 @@ private static function generalizeType(Type $a, Type $b): Type
 					);
 				}
 			}
+		} elseif (count($constantArrays['b']) > 0) {
+			$resultTypes[] = TypeCombinator::union(...$constantArrays['b']);
 		}
 
 		if (count($generalArrays['a']) > 0) {
@@ -4800,6 +4802,8 @@ private static function generalizeType(Type $a, Type $b): Type
 					TypeCombinator::union(self::generalizeType($aValueType, $bValueType)),
 				);
 			}
+		} elseif (count($generalArrays['b']) > 0) {
+			$resultTypes[] = TypeCombinator::union(...$generalArrays['b']);
 		}
 
 		if (count($constantIntegers['a']) > 0) {
@@ -4849,6 +4853,8 @@ private static function generalizeType(Type $a, Type $b): Type
 					}
 				}
 			}
+		} elseif (count($constantIntegers['b']) > 0) {
+			$resultTypes[] = TypeCombinator::union(...$constantIntegers['b']);
 		}
 
 		return TypeCombinator::union(...$resultTypes, ...$otherTypes);