Skip to content

Commit e7898e2

Browse files
committed
SlevomatCodingStandard.Attributes.AttributeAndTargetSpacing: Fixed fixer
1 parent 1123109 commit e7898e2

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

SlevomatCodingStandard/Sniffs/Attributes/AttributeAndTargetSpacingSniff.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,10 @@ public function process(File $phpcsFile, $attributeOpenerPointer): void
8484
}
8585

8686
if ($areOnSameLine) {
87-
$indentation = IndentationHelper::getIndentation($phpcsFile, $attributeOpenerPointer);
87+
$indentation = IndentationHelper::getIndentation(
88+
$phpcsFile,
89+
TokenHelper::findFirstNonWhitespaceOnLine($phpcsFile, $pointerAfter)
90+
);
8891

8992
$phpcsFile->fixer->beginChangeset();
9093

tests/Sniffs/Attributes/AttributeAndTargetSpacingSniffTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,14 @@ public function testErrors(): void
1717
{
1818
$report = self::checkFile(__DIR__ . '/data/attributeAndTargetSpacingErrors.php');
1919

20-
self::assertSame(4, $report->getErrorCount());
20+
self::assertSame(6, $report->getErrorCount());
2121

2222
self::assertSniffError($report, 6, AttributeAndTargetSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_ATTRIBUTE_AND_TARGET);
2323
self::assertSniffError($report, 12, AttributeAndTargetSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_ATTRIBUTE_AND_TARGET);
2424
self::assertSniffError($report, 18, AttributeAndTargetSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_ATTRIBUTE_AND_TARGET);
2525
self::assertSniffError($report, 22, AttributeAndTargetSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_ATTRIBUTE_AND_TARGET);
26+
self::assertSniffError($report, 28, AttributeAndTargetSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_ATTRIBUTE_AND_TARGET);
27+
self::assertSniffError($report, 29, AttributeAndTargetSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_ATTRIBUTE_AND_TARGET);
2628

2729
self::assertAllFixedInFile($report);
2830
}

tests/Sniffs/Attributes/data/attributeAndTargetSpacingErrors.fixed.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,12 @@ public function method(
2121
{
2222
}
2323

24+
public function __construct(
25+
#[ORM\Column(unique: true)]
26+
protected string $name,
27+
#[ORM\Cache] #[ORM\ManyToOne(targetEntity: 'State', inversedBy: 'cities')] #[ORM\JoinColumn(name: 'state_id', referencedColumnName: 'id')]
28+
protected State|null $state = null,
29+
) {
30+
}
31+
2432
}

tests/Sniffs/Attributes/data/attributeAndTargetSpacingErrors.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,10 @@ public function method(
2424
{
2525
}
2626

27+
public function __construct(
28+
#[ORM\Column(unique: true)] protected string $name,
29+
#[ORM\Cache] #[ORM\ManyToOne(targetEntity: 'State', inversedBy: 'cities')] #[ORM\JoinColumn(name: 'state_id', referencedColumnName: 'id')] protected State|null $state = null,
30+
) {
31+
}
32+
2733
}

0 commit comments

Comments
 (0)