simplify

Author: staabm

src/Type/Php/RegexArrayShapeMatcher.php

@@ -132,6 +132,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 
 		$onlyOptionalTopLevelGroup = $this->getOnlyOptionalTopLevelGroup($groupList);
 		$onlyTopLevelAlternation = $this->getOnlyTopLevelAlternation($groupList);
+		$flags ??= 0;
 
 		if (
 			!$matchesAll
@@ -147,12 +148,12 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 				$groupList,
 				$wasMatched,
 				$trailingOptionals,
-				$flags ?? 0,
+				$flags,
 				$markVerbs,
 				$matchesAll,
 			);
 
-			if (!$this->containsUnmatchedAsNull($flags ?? 0, $matchesAll)) {
+			if (!$this->containsUnmatchedAsNull($flags, $matchesAll)) {
 				$combiType = TypeCombinator::union(
 					new ConstantArrayType([new ConstantIntegerType(0)], [$this->createSubjectValueType($flags, $matchesAll)], [0], [], true),
 					$combiType,
@@ -180,7 +181,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 						$group->forceNonOptional();
 					} elseif (
 						$group->getAlternationId() === $onlyTopLevelAlternation->getId()
-						&& !$this->containsUnmatchedAsNull($flags ?? 0, $matchesAll)
+						&& !$this->containsUnmatchedAsNull($flags, $matchesAll)
 					) {
 						unset($comboList[$groupId]);
 					}
@@ -190,7 +191,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 					$comboList,
 					$wasMatched,
 					$trailingOptionals,
-					$flags ?? 0,
+					$flags,
 					$markVerbs,
 					$matchesAll,
 				);
@@ -203,7 +204,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 				}
 			}
 
-			if ($isOptionalAlternation && !$this->containsUnmatchedAsNull($flags ?? 0, $matchesAll)) {
+			if ($isOptionalAlternation && !$this->containsUnmatchedAsNull($flags, $matchesAll)) {
 				$combiTypes[] = new ConstantArrayType([new ConstantIntegerType(0)], [$this->createSubjectValueType($flags, $matchesAll)], [0], [], true);
 			}
 
@@ -214,7 +215,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 			$groupList,
 			$wasMatched,
 			$trailingOptionals,
-			$flags ?? 0,
+			$flags,
 			$markVerbs,
 			$matchesAll,
 		);