cs-fix

phpstan · Dec 16, 2022 · ab253c8 · ab253c8
1 parent 95560ba
commit ab253c8
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/Type/TypeCombinator.php b/src/Type/TypeCombinator.php
@@ -20,9 +20,7 @@
 use PHPStan\Type\Generic\TemplateType;
 use PHPStan\Type\Generic\TemplateTypeFactory;
 use PHPStan\Type\Generic\TemplateUnionType;
-use function array_intersect_key;
 use function array_key_exists;
-use function array_keys;
 use function array_map;
 use function array_merge;
 use function array_slice;
@@ -331,7 +329,7 @@ private static function compareTypesInUnion(Type $a, Type $b): ?array
 					self::union($a->getIterableKeyType(), $b->getIterableKeyType()),
 					self::union($a->getIterableValueType(), $b->getIterableValueType()),
 				),
-				null
+				null,
 			];
 		}
 
@@ -505,7 +503,8 @@ private static function intersectWithSubtractedType(
 	 * @param Type[] $arrayTypes
 	 * @return Type[]
 	 */
-	private static function processArrayAccessoryTypes(array $arrayTypes) {
+	private static function processArrayAccessoryTypes(array $arrayTypes): array
+	{
 		$accessoryTypes = [];
 		foreach ($arrayTypes as $i => $arrayType) {
 			if ($arrayType instanceof IntersectionType) {
@@ -518,15 +517,17 @@ private static function processArrayAccessoryTypes(array $arrayTypes) {
 						$type = isset($accessoryTypes[$key][$i])
 							? new HasOffsetValueType(
 								$innerType->getOffsetType(),
-								self::union($innerType->getValueType(), $accessoryTypes[$key][$i]->getValueType())
+								self::union($innerType->getValueType(), $accessoryTypes[$key][$i]->getValueType()),
 							)
 							: $innerType;
 						$accessoryTypes[$key][$i] = $type;
 						continue;
 					}
-					if ($innerType instanceof AccessoryType || $innerType instanceof CallableType) {
-						$accessoryTypes[$innerType->describe(VerbosityLevel::cache())][$i] = $innerType;
+					if (!($innerType instanceof AccessoryType) && !($innerType instanceof CallableType)) {
+						continue;
 					}
+
+					$accessoryTypes[$innerType->describe(VerbosityLevel::cache())][$i] = $innerType;
 				}
 			}
 
@@ -541,10 +542,12 @@ private static function processArrayAccessoryTypes(array $arrayTypes) {
 					$accessoryTypes[$list->describe(VerbosityLevel::cache())][$i] = $list;
 				}
 
-				if ($constantArray->isIterableAtLeastOnce()->yes()) {
-					$nonEmpty = new NonEmptyArrayType();
-					$accessoryTypes[$nonEmpty->describe(VerbosityLevel::cache())][$i] = $nonEmpty;
+				if (!$constantArray->isIterableAtLeastOnce()->yes()) {
+					continue;
 				}
+
+				$nonEmpty = new NonEmptyArrayType();
+				$accessoryTypes[$nonEmpty->describe(VerbosityLevel::cache())][$i] = $nonEmpty;
 			}
 		}
 
@@ -555,7 +558,7 @@ private static function processArrayAccessoryTypes(array $arrayTypes) {
 				continue;
 			}
 
-			$commonAccessoryTypes[] = TypeCombinator::union(...$accessoryType);
+			$commonAccessoryTypes[] = self::union(...$accessoryType);
 		}
 
 		return $commonAccessoryTypes;