SA fixes

Author: ondrejmirtes

src/Parser/RichParser.php

@@ -361,7 +361,6 @@ private function parseIdentifiers(string $text, int $ignorePos): array
 			throw new IgnoreParseException('Missing identifier', 1);
 		}
 
-		/** @phpstan-ignore return.type (return type is correct, not sure why it's being changed from array shape to key-value shape) */
 		return $identifiers;
 	}
 

src/Type/Constant/ConstantArrayType.php

@@ -560,7 +560,7 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult
 			$result = $result->and($acceptsValue);
 		}
 
-		$otherUnsealed = $constantArray->getUnsealedTypes();
+		$otherUnsealed = $constantArray->unsealed;
 		if ($otherUnsealed !== null && !$constantArray->isUnsealed()->no()) {
 			[$otherUnsealedKeyType, $otherUnsealedValueType] = $otherUnsealed;
 
@@ -662,7 +662,7 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 		if ($type instanceof self) {
 			$thisUnsealedness = $this->isUnsealed();
 			$typeUnsealedness = $type->isUnsealed();
-			$bothDefinite = !$thisUnsealedness->maybe() && !$typeUnsealedness->maybe();
+			$bothDefinite = $this->unsealed !== null && $type->unsealed !== null;
 
 			if (count($this->keyTypes) === 0) {
 				if (!$bothDefinite) {
@@ -678,7 +678,7 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 			foreach ($this->keyTypes as $i => $keyType) {
 				$hasOffset = $type->hasOffsetValueType($keyType);
 				if ($bothDefinite && $hasOffset->no() && $typeUnsealedness->yes()) {
-					[$typeUnsealedKey] = $type->getUnsealedTypes();
+					[$typeUnsealedKey] = $type->unsealed;
 					if (!$typeUnsealedKey->isSuperTypeOf($keyType)->no()) {
 						$hasOffset = TrinaryLogic::createMaybe();
 					}
@@ -696,7 +696,7 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 
 				$otherValueType = $type->getOffsetValueType($keyType);
 				if ($otherValueType instanceof ErrorType && $bothDefinite && $typeUnsealedness->yes()) {
-					[, $typeUnsealedValue] = $type->getUnsealedTypes();
+					[, $typeUnsealedValue] = $type->unsealed;
 					$otherValueType = $typeUnsealedValue;
 				}
 				$isValueSuperType = $this->valueTypes[$i]->isSuperTypeOf($otherValueType);
@@ -725,7 +725,7 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 						continue;
 					}
 
-					[$thisUnsealedKey, $thisUnsealedValue] = $this->getUnsealedTypes();
+					[$thisUnsealedKey, $thisUnsealedValue] = $this->unsealed;
 					$keyCheck = $thisUnsealedKey->isSuperTypeOf($typeKey);
 					if ($keyCheck->no()) {
 						if ($type->isOptionalKey($i)) {
@@ -749,8 +749,8 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 					if ($thisUnsealedness->no()) {
 						$results[] = IsSuperTypeOfResult::createMaybe();
 					} else {
-						[$thisUnsealedKey, $thisUnsealedValue] = $this->getUnsealedTypes();
-						[$typeUnsealedKey, $typeUnsealedValue] = $type->getUnsealedTypes();
+						[$thisUnsealedKey, $thisUnsealedValue] = $this->unsealed;
+						[$typeUnsealedKey, $typeUnsealedValue] = $type->unsealed;
 						$results[] = $thisUnsealedKey->isSuperTypeOf($typeUnsealedKey);
 						$results[] = $thisUnsealedValue->isSuperTypeOf($typeUnsealedValue);
 					}

src/Type/TypeCombinator.php

@@ -1709,7 +1709,7 @@ private static function intersectDefiniteConstantArrays(ConstantArrayType $a, Co
 	{
 		$aSealed = $a->isUnsealed()->no();
 		$bSealed = $b->isUnsealed()->no();
-		$bothUnsealed = !$aSealed && !$bSealed;
+		$bothUnsealed = !$aSealed && !$bSealed && $a->getUnsealedTypes() !== null && $b->getUnsealedTypes() !== null;
 
 		$aKeyByValue = [];
 		foreach ($a->getKeyTypes() as $k => $keyType) {

tests/PHPStan/Type/TypeCombinatorTest.php

@@ -3197,7 +3197,7 @@ public function testUnion(
 	}
 
 	/**
-	 * @param list<Type> $types
+	 * @param list<Type>|list<string> $types
 	 * @param class-string<Type> $expectedTypeClass
 	 */
 	#[DataProvider('dataUnion')]