PHP-CS-Fixer · keradus · Jan 4, 2024 · Jan 4, 2024 · Jan 4, 2024
diff --git a/doc/ruleSets/Symfony.rst b/doc/ruleSets/Symfony.rst
@@ -170,7 +170,10 @@ Rules
   ``['stick_comment_to_next_continuous_control_statement' => true]``
 
 - `switch_continue_to_break <./../rules/control_structure/switch_continue_to_break.rst>`_
-- `trailing_comma_in_multiline <./../rules/control_structure/trailing_comma_in_multiline.rst>`_
+- `trailing_comma_in_multiline <./../rules/control_structure/trailing_comma_in_multiline.rst>`_ with config:
+
+  ``['elements' => ['arrays', 'match', 'parameters']]``
+
 - `trim_array_spaces <./../rules/array_notation/trim_array_spaces.rst>`_
 - `type_declaration_spaces <./../rules/whitespace/type_declaration_spaces.rst>`_
 - `types_spaces <./../rules/whitespace/types_spaces.rst>`_

diff --git a/doc/rules/control_structure/trailing_comma_in_multiline.rst b/doc/rules/control_structure/trailing_comma_in_multiline.rst
@@ -127,8 +127,14 @@ The rule is part of the following rule sets:
 
   ``['after_heredoc' => true]``
 
-- `@PhpCsFixer <./../../ruleSets/PhpCsFixer.rst>`_
-- `@Symfony <./../../ruleSets/Symfony.rst>`_
+- `@PhpCsFixer <./../../ruleSets/PhpCsFixer.rst>`_ with config:
+
+  ``['elements' => ['arrays', 'match', 'parameters']]``
+
+- `@Symfony <./../../ruleSets/Symfony.rst>`_ with config:
+
+  ``['elements' => ['arrays', 'match', 'parameters']]``
+
 
 References
 ----------

