[TASK] Set more options for php-cs-fixer's trailing comma in multilin…

…e rule (#235) Releases: main
TYPO3-Documentation · Mar 5, 2024 · 9f5ce28 · 9f5ce28
1 parent f2addd5
commit 9f5ce28
Show file tree

Hide file tree

Showing 29 changed files with 115 additions and 115 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -80,7 +80,7 @@
         'single_line_comment_style' => ['comment_types' => ['hash']],
         // @todo: Can be dropped once we enable @PER-CS2.0
         'single_line_empty_body' => true,
-        'trailing_comma_in_multiline' => ['elements' => ['arrays']],
+        'trailing_comma_in_multiline' => ['elements' => ['arguments', 'arrays', 'match', 'parameters']],
         'whitespace_after_comma_in_array' => ['ensure_single_space' => true],
         'yoda_style' => ['equal' => false, 'identical' => false, 'less_and_greater' => false],
 

diff --git a/Classes/Command/CreateWizardCommand.php b/Classes/Command/CreateWizardCommand.php
@@ -34,19 +34,19 @@ protected function configure(): void
             ->addArgument(
                 'wizardName',
                 InputArgument::OPTIONAL,
-                'The wizard\'s name'
+                'The wizard\'s name',
             )
             ->addOption(
                 'brute-force',
                 'b',
                 InputOption::VALUE_NONE,
-                'Allow the "Wizard of Oz". You can use --brute-force or -b when running command'
+                'Allow the "Wizard of Oz". You can use --brute-force or -b when running command',
             );
     }
 
     protected function execute(
         InputInterface $input,
-        OutputInterface $output
+        OutputInterface $output,
     ): int {
         $io = new SymfonyStyle($input, $output);
         $wizardName = $input->getArgument('wizardName');
@@ -62,13 +62,13 @@ protected function execute(
     private function doMagic(
         SymfonyStyle $io,
         mixed $wizardName,
-        bool $bruteForce
+        bool $bruteForce,
     ) {
         $io->comment('Trying to create wizard ' . $wizardName . '...');
         if ($wizardName === null) {
             $wizardName = (string)$io->ask(
                 'Enter the wizard\'s name (e.g. "Gandalf the Grey")',
-                'Lord Voldermort'
+                'Lord Voldermort',
             );
         }
         if (!$bruteForce && $wizardName === 'Oz') {

diff --git a/Classes/Command/MeowInformationCommand.php b/Classes/Command/MeowInformationCommand.php
@@ -40,7 +40,7 @@ protected function configure()
 
     protected function execute(
         InputInterface $input,
-        OutputInterface $output
+        OutputInterface $output,
     ): int {
         $io = new SymfonyStyle($input, $output);
         $io->title($this->getDescription());

diff --git a/Classes/Controller/AdminModuleController.php b/Classes/Controller/AdminModuleController.php
@@ -42,13 +42,13 @@ public function handleRequest(ServerRequestInterface $request): ResponseInterfac
         $allowedOptions = [
             'function' => [
                 'debug' => htmlspecialchars(
-                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:debug')
+                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:debug'),
                 ),
                 'password' => htmlspecialchars(
-                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:password')
+                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:password'),
                 ),
                 'index' => htmlspecialchars(
-                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:index')
+                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:index'),
                 ),
             ],
         ];
@@ -66,27 +66,27 @@ public function handleRequest(ServerRequestInterface $request): ResponseInterfac
             case 'debug':
                 $moduleTemplate->setTitle(
                     $title,
-                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:module.menu.debug')
+                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:module.menu.debug'),
                 );
                 return $this->debugAction($request, $moduleTemplate);
             case 'password':
                 $moduleTemplate->setTitle(
                     $title,
-                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:module.menu.password')
+                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:module.menu.password'),
                 );
                 return $this->passwordAction($request, $moduleTemplate);
             default:
                 $moduleTemplate->setTitle(
                     $title,
-                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:module.menu.log')
+                    $languageService->sL('EXT:examples/Resources/Private/Language/AdminModule/locallang.xlf:module.menu.log'),
                 );
                 return $this->indexAction($request, $moduleTemplate);
         }
     }
 
     private function setUpDocHeader(
         ServerRequestInterface $request,
-        ModuleTemplate $view
+        ModuleTemplate $view,
     ) {
         $buttonBar = $view->getDocHeaderComponent()->getButtonBar();
         $list = $buttonBar->makeLinkButton()
@@ -99,15 +99,15 @@ private function setUpDocHeader(
 
     public function indexAction(
         ServerRequestInterface $request,
-        ModuleTemplate $view
+        ModuleTemplate $view,
     ): ResponseInterface {
         $view->assign('aVariable', 'aValue');
         return $view->renderResponse('AdminModule/Index');
     }
 
     protected function debugAction(
         ServerRequestInterface $request,
-        ModuleTemplate $view
+        ModuleTemplate $view,
     ): ResponseInterface {
         $cmd = $request->getParsedBody()['tx_examples_admin_examples']['cmd'] ?? 'cookies';
         switch ($cmd) {
@@ -122,14 +122,14 @@ protected function debugAction(
             [
                 'cookies' => $request->getCookieParams(),
                 'lastcommand' => $cmd,
-            ]
+            ],
         );
         return $view->renderResponse('AdminModule/Debug');
     }
 
     protected function passwordAction(
         ServerRequestInterface $request,
-        ModuleTemplate $view
+        ModuleTemplate $view,
     ): ResponseInterface {
         // TODO: Do something
         return $view->renderResponse('AdminModule/Password');

diff --git a/Classes/Controller/FalExampleController.php b/Classes/Controller/FalExampleController.php
@@ -52,7 +52,7 @@ public function listFilesAction(): ResponseInterface
                 [
                     'folder' => $folder,
                     'files' => $files,
-                ]
+                ],
             );
         }
         return $this->htmlResponse();
@@ -70,7 +70,7 @@ public function collectionAction(): ResponseInterface
                 [
                     'collection' => $collection,
                     'files' => $collection->getItems(),
-                ]
+                ],
             );
         }
         return $this->htmlResponse();

