Skip to content

Commit 299b229

Browse files
maryomaryo
committed
SlevomatCodingStandard.Classes.ClassMemberSpacing: Stop deleting unexpected code
1 parent 06b18b3 commit 299b229

File tree

5 files changed

+51
-18
lines changed

5 files changed

+51
-18
lines changed

‎SlevomatCodingStandard/Sniffs/Classes/ClassMemberSpacingSniff.php

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public function process(File $phpcsFile, $classPointer): void
6363
$tokens = $phpcsFile->getTokens();
6464

6565
$memberPointer = null;
66-
$previousMemberPointer = null;
6766

6867
do {
6968
$previousMemberPointer = $memberPointer;
@@ -105,7 +104,7 @@ public function process(File $phpcsFile, $classPointer): void
105104
}
106105
}
107106

108-
$memberStartPointer = $this->getMemberStartPointer($phpcsFile, $memberPointer);
107+
$memberStartPointer = $this->getMemberStartPointer($phpcsFile, $memberPointer, $previousMemberEndPointer);
109108

110109
$actualLinesCount = $tokens[$memberStartPointer]['line'] - $tokens[$previousMemberEndPointer]['line'] - 1;
111110

@@ -117,10 +116,20 @@ public function process(File $phpcsFile, $classPointer): void
117116
? 'Expected 1 blank line between class members, found %2$d.'
118117
: 'Expected %1$d blank lines between class members, found %2$d.';
119118

120-
$fix = $phpcsFile->addFixableError(
119+
$firstPointerOnMemberLine = TokenHelper::findFirstTokenOnLine($phpcsFile, $memberStartPointer);
120+
$nonWhitespaceBetweenMembersPointer = TokenHelper::findNextNonWhitespace(
121+
$phpcsFile,
122+
$previousMemberEndPointer + 1,
123+
$firstPointerOnMemberLine,
124+
);
125+
126+
$fix = $phpcsFile->addError(
121127
sprintf($errorMessage, $this->linesCountBetweenMembers, $actualLinesCount),
122128
$memberPointer,
123129
self::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS,
130+
[],
131+
0,
132+
$nonWhitespaceBetweenMembersPointer === null,
124133
);
125134
if (!$fix) {
126135
continue;
@@ -131,8 +140,6 @@ public function process(File $phpcsFile, $classPointer): void
131140
$this->linesCountBetweenMembers + ($hasCommentWithNewLineAfterPreviousMember ? 0 : 1),
132141
);
133142

134-
$firstPointerOnMemberLine = TokenHelper::findFirstTokenOnLine($phpcsFile, $memberStartPointer);
135-
136143
$phpcsFile->fixer->beginChangeset();
137144

138145
$phpcsFile->fixer->addContent($previousMemberEndPointer, $newLines);
@@ -192,24 +199,25 @@ private function findNextMember(File $phpcsFile, int $classPointer, int $previou
192199
return $memberPointer;
193200
}
194201

195-
private function getMemberStartPointer(File $phpcsFile, int $memberPointer): int
202+
private function getMemberStartPointer(File $phpcsFile, int $memberPointer, int $previousMemberEndPointer): int
196203
{
197204
$tokens = $phpcsFile->getTokens();
198205

199206
$memberFirstCodePointer = $this->getMemberFirstCodePointer($phpcsFile, $memberPointer);
200207

201208
do {
209+
if ($memberFirstCodePointer <= $previousMemberEndPointer) {
210+
return TokenHelper::findNextNonWhitespace($phpcsFile, $memberFirstCodePointer + 1);
211+
}
212+
202213
$pointerBefore = TokenHelper::findPreviousNonWhitespace($phpcsFile, $memberFirstCodePointer - 1);
203214

204215
if ($tokens[$pointerBefore]['code'] === T_ATTRIBUTE_END) {
205216
$memberFirstCodePointer = $tokens[$pointerBefore]['attribute_opener'];
206217
continue;
207218
}
208219

209-
if (
210-
in_array($tokens[$pointerBefore]['code'], Tokens::$commentTokens, true)
211-
&& $tokens[$pointerBefore]['line'] + 1 === $tokens[$memberFirstCodePointer]['line']
212-
) {
220+
if (in_array($tokens[$pointerBefore]['code'], Tokens::$commentTokens, true)) {
213221
$pointerBeforeComment = TokenHelper::findPreviousEffective($phpcsFile, $pointerBefore - 1);
214222
if ($tokens[$pointerBeforeComment]['line'] !== $tokens[$pointerBefore]['line']) {
215223
$memberFirstCodePointer = array_key_exists('comment_opener', $tokens[$pointerBefore])

‎tests/Sniffs/Classes/ClassMemberSpacingSniffTest.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function testErrors(): void
1717
{
1818
$report = self::checkFile(__DIR__ . '/data/classMemberSpacingErrors.php');
1919

20-
self::assertSame(9, $report->getErrorCount());
20+
self::assertSame(10, $report->getErrorCount());
2121

2222
self::assertSniffError($report, 15, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
2323
self::assertSniffError($report, 21, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
@@ -26,8 +26,9 @@ public function testErrors(): void
2626
self::assertSniffError($report, 44, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
2727
self::assertSniffError($report, 47, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
2828
self::assertSniffError($report, 50, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
29-
self::assertSniffError($report, 60, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
30-
self::assertSniffError($report, 69, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
29+
self::assertSniffError($report, 58, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
30+
self::assertSniffError($report, 70, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
31+
self::assertSniffError($report, 79, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
3132

3233
self::assertAllFixedInFile($report);
3334
}
@@ -38,10 +39,11 @@ public function testErrorsWithModifiedLinesCount(): void
3839
'linesCountBetweenMembers' => 2,
3940
]);
4041

41-
self::assertSame(2, $report->getErrorCount());
42+
self::assertSame(3, $report->getErrorCount());
4243

4344
self::assertSniffError($report, 21, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
44-
self::assertSniffError($report, 69, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
45+
self::assertSniffError($report, 58, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
46+
self::assertSniffError($report, 79, ClassMemberSpacingSniff::CODE_INCORRECT_COUNT_OF_BLANK_LINES_BETWEEN_MEMBERS);
4547
}
4648

4749
}

‎tests/Sniffs/Classes/data/classMemberSpacingErrors.fixed.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,16 @@ public function third()
4242

4343
final const THIRD = 'third';
4444

45-
readonly int $forth;
45+
readonly int $fourth;
4646

47+
/**
48+
* @return void
49+
*/
50+
51+
public function fifth()
52+
{
53+
54+
}
4755
}
4856

4957
enum Gender: string

‎tests/Sniffs/Classes/data/classMemberSpacingErrors.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,18 @@ public function third()
4747
final const THIRD = 'third';
4848

4949

50-
readonly int $forth;
50+
readonly int $fourth;
5151

52+
53+
54+
/**
55+
* @return void
56+
*/
57+
58+
public function fifth()
59+
{
60+
61+
}
5262
}
5363

5464
enum Gender: string

‎tests/Sniffs/Classes/data/classMemberSpacingNoErrors.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ abstract public function thirdWithAttributeAndDocDomment();
9494
*
9595
* @var string
9696
*/
97-
protected $forth;
97+
protected $fourth;
9898
// @codingStandardsIgnoreEnd
9999

100100
#[SomeAttribute]
@@ -124,6 +124,11 @@ public function withAnonymous($parameter)
124124
};
125125
}
126126

127+
/**
128+
* @var string
129+
*/
130+
131+
protected $fifth;
127132
}
128133

129134
enum Gender: string

0 commit comments

Comments
 (0)