diff --git a/src/Cache/FileCacheManager.php b/src/Cache/FileCacheManager.php
@@ -55,7 +55,7 @@ public function __construct(
         FileHandlerInterface $handler,
         SignatureInterface $signature,
         bool $isDryRun = false,
-        ?DirectoryInterface $cacheDirectory = null
+        ?DirectoryInterface $cacheDirectory = null,
     ) {
         $this->handler = $handler;
         $this->signature = $signature;

diff --git a/src/Console/Command/SelfUpdateCommand.php b/src/Console/Command/SelfUpdateCommand.php
@@ -47,7 +47,7 @@ final class SelfUpdateCommand extends Command
     public function __construct(
         NewVersionCheckerInterface $versionChecker,
         ToolInfoInterface $toolInfo,
-        PharCheckerInterface $pharChecker
+        PharCheckerInterface $pharChecker,
     ) {
         parent::__construct();
 

diff --git a/src/Console/ConfigurationResolver.php b/src/Console/ConfigurationResolver.php
@@ -188,7 +188,7 @@ public function __construct(
         ConfigInterface $config,
         array $options,
         string $cwd,
-        ToolInfoInterface $toolInfo
+        ToolInfoInterface $toolInfo,
     ) {
         $this->defaultConfig = $config;
         $this->cwd = $cwd;

diff --git a/src/Console/Output/OutputContext.php b/src/Console/Output/OutputContext.php
@@ -28,7 +28,7 @@ final class OutputContext
     public function __construct(
         ?OutputInterface $output,
         int $terminalWidth,
-        int $filesCount
+        int $filesCount,
     ) {
         $this->output = $output;
         $this->terminalWidth = $terminalWidth;

diff --git a/src/Console/Report/FixReport/ReportSummary.php b/src/Console/Report/FixReport/ReportSummary.php
@@ -50,7 +50,7 @@ public function __construct(
         int $memory,
         bool $addAppliedFixers,
         bool $isDryRun,
-        bool $isDecoratedOutput
+        bool $isDecoratedOutput,
     ) {
         $this->changed = $changed;
         $this->filesCount = $filesCount;

diff --git a/src/Fixer/AbstractPhpUnitFixer.php b/src/Fixer/AbstractPhpUnitFixer.php
@@ -74,7 +74,7 @@ final protected function ensureIsDockBlockWithAnnotation(
         Tokens $tokens,
         int $index,
         string $annotation,
-        array $preventingAnnotations
+        array $preventingAnnotations,
     ): void {
         $docBlockIndex = $this->getDocBlockIndex($tokens, $index);
 
@@ -121,7 +121,7 @@ private function updateDocBlockIfNeeded(
         Tokens $tokens,
         int $docBlockIndex,
         string $annotation,
-        array $preventingAnnotations
+        array $preventingAnnotations,
     ): void {
         $doc = new DocBlock($tokens[$docBlockIndex]->getContent());
         foreach ($preventingAnnotations as $preventingAnnotation) {

diff --git a/src/Fixer/AbstractShortOperatorFixer.php b/src/Fixer/AbstractShortOperatorFixer.php
@@ -95,7 +95,7 @@ private function shortenOperation(
         int $equalsIndex,
         int $operatorIndex,
         array $assignRange,
-        array $operatorRange
+        array $operatorRange,
     ): void {
         $tokens[$equalsIndex] = $this->getReplacementToken($tokens[$operatorIndex]);
         $tokens->clearTokenAndMergeSurroundingWhitespace($operatorIndex);

diff --git a/src/Fixer/Alias/SetTypeToCastFixer.php b/src/Fixer/Alias/SetTypeToCastFixer.php
@@ -182,7 +182,7 @@ private function removeSettypeCall(
         int $firstArgumentStart,
         int $commaIndex,
         int $secondArgumentStart,
-        int $closeParenthesisIndex
+        int $closeParenthesisIndex,
     ): void {
         $tokens->clearTokenAndMergeSurroundingWhitespace($closeParenthesisIndex);
         $prevIndex = $tokens->getPrevMeaningfulToken($closeParenthesisIndex);
@@ -201,7 +201,7 @@ private function fixSettypeCall(
         Tokens $tokens,
         int $functionNameIndex,
         Token $argumentToken,
-        Token $castToken
+        Token $castToken,
     ): void {
         $tokens->insertAt(
             $functionNameIndex,
@@ -222,7 +222,7 @@ private function fixSettypeCall(
     private function fixSettypeNullCall(
         Tokens $tokens,
         int $functionNameIndex,
-        Token $argumentToken
+        Token $argumentToken,
     ): void {
         $tokens->insertAt(
             $functionNameIndex,

diff --git a/src/Fixer/ControlStructure/NoUnneededControlParenthesesFixer.php b/src/Fixer/ControlStructure/NoUnneededControlParenthesesFixer.php
@@ -683,7 +683,7 @@ private function removeUselessParenthesisPair(
         int $afterCloseIndex,
         int $openIndex,
         int $closeIndex,
-        ?string $configType
+        ?string $configType,
     ): void {
         $statements = $this->configuration['statements'];
 

diff --git a/src/Fixer/ControlStructure/YodaStyleFixer.php b/src/Fixer/ControlStructure/YodaStyleFixer.php
@@ -306,7 +306,7 @@ private function fixTokensCompare(
         int $endLeft,
         int $compareOperatorIndex,
         int $startRight,
-        int $endRight
+        int $endRight,
     ): int {
         $type = $tokens[$compareOperatorIndex]->getId();
         $content = $tokens[$compareOperatorIndex]->getContent();

diff --git a/src/Fixer/LanguageConstruct/FunctionToConstantFixer.php b/src/Fixer/LanguageConstruct/FunctionToConstantFixer.php
@@ -182,7 +182,7 @@ private function fixFunctionCallToConstant(Tokens $tokens, int $index, int $brac
     private function getReplaceCandidate(
         Tokens $tokens,
         FunctionsAnalyzer $functionAnalyzer,
-        int $index
+        int $index,
     ): ?array {
         if (!$tokens[$index]->isGivenKind(T_STRING)) {
             return null;
@@ -219,7 +219,7 @@ private function getReplaceCandidate(
     private function fixGetClassCall(
         Tokens $tokens,
         FunctionsAnalyzer $functionAnalyzer,
-        int $index
+        int $index,
     ): ?array {
         if (!isset($this->functionsFixMap['get_class']) && !isset($this->functionsFixMap['get_class_this'])) {
             return null;

diff --git a/src/Fixer/Operator/NoUselessConcatOperatorFixer.php b/src/Fixer/Operator/NoUselessConcatOperatorFixer.php
@@ -231,7 +231,7 @@ private function mergeConstantEscapedStringOperands(
         Tokens $tokens,
         array $firstOperand,
         int $concatOperatorIndex,
-        array $secondOperand
+        array $secondOperand,
     ): void {
         $quote = self::STR_DOUBLE_QUOTE === $firstOperand['type'] || self::STR_DOUBLE_QUOTE === $secondOperand['type'] ? '"' : "'";
         $firstOperandTokenContent = $tokens[$firstOperand['start']]->getContent();
@@ -264,7 +264,7 @@ private function mergeConstantEscapedStringVarOperands(
         Tokens $tokens,
         array $firstOperand,
         int $concatOperatorIndex,
-        array $secondOperand
+        array $secondOperand,
     ): void {
         // build uo the new content
         $newContent = '';

diff --git a/src/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixer.php b/src/Fixer/Phpdoc/NoSuperfluousPhpdocTagsFixer.php
@@ -306,7 +306,7 @@ private function fixFunctionDocComment(
         array $element,
         ?string $namespace,
         ?string $currentSymbol,
-        array $shortNames
+        array $shortNames,
     ): string {
         $docBlock = new DocBlock($content);
 
@@ -368,7 +368,7 @@ private function fixPropertyDocComment(
         array $element,
         ?string $namespace,
         ?string $currentSymbol,
-        array $shortNames
+        array $shortNames,
     ): string {
         if (\count($element['types']) > 0) {
             $propertyTypeInfo = $this->parseTypeHint($tokens, array_key_first($element['types']));
@@ -517,7 +517,7 @@ private function annotationIsSuperfluous(
         array $info,
         ?string $namespace,
         ?string $currentSymbol,
-        array $symbolShortNames
+        array $symbolShortNames,
     ): bool {
         if ('param' === $annotation->getTag()->getName()) {
             $regex = '{\*\h*@param(?:\h+'.TypeExpression::REGEX_TYPES.')?(?!\S)(?:\h+(?:\&\h*)?(?:\.{3}\h*)?\$\S+)?(?:\h+(?<description>(?!\*+\/)\S+))?}s';

diff --git a/src/Fixer/ReturnNotation/ReturnAssignmentFixer.php b/src/Fixer/ReturnNotation/ReturnAssignmentFixer.php
@@ -302,7 +302,7 @@ private function simplifyReturnStatement(
         int $assignVarIndex,
         int $assignVarOperatorIndex,
         int $returnIndex,
-        int $returnVarEndIndex
+        int $returnVarEndIndex,
     ): int {
         $inserted = 0;
         $originalIndent = $tokens[$assignVarIndex - 1]->isWhitespace()

diff --git a/src/FixerConfiguration/FixerOption.php b/src/FixerConfiguration/FixerOption.php
@@ -54,7 +54,7 @@ public function __construct(
         $default = null,
         ?array $allowedTypes = null,
         ?array $allowedValues = null,
-        ?\Closure $normalizer = null
+        ?\Closure $normalizer = null,
     ) {
         if ($isRequired && null !== $default) {
             throw new \LogicException('Required options cannot have a default value.');

diff --git a/src/FixerDefinition/FileSpecificCodeSample.php b/src/FixerDefinition/FileSpecificCodeSample.php
@@ -31,7 +31,7 @@ final class FileSpecificCodeSample implements FileSpecificCodeSampleInterface
     public function __construct(
         string $code,
         \SplFileInfo $splFileInfo,
-        ?array $configuration = null
+        ?array $configuration = null,
     ) {
         $this->codeSample = new CodeSample($code, $configuration);
         $this->splFileInfo = $splFileInfo;

diff --git a/src/FixerDefinition/FixerDefinition.php b/src/FixerDefinition/FixerDefinition.php
@@ -44,7 +44,7 @@ public function __construct(
         string $summary,
         array $codeSamples,
         ?string $description = null,
-        ?string $riskyDescription = null
+        ?string $riskyDescription = null,
     ) {
         $this->summary = $summary;
         $this->codeSamples = $codeSamples;

diff --git a/src/FixerDefinition/VersionSpecificCodeSample.php b/src/FixerDefinition/VersionSpecificCodeSample.php
@@ -29,7 +29,7 @@ final class VersionSpecificCodeSample implements VersionSpecificCodeSampleInterf
     public function __construct(
         string $code,
         VersionSpecificationInterface $versionSpecification,
-        ?array $configuration = null
+        ?array $configuration = null,
     ) {
         $this->codeSample = new CodeSample($code, $configuration);
         $this->versionSpecification = $versionSpecification;

diff --git a/src/RuleSet/Sets/SymfonySet.php b/src/RuleSet/Sets/SymfonySet.php
@@ -134,7 +134,9 @@ public function getRules(): array
             'no_useless_nullsafe_operator' => true,
             'no_whitespace_before_comma_in_array' => true,
             'normalize_index_brace' => true,
-            'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => false],
+            'nullable_type_declaration_for_default_null_value' => [
+                'use_nullable_type_declaration' => false,
+            ],
             'object_operator_without_whitespace' => true,
             'operator_linebreak' => [
                 'only_booleans' => true,
@@ -211,7 +213,9 @@ public function getRules(): array
                 'stick_comment_to_next_continuous_control_statement' => true,
             ],
             'switch_continue_to_break' => true,
-            'trailing_comma_in_multiline' => true,
+            'trailing_comma_in_multiline' => [
+                'elements' => ['arrays', 'match', 'parameters'],
+            ],
             'trim_array_spaces' => true,
             'type_declaration_spaces' => true,
             'types_spaces' => true,

diff --git a/src/Runner/FileFilterIterator.php b/src/Runner/FileFilterIterator.php
@@ -44,7 +44,7 @@ final class FileFilterIterator extends \FilterIterator
     public function __construct(
         \Traversable $iterator,
         ?EventDispatcherInterface $eventDispatcher,
-        CacheManagerInterface $cacheManager
+        CacheManagerInterface $cacheManager,
     ) {
         if (!$iterator instanceof \Iterator) {
             $iterator = new \IteratorIterator($iterator);

diff --git a/src/Runner/Runner.php b/src/Runner/Runner.php
@@ -77,7 +77,7 @@ public function __construct(
         bool $isDryRun,
         CacheManagerInterface $cacheManager,
         ?DirectoryInterface $directory = null,
-        bool $stopOnViolation = false
+        bool $stopOnViolation = false,
     ) {
         $this->finder = $finder;
         $this->fixers = $fixers;

diff --git a/tests/AbstractFunctionReferenceFixerTest.php b/tests/AbstractFunctionReferenceFixerTest.php
@@ -36,7 +36,7 @@ public function testAbstractFunctionReferenceFixer(
         string $source,
         string $functionNameToSearch,
         int $start = 0,
-        ?int $end = null
+        ?int $end = null,
     ): void {
         $fixer = $this->createAbstractFunctionReferenceFixerDouble();
 

diff --git a/tests/AbstractProxyFixerTest.php b/tests/AbstractProxyFixerTest.php
@@ -135,7 +135,7 @@ private function createFixerDouble(
         bool $isCandidate,
         bool $isRisky = false,
         bool $supports = false,
-        int $priority = 999
+        int $priority = 999,
     ): FixerInterface {
         return new class($isCandidate, $isRisky, $supports, $priority) implements FixerInterface {
             private bool $isCandidate;

diff --git a/tests/Console/Command/DescribeCommandTest.php b/tests/Console/Command/DescribeCommandTest.php
@@ -464,7 +464,7 @@ private static function createFixerWithSamplesDouble(array $samples): FixerInter
              * @param list<CodeSampleInterface> $samples
              */
             public function __construct(
-                array $samples
+                array $samples,
             ) {
                 parent::__construct();
                 $this->samples = $samples;

diff --git a/tests/Console/Command/SelfUpdateCommandTest.php b/tests/Console/Command/SelfUpdateCommandTest.php
@@ -101,7 +101,7 @@ public function testExecute(
         array $input,
         bool $decorated,
         string $expectedFileContents,
-        string $expectedDisplay
+        string $expectedDisplay,
     ): void {
         $versionChecker = $this->createNewVersionCheckerDouble($latestVersion, $latestMinorVersion);
 
@@ -260,7 +260,7 @@ public function testExecuteWhenNotAbleToGetLatestVersions(
         bool $latestMajorVersionSuccess,
         bool $latestMinorVersionSuccess,
         array $input,
-        bool $decorated
+        bool $decorated,
     ): void {
         $versionChecker = $this->createNewVersionCheckerDouble(
             self::getNewMajorReleaseVersion(),
@@ -467,7 +467,7 @@ private function createNewVersionCheckerDouble(
         string $latestVersion = Application::VERSION,
         ?string $latestMinorVersion = Application::VERSION,
         bool $latestMajorVersionSuccess = true,
-        bool $latestMinorVersionSuccess = true
+        bool $latestMinorVersionSuccess = true,
     ): NewVersionCheckerInterface {
         return new class($latestVersion, $latestMinorVersion, $latestMajorVersionSuccess, $latestMinorVersionSuccess) implements NewVersionCheckerInterface {
             private string $latestVersion;
@@ -479,7 +479,7 @@ public function __construct(
                 string $latestVersion,
                 ?string $latestMinorVersion,
                 bool $latestMajorVersionSuccess = true,
-                bool $latestMinorVersionSuccess = true
+                bool $latestMinorVersionSuccess = true,
             ) {
                 $this->latestVersion = $latestVersion;
                 $this->latestMinorVersion = $latestMinorVersion;

diff --git a/tests/Console/Output/Progress/ProgressOutputFactoryTest.php b/tests/Console/Output/Progress/ProgressOutputFactoryTest.php
@@ -35,7 +35,7 @@ final class ProgressOutputFactoryTest extends TestCase
     public function testValidProcessOutputIsCreated(
         string $outputType,
         OutputContext $context,
-        string $expectedOutputClass
+        string $expectedOutputClass,
     ): void {
         self::assertInstanceOf($expectedOutputClass, (new ProgressOutputFactory())->create($outputType, $context));
     }

diff --git a/tests/Fixer/FunctionNotation/NativeFunctionInvocationFixerTest.php b/tests/Fixer/FunctionNotation/NativeFunctionInvocationFixerTest.php
@@ -90,7 +90,7 @@ public static function provideConfigureRejectsInvalidConfigurationElementCases()
     public function testConfigureIncludeSets(
         array $include,
         ?string $expectedExceptionClass = null,
-        ?string $expectedExceptionMessage = null
+        ?string $expectedExceptionMessage = null,
     ): void {
         if (null !== $expectedExceptionClass) {
             $this->expectException($expectedExceptionClass);

diff --git a/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php b/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php
@@ -35,7 +35,7 @@ public function testFix(
         string $expected,
         ?string $input = null,
         array $config = [],
-        ?WhitespacesFixerConfig $whitespaceConfig = null
+        ?WhitespacesFixerConfig $whitespaceConfig = null,
     ): void {
         $this->fixer->configure($config);
 

diff --git a/tests/Fixer/NamespaceNotation/BlankLinesBeforeNamespaceFixerTest.php b/tests/Fixer/NamespaceNotation/BlankLinesBeforeNamespaceFixerTest.php
@@ -37,7 +37,7 @@ public function testFix(
         string $expected,
         ?string $input = null,
         ?array $config = [],
-        ?WhitespacesFixerConfig $whitespaces = null
+        ?WhitespacesFixerConfig $whitespaces = null,
     ): void {
         if (null !== $whitespaces) {
             $this->fixer->setWhitespacesConfig($whitespaces);