stronger types

Author: staabm

src/Type/Php/RegexArrayShapeMatcher.php

@@ -116,18 +116,18 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 
 		$regexGroupList = new RegexGroupList($groupList);
 		$trailingOptionals = $regexGroupList->countTrailingOptionals();
-		$onlyOptionalTopLevelGroupId = $regexGroupList->getOnlyOptionalTopLevelGroupId();
+		$onlyOptionalTopLevelGroup = $regexGroupList->getOnlyOptionalTopLevelGroup();
 		$onlyTopLevelAlternation = $regexGroupList->getOnlyTopLevelAlternation();
 		$flags ??= 0;
 
 		if (
 			!$matchesAll
 			&& $wasMatched->yes()
-			&& $onlyOptionalTopLevelGroupId !== null
+			&& $onlyOptionalTopLevelGroup !== null
 		) {
 			// if only one top level capturing optional group exists
 			// we build a more precise tagged union of a empty-match and a match with the group
-			$regexGroupList = $regexGroupList->forceGroupIdNonOptional($onlyOptionalTopLevelGroupId);
+			$regexGroupList = $regexGroupList->forceGroupNonOptional($onlyOptionalTopLevelGroup);
 
 			$combiType = $this->buildArrayType(
 				$regexGroupList,
@@ -149,7 +149,7 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 			return $combiType;
 		} elseif (
 			!$matchesAll
-			&& $onlyOptionalTopLevelGroupId === null
+			&& $onlyOptionalTopLevelGroup === null
 			&& $onlyTopLevelAlternation !== null
 			&& !$wasMatched->no()
 		) {
@@ -161,21 +161,21 @@ private function matchRegex(string $regex, ?int $flags, TrinaryLogic $wasMatched
 				$comboList = new RegexGroupList($groupList);
 
 				$beforeCurrentCombo = true;
-				foreach ($comboList as $groupId => $group) {
-					if (in_array($groupId, $groupCombo, true)) {
+				foreach ($comboList as $group) {
+					if (in_array($group->getId(), $groupCombo, true)) {
 						$isOptionalAlternation = $group->inOptionalAlternation();
-						$comboList = $comboList->forceGroupIdNonOptional($group->getId());
+						$comboList = $comboList->forceGroupNonOptional($group);
 						$beforeCurrentCombo = false;
 					} elseif ($beforeCurrentCombo && !$group->resetsGroupCounter()) {
-						$comboList = $comboList->forceGroupIdTypeAndNonOptional(
-							$group->getId(),
+						$comboList = $comboList->forceGroupTypeAndNonOptional(
+							$group,
 							$this->containsUnmatchedAsNull($flags, $matchesAll) ? new NullType() : new ConstantStringType(''),
 						);
 					} elseif (
 						$group->getAlternationId() === $onlyTopLevelAlternation->getId()
 						&& !$this->containsUnmatchedAsNull($flags, $matchesAll)
 					) {
-						$comboList = $comboList->removeGroup($groupId);
+						$comboList = $comboList->removeGroup($group);
 					}
 				}
 

src/Type/Regex/RegexGroupList.php

@@ -37,22 +37,22 @@ public function countTrailingOptionals(): int
 		return $trailingOptionals;
 	}
 
-	public function forceGroupIdNonOptional(int $id): self
+	public function forceGroupNonOptional(RegexCapturingGroup $group): self
 	{
-		return $this->cloneAndReParentList($id);
+		return $this->cloneAndReParentList($group);
 	}
 
-	public function forceGroupIdTypeAndNonOptional(int $id, Type $type): self
+	public function forceGroupTypeAndNonOptional(RegexCapturingGroup $group, Type $type): self
 	{
-		return $this->cloneAndReParentList($id, $type);
+		return $this->cloneAndReParentList($group, $type);
 	}
 
-	private function cloneAndReParentList(int $id, ?Type $type = null): self
+	private function cloneAndReParentList(RegexCapturingGroup $target, ?Type $type = null): self
 	{
 		$groups = [];
 		$forcedGroup = null;
 		foreach ($this->groups as $i => $group) {
-			if ($group->getId() === $id) {
+			if ($group->getId() === $target->getId()) {
 				$forcedGroup = $group->forceNonOptional();
 				if ($type !== null) {
 					$forcedGroup = $forcedGroup->forceType($type);
@@ -78,7 +78,7 @@ private function cloneAndReParentList(int $id, ?Type $type = null): self
 					continue;
 				}
 
-				if ($parent->getId() === $id) {
+				if ($parent->getId() === $target->getId()) {
 					$groups[$i] = $groups[$i]->withParent($forcedGroup);
 				}
 				$parent = $parent->getParent();
@@ -88,11 +88,11 @@ private function cloneAndReParentList(int $id, ?Type $type = null): self
 		return new self($groups);
 	}
 
-	public function removeGroup(int $id): self
+	public function removeGroup(RegexCapturingGroup $remove): self
 	{
 		$groups = [];
 		foreach ($this->groups as $i => $group) {
-			if ($group->getId() === $id) {
+			if ($group->getId() === $remove->getId()) {
 				continue;
 			}
 
@@ -102,9 +102,9 @@ public function removeGroup(int $id): self
 		return new self($groups);
 	}
 
-	public function getOnlyOptionalTopLevelGroupId(): ?int
+	public function getOnlyOptionalTopLevelGroup(): ?RegexCapturingGroup
 	{
-		$groupIndex = null;
+		$group = null;
 		foreach ($this->groups as $captureGroup) {
 			if (!$captureGroup->isTopLevel()) {
 				continue;
@@ -114,14 +114,14 @@ public function getOnlyOptionalTopLevelGroupId(): ?int
 				return null;
 			}
 
-			if ($groupIndex !== null) {
+			if ($group !== null) {
 				return null;
 			}
 
-			$groupIndex = $captureGroup->getId();
+			$group = $captureGroup;
 		}
 
-		return $groupIndex;
+		return $group;
 	}
 
 	public function getOnlyTopLevelAlternation(): ?RegexAlternation