Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions rules/CodingStyle/Rector/Use_/SeparateMultiUseImportsRector.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
namespace Rector\CodingStyle\Rector\Use_;

use PhpParser\Node;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\Node\Stmt\TraitUse;
use PhpParser\Node\Stmt\Use_;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
Expand Down Expand Up @@ -51,20 +54,44 @@ class SomeClass
*/
public function getNodeTypes(): array
{
return [Use_::class, TraitUse::class];
return [FileWithoutNamespace::class, Namespace_::class, Class_::class];
}

/**
* @param Use_|TraitUse $node
* @return Use_[]|TraitUse[]|null
* @param FileWithoutNamespace|Namespace_|Class_ $node
*/
public function refactor(Node $node): ?array
public function refactor(Node $node): FileWithoutNamespace|Namespace_|Class_|null
{
if ($node instanceof Use_) {
return $this->refactorUseImport($node);
$hasChanged = false;
foreach ($node->stmts as $key => $stmt) {
if ($stmt instanceof Use_) {
$refactorUseImport = $this->refactorUseImport($stmt);
if ($refactorUseImport !== null) {
unset($node->stmts[$key]);
array_splice($node->stmts, $key, 0, $refactorUseImport);

$hasChanged = true;
}

continue;
}

if ($stmt instanceof TraitUse) {
$refactorTraitUse = $this->refactorTraitUse($stmt);
if ($refactorTraitUse !== null) {
unset($node->stmts[$key]);
array_splice($node->stmts, $key, 0, $refactorTraitUse);

$hasChanged = true;
}
}
}

if (! $hasChanged) {
return null;
}

return $this->refactorTraitUse($node);
return $node;
}

/**
Expand Down
63 changes: 63 additions & 0 deletions tests/Issues/IssueTraitUseKey/Fixture/fixture.php.inc
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?php

declare(strict_types=1);

namespace Rector\Core\Tests\Issues\IssueTraitUseKey\Fixture;

use Rector\Core\Tests\Issues\IssueTraitUseKey\TraitA;
use Rector\Core\Tests\Issues\IssueTraitUseKey\TraitB;

class Fixture
{
use TraitA, TraitB;

public const PUBLIC_CONST = 2;

private const PRIVATE_CONST = 1;

protected $foo;

public $bar;

public function __construct(int $foo, int $bar)
{
$this->foo = $foo;
$this->bar = $bar;
}

public function getConst(): int
{
return self::PRIVATE_CONST ?? self::PUBLIC_CONST;
}
}

?>
-----
<?php

declare(strict_types=1);

namespace Rector\Core\Tests\Issues\IssueTraitUseKey\Fixture;

use Rector\Core\Tests\Issues\IssueTraitUseKey\TraitA;
use Rector\Core\Tests\Issues\IssueTraitUseKey\TraitB;

final class Fixture
{
use TraitA;
use TraitB;
public const PUBLIC_CONST = 2;

private const PRIVATE_CONST = 1;

public function __construct(protected int $foo, public int $bar)
{
}

public function getConst(): int
{
return self::PRIVATE_CONST ?? self::PUBLIC_CONST;
}
}

?>
28 changes: 28 additions & 0 deletions tests/Issues/IssueTraitUseKey/IssueTraitUseKeyTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

declare(strict_types=1);

namespace Rector\Core\Tests\Issues\IssueTraitUseKey;

use Iterator;
use PHPUnit\Framework\Attributes\DataProvider;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;

final class IssueTraitUseKeyTest extends AbstractRectorTestCase
{
#[DataProvider('provideData')]
public function test(string $filePath): void
{
$this->doTestFile($filePath);
}

public static function provideData(): Iterator
{
return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
}

public function provideConfigFilePath(): string
{
return __DIR__ . '/config/configured_rule.php';
}
}
9 changes: 9 additions & 0 deletions tests/Issues/IssueTraitUseKey/Source/TraitA.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

declare(strict_types=1);

namespace Rector\Core\Tests\Issues\IssueTraitUseKey;

trait TraitA
{
}
9 changes: 9 additions & 0 deletions tests/Issues/IssueTraitUseKey/Source/TraitB.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?php

declare(strict_types=1);

namespace Rector\Core\Tests\Issues\IssueTraitUseKey;

trait TraitB
{
}
14 changes: 14 additions & 0 deletions tests/Issues/IssueTraitUseKey/config/configured_rule.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\CodingStyle\Rector\Use_\SeparateMultiUseImportsRector;
use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector;

return static function (RectorConfig $rectorConfig): void {
$rectorConfig->rule(SeparateMultiUseImportsRector::class);
$rectorConfig->rule(ClassPropertyAssignToConstructorPromotionRector::class);
$rectorConfig->rule(FinalizeClassesWithoutChildrenRector::class);
};