Merge pull request #700 from PHPCSStandards/feature/various-minor-cs-fixes

CS: various minor tweaks

Author: jrfnl

Tests/Utils/UseStatements/SplitAndMergeImportUseStatementTest.php

@@ -97,23 +97,23 @@ public static function dataSplitAndMergeImportUseStatementNonImportUse()
     {
         return [
             'closure-use-previous-empty-array' => [
-                'testMarker' => '/* testClosureUse */',
+                'testMarker'  => '/* testClosureUse */',
                 'expected'    => [],
                 'previousUse' => [],
             ],
             // Documenting that a "previous" array is not cleaned of unexpected keys.
             'closure-use-previous-non-empty-array-unexpected-keys' => [
-                'testMarker' => '/* testClosureUse */',
-                'expected'   => [
+                'testMarker'  => '/* testClosureUse */',
+                'expected'    => [
                     'something' => 'else',
                 ],
                 'previousUse' => [
                     'something' => 'else',
                 ],
             ],
             'closure-use-previous-base-array' => [
-                'testMarker' => '/* testClosureUse */',
-                'expected'   => [
+                'testMarker'  => '/* testClosureUse */',
+                'expected'    => [
                     'name'     => [],
                     'function' => [],
                     'const'    => [],
@@ -138,8 +138,8 @@ public static function dataSplitAndMergeImportUseStatement()
     {
         $data = [
             'name-plain' => [
-                'testMarker' => '/* testUseNamePlainAliased */',
-                'expected'   => [
+                'testMarker'  => '/* testUseNamePlainAliased */',
+                'expected'    => [
                     'name'     => ['ClassAlias' => 'MyNamespace\YourClass'],
                     'function' => [],
                     'const'    => [],