Extract RegexExpressionHelper

Author: staabm

conf/config.neon

@@ -1491,6 +1491,9 @@ services:
 	-
 		class: PHPStan\Type\Php\RegexArrayShapeMatcher
 
+	-
+		class: PHPStan\Type\Php\RegexExpressionHelper
+
 	-
 		class: PHPStan\Type\Php\ReflectionClassConstructorThrowTypeExtension
 		tags:

src/Type/Php/RegexArrayShapeMatcher.php

@@ -10,10 +10,8 @@
 use Nette\Utils\RegexpException;
 use Nette\Utils\Strings;
 use PhpParser\Node\Expr;
-use PhpParser\Node\Name;
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
-use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
@@ -56,7 +54,7 @@ final class RegexArrayShapeMatcher
 
 	public function __construct(
 		private PhpVersion $phpVersion,
-		private InitializerExprTypeResolver $initializerExprTypeResolver,
+		private RegexExpressionHelper $regexExpressionHelper,
 	)
 	{
 	}
@@ -712,57 +710,10 @@ private function getLiteralValue(TreeNode $node): ?string
 	private function getPatternType(Expr $patternExpr, Scope $scope): Type
 	{
 		if ($patternExpr instanceof Expr\BinaryOp\Concat) {
-			return $this->resolvePatternConcat($patternExpr, $scope);
+			return $this->regexExpressionHelper->resolvePatternConcat($patternExpr, $scope);
 		}
 
 		return $scope->getType($patternExpr);
 	}
 
-	/**
-	 * Ignores preg_quote() calls in the concatenation as these are not relevant for array-shape matching.
-	 *
-	 * This assumption only works for the ArrayShapeMatcher therefore it is not implemented for the common case in Scope.
-	 *
-	 * see https://github.com/phpstan/phpstan-src/pull/3233#discussion_r1676938085
-	 */
-	private function resolvePatternConcat(Expr\BinaryOp\Concat $concat, Scope $scope): Type
-	{
-		$resolver = new class($scope) {
-
-			public function __construct(private Scope $scope)
-			{
-			}
-
-			public function resolve(Expr $expr): Type
-			{
-				if (
-					$expr instanceof Expr\FuncCall
-					&& $expr->name instanceof Name
-					&& $expr->name->toLowerString() === 'preg_quote'
-				) {
-					return new ConstantStringType('');
-				}
-
-				if ($expr instanceof Expr\BinaryOp\Concat) {
-					$left = $this->resolve($expr->left);
-					$right = $this->resolve($expr->right);
-
-					$strings = [];
-					foreach ($left->toString()->getConstantStrings() as $leftString) {
-						foreach ($right->toString()->getConstantStrings() as $rightString) {
-							$strings[] = new ConstantStringType($leftString->getValue() . $rightString->getValue());
-						}
-					}
-
-					return TypeCombinator::union(...$strings);
-				}
-
-				return $this->scope->getType($expr);
-			}
-
-		};
-
-		return $this->initializerExprTypeResolver->getConcatType($concat->left, $concat->right, static fn (Expr $expr): Type => $resolver->resolve($expr));
-	}
-
 }

src/Type/Php/RegexExpressionHelper.php

@@ -0,0 +1,69 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\Php;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Name;
+use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\InitializerExprTypeResolver;
+use PHPStan\Type\Constant\ConstantStringType;
+use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
+
+final class RegexExpressionHelper
+{
+
+	public function __construct(
+		private InitializerExprTypeResolver $initializerExprTypeResolver,
+	)
+	{
+	}
+
+	/**
+	 * Ignores preg_quote() calls in the concatenation as these are not relevant for array-shape matching.
+	 *
+	 * This assumption only works for the ArrayShapeMatcher therefore it is not implemented for the common case in Scope.
+	 *
+	 * see https://github.com/phpstan/phpstan-src/pull/3233#discussion_r1676938085
+	 */
+	public function resolvePatternConcat(Expr\BinaryOp\Concat $concat, Scope $scope): Type
+	{
+		$resolver = new class($scope) {
+
+			public function __construct(private Scope $scope)
+			{
+			}
+
+			public function resolve(Expr $expr): Type
+			{
+				if (
+					$expr instanceof Expr\FuncCall
+					&& $expr->name instanceof Name
+					&& $expr->name->toLowerString() === 'preg_quote'
+				) {
+					return new ConstantStringType('');
+				}
+
+				if ($expr instanceof Expr\BinaryOp\Concat) {
+					$left = $this->resolve($expr->left);
+					$right = $this->resolve($expr->right);
+
+					$strings = [];
+					foreach ($left->toString()->getConstantStrings() as $leftString) {
+						foreach ($right->toString()->getConstantStrings() as $rightString) {
+							$strings[] = new ConstantStringType($leftString->getValue() . $rightString->getValue());
+						}
+					}
+
+					return TypeCombinator::union(...$strings);
+				}
+
+				return $this->scope->getType($expr);
+			}
+
+		};
+
+		return $this->initializerExprTypeResolver->getConcatType($concat->left, $concat->right, static fn (Expr $expr): Type => $resolver->resolve($expr));
+	}
+
+}