Use single regex shape matcher call with dynamically determined method

Wirone · Wirone · commit d2da3a8b11ac · 2024-09-23T09:59:43.000+02:00
Personally I find it better than if/else with similar calls to different methods with exact same parameters.
diff --git a/dev-tools/phpstan/src/Extension/PregMatchParameterOutExtension.php b/dev-tools/phpstan/src/Extension/PregMatchParameterOutExtension.php
@@ -38,7 +38,7 @@ public function isStaticMethodSupported(MethodReflection $methodReflection, Para
     {
         return
             Preg::class === $methodReflection->getDeclaringClass()->getName()
-            && in_array($methodReflection->getName(), ['match', 'matchAll'], true)
+            && \in_array($methodReflection->getName(), ['match', 'matchAll'], true)
             && 'matches' === $parameter->getName();
     }
 
@@ -60,9 +60,9 @@ public function getParameterOutTypeFromStaticMethodCall(MethodReflection $method
             $flagsType = $scope->getType($flagsArg->value);
         }
 
-        if ($methodReflection->getName() === 'match') {
-            return $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, TrinaryLogic::createMaybe(), $scope);
-        }
-        return $this->regexShapeMatcher->matchAllExpr($patternArg->value, $flagsType, TrinaryLogic::createMaybe(), $scope);
+        $matcherMethod = ('match' === $methodReflection->getName()) ? 'matchExpr' : 'matchAllExpr';
+
+        // @phpstan-ignore method.dynamicName
+        return $this->regexShapeMatcher->{$matcherMethod}($patternArg->value, $flagsType, TrinaryLogic::createMaybe(), $scope);
     }
 }
diff --git a/dev-tools/phpstan/src/Extension/PregMatchTypeSpecifyingExtension.php b/dev-tools/phpstan/src/Extension/PregMatchTypeSpecifyingExtension.php
@@ -50,7 +50,7 @@ public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
 
     public function isStaticMethodSupported(MethodReflection $methodReflection, StaticCall $node, TypeSpecifierContext $context): bool
     {
-        return in_array($methodReflection->getName(), ['match', 'matchAll'], true)  && !$context->null();
+        return \in_array($methodReflection->getName(), ['match', 'matchAll'], true) && !$context->null();
     }
 
     public function specifyTypes(MethodReflection $methodReflection, StaticCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
@@ -71,11 +71,15 @@ public function specifyTypes(MethodReflection $methodReflection, StaticCall $nod
             $flagsType = $scope->getType($flagsArg->value);
         }
 
-        if ($methodReflection->getName() === 'match') {
-            $matchedType = $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, TrinaryLogic::createFromBoolean($context->true()), $scope);
-        } else {
-            $matchedType = $this->regexShapeMatcher->matchAllExpr($patternArg->value, $flagsType, TrinaryLogic::createFromBoolean($context->true()), $scope);
-        }
+        $matcherMethod = ('match' === $methodReflection->getName()) ? 'matchExpr' : 'matchAllExpr';
+
+        /** @phpstan-ignore method.dynamicName */
+        $matchedType = $this->regexShapeMatcher->{$matcherMethod}(
+            $patternArg->value,
+            $flagsType,
+            TrinaryLogic::createFromBoolean($context->true()),
+            $scope
+        );
 
         if (null === $matchedType) {
             return new SpecifiedTypes();

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function isStaticMethodSupported(MethodReflection $methodReflection, Para`
`38`	`38`	`{`
`39`	`39`	`return`
`40`	`40`	`Preg::class === $methodReflection->getDeclaringClass()->getName()`
`41`		`- && in_array($methodReflection->getName(), ['match', 'matchAll'], true)`
	`41`	`+ && \in_array($methodReflection->getName(), ['match', 'matchAll'], true)`
`42`	`42`	`&& 'matches' === $parameter->getName();`
`43`	`43`	`}`
`44`	`44`
`@@ -60,9 +60,9 @@ public function getParameterOutTypeFromStaticMethodCall(MethodReflection $method`
`60`	`60`	`$flagsType = $scope->getType($flagsArg->value);`
`61`	`61`	`}`
`62`	`62`
`63`		`- if ($methodReflection->getName() === 'match') {`
`64`		`- return $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, TrinaryLogic::createMaybe(), $scope);`
`65`		`- }`
`66`		`- return $this->regexShapeMatcher->matchAllExpr($patternArg->value, $flagsType, TrinaryLogic::createMaybe(), $scope);`
	`63`	`+ $matcherMethod = ('match' === $methodReflection->getName()) ? 'matchExpr' : 'matchAllExpr';`
	`64`	`+`
	`65`	`+ // @phpstan-ignore method.dynamicName`
	`66`	`+ return $this->regexShapeMatcher->{$matcherMethod}($patternArg->value, $flagsType, TrinaryLogic::createMaybe(), $scope);`
`67`	`67`	`}`
`68`	`68`	`}`