Skip to content

Commit 1d51948

Browse files
[CodingStyle] Handle use trait after property on NewlineBetweenClassLikeStmtsRector (#7687)
* [CodingStyle] Handle use trait after property on NewlineBetweenClassLikeStmtsRector * [ci-review] Rector Rectify --------- Co-authored-by: GitHub Action <actions@github.com>
1 parent 51a334c commit 1d51948

File tree

3 files changed

+29
-4
lines changed

3 files changed

+29
-4
lines changed
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
namespace Rector\Tests\CodingStyle\Rector\ClassLike\NewlineBetweenClassLikeStmtsRector\Fixture;
4+
5+
class UseTraitAfterProperty
6+
{
7+
private $a;
8+
use SomeTrait;
9+
}
10+
11+
?>
12+
-----
13+
<?php
14+
15+
namespace Rector\Tests\CodingStyle\Rector\ClassLike\NewlineBetweenClassLikeStmtsRector\Fixture;
16+
17+
class UseTraitAfterProperty
18+
{
19+
private $a;
20+
21+
use SomeTrait;
22+
}
23+
24+
?>

rules/CodeQuality/Rector/FuncCall/SortNamedParamRector.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public function refactor(Node $node): ?Node
7575
if ($node instanceof CallLike && $node->isFirstClassCallable()) {
7676
return null;
7777
}
78+
7879
$args = $node instanceof Attribute ? $node->args : $node->getArgs();
7980

8081
if (count($args) <= 1) {

rules/CodingStyle/Rector/ClassLike/NewlineBetweenClassLikeStmtsRector.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ private function processAddNewLine(ClassLike $classLike, bool $hasChanged, int $
8686
break;
8787
}
8888

89-
if ($classLike->stmts[$key + 1] instanceof TraitUse) {
90-
continue;
91-
}
92-
9389
$stmt = $classLike->stmts[$key];
9490
$nextStmt = $classLike->stmts[$key + 1];
9591

92+
if ($stmt instanceof TraitUse && $nextStmt instanceof TraitUse) {
93+
continue;
94+
}
95+
9696
$endLine = $stmt->getEndLine();
9797
$rangeLine = $nextStmt->getStartLine() - $endLine;
9898

0 commit comments

Comments
 (0)