[TASK] Add trailing commas to multiline arrays

SomeBdyElse · SomeBdyElse · commit fe3dd57af6a3 · 2023-08-07T12:31:47.000+02:00
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -62,6 +62,7 @@
         'single_quote' => true,
         'single_space_around_construct' => true,
         'single_line_comment_style' => ['comment_types' => ['hash']],
+        'trailing_comma_in_multiline' => ['elements' => ['arrays']],
         'whitespace_after_comma_in_array' => ['ensure_single_space' => true],
         'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
     ]);
diff --git a/Classes/Processor/FileMetadataProcessor.php b/Classes/Processor/FileMetadataProcessor.php
@@ -16,7 +16,7 @@ public function processFile(FileInterface $file): array
             'copyright' => 'copyright',
             'link' => 'link',
             'alternative' => 'alternative',
-            'fileType' => 'extension'
+            'fileType' => 'extension',
         ];
 
         $metaData = [];
diff --git a/Classes/Processor/FileProcessor.php b/Classes/Processor/FileProcessor.php
@@ -57,7 +57,7 @@ class FileProcessor
         'downloadDescriptionFallbackField' => '',
         'maxCharacters' => PHP_INT_MAX,
         'append' => '...',
-        'respectWordBoundaries' => true
+        'respectWordBoundaries' => true,
     ];
 
     /**
@@ -127,8 +127,8 @@ protected function getDownloadItem(FileReference $item): array
                     'description' => $description,
                     'name' => $item->getTitle(),
                     'extension' => $item->getExtension(),
-                    'size' => $this->fileSizeProcessor->formatFileSize($item->getSize(), $fileFormatConfiguration)
-                ]
+                    'size' => $this->fileSizeProcessor->formatFileSize($item->getSize(), $fileFormatConfiguration),
+                ],
             ],
         ];
 
diff --git a/Classes/Processor/ImageProcessor.php b/Classes/Processor/ImageProcessor.php
@@ -45,7 +45,7 @@ public function renderImage(FileInterface $file, array $conf = []): array
             ],
             'width' => $defaultImageResource[0],
             'height' => $defaultImageResource[1],
-            'ratio' => $defaultImageResource[0] / $defaultImageResource[1]
+            'ratio' => $defaultImageResource[0] / $defaultImageResource[1],
         ];
 
         self::clearAssetOptions($assetOptions, $conf);
diff --git a/Classes/Processor/MediaProcessor.php b/Classes/Processor/MediaProcessor.php
@@ -106,7 +106,7 @@ protected function renderImageElement(
             'image' => $this->pictureProcessor->renderPicture(
                 $mediaElement,
                 $imageConfiguration
-            )
+            ),
         ];
 
         if (! empty($mediaData) && ! empty($imageThumbnailConfiguration)) {
diff --git a/Classes/Processor/PageElement/LanguageMenuProcessor.php b/Classes/Processor/PageElement/LanguageMenuProcessor.php
@@ -84,7 +84,7 @@ protected function prepareLanguageInformation(array $menuData, array $pageData):
             'titleShort' => $menuData['navigationTitle'],
             'link' => $link,
             'current' => (bool)$menuData['active'],
-            'sortValue' => (int)$menuData['active']
+            'sortValue' => (int)$menuData['active'],
         ];
 
         return $languageData;
diff --git a/Classes/Processor/PageElement/MenuProcessor.php b/Classes/Processor/PageElement/MenuProcessor.php
@@ -29,7 +29,7 @@ public function injectContentObjectRenderer(ContentObjectRenderer $contentObject
     public function process(array $data, array $configuration): ?array
     {
         $defaultConfiguration = [
-            'includePageData' => false
+            'includePageData' => false,
         ];
         $configuration = array_replace($defaultConfiguration, $configuration);
 
diff --git a/Classes/Processor/TypoLinkStringProcessor.php b/Classes/Processor/TypoLinkStringProcessor.php
@@ -27,7 +27,7 @@ public function processTypoLinkString(string $typoLinkString): ?array
         $uri = $this->contentObject->typoLink_URL(
             [
                 'parameter' => $typoLinkParts['url'],
-                'additionalParams' => $typoLinkParts['additionalParams']
+                'additionalParams' => $typoLinkParts['additionalParams'],
             ]
         );
 
@@ -40,8 +40,8 @@ public function processTypoLinkString(string $typoLinkString): ?array
                 'uri' => $uri,
                 'target' => $typoLinkParts['target'],
                 'class' => $typoLinkParts['class'],
-                'title' => $typoLinkParts['title']
-            ]
+                'title' => $typoLinkParts['title'],
+            ],
         ];
     }
 }
diff --git a/Classes/Processor/VideoProcessor.php b/Classes/Processor/VideoProcessor.php
@@ -35,7 +35,7 @@ public function renderVideo(FileInterface $file): ?array
         $videoData = [
             'default' => [
                 'src' => $src,
-                'type' => $file->getMimeType()
+                'type' => $file->getMimeType(),
             ],
             'metaData' => $this->fileMetaDataProcessor->processFile(($file)),
         ];
diff --git a/Tests/Unit/Evaluator/PhoneNumberValidationTest.php b/Tests/Unit/Evaluator/PhoneNumberValidationTest.php
@@ -47,7 +47,7 @@ public static function telephoneIsProperlyEvaluatedDataProvider(): array
             'with preceding plus' => ['+43 699 12 54 12 1', '+43 699 12 54 12 1'],
             'with preceding 00' => ['0043 699 12 54 12 1', '+43 699 12 54 12 1'],
             'national format return same' => ['0699 12 54 12 1', '0699 12 54 12 1'],
-            'with non numeric characters' => ['+43 699 12 54 12 1 -D:4', '+43 699 12 54 12 1 4']
+            'with non numeric characters' => ['+43 699 12 54 12 1 -D:4', '+43 699 12 54 12 1 4'],
         ];
     }
 }
diff --git a/Tests/Unit/Processor/FileSizeProcessorTest.php b/Tests/Unit/Processor/FileSizeProcessorTest.php
@@ -39,75 +39,75 @@ public static function defaultFormatDataProvider(): array
             [
                 'fileSize' => 'invalid',
                 [],
-                'expected' => '0 B'
+                'expected' => '0 B',
             ],
             [
                 'fileSize' => '',
                 [],
-                'expected' => '0 B'
+                'expected' => '0 B',
             ],
             [
                 'fileSize' => [],
                 [],
-                'expected' => '0 B'
+                'expected' => '0 B',
             ],
             [
                 'fileSize' => 123,
                 [],
-                'expected' => '123 B'
+                'expected' => '123 B',
             ],
             [
                 'fileSize' => '43008',
                 [
-                    'decimals' => 1
+                    'decimals' => 1,
                 ],
-                'expected' => '42.0 KB'
+                'expected' => '42.0 KB',
             ],
             [
                 'fileSize' => '1024',
                 [
-                    'decimals' => 1
+                    'decimals' => 1,
                 ],
-                'expected' => '1.0 KB'
+                'expected' => '1.0 KB',
             ],
             [
                 'fileSize' => '1022',
                 [
-                    'decimals' => 2
+                    'decimals' => 2,
                 ],
-                'expected' => '1022.00 B'
+                'expected' => '1022.00 B',
             ],
             [
                 'fileSize' => '1022',
                 [
                     'decimals' => 2,
-                    'thousandsSeparator' => ','
+                    'thousandsSeparator' => ',',
                 ],
-                'expected' => '1,022.00 B'
+                'expected' => '1,022.00 B',
             ],
             [
                 'fileSize' => 1073741823,
                 [
                     'decimals' => 1,
                     'decimalSeparator' => ',',
-                    'thousandsSeparator' => '.'
+                    'thousandsSeparator' => '.',
                 ],
-                'expected' => '1.024,0 MB'
+                'expected' => '1.024,0 MB',
             ],
             [
                 'fileSize' => pow(1024, 5),
                 [
-                    'decimals' => 1
+                    'decimals' => 1,
                 ],
-                'expected' => '1.0 PB'
+                'expected' => '1.0 PB',
             ],
             [
                 'fileSize' => pow(1024, 8),
                 [
-                    'decimals' => 1
+                    'decimals' => 1,
                 ],
-                'expected' => '1.0 YB'
-            ]
+                'expected' => '1.0 YB',
+            ],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function injectContentObjectRenderer(ContentObjectRenderer $contentObject`
`29`	`29`	`public function process(array $data, array $configuration): ?array`
`30`	`30`	`{`
`31`	`31`	`$defaultConfiguration = [`
`32`		`- 'includePageData' => false`
	`32`	`+ 'includePageData' => false,`
`33`	`33`	`];`
`34`	`34`	`$configuration = array_replace($defaultConfiguration, $configuration);`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function processTypoLinkString(string $typoLinkString): ?array`
`27`	`27`	`$uri = $this->contentObject->typoLink_URL(`
`28`	`28`	`[`
`29`	`29`	`'parameter' => $typoLinkParts['url'],`
`30`		`- 'additionalParams' => $typoLinkParts['additionalParams']`
	`30`	`+ 'additionalParams' => $typoLinkParts['additionalParams'],`
`31`	`31`	`]`
`32`	`32`	`);`
`33`	`33`
`@@ -40,8 +40,8 @@ public function processTypoLinkString(string $typoLinkString): ?array`
`40`	`40`	`'uri' => $uri,`
`41`	`41`	`'target' => $typoLinkParts['target'],`
`42`	`42`	`'class' => $typoLinkParts['class'],`
`43`		`- 'title' => $typoLinkParts['title']`
`44`		`- ]`
	`43`	`+ 'title' => $typoLinkParts['title'],`
	`44`	`+ ],`
`45`	`45`	`];`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static function telephoneIsProperlyEvaluatedDataProvider(): array`
`47`	`47`	`'with preceding plus' => ['+43 699 12 54 12 1', '+43 699 12 54 12 1'],`
`48`	`48`	`'with preceding 00' => ['0043 699 12 54 12 1', '+43 699 12 54 12 1'],`
`49`	`49`	`'national format return same' => ['0699 12 54 12 1', '0699 12 54 12 1'],`
`50`		`- 'with non numeric characters' => ['+43 699 12 54 12 1 -D:4', '+43 699 12 54 12 1 4']`
	`50`	`+ 'with non numeric characters' => ['+43 699 12 54 12 1 -D:4', '+43 699 12 54 12 1 4'],`
`51`	`51`	`];`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,75 +39,75 @@ public static function defaultFormatDataProvider(): array`
`39`	`39`	`[`
`40`	`40`	`'fileSize' => 'invalid',`
`41`	`41`	`[],`
`42`		`- 'expected' => '0 B'`
	`42`	`+ 'expected' => '0 B',`
`43`	`43`	`],`
`44`	`44`	`[`
`45`	`45`	`'fileSize' => '',`
`46`	`46`	`[],`
`47`		`- 'expected' => '0 B'`
	`47`	`+ 'expected' => '0 B',`
`48`	`48`	`],`
`49`	`49`	`[`
`50`	`50`	`'fileSize' => [],`
`51`	`51`	`[],`
`52`		`- 'expected' => '0 B'`
	`52`	`+ 'expected' => '0 B',`
`53`	`53`	`],`
`54`	`54`	`[`
`55`	`55`	`'fileSize' => 123,`
`56`	`56`	`[],`
`57`		`- 'expected' => '123 B'`
	`57`	`+ 'expected' => '123 B',`
`58`	`58`	`],`
`59`	`59`	`[`
`60`	`60`	`'fileSize' => '43008',`
`61`	`61`	`[`
`62`		`- 'decimals' => 1`
	`62`	`+ 'decimals' => 1,`
`63`	`63`	`],`
`64`		`- 'expected' => '42.0 KB'`
	`64`	`+ 'expected' => '42.0 KB',`
`65`	`65`	`],`
`66`	`66`	`[`
`67`	`67`	`'fileSize' => '1024',`
`68`	`68`	`[`
`69`		`- 'decimals' => 1`
	`69`	`+ 'decimals' => 1,`
`70`	`70`	`],`
`71`		`- 'expected' => '1.0 KB'`
	`71`	`+ 'expected' => '1.0 KB',`
`72`	`72`	`],`
`73`	`73`	`[`
`74`	`74`	`'fileSize' => '1022',`
`75`	`75`	`[`
`76`		`- 'decimals' => 2`
	`76`	`+ 'decimals' => 2,`
`77`	`77`	`],`
`78`		`- 'expected' => '1022.00 B'`
	`78`	`+ 'expected' => '1022.00 B',`
`79`	`79`	`],`
`80`	`80`	`[`
`81`	`81`	`'fileSize' => '1022',`
`82`	`82`	`[`
`83`	`83`	`'decimals' => 2,`
`84`		`- 'thousandsSeparator' => ','`
	`84`	`+ 'thousandsSeparator' => ',',`
`85`	`85`	`],`
`86`		`- 'expected' => '1,022.00 B'`
	`86`	`+ 'expected' => '1,022.00 B',`
`87`	`87`	`],`
`88`	`88`	`[`
`89`	`89`	`'fileSize' => 1073741823,`
`90`	`90`	`[`
`91`	`91`	`'decimals' => 1,`
`92`	`92`	`'decimalSeparator' => ',',`
`93`		`- 'thousandsSeparator' => '.'`
	`93`	`+ 'thousandsSeparator' => '.',`
`94`	`94`	`],`
`95`		`- 'expected' => '1.024,0 MB'`
	`95`	`+ 'expected' => '1.024,0 MB',`
`96`	`96`	`],`
`97`	`97`	`[`
`98`	`98`	`'fileSize' => pow(1024, 5),`
`99`	`99`	`[`
`100`		`- 'decimals' => 1`
	`100`	`+ 'decimals' => 1,`
`101`	`101`	`],`
`102`		`- 'expected' => '1.0 PB'`
	`102`	`+ 'expected' => '1.0 PB',`
`103`	`103`	`],`
`104`	`104`	`[`
`105`	`105`	`'fileSize' => pow(1024, 8),`
`106`	`106`	`[`
`107`		`- 'decimals' => 1`
	`107`	`+ 'decimals' => 1,`
`108`	`108`	`],`
`109`		`- 'expected' => '1.0 YB'`
`110`		`- ]`
	`109`	`+ 'expected' => '1.0 YB',`
	`110`	`+ ],`
`111`	`111`	`];`
`112`	`112`	`}`
`113`	`113`	`}`