Only preserve accesory types on both sides

phpstan · Oct 5, 2022 · f4f9414 · f4f9414
1 parent 475cdb3
commit f4f9414
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 28 deletions.
diff --git a/src/Analyser/MutatingScope.php b/src/Analyser/MutatingScope.php
@@ -4674,7 +4674,7 @@ private static function generalizeType(Type $a, Type $b): Type
 						TypeCombinator::union(self::generalizeType($constantArraysA->getIterableKeyType(), $constantArraysB->getIterableKeyType())),
 						TypeCombinator::union(self::generalizeType($constantArraysA->getIterableValueType(), $constantArraysB->getIterableValueType())),
 					);
-					if ($constantArraysA->isIterableAtLeastOnce()->yes() || $constantArraysB->isIterableAtLeastOnce()->yes()) {
+					if ($constantArraysA->isIterableAtLeastOnce()->yes() && $constantArraysB->isIterableAtLeastOnce()->yes()) {
 						$accessoryTypes[] = new NonEmptyArrayType();
 					}
 				}
@@ -4851,35 +4851,26 @@ private static function generalizeType(Type $a, Type $b): Type
 			$resultTypes[] = TypeCombinator::union(...$integerRanges['b']);
 		}
 
-		$aAccessoryTypes = TypeUtils::getAccessoryTypes($a);
-		$bAccessoryTypes = TypeUtils::getAccessoryTypes($b);
-		if (count($aAccessoryTypes) > 0) {
-			if (count($bAccessoryTypes) === 0) {
-				$accessoryTypes = array_merge($accessoryTypes, $aAccessoryTypes);
-			} else {
-				$commonTypeMaps = [];
-				foreach ([$aAccessoryTypes, $bAccessoryTypes] as $listKey => $accessoryTypeList) {
-					foreach ($accessoryTypeList as $accessoryType) {
-						if ($accessoryType instanceof HasOffsetValueType) {
-							$commonTypeMaps[$listKey][sprintf('hasOffsetValue(%s)', $accessoryType->getOffsetType()->describe(VerbosityLevel::cache()))][] = $accessoryType;
-							continue;
-						}
-
-						$commonTypeMaps[$listKey][$accessoryType->describe(VerbosityLevel::cache())][] = $accessoryType;
-					}
-
+		$commonTypeMaps = [];
+		foreach ([TypeUtils::getAccessoryTypes($a), TypeUtils::getAccessoryTypes($b)] as $listKey => $accessoryTypeList) {
+			foreach ($accessoryTypeList as $accessoryType) {
+				if ($accessoryType instanceof HasOffsetValueType) {
+					$commonTypeMaps[$listKey][sprintf('hasOffsetValue(%s)', $accessoryType->getOffsetType()->describe(VerbosityLevel::cache()))][] = $accessoryType;
+					continue;
 				}
 
-				$accessoryTypes = array_merge(
-					$accessoryTypes,
-					array_map(
-						static fn (Type $type): Type => $type->generalize(GeneralizePrecision::moreSpecific()),
-						TypeCombinator::unionCommonTypeMaps($commonTypeMaps),
-					),
-				);
+				$commonTypeMaps[$listKey][$accessoryType->describe(VerbosityLevel::cache())][] = $accessoryType;
 			}
-		} elseif (count($bAccessoryTypes) > 0) {
-			$accessoryTypes = array_merge($accessoryTypes, $bAccessoryTypes);
+		}
+
+		if (count($commonTypeMaps) === 2) {
+			$accessoryTypes = array_merge(
+				$accessoryTypes,
+				array_map(
+					static fn (Type $type): Type => $type->generalize(GeneralizePrecision::moreSpecific()),
+					TypeCombinator::unionCommonTypeMaps($commonTypeMaps),
+				),
+			);
 		}
 
 		return TypeCombinator::intersect(

diff --git a/src/Parallel/ParallelAnalyser.php b/src/Parallel/ParallelAnalyser.php
@@ -185,7 +185,7 @@ public function analyse(
 					$this->processPool->quitAll();
 				}
 
-				if (count($jobs) === 0) { // @phpstan-ignore-line
+				if (count($jobs) === 0) {
 					$this->processPool->tryQuitProcess($processIdentifier);
 					return;
 				}