[CodingStyle] Handle use trait after property on NewlineBetweenClassLikeStmtsRector

rules-tests/CodingStyle/Rector/ClassLike/NewlineBetweenClassLikeStmtsRector/Fixture/use_trait_after_property.php.inc

@@ -0,0 +1,24 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\ClassLike\NewlineBetweenClassLikeStmtsRector\Fixture;
+
+class UseTraitAfterProperty
+{
+    private $a;
+    use SomeTrait;
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\ClassLike\NewlineBetweenClassLikeStmtsRector\Fixture;
+
+class UseTraitAfterProperty
+{
+    private $a;
+
+    use SomeTrait;
+}
+
+?>

rules/CodeQuality/Rector/FuncCall/SortNamedParamRector.php

@@ -75,6 +75,7 @@ public function refactor(Node $node): ?Node
         if ($node instanceof CallLike && $node->isFirstClassCallable()) {
             return null;
         }
+
         $args = $node instanceof Attribute ? $node->args : $node->getArgs();
 
         if (count($args) <= 1) {

rules/CodingStyle/Rector/ClassLike/NewlineBetweenClassLikeStmtsRector.php

@@ -86,13 +86,13 @@ private function processAddNewLine(ClassLike $classLike, bool $hasChanged, int $
                 break;
             }
 
-            if ($classLike->stmts[$key + 1] instanceof TraitUse) {
-                continue;
-            }
-
             $stmt = $classLike->stmts[$key];
             $nextStmt = $classLike->stmts[$key + 1];
 
+            if ($stmt instanceof TraitUse && $nextStmt instanceof TraitUse) {
+                continue;
+            }
+
             $endLine = $stmt->getEndLine();
             $rangeLine = $nextStmt->getStartLine() - $endLine;