AlphabeticallySortedUsesSniff: fixable supports functions and constants

slevomat · Jan 4, 2018 · df7bed1 · df7bed1
1 parent a788a1a
commit df7bed1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/SlevomatCodingStandard/Sniffs/Namespaces/AlphabeticallySortedUsesSniff.php b/SlevomatCodingStandard/Sniffs/Namespaces/AlphabeticallySortedUsesSniff.php
@@ -86,11 +86,15 @@ private function fixAlphabeticalOrder(
 
 		$phpcsFile->fixer->addContent($firstUseStatement->getPointer(), implode($phpcsFile->eolChar, array_map(function (UseStatement $useStatement): string {
 			$unqualifiedName = NamespaceHelper::getUnqualifiedNameFromFullyQualifiedName($useStatement->getFullyQualifiedTypeName());
+
+			$useTypeName = $useStatement->getTypeName();
+			$useTypeFormatted = $useTypeName !== null ? sprintf('%s ', $useTypeName) : '';
+
 			if ($unqualifiedName === $useStatement->getNameAsReferencedInFile()) {
-				return sprintf('use %s;', $useStatement->getFullyQualifiedTypeName());
+				return sprintf('use %s%s;', $useTypeFormatted, $useStatement->getFullyQualifiedTypeName());
 			}
 
-			return sprintf('use %s as %s;', $useStatement->getFullyQualifiedTypeName(), $useStatement->getNameAsReferencedInFile());
+			return sprintf('use %s%s as %s;', $useTypeFormatted, $useStatement->getFullyQualifiedTypeName(), $useStatement->getNameAsReferencedInFile());
 		}, $useStatements)));
 		$phpcsFile->fixer->endChangeset();
 	}

diff --git a/tests/Sniffs/Namespaces/data/fixableAlphabeticalSortedUses.fixed.php b/tests/Sniffs/Namespaces/data/fixableAlphabeticalSortedUses.fixed.php
@@ -13,6 +13,12 @@
 use P\Q\R\T;
 use U\V\W\Z;
 use U\V\X\Y;
+use const PHP_OS;
+use const X\BOO;
+use const X\FOO;
+use function strpos;
+use function X\boo;
+use function X\foo;
 
 class Alphabetical
 {

diff --git a/tests/Sniffs/Namespaces/data/fixableAlphabeticalSortedUses.php b/tests/Sniffs/Namespaces/data/fixableAlphabeticalSortedUses.php
@@ -2,14 +2,20 @@
 
 namespace Abc;
 
+use function X\foo;
+use const X\FOO;
 use \A;
 use \H\I\K;
 use \H\I\J;
+use const PHP_OS;
 use \B\C as Ccc;
 use L\M\O;
+use const X\BOO;
 use L\m\O as Ooo;
+use function strpos;
 use D\E\F;
 use \U\V\X\Y;
+use function X\boo;
 use P\Q\R\T;
 use \U\V\W\Z;
 use P\Q\R\S;