Enhancement: Enable trailing_comma_in_multiline_array fixer

sebastianbergmann · Sep 8, 2018 · 952160e · 952160e
1 parent a578749
commit 952160e
Show file tree

Hide file tree

Showing 47 changed files with 263 additions and 262 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -174,6 +174,7 @@ return PhpCsFixer\Config::create()
             'single_quote' => true,
             'standardize_not_equals' => true,
             'ternary_to_null_coalescing' => true,
+            'trailing_comma_in_multiline_array' => true,
             'trim_array_spaces' => true,
             'unary_operator_spaces' => true,
             'visibility_required' => true,

diff --git a/src/Framework/Constraint/IsType.php b/src/Framework/Constraint/IsType.php
@@ -60,7 +60,7 @@ class IsType extends Constraint
         'string'   => true,
         'scalar'   => true,
         'callable' => true,
-        'iterable' => true
+        'iterable' => true,
     ];
 
     /**

diff --git a/src/Framework/Constraint/LogicalNot.php b/src/Framework/Constraint/LogicalNot.php
@@ -33,7 +33,7 @@ public static function negate(string $string): string
             'starts with ',
             'ends with ',
             'reference ',
-            'not not '
+            'not not ',
         ];
 
         $negatives = [
@@ -46,7 +46,7 @@ public static function negate(string $string): string
             'starts not with ',
             'ends not with ',
             'don\'t reference ',
-            'not '
+            'not ',
         ];
 
         \preg_match('/(\'[\w\W]*\')([\w\W]*)("[\w\W]*")/i', $string, $matches);

diff --git a/src/Framework/Constraint/StringMatchesFormatDescription.php b/src/Framework/Constraint/StringMatchesFormatDescription.php
@@ -89,7 +89,7 @@ private function createPatternFromFormat(string $string): string
                 '%d' => '\d+',
                 '%x' => '[0-9a-fA-F]+',
                 '%f' => '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?',
-                '%c' => '.'
+                '%c' => '.',
             ]
         );
 

diff --git a/src/Framework/MockObject/Generator.php b/src/Framework/MockObject/Generator.php
@@ -313,7 +313,7 @@ public function getMockForTrait($traitName, array $arguments = [], $mockClassNam
             [
                 'prologue'   => 'abstract ',
                 'class_name' => $className['className'],
-                'trait_name' => $traitName
+                'trait_name' => $traitName,
             ]
         );
 
@@ -371,7 +371,7 @@ public function getObjectForTrait($traitName, array $arguments = [], $traitClass
             [
                 'prologue'   => '',
                 'class_name' => $className['className'],
-                'trait_name' => $traitName
+                'trait_name' => $traitName,
             ]
         );
 
@@ -480,7 +480,7 @@ public function generateClassFromWsdl($wsdlFile, $className, array $methods = []
                 $methodTemplate->setVar(
                     [
                         'method_name' => $name,
-                        'arguments'   => \implode(', ', $args)
+                        'arguments'   => \implode(', ', $args),
                     ]
                 );
 
@@ -511,7 +511,7 @@ public function generateClassFromWsdl($wsdlFile, $className, array $methods = []
                 'class_name' => $className,
                 'wsdl'       => $wsdlFile,
                 'options'    => $optionsBuffer,
-                'methods'    => $methodsBuffer
+                'methods'    => $methodsBuffer,
             ]
         );
 
@@ -837,13 +837,13 @@ function ($m) {
                         },
                         $configurable
                     )
-                ) . ']'
+                ) . ']',
             ]
         );
 
         return [
             'code'          => $classTemplate->render(),
-            'mockClassName' => $mockClassName['className']
+            'mockClassName' => $mockClassName['className'],
         ];
     }
 
@@ -886,7 +886,7 @@ private function generateClassName($type, $className, $prefix)
             'className'         => $className,
             'originalClassName' => $type,
             'fullClassName'     => $fullClassName,
-            'namespaceName'     => $namespaceName
+            'namespaceName'     => $namespaceName,
         ];
     }
 
@@ -1077,7 +1077,7 @@ private function generateMockedMethodDefinition($className, $methodName, $cloneA
                 'modifier'        => $modifier,
                 'reference'       => $reference,
                 'clone_arguments' => $cloneArguments ? 'true' : 'false',
-                'deprecation'     => $deprecation
+                'deprecation'     => $deprecation,
             ]
         );
 

diff --git a/src/Framework/MockObject/Invocation/StaticInvocation.php b/src/Framework/MockObject/Invocation/StaticInvocation.php
@@ -29,7 +29,7 @@ class StaticInvocation implements Invocation, SelfDescribing
         'sqlite3'   => true,
         'tidy'      => true,
         'xmlwriter' => true,
-        'xsl'       => true
+        'xsl'       => true,
     ];
 
     /**
@@ -42,7 +42,7 @@ class StaticInvocation implements Invocation, SelfDescribing
         'RecursiveIteratorIterator',
         'SplFileObject',
         'PDORow',
-        'ZipArchive'
+        'ZipArchive',
     ];
 
     /**

diff --git a/src/Framework/TestResult.php b/src/Framework/TestResult.php
@@ -416,7 +416,7 @@ public function endTest(Test $test, float $time): void
                 'size'   => \PHPUnit\Util\Test::getSize(
                     $class,
                     $test->getName(false)
-                )
+                ),
             ];
 
             $this->time += $time;

diff --git a/src/Runner/PhptTestCase.php b/src/Runner/PhptTestCase.php
@@ -49,7 +49,7 @@ class PhptTestCase implements Test, SelfDescribing
         'report_memleaks=0',
         'report_zend_debug=0',
         'safe_mode=0',
-        'xdebug.default_enable=0'
+        'xdebug.default_enable=0',
     ];
 
     /**
@@ -345,7 +345,7 @@ private function parse(): array
             'CGI',
             'EXPECTHEADERS',
             'EXTENSIONS',
-            'PHPDBG'
+            'PHPDBG',
         ];
 
         foreach (\file($this->filename) as $line) {
@@ -394,7 +394,7 @@ private function parseExternal(array &$sections): void
             'FILE',
             'EXPECT',
             'EXPECTF',
-            'EXPECTREGEX'
+            'EXPECTREGEX',
         ];
         $testDirectory = \dirname($this->filename) . \DIRECTORY_SEPARATOR;
 
@@ -427,8 +427,8 @@ private function validate(array &$sections): bool
             [
                 'EXPECT',
                 'EXPECTF',
-                'EXPECTREGEX'
-            ]
+                'EXPECTREGEX',
+            ],
         ];
 
         foreach ($requiredSections as $section) {
@@ -463,11 +463,11 @@ private function render(string $code): string
         return \str_replace(
             [
                 '__DIR__',
-                '__FILE__'
+                '__FILE__',
             ],
             [
                 "'" . \dirname($this->filename) . "'",
-                "'" . $this->filename . "'"
+                "'" . $this->filename . "'",
             ],
             $code
         );
@@ -480,7 +480,7 @@ private function getCoverageFiles(): array
 
         return [
             'coverage' => $baseDir . $basename . 'coverage',
-            'job'      => $baseDir . $basename . 'php'
+            'job'      => $baseDir . $basename . 'php',
         ];
     }
 
@@ -516,7 +516,7 @@ private function renderForCoverage(string &$job): void
                 'phar'             => $phar,
                 'globals'          => $globals,
                 'job'              => $files['job'],
-                'coverageFile'     => $files['coverage']
+                'coverageFile'     => $files['coverage'],
             ]
         );
 

diff --git a/src/Runner/TestSuiteSorter.php b/src/Runner/TestSuiteSorter.php
@@ -46,7 +46,7 @@ final class TestSuiteSorter
         BaseTestRunner::STATUS_INCOMPLETE => 3,
         BaseTestRunner::STATUS_RISKY      => 2,
         BaseTestRunner::STATUS_SKIPPED    => 1,
-        BaseTestRunner::STATUS_UNKNOWN    => 0
+        BaseTestRunner::STATUS_UNKNOWN    => 0,
     ];
 
     /**

diff --git a/src/TextUI/Command.php b/src/TextUI/Command.php
@@ -54,7 +54,7 @@ class Command
         'loader'                  => null,
         'useDefaultConfiguration' => true,
         'loadedExtensions'        => [],
-        'notLoadedExtensions'     => []
+        'notLoadedExtensions'     => [],
     ];
 
     /**
@@ -139,7 +139,7 @@ class Command
         'testsuite='                => null,
         'verbose'                   => null,
         'version'                   => null,
-        'whitelist='                => null
+        'whitelist='                => null,
     ];
 
     /**

diff --git a/src/TextUI/ResultPrinter.php b/src/TextUI/ResultPrinter.php
@@ -67,7 +67,7 @@ class ResultPrinter extends Printer implements TestListener
         'bg-blue'    => 44,
         'bg-magenta' => 45,
         'bg-cyan'    => 46,
-        'bg-white'   => 47
+        'bg-white'   => 47,
     ];
 
     /**

diff --git a/src/Util/Blacklist.php b/src/Util/Blacklist.php
@@ -61,7 +61,7 @@ final class Blacklist
         Instantiator::class           => 1,
         DocBlock::class               => 1,
         Prophet::class                => 1,
-        DeepCopy::class               => 1
+        DeepCopy::class               => 1,
     ];
 
     /**

diff --git a/src/Util/Configuration.php b/src/Util/Configuration.php
@@ -275,7 +275,7 @@ public function getExtensionConfiguration(): array
             $result[] = [
                 'class'     => $class,
                 'file'      => $file,
-                'arguments' => $arguments
+                'arguments' => $arguments,
             ];
         }
 
@@ -338,13 +338,13 @@ public function getFilterConfiguration(): array
                 'processUncoveredFilesFromWhitelist' => $processUncoveredFilesFromWhitelist,
                 'include'                            => [
                     'directory' => $includeDirectory,
-                    'file'      => $includeFile
+                    'file'      => $includeFile,
                 ],
                 'exclude' => [
                     'directory' => $excludeDirectory,
-                    'file'      => $excludeFile
-                ]
-            ]
+                    'file'      => $excludeFile,
+                ],
+            ],
         ];
     }
 
@@ -387,7 +387,7 @@ public function getListenerConfiguration(): array
             $result[] = [
                 'class'     => $class,
                 'file'      => $file,
-                'arguments' => $arguments
+                'arguments' => $arguments,
             ];
         }
 
@@ -471,7 +471,7 @@ public function getPHPConfiguration(): array
             'cookie'       => [],
             'server'       => [],
             'files'        => [],
-            'request'      => []
+            'request'      => [],
         ];
 
         foreach ($this->xpath->query('php/includePath') as $includePath) {
@@ -1240,7 +1240,7 @@ private function readFilterDirectories(string $query): array
                 'path'   => $this->toAbsolutePath($directoryPath),
                 'prefix' => $prefix,
                 'suffix' => $suffix,
-                'group'  => $group
+                'group'  => $group,
             ];
         }
 
@@ -1307,7 +1307,7 @@ private function parseGroupConfiguration(string $root): array
     {
         $groups = [
             'include' => [],
-            'exclude' => []
+            'exclude' => [],
         ];
 
         foreach ($this->xpath->query($root . '/include/group') as $group) {

diff --git a/src/Util/ConfigurationGenerator.php b/src/Util/ConfigurationGenerator.php
@@ -46,13 +46,13 @@ public function generateDefaultConfiguration(string $phpunitVersion, string $boo
                 '{phpunit_version}',
                 '{bootstrap_script}',
                 '{tests_directory}',
-                '{src_directory}'
+                '{src_directory}',
             ],
             [
                 $phpunitVersion,
                 $bootstrapScript,
                 $testsDirectory,
-                $srcDirectory
+                $srcDirectory,
             ],
             self::TEMPLATE
         );

diff --git a/src/Util/GlobalState.php b/src/Util/GlobalState.php
@@ -23,7 +23,7 @@ final class GlobalState
         '_COOKIE',
         '_SERVER',
         '_FILES',
-        '_REQUEST'
+        '_REQUEST',
     ];
 
     public static function getIncludedFilesAsString(): string

diff --git a/src/Util/Log/TeamCity.php b/src/Util/Log/TeamCity.php
@@ -277,7 +277,7 @@ public function endTest(Test $test, float $time): void
             'testFinished',
             [
                 'name'     => $test->getName(),
-                'duration' => self::toMilliseconds($time)
+                'duration' => self::toMilliseconds($time),
             ]
         );
     }

diff --git a/src/Util/PHP/WindowsPhpProcess.php b/src/Util/PHP/WindowsPhpProcess.php
@@ -35,7 +35,7 @@ protected function getHandles(): array
         }
 
         return [
-            1 => $stdout_handle
+            1 => $stdout_handle,
         ];
     }