Skip to content

Commit ec9a5d6

Browse files
kukulichkukulich
committed
Simplified fixing
1 parent 02fd982 commit ec9a5d6

30 files changed

+139
-169
lines changed

‎SlevomatCodingStandard/Helpers/FixerHelper.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
class FixerHelper
1313
{
1414

15+
public static function change(File $phpcsFile, int $startPointer, int $endPointer, string $content): void
16+
{
17+
self::removeBetweenIncluding($phpcsFile, $startPointer, $endPointer);
18+
$phpcsFile->fixer->replaceToken($startPointer, $content);
19+
}
20+
1521
public static function removeBetween(File $phpcsFile, int $startPointer, int $endPointer): void
1622
{
1723
self::removeBetweenIncluding($phpcsFile, $startPointer + 1, $endPointer - 1);

‎SlevomatCodingStandard/Helpers/YodaHelper.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,13 +283,13 @@ private static function replace(File $phpcsFile, array $oldTokens, array $newTok
283283
/** @var int $lastOldPointer */
284284
$lastOldPointer = key($oldTokens);
285285

286-
FixerHelper::removeBetweenIncluding($phpcsFile, $firstOldPointer, $lastOldPointer);
287-
288-
$phpcsFile->fixer->addContent($firstOldPointer, implode('', array_map(static function (array $token): string {
286+
$content = implode('', array_map(static function (array $token): string {
289287
/** @var string $content */
290288
$content = $token['content'];
291289
return $content;
292-
}, $newTokens)));
290+
}, $newTokens));
291+
292+
FixerHelper::change($phpcsFile, $firstOldPointer, $lastOldPointer, $content);
293293
}
294294

295295
/**

‎SlevomatCodingStandard/Sniffs/Arrays/AlphabeticallySortedByKeysSniff.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function process(File $phpcsFile, $stackPointer): void
6161
/**
6262
* @param list<ArrayKeyValue> $keyValues
6363
*/
64-
private function fix(File $phpcsFile, array $keyValues): bool
64+
private function fix(File $phpcsFile, array $keyValues): void
6565
{
6666
$pointerStart = $keyValues[0]->getPointerStart();
6767
$pointerEnd = $keyValues[count($keyValues) - 1]->getPointerEnd();
@@ -78,9 +78,8 @@ private function fix(File $phpcsFile, array $keyValues): bool
7878
}, $keyValues));
7979

8080
$phpcsFile->fixer->beginChangeset();
81-
FixerHelper::removeBetweenIncluding($phpcsFile, $pointerStart, $pointerEnd);
82-
$phpcsFile->fixer->addContent($pointerStart, $content);
83-
return $phpcsFile->fixer->endChangeset();
81+
FixerHelper::change($phpcsFile, $pointerStart, $pointerEnd, $content);
82+
$phpcsFile->fixer->endChangeset();
8483
}
8584

8685
}

‎SlevomatCodingStandard/Sniffs/Classes/DisallowStringExpressionPropertyFetchSniff.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ public function process(File $phpcsFile, $objectOperatorPointer): void
7676

7777
$phpcsFile->fixer->beginChangeset();
7878

79-
$phpcsFile->fixer->replaceToken($curlyBracketOpenerPointer, $matches[2]);
80-
FixerHelper::removeBetweenIncluding($phpcsFile, $curlyBracketOpenerPointer + 1, $curlyBracketCloserPointer);
79+
FixerHelper::change($phpcsFile, $curlyBracketOpenerPointer, $curlyBracketCloserPointer, $matches[2]);
8180

8281
$phpcsFile->fixer->endChangeset();
8382
}

‎SlevomatCodingStandard/Sniffs/Classes/ModernClassNameReferenceSniff.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,8 @@ private function checkFunctionCall(File $phpcsFile, int $functionPointer): void
169169
if ($tokens[$functionPointer - 1]['code'] === T_NS_SEPARATOR) {
170170
$phpcsFile->fixer->replaceToken($functionPointer - 1, '');
171171
}
172-
$phpcsFile->fixer->replaceToken($functionPointer, $fixedContent);
173172

174-
FixerHelper::removeBetweenIncluding($phpcsFile, $functionPointer + 1, $tokens[$openParenthesisPointer]['parenthesis_closer']);
173+
FixerHelper::change($phpcsFile, $functionPointer, $tokens[$openParenthesisPointer]['parenthesis_closer'], $fixedContent);
175174

176175
$phpcsFile->fixer->endChangeset();
177176
}

‎SlevomatCodingStandard/Sniffs/Classes/PropertyDeclarationSniff.php‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,7 @@ private function checkModifiersOrder(File $phpcsFile, int $propertyPointer, int
193193

194194
$phpcsFile->fixer->beginChangeset();
195195

196-
$phpcsFile->fixer->replaceToken($firstModifierPointer, $expectedModifiersFormatted);
197-
198-
FixerHelper::removeBetweenIncluding($phpcsFile, $firstModifierPointer + 1, $lastModifierPointer);
196+
FixerHelper::change($phpcsFile, $firstModifierPointer, $lastModifierPointer, $expectedModifiersFormatted);
199197

200198
$phpcsFile->fixer->endChangeset();
201199
}
@@ -253,9 +251,7 @@ private function checkSpacesBetweenModifiers(
253251

254252
$phpcsFile->fixer->beginChangeset();
255253

256-
$phpcsFile->fixer->replaceToken($firstModifierPointer, $expectedModifiersFormatted);
257-
258-
FixerHelper::removeBetweenIncluding($phpcsFile, $firstModifierPointer + 1, $lastModifierPointer);
254+
FixerHelper::change($phpcsFile, $firstModifierPointer, $lastModifierPointer, $expectedModifiersFormatted);
259255

260256
$phpcsFile->fixer->endChangeset();
261257
}

