Fixed bug #2624 : PSR12.Traits.UseDeclaration doesnt apply the correct indent during auto fixing

Author: gsherwood

package.xml

@@ -30,6 +30,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #2619 : PSR12.Files.FileHeader locks up when inline comment is the last content in a file
   - Fixed bug #2621 : PSR12.Classes.AnonClassDeclaration.CloseBraceSameLine false positive for anon class passed as function argument
     -- Thanks to Martins Sipenko for the patch
+  - Fixed bug #2624 : PSR12.Traits.UseDeclaration doesnt apply the correct indent during auto fixing
  </notes>
  <contents>
   <dir name="/">

src/Standards/PSR12/Sniffs/Traits/UseDeclarationSniff.php

@@ -120,11 +120,18 @@ public function process(File $phpcsFile, $stackPtr)
                             $phpcsFile->fixer->replaceToken($x, '');
                         }
 
-                        $padding = str_repeat(' ', ($tokens[$firstUse]['column'] - 1));
                         $phpcsFile->fixer->addNewline($prev);
-                        $phpcsFile->fixer->addContent($prev, $padding);
+                        if ($tokens[$prev]['line'] === $tokens[$stackPtr]['line']) {
+                            if ($tokens[($stackPtr - 1)]['code'] === T_WHITESPACE) {
+                                $phpcsFile->fixer->replaceToken(($stackPtr - 1), '');
+                            }
+
+                            $padding = str_repeat(' ', ($tokens[$firstUse]['column'] - 1));
+                            $phpcsFile->fixer->addContent($prev, $padding);
+                        }
+
                         $phpcsFile->fixer->endChangeset();
-                    }
+                    }//end if
                 }//end if
             }//end if
         }//end if

src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.inc

@@ -76,3 +76,12 @@ class ClassName9
         as FooBar;
     }
 }
+
+class ClassName10
+{
+    use TransactionTrait;
+
+    use PermissionAwareTrait;
+
+    use FirstTrait; use SecondTrait; use ThirdTrait;
+}

src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.inc.fixed

@@ -73,3 +73,12 @@ class ClassName9
         as FooBar;
     }
 }
+
+class ClassName10
+{
+    use TransactionTrait;
+    use PermissionAwareTrait;
+    use FirstTrait;
+    use SecondTrait;
+    use ThirdTrait;
+}

src/Standards/PSR12/Tests/Traits/UseDeclarationUnitTest.php

@@ -38,6 +38,8 @@ public function getErrorList()
             71 => 1,
             73 => 2,
             76 => 1,
+            84 => 1,
+            86 => 3,
         ];
 
     }//end getErrorList()