Merge pull request #271 from PHPCSStandards/feature/tests-various-normalize-dataprovider-arrays

Tests/various: normalize data provider arrays

Author: jrfnl

tests/Core/File/FindImplementedInterfaceNamesTest.php

@@ -86,7 +86,9 @@ public static function dataImplementedInterface()
             ],
             'class implements single interface, unqualified'                     => [
                 'identifier' => '/* testClassImplementsSingle */',
-                'expected'   => ['testFIINInterface'],
+                'expected'   => [
+                    'testFIINInterface',
+                ],
             ],
             'class implements multiple interfaces'                               => [
                 'identifier' => '/* testClassImplementsMultiple */',
@@ -97,11 +99,15 @@ public static function dataImplementedInterface()
             ],
             'class implements single interface, fully qualified'                 => [
                 'identifier' => '/* testImplementsFullyQualified */',
-                'expected'   => ['\PHP_CodeSniffer\Tests\Core\File\testFIINInterface'],
+                'expected'   => [
+                    '\PHP_CodeSniffer\Tests\Core\File\testFIINInterface',
+                ],
             ],
             'class implements single interface, partially qualified'             => [
                 'identifier' => '/* testImplementsPartiallyQualified */',
-                'expected'   => ['Core\File\RelativeInterface'],
+                'expected'   => [
+                    'Core\File\RelativeInterface',
+                ],
             ],
             'class extends and implements'                                       => [
                 'identifier' => '/* testClassThatExtendsAndImplements */',
@@ -123,7 +129,9 @@ public static function dataImplementedInterface()
             ],
             'enum implements single interface, unqualified'                      => [
                 'identifier' => '/* testEnumImplementsSingle */',
-                'expected'   => ['Colorful'],
+                'expected'   => [
+                    'Colorful',
+                ],
             ],
             'enum implements multiple interfaces, unqualified + fully qualified' => [
                 'identifier' => '/* testBackedEnumImplementsMulti */',
@@ -134,7 +142,9 @@ public static function dataImplementedInterface()
             ],
             'anon class implements single interface, unqualified'                => [
                 'identifier' => '/* testAnonClassImplementsSingle */',
-                'expected'   => ['testFIINInterface'],
+                'expected'   => [
+                    'testFIINInterface',
+                ],
             ],
             'parse error - implements keyword, but no interface name'            => [
                 'identifier' => '/* testMissingImplementsName */',

tests/Core/File/GetMethodParametersTest.php

@@ -143,11 +143,15 @@ public function testNoParams($commentString, $targetTokenType=[T_FUNCTION, T_CLO
     public static function dataNoParams()
     {
         return [
-            'FunctionNoParams'   => ['/* testFunctionNoParams */'],
-            'ClosureNoParams'    => ['/* testClosureNoParams */'],
+            'FunctionNoParams'   => [
+                'commentString' => '/* testFunctionNoParams */',
+            ],
+            'ClosureNoParams'    => [
+                'commentString' => '/* testClosureNoParams */',
+            ],
             'ClosureUseNoParams' => [
-                '/* testClosureUseNoParams */',
-                T_USE,
+                'commentString'   => '/* testClosureUseNoParams */',
+                'targetTokenType' => T_USE,
             ],
         ];
 

tests/Core/Filters/GitModifiedTest.php

@@ -112,14 +112,18 @@ public static function dataAcceptOnlyGitModified()
 
             'single file marked as git modified - file in root dir'                => [
                 'inputPaths'        => $fakeFileList,
-                'outputGitModified' => ['autoload.php'],
+                'outputGitModified' => [
+                    'autoload.php',
+                ],
                 'expectedOutput'    => [
                     $basedir.'/autoload.php',
                 ],
             ],
             'single file marked as git modified - file in sub dir'                 => [
                 'inputPaths'        => $fakeFileList,
-                'outputGitModified' => ['src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php'],
+                'outputGitModified' => [
+                    'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ],
                 'expectedOutput'    => [
                     $basedir.'/src',
                     $basedir.'/src/Standards',

tests/Core/Filters/GitStagedTest.php

@@ -112,14 +112,18 @@ public static function dataAcceptOnlyGitStaged()
 
             'single file marked as git modified - file in root dir'                => [
                 'inputPaths'      => $fakeFileList,
-                'outputGitStaged' => ['autoload.php'],
+                'outputGitStaged' => [
+                    'autoload.php',
+                ],
                 'expectedOutput'  => [
                     $basedir.'/autoload.php',
                 ],
             ],
             'single file marked as git modified - file in sub dir'                 => [
                 'inputPaths'      => $fakeFileList,
-                'outputGitStaged' => ['src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php'],
+                'outputGitStaged' => [
+                    'src/Standards/Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
+                ],
                 'expectedOutput'  => [
                     $basedir.'/src',
                     $basedir.'/src/Standards',