Merge branch refs/heads/1.11.x into 1.12.x

phpstan · Jul 28, 2024 · 5979498 · 5979498
2 parents 598ed5b + cf1096d
commit 5979498
Showing 1 changed file with 36 additions and 20 deletions.
diff --git a/src/Type/Php/RegexArrayShapeMatcher.php b/src/Type/Php/RegexArrayShapeMatcher.php
@@ -293,26 +293,8 @@ private function buildArrayType(
 		$i = 0;
 		foreach ($captureGroups as $captureGroup) {
 			$isTrailingOptional = $i >= $countGroups - $trailingOptionals;
-			$groupValueType = $this->getValueType($captureGroup->getType(), $flags);
-
-			if (!$wasMatched->yes()) {
-				$optional = true;
-			} else {
-				if (!$isTrailingOptional) {
-					$optional = false;
-					if ($this->containsUnmatchedAsNull($flags) && !$captureGroup->isOptional()) {
-						$groupValueType = TypeCombinator::removeNull($groupValueType);
-					}
-				} elseif ($this->containsUnmatchedAsNull($flags)) {
-					$optional = false;
-				} else {
-					$optional = $captureGroup->isOptional();
-				}
-			}
-
-			if (!$isTrailingOptional && $captureGroup->isOptional() && !$this->containsUnmatchedAsNull($flags)) {
-				$groupValueType = TypeCombinator::union($groupValueType, new ConstantStringType(''));
-			}
+			$groupValueType = $this->createGroupValueType($captureGroup, $wasMatched, $flags, $isTrailingOptional);
+			$optional = $this->isGroupOptional($captureGroup, $wasMatched, $flags, $isTrailingOptional);
 
 			if ($captureGroup->isNamed()) {
 				$builder->setOffsetValueType(
@@ -346,6 +328,40 @@ private function buildArrayType(
 		return $builder->getArray();
 	}
 
+	private function isGroupOptional(RegexCapturingGroup $captureGroup, TrinaryLogic $wasMatched, int $flags, bool $isTrailingOptional): bool
+	{
+		if (!$wasMatched->yes()) {
+			$optional = true;
+		} else {
+			if (!$isTrailingOptional) {
+				$optional = false;
+			} elseif ($this->containsUnmatchedAsNull($flags)) {
+				$optional = false;
+			} else {
+				$optional = $captureGroup->isOptional();
+			}
+		}
+
+		return $optional;
+	}
+
+	private function createGroupValueType(RegexCapturingGroup $captureGroup, TrinaryLogic $wasMatched, int $flags, bool $isTrailingOptional): Type
+	{
+		$groupValueType = $this->getValueType($captureGroup->getType(), $flags);
+
+		if ($wasMatched->yes()) {
+			if (!$isTrailingOptional && $this->containsUnmatchedAsNull($flags) && !$captureGroup->isOptional()) {
+				$groupValueType = TypeCombinator::removeNull($groupValueType);
+			}
+		}
+
+		if (!$isTrailingOptional && !$this->containsUnmatchedAsNull($flags) && $captureGroup->isOptional()) {
+			$groupValueType = TypeCombinator::union($groupValueType, new ConstantStringType(''));
+		}
+
+		return $groupValueType;
+	}
+
 	private function containsUnmatchedAsNull(int $flags): bool
 	{
 		return ($flags & PREG_UNMATCHED_AS_NULL) !== 0 && (($flags & self::PREG_UNMATCHED_AS_NULL_ON_72_73) !== 0 || $this->phpVersion->supportsPregUnmatchedAsNull());