Update Preg::match (#911)

kubawerlos · web-flow · commit c3df089c2ab7 · 2023-07-17T23:03:59.000+02:00
diff --git a/src/Fixer/CommentedOutFunctionFixer.php b/src/Fixer/CommentedOutFunctionFixer.php
@@ -182,7 +182,7 @@ private function canUseSingleLineComment(Tokens $tokens, int $startIndex, int $e
             return true;
         }
 
-        if (Preg::match('/^\R/', $tokens[$endIndex + 1]->getContent()) === 1) {
+        if (Preg::match('/^\R/', $tokens[$endIndex + 1]->getContent())) {
             return true;
         }
 
@@ -207,7 +207,7 @@ private function fixBlockWithSingleLineComments(Tokens $tokens, int $startIndex,
         $codeToCommentOut = $prefix . \str_replace("\n", "\n//", $codeToCommentOut);
 
         if ($tokens->offsetExists($endIndex + 1)) {
-            if (Preg::match('/^\R/', $tokens[$endIndex + 1]->getContent()) === 0) {
+            if (!Preg::match('/^\R/', $tokens[$endIndex + 1]->getContent())) {
                 $codeToCommentOut .= "\n";
                 if ($tokens[$endIndex + 1]->isWhitespace()) {
                     $endIndex++;
diff --git a/src/Fixer/MultilineCommentOpeningClosingAloneFixer.php b/src/Fixer/MultilineCommentOpeningClosingAloneFixer.php
@@ -54,7 +54,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
-            if (Preg::match('/\R/', $tokens[$index]->getContent()) !== 1) {
+            if (!Preg::match('/\R/', $tokens[$index]->getContent())) {
                 continue;
             }
 
@@ -65,7 +65,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
 
     private function fixOpening(Tokens $tokens, int $index): void
     {
-        if (Preg::match('#^/\*+\R#', $tokens[$index]->getContent()) === 1) {
+        if (Preg::match('#^/\*+\R#', $tokens[$index]->getContent())) {
             return;
         }
 
@@ -93,7 +93,7 @@ private function fixOpening(Tokens $tokens, int $index): void
             $indent .= ' ';
         }
 
-        if (Preg::match('#^\h+$#', $beforeNewline) === 1) {
+        if (Preg::match('#^\h+$#', $beforeNewline)) {
             $insert = '';
         } else {
             $insert = $newline . $indent . $beforeNewline;
@@ -102,13 +102,13 @@ private function fixOpening(Tokens $tokens, int $index): void
         $newContent = $opening . $insert . $newline . $afterNewline;
 
         if ($newContent !== $tokens[$index]->getContent()) {
-            $tokens[$index] = new Token([Preg::match('~/\*{2}\s~', $newContent) === 1 ? \T_DOC_COMMENT : \T_COMMENT, $newContent]);
+            $tokens[$index] = new Token([Preg::match('~/\*{2}\s~', $newContent) ? \T_DOC_COMMENT : \T_COMMENT, $newContent]);
         }
     }
 
     private function fixClosing(Tokens $tokens, int $index): void
     {
-        if (Preg::match('#\R\h*\*+/$#', $tokens[$index]->getContent()) === 1) {
+        if (Preg::match('#\R\h*\*+/$#', $tokens[$index]->getContent())) {
             return;
         }
 
diff --git a/src/Fixer/NoDuplicatedArrayKeyFixer.php b/src/Fixer/NoDuplicatedArrayKeyFixer.php
@@ -108,7 +108,7 @@ private function fixArray(Tokens $tokens, int $index): void
                 $endIndex = $tokens->getNextMeaningfulToken($arrayElementAnalysis->getValueEndIndex());
                 \assert(\is_int($endIndex));
 
-                if ($tokens[$endIndex + 1]->isWhitespace() && Preg::match('/^\h+$/', $tokens[$endIndex + 1]->getContent()) === 1) {
+                if ($tokens[$endIndex + 1]->isWhitespace() && Preg::match('/^\h+$/', $tokens[$endIndex + 1]->getContent())) {
                     $endIndex++;
                 }
 
diff --git a/src/Fixer/NoPhpStormGeneratedCommentFixer.php b/src/Fixer/NoPhpStormGeneratedCommentFixer.php
@@ -59,7 +59,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
-            if (Preg::match('/\*\h+Created by PhpStorm/i', $tokens[$index]->getContent(), $matches) !== 1) {
+            if (!Preg::match('/\*\h+Created by PhpStorm/i', $tokens[$index]->getContent(), $matches)) {
                 continue;
             }
 
diff --git a/src/Fixer/NoSuperfluousConcatenationFixer.php b/src/Fixer/NoSuperfluousConcatenationFixer.php
@@ -111,7 +111,7 @@ private function areOnlyHorizontalWhitespacesBetween(Tokens $tokens, int $indexS
             if (!$tokens[$index]->isGivenKind(\T_WHITESPACE)) {
                 return false;
             }
-            if (Preg::match('/\R/', $tokens[$index]->getContent()) === 1) {
+            if (Preg::match('/\R/', $tokens[$index]->getContent())) {
                 return false;
             }
         }
@@ -127,8 +127,8 @@ private function fixConcat(Tokens $tokens, int $firstIndex, int $secondIndex): v
 
         if (
             $this->allowPreventingTrailingSpaces
-            && Preg::match('/\h(\\\'|")$/', $firstContent) === 1
-            && Preg::match('/^(\\\'|")\R/', $secondContent) === 1
+            && Preg::match('/\h(\\\'|")$/', $firstContent)
+            && Preg::match('/^(\\\'|")\R/', $secondContent)
         ) {
             return;
         }
diff --git a/src/Fixer/NumericLiteralSeparatorFixer.php b/src/Fixer/NumericLiteralSeparatorFixer.php
@@ -147,7 +147,7 @@ private function getNewContent(string $content): string
             return $this->updateContent($content, 'x', null, 2, $this->hexadecimalSeparator);
         }
 
-        if (Preg::match('/e-?[\d_]+$/i', $content) === 1) {
+        if (Preg::match('/e-?[\d_]+$/i', $content)) {
             $content = $this->updateContent($content, null, 'e', 3, $this->floatSeparator);
 
             return $this->updateContent($content, 'e', null, 3, $this->floatSeparator);
diff --git a/src/Fixer/PhpdocNoIncorrectVarAnnotationFixer.php b/src/Fixer/PhpdocNoIncorrectVarAnnotationFixer.php
@@ -107,7 +107,7 @@ private function removeForClassElement(Tokens $tokens, int $index, int $property
             return;
         }
 
-        if (Preg::match('/@var\h+(.+\h+)?\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $tokens[$index]->getContent()) === 1) {
+        if (Preg::match('/@var\h+(.+\h+)?\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $tokens[$index]->getContent())) {
             $this->removeVarAnnotation($tokens, $index, [$tokens[$variableIndex]->getContent()]);
         }
     }
@@ -149,7 +149,7 @@ private function removeVarAnnotationNotMatchingPattern(Tokens $tokens, int $inde
         $doc = new DocBlock($tokens[$index]->getContent());
 
         foreach ($doc->getAnnotationsOfType(['var']) as $annotation) {
-            if ($pattern === null || Preg::match($pattern, $annotation->getContent()) !== 1) {
+            if ($pattern === null || !Preg::match($pattern, $annotation->getContent())) {
                 $annotation->remove();
             }
         }
diff --git a/src/Fixer/PhpdocNoSuperfluousParamFixer.php b/src/Fixer/PhpdocNoSuperfluousParamFixer.php
@@ -121,7 +121,7 @@ private function getFilteredDocComment(string $comment, array $paramNames): stri
 
         $foundParamNames = [];
         foreach ($doc->getAnnotationsOfType('param') as $annotation) {
-            if (Preg::match(\sprintf('/@param\s+(?:[^\$](?:[^<.]|<[^>]*>)*\s*)?(?:&|\.\.\.)?\s*(?=\$)%s\b/', $regexParamNamesPattern), $annotation->getContent(), $matches) === 1 && !\in_array($matches[1], $foundParamNames, true)) {
+            if (Preg::match(\sprintf('/@param\s+(?:[^\$](?:[^<.]|<[^>]*>)*\s*)?(?:&|\.\.\.)?\s*(?=\$)%s\b/', $regexParamNamesPattern), $annotation->getContent(), $matches) && !\in_array($matches[1], $foundParamNames, true)) {
                 $foundParamNames[] = $matches[1];
                 continue;
             }
diff --git a/src/Fixer/PhpdocOnlyAllowedAnnotationsFixer.php b/src/Fixer/PhpdocOnlyAllowedAnnotationsFixer.php
@@ -98,7 +98,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
 
             foreach ($docBlock->getAnnotations() as $annotation) {
                 if (
-                    Preg::match('/@([a-zA-Z0-9_\\-\\\\]+)/', $annotation->getContent(), $matches) === 1
+                    Preg::match('/@([a-zA-Z0-9_\\-\\\\]+)/', $annotation->getContent(), $matches)
                     && \in_array($matches[1], $this->elements, true)
                 ) {
                     continue;
diff --git a/src/Fixer/PhpdocSingleLineVarFixer.php b/src/Fixer/PhpdocSingleLineVarFixer.php
@@ -61,7 +61,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
-            if (Preg::match('#^/\*\*[\s\*]+(@var[^\r\n]+)[\s\*]*\*\/$#u', $tokens[$index]->getContent(), $matches) !== 1) {
+            if (!Preg::match('#^/\*\*[\s\*]+(@var[^\r\n]+)[\s\*]*\*\/$#u', $tokens[$index]->getContent(), $matches)) {
                 continue;
             }
 
diff --git a/src/Fixer/PromotedConstructorPropertyFixer.php b/src/Fixer/PromotedConstructorPropertyFixer.php
@@ -185,7 +185,7 @@ private function isDoctrineEntity(Tokens $tokens, int $index): bool
         $docBlock = new DocBlock($tokens[$phpDocIndex]->getContent());
 
         foreach ($docBlock->getAnnotations() as $annotation) {
-            if (Preg::match('/\*\h+(@Document|@Entity|@Mapping\\\\Entity|@ODM\\\\Document|@ORM\\\\Entity|@ORM\\\\Mapping\\\\Entity)/', $annotation->getContent()) === 1) {
+            if (Preg::match('/\*\h+(@Document|@Entity|@Mapping\\\\Entity|@ODM\\\\Document|@ORM\\\\Entity|@ORM\\\\Mapping\\\\Entity)/', $annotation->getContent())) {
                 return true;
             }
         }
diff --git a/src/Fixer/SingleSpaceAfterStatementFixer.php b/src/Fixer/SingleSpaceAfterStatementFixer.php
@@ -143,7 +143,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
     private function canAddSpaceAfter(Tokens $tokens, int $index): bool
     {
         if ($tokens[$index + 1]->isGivenKind(\T_WHITESPACE)) {
-            return !$this->allowLinebreak || Preg::match('/\R/', $tokens[$index + 1]->getContent()) !== 1;
+            return !$this->allowLinebreak || !Preg::match('/\R/', $tokens[$index + 1]->getContent());
         }
 
         if ($tokens[$index]->isGivenKind(\T_CLASS) && $tokens[$index + 1]->equals('(')) {
diff --git a/src/Fixer/SingleSpaceBeforeStatementFixer.php b/src/Fixer/SingleSpaceBeforeStatementFixer.php
@@ -121,15 +121,15 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
 
     private function fixTwoTokensAfterOpenTag(Tokens $tokens, int $index): void
     {
-        if ($tokens[$index - 1]->isGivenKind(\T_WHITESPACE) && Preg::match('/\R/', $tokens[$index - 2]->getContent()) !== 1) {
+        if ($tokens[$index - 1]->isGivenKind(\T_WHITESPACE) && !Preg::match('/\R/', $tokens[$index - 2]->getContent())) {
             $tokens->clearAt($index - 1);
         }
     }
 
     private function fixMoreThanTwoTokensAfterOpenTag(Tokens $tokens, int $index): void
     {
         if ($tokens[$index - 1]->isGivenKind(\T_WHITESPACE)) {
-            if (Preg::match('/\R/', $tokens[$index - 1]->getContent()) !== 1) {
+            if (!Preg::match('/\R/', $tokens[$index - 1]->getContent())) {
                 $tokens[$index - 1] = new Token([\T_WHITESPACE, ' ']);
             }
 
diff --git a/src/TokenRemover.php b/src/TokenRemover.php
@@ -50,15 +50,15 @@ private static function hasMeaningTokenInLineBefore(Tokens $tokens, int $index):
             return true;
         }
 
-        if ($tokens[$prevIndex]->isGivenKind(\T_OPEN_TAG) && Preg::match('/\R$/', $tokens[$prevIndex]->getContent()) !== 1) {
+        if ($tokens[$prevIndex]->isGivenKind(\T_OPEN_TAG) && !Preg::match('/\R$/', $tokens[$prevIndex]->getContent())) {
             return true;
         }
 
-        if (Preg::match('/\R/', $tokens[$prevIndex]->getContent()) !== 1) {
+        if (!Preg::match('/\R/', $tokens[$prevIndex]->getContent())) {
             $prevPrevIndex = $tokens->getNonEmptySibling($prevIndex, -1);
             \assert(\is_int($prevPrevIndex));
 
-            if (!$tokens[$prevPrevIndex]->isGivenKind(\T_OPEN_TAG) || Preg::match('/\R$/', $tokens[$prevPrevIndex]->getContent()) !== 1) {
+            if (!$tokens[$prevPrevIndex]->isGivenKind(\T_OPEN_TAG) || !Preg::match('/\R$/', $tokens[$prevPrevIndex]->getContent())) {
                 return true;
             }
         }
@@ -77,7 +77,7 @@ private static function hasMeaningTokenInLineAfter(Tokens $tokens, int $index):
             return true;
         }
 
-        return Preg::match('/\R/', $tokens[$nextIndex]->getContent()) !== 1;
+        return !Preg::match('/\R/', $tokens[$nextIndex]->getContent());
     }
 
     private static function handleWhitespaceBefore(Tokens $tokens, int $index): bool
diff --git a/tests/AutoReview/TestsCodeTest.php b/tests/AutoReview/TestsCodeTest.php
@@ -41,7 +41,7 @@ public function testClassContainsCorrectMethods(string $className): void
 
         foreach ($this->getMethods($className, \ReflectionMethod::IS_PUBLIC) as $reflectionMethod) {
             self::assertTrue(
-                \strpos($reflectionMethod->getName(), 'test') === 0 || Preg::match('/^provide.+Cases$/', $reflectionMethod->getName()) === 1,
+                \strpos($reflectionMethod->getName(), 'test') === 0 || Preg::match('/^provide.+Cases$/', $reflectionMethod->getName()),
                 \sprintf(
                     'Data provider "%s" in class "%s" is not correctly named.',
                     $reflectionMethod->getName(),

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private function canUseSingleLineComment(Tokens $tokens, int $startIndex, int $e`
`182`	`182`	`return true;`
`183`	`183`	`}`
`184`	`184`
`185`		`- if (Preg::match('/^\R/', $tokens[$endIndex + 1]->getContent()) === 1) {`
	`185`	`+ if (Preg::match('/^\R/', $tokens[$endIndex + 1]->getContent())) {`
`186`	`186`	`return true;`
`187`	`187`	`}`
`188`	`188`
`@@ -207,7 +207,7 @@ private function fixBlockWithSingleLineComments(Tokens $tokens, int $startIndex,`
`207`	`207`	`$codeToCommentOut = $prefix . \str_replace("\n", "\n//", $codeToCommentOut);`
`208`	`208`
`209`	`209`	`if ($tokens->offsetExists($endIndex + 1)) {`
`210`		`- if (Preg::match('/^\R/', $tokens[$endIndex + 1]->getContent()) === 0) {`
	`210`	`+ if (!Preg::match('/^\R/', $tokens[$endIndex + 1]->getContent())) {`
`211`	`211`	`$codeToCommentOut .= "\n";`
`212`	`212`	`if ($tokens[$endIndex + 1]->isWhitespace()) {`
`213`	`213`	`$endIndex++;`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void`
`54`	`54`	`continue;`
`55`	`55`	`}`
`56`	`56`
`57`		`- if (Preg::match('/\R/', $tokens[$index]->getContent()) !== 1) {`
	`57`	`+ if (!Preg::match('/\R/', $tokens[$index]->getContent())) {`
`58`	`58`	`continue;`
`59`	`59`	`}`
`60`	`60`
`@@ -65,7 +65,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void`
`65`	`65`
`66`	`66`	`private function fixOpening(Tokens $tokens, int $index): void`
`67`	`67`	`{`
`68`		`- if (Preg::match('#^/\*+\R#', $tokens[$index]->getContent()) === 1) {`
	`68`	`+ if (Preg::match('#^/\*+\R#', $tokens[$index]->getContent())) {`
`69`	`69`	`return;`
`70`	`70`	`}`
`71`	`71`
`@@ -93,7 +93,7 @@ private function fixOpening(Tokens $tokens, int $index): void`
`93`	`93`	`$indent .= ' ';`
`94`	`94`	`}`
`95`	`95`
`96`		`- if (Preg::match('#^\h+$#', $beforeNewline) === 1) {`
	`96`	`+ if (Preg::match('#^\h+$#', $beforeNewline)) {`
`97`	`97`	`$insert = '';`
`98`	`98`	`} else {`
`99`	`99`	`$insert = $newline . $indent . $beforeNewline;`
`@@ -102,13 +102,13 @@ private function fixOpening(Tokens $tokens, int $index): void`
`102`	`102`	`$newContent = $opening . $insert . $newline . $afterNewline;`
`103`	`103`
`104`	`104`	`if ($newContent !== $tokens[$index]->getContent()) {`
`105`		`- $tokens[$index] = new Token([Preg::match('~/\*{2}\s~', $newContent) === 1 ? \T_DOC_COMMENT : \T_COMMENT, $newContent]);`
	`105`	`+ $tokens[$index] = new Token([Preg::match('~/\*{2}\s~', $newContent) ? \T_DOC_COMMENT : \T_COMMENT, $newContent]);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`private function fixClosing(Tokens $tokens, int $index): void`
`110`	`110`	`{`
`111`		`- if (Preg::match('#\R\h\+/$#', $tokens[$index]->getContent()) === 1) {`
	`111`	`+ if (Preg::match('#\R\h\+/$#', $tokens[$index]->getContent())) {`
`112`	`112`	`return;`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ private function fixArray(Tokens $tokens, int $index): void`
`108`	`108`	`$endIndex = $tokens->getNextMeaningfulToken($arrayElementAnalysis->getValueEndIndex());`
`109`	`109`	`\assert(\is_int($endIndex));`
`110`	`110`
`111`		`- if ($tokens[$endIndex + 1]->isWhitespace() && Preg::match('/^\h+$/', $tokens[$endIndex + 1]->getContent()) === 1) {`
	`111`	`+ if ($tokens[$endIndex + 1]->isWhitespace() && Preg::match('/^\h+$/', $tokens[$endIndex + 1]->getContent())) {`
`112`	`112`	`$endIndex++;`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void`
`59`	`59`	`continue;`
`60`	`60`	`}`
`61`	`61`
`62`		`- if (Preg::match('/\*\h+Created by PhpStorm/i', $tokens[$index]->getContent(), $matches) !== 1) {`
	`62`	`+ if (!Preg::match('/\*\h+Created by PhpStorm/i', $tokens[$index]->getContent(), $matches)) {`
`63`	`63`	`continue;`
`64`	`64`	`}`
`65`	`65`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ private function areOnlyHorizontalWhitespacesBetween(Tokens $tokens, int $indexS`
`111`	`111`	`if (!$tokens[$index]->isGivenKind(\T_WHITESPACE)) {`
`112`	`112`	`return false;`
`113`	`113`	`}`
`114`		`- if (Preg::match('/\R/', $tokens[$index]->getContent()) === 1) {`
	`114`	`+ if (Preg::match('/\R/', $tokens[$index]->getContent())) {`
`115`	`115`	`return false;`
`116`	`116`	`}`
`117`	`117`	`}`
`@@ -127,8 +127,8 @@ private function fixConcat(Tokens $tokens, int $firstIndex, int $secondIndex): v`
`127`	`127`
`128`	`128`	`if (`
`129`	`129`	`$this->allowPreventingTrailingSpaces`
`130`		`- && Preg::match('/\h(\\\'\|")$/', $firstContent) === 1`
`131`		`- && Preg::match('/^(\\\'\|")\R/', $secondContent) === 1`
	`130`	`+ && Preg::match('/\h(\\\'\|")$/', $firstContent)`
	`131`	`+ && Preg::match('/^(\\\'\|")\R/', $secondContent)`
`132`	`132`	`) {`
`133`	`133`	`return;`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private function getNewContent(string $content): string`
`147`	`147`	`return $this->updateContent($content, 'x', null, 2, $this->hexadecimalSeparator);`
`148`	`148`	`}`
`149`	`149`
`150`		`- if (Preg::match('/e-?[\d_]+$/i', $content) === 1) {`
	`150`	`+ if (Preg::match('/e-?[\d_]+$/i', $content)) {`
`151`	`151`	`$content = $this->updateContent($content, null, 'e', 3, $this->floatSeparator);`
`152`	`152`
`153`	`153`	`return $this->updateContent($content, 'e', null, 3, $this->floatSeparator);`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ private function removeForClassElement(Tokens $tokens, int $index, int $property`
`107`	`107`	`return;`
`108`	`108`	`}`
`109`	`109`
`110`		`- if (Preg::match('/@var\h+(.+\h+)?\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $tokens[$index]->getContent()) === 1) {`
	`110`	`+ if (Preg::match('/@var\h+(.+\h+)?\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $tokens[$index]->getContent())) {`
`111`	`111`	`$this->removeVarAnnotation($tokens, $index, [$tokens[$variableIndex]->getContent()]);`
`112`	`112`	`}`
`113`	`113`	`}`
`@@ -149,7 +149,7 @@ private function removeVarAnnotationNotMatchingPattern(Tokens $tokens, int $inde`
`149`	`149`	`$doc = new DocBlock($tokens[$index]->getContent());`
`150`	`150`
`151`	`151`	`foreach ($doc->getAnnotationsOfType(['var']) as $annotation) {`
`152`		`- if ($pattern === null \|\| Preg::match($pattern, $annotation->getContent()) !== 1) {`
	`152`	`+ if ($pattern === null \|\| !Preg::match($pattern, $annotation->getContent())) {`
`153`	`153`	`$annotation->remove();`
`154`	`154`	`}`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private function getFilteredDocComment(string $comment, array $paramNames): stri`
`121`	`121`
`122`	`122`	`$foundParamNames = [];`
`123`	`123`	`foreach ($doc->getAnnotationsOfType('param') as $annotation) {`
`124`		`- if (Preg::match(\sprintf('/@param\s+(?:[^\$](?:[^<.]\|<[^>]>)\s)?(?:&\|\.\.\.)?\s(?=\$)%s\b/', $regexParamNamesPattern), $annotation->getContent(), $matches) === 1 && !\in_array($matches[1], $foundParamNames, true)) {`
	`124`	`+ if (Preg::match(\sprintf('/@param\s+(?:[^\$](?:[^<.]\|<[^>]>)\s)?(?:&\|\.\.\.)?\s(?=\$)%s\b/', $regexParamNamesPattern), $annotation->getContent(), $matches) && !\in_array($matches[1], $foundParamNames, true)) {`
`125`	`125`	`$foundParamNames[] = $matches[1];`
`126`	`126`	`continue;`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void`
`61`	`61`	`continue;`
`62`	`62`	`}`
`63`	`63`
`64`		`- if (Preg::match('#^/\\[\s\]+(@var[^\r\n]+)[\s\]\\/$#u', $tokens[$index]->getContent(), $matches) !== 1) {`
	`64`	`+ if (!Preg::match('#^/\\[\s\]+(@var[^\r\n]+)[\s\]\\/$#u', $tokens[$index]->getContent(), $matches)) {`
`65`	`65`	`continue;`
`66`	`66`	`}`
`67`	`67`