update AST with empty tokens for alternations

Author: mvorisek

src/Type/Regex/RegexGroupParser.php

@@ -20,6 +20,7 @@
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use function array_values;
 use function count;
 use function in_array;
 use function is_int;
@@ -67,6 +68,8 @@ public function parseGroups(string $regex): ?array
 			return null;
 		}
 
+		$this->updateAlternationAstRemoveVerticalBarsAndAddEmptyToken($ast);
+
 		$captureOnlyNamed = false;
 		$modifiers = $this->regexExpressionHelper->getPatternModifiers($regex) ?? '';
 		if ($this->phpVersion->supportsPregCaptureOnlyNamedGroups()) {
@@ -88,6 +91,31 @@ public function parseGroups(string $regex): ?array
 		return [$astWalkResult->getCapturingGroups(), $astWalkResult->getMarkVerbs()];
 	}
 
+	private function updateAlternationAstRemoveVerticalBarsAndAddEmptyToken(TreeNode $ast): void
+	{
+		$children = $ast->getChildren();
+
+		foreach ($children as $i => $child) {
+			$this->updateAlternationAstRemoveVerticalBarsAndAddEmptyToken($child);
+
+			if ($ast->getId() !== '#alternation' || $child->getValueToken() !== 'alternation') {
+				continue;
+			}
+
+			unset($children[$i]);
+
+			if ($i !== 0
+				&& isset($children[$i + 1])
+				&& $children[$i + 1]->getValueToken() !== 'alternation') {
+				continue;
+			}
+
+			$children[$i] = new TreeNode('token', ['token' => 'literal', 'value' => '', 'namespace' => 'default'], [], $ast);
+		}
+
+		$ast->setChildren(array_values($children));
+	}
+
 	private function walkRegexAst(
 		TreeNode $ast,
 		?RegexAlternation $alternation,

tests/PHPStan/Command/IgnoredRegexValidatorTest.php

@@ -104,13 +104,15 @@ public function dataValidate(): array
 				'~Result of || is always true.~',
 				[],
 				false,
-				true,
+				false,
 			],
 			[
 				'#Method PragmaRX\Notified\Data\Repositories\Notified::firstOrCreateByEvent() should return PragmaRX\Notified\Data\Models\Notified but returns Illuminate\Database\Eloquent\Model|null#',
-				[],
+				[
+					'null' => 'null',
+				],
+				false,
 				false,
-				true,
 			],
 		];
 	}