‎SlevomatCodingStandard/Sniffs/Classes/RequireSingleLineMethodSignatureSniff.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ public function process(File $phpcsFile, $methodPointer): void
8282

8383
$phpcsFile->fixer->beginChangeset();
8484

85-
$phpcsFile->fixer->replaceToken($signatureStartPointer, $signature);
86-
87-
FixerHelper::removeBetweenIncluding($phpcsFile, $signatureStartPointer + 1, $signatureEndPointer);
85+
FixerHelper::change($phpcsFile, $signatureStartPointer, $signatureEndPointer, $signature);
8886

8987
$phpcsFile->fixer->endChangeset();
9088
}

‎SlevomatCodingStandard/Sniffs/Classes/TraitUseDeclarationSniff.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,8 @@ private function checkDeclaration(File $phpcsFile, int $usePointer): void
9191
$otherCommaPointers = TokenHelper::findNextAll($phpcsFile, T_COMMA, $usePointer + 1, $endPointer);
9292
foreach ($otherCommaPointers as $otherCommaPointer) {
9393
$pointerAfterComma = TokenHelper::findNextEffective($phpcsFile, $otherCommaPointer + 1);
94-
$phpcsFile->fixer->replaceToken($otherCommaPointer, ';' . $phpcsFile->eolChar . $indentation . 'use ');
9594

96-
FixerHelper::removeBetween($phpcsFile, $otherCommaPointer, $pointerAfterComma);
95+
FixerHelper::change($phpcsFile, $otherCommaPointer, $pointerAfterComma - 1, ';' . $phpcsFile->eolChar . $indentation . 'use ');
9796
}
9897

9998
$phpcsFile->fixer->endChangeset();

‎SlevomatCodingStandard/Sniffs/Commenting/AnnotationNameSniff.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,12 @@ public function process(File $phpcsFile, $docCommentOpenPointer): void
247247
$match[1] + strlen($match[0])
248248
);
249249

250-
$phpcsFile->fixer->replaceToken($docCommentOpenPointer, $fixedDocCommentContent);
251-
FixerHelper::removeBetweenIncluding($phpcsFile, $docCommentOpenPointer + 1, $tokens[$docCommentOpenPointer]['comment_closer']);
250+
FixerHelper::change(
251+
$phpcsFile,
252+
$docCommentOpenPointer,
253+
$tokens[$docCommentOpenPointer]['comment_closer'],
254+
$fixedDocCommentContent
255+
);
252256

253257
$phpcsFile->fixer->endChangeset();
254258
}

‎SlevomatCodingStandard/Sniffs/Commenting/DocCommentSpacingSniff.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,7 @@ private function checkLinesBeforeFirstContent(File $phpcsFile, int $docCommentOp
197197

198198
$phpcsFile->fixer->beginChangeset();
199199

200-
$phpcsFile->fixer->replaceToken($docCommentOpenerPointer, '/**' . $phpcsFile->eolChar);
201-
202-
FixerHelper::removeBetween($phpcsFile, $docCommentOpenerPointer, $firstContentStartPointer);
200+
FixerHelper::change($phpcsFile, $docCommentOpenerPointer, $firstContentStartPointer - 1, '/**' . $phpcsFile->eolChar);
203201

204202
for ($i = 1; $i <= $this->linesCountBeforeFirstContent; $i++) {
205203
$phpcsFile->fixer->addContent($docCommentOpenerPointer, sprintf('%s *%s', $indentation, $phpcsFile->eolChar));
@@ -623,16 +621,18 @@ private function checkAnnotationsGroupsOrder(
623621
}
624622

625623
$phpcsFile->fixer->beginChangeset();
626-
if ($endOfLineBeforeFirstAnnotation === null) {
627-
$phpcsFile->fixer->replaceToken($docCommentOpenerPointer, '/**' . $phpcsFile->eolChar . $fixedAnnotations);
628-
629-
FixerHelper::removeBetweenIncluding($phpcsFile, $docCommentOpenerPointer + 1, $docCommentContentEndPointer);
630624

625+
if ($endOfLineBeforeFirstAnnotation === null) {
626+
FixerHelper::change(
627+
$phpcsFile,
628+
$docCommentOpenerPointer,
629+
$docCommentContentEndPointer,
630+
'/**' . $phpcsFile->eolChar . $fixedAnnotations
631+
);
631632
} else {
632-
$phpcsFile->fixer->replaceToken($endOfLineBeforeFirstAnnotation + 1, $fixedAnnotations);
633-
634-
FixerHelper::removeBetweenIncluding($phpcsFile, $endOfLineBeforeFirstAnnotation + 2, $docCommentContentEndPointer);
633+
FixerHelper::change($phpcsFile, $endOfLineBeforeFirstAnnotation + 1, $docCommentContentEndPointer, $fixedAnnotations);
635634
}
635+
636636
$phpcsFile->fixer->endChangeset();
637637
}
638638

0 commit comments

Comments
 (0)