Skip to content

Commit

Permalink
bug #5615 GroupImportFixer severely broken (Leprechaunz)
Browse files Browse the repository at this point in the history
This PR was squashed before being merged into the 2.18 branch.

Discussion
----------

GroupImportFixer severely broken

Fixes #5408

Commits
-------

4bceafb GroupImportFixer severely broken
  • Loading branch information
keradus committed Apr 11, 2021
2 parents a6f4227 + 4bceafb commit 35aa5f4
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/Fixer/Import/GroupImportFixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,12 @@ function (NamespaceUseAnalysis $useDeclaration) {
return \in_array($namespaceName, $sameNamespaces, true);
});

sort($sameNamespaceAnalysis);
usort($sameNamespaceAnalysis, function (NamespaceUseAnalysis $a, NamespaceUseAnalysis $b) {
$namespaceA = $this->getNamespaceNameWithSlash($a);
$namespaceB = $this->getNamespaceNameWithSlash($b);

return \strlen($namespaceA) - \strlen($namespaceB) ?: strcmp($a->getFullName(), $b->getFullName());
});

return $sameNamespaceAnalysis;
}
Expand Down
43 changes: 43 additions & 0 deletions tests/Fixer/Import/GroupImportFixerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,49 @@ public function provideFixCases()
use Foo\Baz;
use \ReflectionClass;
use \ReflectionMethod;
',
],
[
'<?php
use Framework\Support\{Arr, Collection};
use Framework\Database\ORM\{Model, SoftDeletes};
use Framework\Notifications\{Notifiable, Notification};
use Framework\Support\Facades\{DB, Log};
use Framework\Database\ORM\Relations\{BelongsTo, HasOne};
use Framework\Database\Query\JoinClause;
',
'<?php
use Framework\Database\ORM\Model;
use Framework\Database\ORM\Relations\BelongsTo;
use Framework\Database\ORM\Relations\HasOne;
use Framework\Database\ORM\SoftDeletes;
use Framework\Database\Query\JoinClause;
use Framework\Notifications\Notifiable;
use Framework\Notifications\Notification;
use Framework\Support\Arr;
use Framework\Support\Collection;
use Framework\Support\Facades\DB;
use Framework\Support\Facades\Log;
',
],
[
'<?php
use Framework\Baz\Class6;
use Framework\Bar\{Class3, Class4, Class5};
use Framework\Foo\{Class1, Class2, Class7};
',
'<?php
use Framework\Foo\Class1;
use Framework\Foo\Class2;
use Framework\Bar\Class3;
use Framework\Bar\Class4;
use Framework\Bar\Class5;
use Framework\Baz\Class6;
use Framework\Foo\Class7;
',
],
];
Expand Down

0 comments on commit 35aa5f4

Please sign in to comment.