Apply feedback

composer · Jul 12, 2024 · 7de8962 · 7de8962
1 parent eca48c7
commit 7de8962
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 18 deletions.
diff --git a/src/PHPStan/UnsafeStrictGroupsCallRule.php b/src/PHPStan/UnsafeStrictGroupsCallRule.php
@@ -77,7 +77,7 @@ public function processNode(Node $node, Scope $scope): array
         }
         $patternType = $scope->getType($patternArg->value);
 
-        $matchedType = $this->regexShapeMatcher->matchType($patternType, $flagsType, TrinaryLogic::createFromBoolean(true));
+        $matchedType = $this->regexShapeMatcher->matchType($patternType, $flagsType, TrinaryLogic::createYes());
         if ($matchedType === null) {
             return [
                 RuleErrorBuilder::message(sprintf('The %s call is potentially unsafe as $matches\' type could not be inferred.', $node->name->name))

diff --git a/tests/PHPStanTests/UnsafeStrictGroupsCallRuleTest.php b/tests/PHPStanTests/UnsafeStrictGroupsCallRuleTest.php
@@ -14,7 +14,6 @@
 use PHPStan\Testing\RuleTestCase;
 use Composer\Pcre\PHPStan\UnsafeStrictGroupsCallRule;
 use PHPStan\Type\Php\RegexArrayShapeMatcher;
-use PHPStan\Php\PhpVersion;
 
 /**
  * Run with "vendor/bin/phpunit --testsuite phpstan"
@@ -27,8 +26,7 @@ class UnsafeStrictGruopsCallRuleTest extends RuleTestCase
 {
     protected function getRule(): \PHPStan\Rules\Rule
     {
-        // @phpstan-ignore phpstanApi.constructor,phpstanApi.constructor
-        return new UnsafeStrictGroupsCallRule(new RegexArrayShapeMatcher(new PhpVersion(PHP_VERSION_ID, PhpVersion::SOURCE_RUNTIME)));
+        return new UnsafeStrictGroupsCallRule(self::getContainer()->getByType(RegexArrayShapeMatcher::class));
     }
 
     public function testRule(): void

diff --git a/tests/PHPStanTests/nsrt/preg-match.php b/tests/PHPStanTests/nsrt/preg-match.php
@@ -22,20 +22,20 @@ function doMatch(string $s): void
     }
     assertType('array{}|array{string, string}', $matches);
 
-    if (Preg::match('/Price: (£|€)?\d+/', $s, $matches)) {
-        assertType('array{0: string, 1: string|null}', $matches);
-    } else {
-        assertType('array{}', $matches);
-    }
-    assertType('array{}|array{0: string, 1: string|null}', $matches);
-
-    // passing the PREG_UNMATCHED_AS_NULL should change nothing compared to above as it is always set
-    if (Preg::match('/Price: (£|€)?\d+/', $s, $matches, PREG_UNMATCHED_AS_NULL)) {
-        assertType('array{0: string, 1: string|null}', $matches);
-    } else {
-        assertType('array{}', $matches);
-    }
-    assertType('array{}|array{0: string, 1: string|null}', $matches);
+//    if (Preg::match('/Price: (£|€)?\d+/', $s, $matches)) { // temporarily disabled until https://github.com/phpstan/phpstan-src/pull/3229 is released
+//        assertType('array{0: string, 1: string|null}', $matches);
+//    } else {
+//        assertType('array{}', $matches);
+//    }
+//    assertType('array{}|array{0: string, 1: string|null}', $matches);
+//
+//    // passing the PREG_UNMATCHED_AS_NULL should change nothing compared to above as it is always set
+//    if (Preg::match('/Price: (£|€)?\d+/', $s, $matches, PREG_UNMATCHED_AS_NULL)) {
+//        assertType('array{0: string, 1: string|null}', $matches);
+//    } else {
+//        assertType('array{}', $matches);
+//    }
+//    assertType('array{}|array{0: string, 1: string|null}', $matches);
 
     if (Preg::isMatch('/Price: (?<currency>£|€)\d+/', $s, $matches)) {
         assertType('array{0: string, currency: string, 1: string}', $matches);