diff --git a/Classes/Controller/Haiku/DetailController.php b/Classes/Controller/Haiku/DetailController.php
@@ -80,8 +80,8 @@ private function notFoundAction(string $reason): never
                 null,
                 404,
                 [],
-                $reason
-            )
+                $reason,
+            ),
         );
     }
 
@@ -105,7 +105,7 @@ private function loadFlexFormSettings(): void
     {
         $this->conf['settings'] = $this->flexFormSettingsService->combineSettings(
             $this->conf['settings'] ?? [],
-            $this->cObj->data['pi_flexform'] ?? ''
+            $this->cObj->data['pi_flexform'] ?? '',
         );
     }
 }
diff --git a/Classes/Controller/Haiku/ListController.php b/Classes/Controller/Haiku/ListController.php
@@ -59,7 +59,7 @@ private function loadFlexFormSettings(): void
     {
         $this->conf['settings'] = $this->flexFormSettingsService->combineSettings(
             $this->conf['settings'] ?? [],
-            $this->cObj->data['pi_flexform'] ?? ''
+            $this->cObj->data['pi_flexform'] ?? '',
         );
     }
 }
diff --git a/Classes/Controller/HtmlParserController.php b/Classes/Controller/HtmlParserController.php
@@ -63,13 +63,13 @@ public function indexAction(): ResponseInterface
         // Splitting HTML into blocks defined by <div> and <table> block tags
         $this->view->assign(
             'result1',
-            $this->htmlParser->splitIntoBlock('div,table', $testHTML)
+            $this->htmlParser->splitIntoBlock('div,table', $testHTML),
         );
 
         // Splitting HTML into blocks defined by <img> and <br> single tags
         $this->view->assign(
             'result2',
-            $this->htmlParser->splitTags('img,br', $testHTML)
+            $this->htmlParser->splitTags('img,br', $testHTML),
         );
 
         // Cleaning HTML
@@ -97,8 +97,8 @@ public function indexAction(): ResponseInterface
                 $tagCfg,
                 false,
                 false,
-                ['xhtml' => 1]
-            )
+                ['xhtml' => 1],
+            ),
         );
         return $this->htmlResponse();
     }