Use new matchExpr API

composer · Jul 19, 2024 · 744502a · 744502a
1 parent c2f6808
commit 744502a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/PHPStan/PregMatchParameterOutTypeExtension.php b/src/PHPStan/PregMatchParameterOutTypeExtension.php
@@ -51,9 +51,8 @@ public function getParameterOutTypeFromStaticMethodCall(MethodReflection $method
         if ($flagsType === null) {
             return null;
         }
-        $patternType = $scope->getType($patternArg->value);
 
-        return $this->regexShapeMatcher->matchExpr($patternType, $flagsType, TrinaryLogic::createMaybe());
+        return $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, TrinaryLogic::createMaybe(), $scope);
     }
 
 }
diff --git a/src/PHPStan/PregMatchTypeSpecifyingExtension.php b/src/PHPStan/PregMatchTypeSpecifyingExtension.php
@@ -66,9 +66,8 @@ public function specifyTypes(MethodReflection $methodReflection, StaticCall $nod
         if ($flagsType === null) {
             return new SpecifiedTypes();
         }
-        $patternType = $scope->getType($patternArg->value);
 
-        $matchedType = $this->regexShapeMatcher->matchExpr($patternType, $flagsType, TrinaryLogic::createFromBoolean($context->true()));
+        $matchedType = $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, TrinaryLogic::createFromBoolean($context->true()), $scope);
         if ($matchedType === null) {
             return new SpecifiedTypes();
         }

diff --git a/src/PHPStan/UnsafeStrictGroupsCallRule.php b/src/PHPStan/UnsafeStrictGroupsCallRule.php
@@ -75,9 +75,8 @@ public function processNode(Node $node, Scope $scope): array
         if ($flagsType === null) {
             return [];
         }
-        $patternType = $scope->getType($patternArg->value);
 
-        $matchedType = $this->regexShapeMatcher->matchExpr($patternType, $flagsType, TrinaryLogic::createYes());
+        $matchedType = $this->regexShapeMatcher->matchExpr($patternArg->value, $flagsType, TrinaryLogic::createYes(), $scope);
         if ($matchedType === null) {
             return [
                 RuleErrorBuilder::message(sprintf('The %s call is potentially unsafe as $matches\' type could not be inferred.', $node->name->name))