Merge f7e6542 into 08b7d23

PHPCSStandards · May 10, 2024 · 4ed1e7a · 4ed1e7a
2 parents 08b7d23 + f7e6542
commit 4ed1e7a
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 7 deletions.
diff --git a/PHPCSUtils/Utils/UseStatements.php b/PHPCSUtils/Utils/UseStatements.php
@@ -301,9 +301,9 @@ public static function splitImportUseStatement(File $phpcsFile, $stackPtr)
                 case \T_COMMA:
                     if ($name !== '') {
                         if ($useGroup === true) {
-                            $statements[$type][$alias] = $baseName . $name;
+                            $statements[$type][$alias] = \ltrim($baseName, '\\') . $name;
                         } else {
-                            $statements[$type][$alias] = $name;
+                            $statements[$type][$alias] = \ltrim($name, '\\');
                         }
                     }
 

diff --git a/Tests/Utils/UseStatements/SplitImportUseStatementTest.inc b/Tests/Utils/UseStatements/SplitImportUseStatementTest.inc
@@ -14,6 +14,9 @@ use MyNamespace\MyClass;
 /* testUsePlainAliased */
 use MyNamespace \ YourClass as ClassAlias;
 
+/* testUsePlainLeadingBackslash */
+use \MyNamespace\TheirClass;
+
 /* testUseMultipleWithComments */
 use Vendor\Foo\ClassA as ClassABC,
    Vendor \ /*comment*/ Bar \ /*another comment */ InterfaceB,
@@ -38,7 +41,7 @@ use CONST MyNamespace\MY_CONST;
 use const MyNamespace\YOUR_CONST as CONST_ALIAS;
 
 /* testUseConstMultiple */
-use const foo\math\PI, foo\math\GOLDEN_RATIO as MATH_GOLDEN;
+use const foo\math\PI, \foo\math\GOLDEN_RATIO as MATH_GOLDEN;
 
 /* testGroupUse */
 use some\namespacing\{
@@ -47,6 +50,12 @@ use some\namespacing\{
     another\level\SomeClassC as C
 };
 
+/* testGroupUseLeadingBackslash */
+use \world\namespacing\{
+    SomeClassA,
+    deeper\level\SomeClassB
+};
+
 /* testGroupUseFunctionTrailingComma */
 use function bar\math\{
     Msin,
@@ -70,15 +79,15 @@ use Some\NS\ {
 };
 
 /* testUsePlainReservedKeyword */
-// Intentional parse error - use of reserved keyword in namespace.
+// Intentional parse error for PHP < 8.0 - use of reserved keyword in namespace.
 use Vendor\break\ClassName;
 
 /* testUseFunctionPlainReservedKeyword */
-// Intentional parse error - use of reserved keyword in namespace.
+// Intentional parse error for PHP < 8.0  - use of reserved keyword in namespace.
 use function Vendor\YourNamespace\switch\yourFunction;
 
 /* testUseConstPlainReservedKeyword */
-// Intentional parse error - use of reserved keyword in namespace.
+// Intentional parse error for PHP < 8.0  - use of reserved keyword in namespace.
 use const Vendor\YourNamespace\function\yourConst;
 
 /* testUsePlainAliasReservedKeyword */
@@ -88,7 +97,7 @@ use Vendor\YourNamespace\ClassName as class;
 /* testUsePlainAliasReservedKeywordFunction */
 // Intentional parse error - use of reserved keyword as alias.
 use Vendor\{
-	YourNamespace\ClassName as function
+    YourNamespace\ClassName as function
 };
 
 /* testUsePlainAliasReservedKeywordConst */

diff --git a/Tests/Utils/UseStatements/SplitImportUseStatementTest.php b/Tests/Utils/UseStatements/SplitImportUseStatementTest.php
@@ -124,6 +124,15 @@ public static function dataSplitImportUseStatement()
                     'const'    => [],
                 ],
             ],
+            'plain-with-leading-backslash' => [
+                'testMarker' => '/* testUsePlainLeadingBackslash */',
+                'expected'   => [
+                    'name'     => ['TheirClass' => 'MyNamespace\TheirClass'],
+                    'function' => [],
+                    'const'    => [],
+                ],
+            ],
+
             'multiple-with-comments' => [
                 'testMarker' => '/* testUseMultipleWithComments */',
                 'expected'   => [
@@ -203,6 +212,17 @@ public static function dataSplitImportUseStatement()
                     'const'    => [],
                 ],
             ],
+            'group-with-leading-backslash' => [
+                'testMarker' => '/* testGroupUseLeadingBackslash */',
+                'expected'   => [
+                    'name'     => [
+                        'SomeClassA' => 'world\namespacing\SomeClassA',
+                        'SomeClassB' => 'world\namespacing\deeper\level\SomeClassB',
+                    ],
+                    'function' => [],
+                    'const'    => [],
+                ],
+            ],
             'group-function-trailing-comma' => [
                 'testMarker' => '/* testGroupUseFunctionTrailingComma */',
                 'expected'   => [