Skip to content

Commit 51a334c

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

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php
2+
3+
namespace Rector\Tests\CodingStyle\Rector\ClassLike\NewlineBetweenClassLikeStmtsRector\Fixture;
4+
5+
class SkipUseTrait
6+
{
7+
use SomeTrait;
8+
use SomeOtherTrait;
9+
use SomeAnotherTrait;
10+
}

rules/CodeQuality/Rector/FuncCall/SortNamedParamRector.php

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

79-
if ($node instanceof Attribute) {
80-
$args = $node->args;
81-
} else {
82-
$args = $node->getArgs();
83-
}
8480
if (count($args) <= 1) {
8581
return null;
8682
}

rules/CodingStyle/Rector/ClassLike/NewlineBetweenClassLikeStmtsRector.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use PhpParser\Node;
88
use PhpParser\Node\Stmt\ClassLike;
99
use PhpParser\Node\Stmt\Nop;
10+
use PhpParser\Node\Stmt\TraitUse;
1011
use Rector\Comments\CommentResolver;
1112
use Rector\Rector\AbstractRector;
1213
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -85,6 +86,10 @@ private function processAddNewLine(ClassLike $classLike, bool $hasChanged, int $
8586
break;
8687
}
8788

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

0 commit comments

Comments
 (0)