AlphabeticallySortedUsesSniff more compatible with PHPStorm

Author: kukulich

SlevomatCodingStandard/Sniffs/Namespaces/AlphabeticallySortedUsesSniff.php

@@ -96,36 +96,18 @@ private function compareUseStatements(UseStatement $a, UseStatement $b): int
 		if (!$a->hasSameType($b)) {
 			return $a->compareByType($b);
 		}
-		$aName = $a->getFullyQualifiedTypeName();
-		$bName = $b->getFullyQualifiedTypeName();
-
-		$i = 0;
-		for (; $i < min(strlen($aName), strlen($bName)); $i++) {
-			if ($this->isSpecialCharacter($aName[$i]) && !$this->isSpecialCharacter($bName[$i])) {
-				return -1;
-			} elseif (!$this->isSpecialCharacter($aName[$i]) && $this->isSpecialCharacter($bName[$i])) {
-				return 1;
-			}
 
-			if (is_numeric($aName[$i]) && is_numeric($bName[$i])) {
-				break;
-			}
+		$aNameParts = explode(NamespaceHelper::NAMESPACE_SEPARATOR, $a->getFullyQualifiedTypeName());
+		$bNameParts = explode(NamespaceHelper::NAMESPACE_SEPARATOR, $b->getFullyQualifiedTypeName());
 
-			$cmp = strcasecmp($aName[$i], $bName[$i]);
-			if (
-				$cmp !== 0
-				|| ($aName[$i] !== $bName[$i] && strtolower($aName[$i]) === strtolower($bName[$i]))
-			) {
-				return $cmp;
+		for ($i = 0; $i < min(count($aNameParts), count($bNameParts)); $i++) {
+			$comparison = strcasecmp($aNameParts[$i], $bNameParts[$i]);
+			if ($comparison !== 0) {
+				return $comparison;
 			}
 		}
 
-		return strnatcasecmp(substr($aName, $i), substr($bName, $i));
-	}
-
-	private function isSpecialCharacter(string $character): bool
-	{
-		return in_array($character, ['\\', '_'], true);
+		return count($aNameParts) <=> count($bNameParts);
 	}
 
 }

tests/Sniffs/Namespaces/data/correctOrderSimilarNamespaces.php

@@ -5,12 +5,13 @@
 use Baz;
 use Foo;
 use Foo\Bar;
-use Foo_Baz;
-use Foo_bar;
+use Foo\Bar\Boo;
 use Foo1;
-use Foo2;
 use Foo11;
+use Foo2;
 use Foo22;
-use FooBaz;
+use Foo_bar;
+use Foo_Baz;
 use Foobar;
 use Foobarz;
+use FooBaz;