Update RegexGroupParser.php

Author: staabm

src/Type/Regex/RegexGroupParser.php

@@ -102,6 +102,19 @@ public function parseGroups(string $regex): ?RegexAstWalkResult
 			RegexAstWalkResult::createEmpty(),
 		);
 
+		$subjectAsGroupResult = $this->walkGroupAst(
+			$ast,
+			false,
+			false,
+			$modifiers,
+			RegexGroupWalkResult::createEmpty(),
+		);
+		if ($subjectAsGroupResult->isNonEmpty()->yes()) {
+			$astWalkResult = $astWalkResult->withSubjectBaseType(
+				TypeCombinator::intersect(new StringType(), new AccessoryNonEmptyStringType())
+			);
+		}
+
 		return $astWalkResult;
 	}
 
@@ -260,12 +273,6 @@ private function walkRegexAst(
 				$astWalkResult,
 			);
 
-			if ($alternation === null && !$inOptionalQuantification) {
-				$astWalkResult = $astWalkResult->withSubjectBaseType(
-					TypeCombinator::intersect(new StringType(), new AccessoryNonEmptyStringType())
-				);
-			}
-
 			if ($ast->getId() !== '#alternation') {
 				continue;
 			}