chore: update coding-standards to 5.1.0

brotkrueml · Feb 12, 2024 · abbea81 · abbea81
1 parent 18e4749
commit abbea81
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 47 deletions.
diff --git a/Classes/Event/EnrichCodeSnippetEvent.php b/Classes/Event/EnrichCodeSnippetEvent.php
@@ -35,6 +35,5 @@ public function __construct(
         public readonly TagAttributesCollector $codeAttributesCollector,
         public readonly TagAttributeValuesCollector $codeClassesCollector,
         public readonly ServerRequestInterface $request,
-    ) {
-    }
+    ) {}
 }
diff --git a/Classes/EventListener/CopyToClipboard.php b/Classes/EventListener/CopyToClipboard.php
@@ -22,8 +22,7 @@ final class CopyToClipboard
 {
     public function __construct(
         private readonly LanguageServiceFactory $languageServiceFactory,
-    ) {
-    }
+    ) {}
 
     public function __invoke(EnrichCodeSnippetEvent $event): void
     {
@@ -36,7 +35,7 @@ public function __invoke(EnrichCodeSnippetEvent $event): void
         $event->scriptsCollector->addPath(Extension::PRISM_BASE_PATH . 'plugins/copy-to-clipboard/prism-copy-to-clipboard.min.js');
 
         $languageService = $this->languageServiceFactory->createFromSiteLanguage(
-            $event->request->getAttribute('language') ?? $event->request->getAttribute('site')->getDefaultLanguage()
+            $event->request->getAttribute('language') ?? $event->request->getAttribute('site')->getDefaultLanguage(),
         );
 
         $event->preAttributesCollector->setAttribute('prismjs-copy', $languageService->sL('toolbar.copy'));

diff --git a/Classes/Preview/ContentPreviewRenderer.php b/Classes/Preview/ContentPreviewRenderer.php
@@ -25,8 +25,7 @@ final class ContentPreviewRenderer extends StandardContentPreviewRenderer
 
     public function __construct(
         private readonly FlexFormService $flexFormService,
-    ) {
-    }
+    ) {}
 
     public function renderPageModulePreviewContent(GridColumnItem $item): string
     {
@@ -36,7 +35,7 @@ public function renderPageModulePreviewContent(GridColumnItem $item): string
             $content .= '<pre><code style="margin-left:0;">' . $this->renderSnippet($record['bodytext']) . '</code></pre>';
         } else {
             $content .= $this->buildWarning(
-                $this->getLanguageService()->sL(Extension::LANGUAGE_PATH_CONTENT_ELEMENT . ':codeSnippet.notDefined')
+                $this->getLanguageService()->sL(Extension::LANGUAGE_PATH_CONTENT_ELEMENT . ':codeSnippet.notDefined'),
             );
         }
 
@@ -78,7 +77,7 @@ private function renderSnippet(string $input): string
 
     private function treatSpecialChars(string $input): string
     {
-        return \htmlspecialchars(\trim($input), ENT_QUOTES, 'UTF-8', false);
+        return \htmlspecialchars(\trim($input), \ENT_QUOTES, 'UTF-8', false);
     }
 
     private function buildWarning(string $text): string

diff --git a/Classes/UserFunctions/CodeSnippetGenerator.php b/Classes/UserFunctions/CodeSnippetGenerator.php
@@ -38,8 +38,7 @@ public function __construct(
         private readonly EventDispatcher $eventDispatcher,
         private readonly FlexFormService $flexFormService,
         private readonly PageRenderer $pageRenderer,
-    ) {
-    }
+    ) {}
 
     public function setContentObjectRenderer(ContentObjectRenderer $cObj): void
     {
@@ -52,7 +51,7 @@ public function setContentObjectRenderer(ContentObjectRenderer $cObj): void
     public function generate(
         string $content,
         array $conf,
-        ServerRequestInterface $request
+        ServerRequestInterface $request,
     ): string {
         $snippet = $this->cObj->data['bodytext'] ?? '';
         if ($snippet === '') {
@@ -76,7 +75,7 @@ public function generate(
             new TagAttributeValuesCollector(),
             new TagAttributesCollector(),
             new TagAttributeValuesCollector(),
-            $request
+            $request,
         );
         $event->preAttributesCollector->setAttribute('id', self::PRE_ID_PREFIX . $this->cObj->data['uid']);
 
@@ -125,7 +124,7 @@ private function addJsFile(string $file, bool $allowConcatenation = true): void
             false,
             false,
             '',
-            true
+            true,
         );
     }
 }
diff --git a/Configuration/TCA/Overrides/sys_template.php b/Configuration/TCA/Overrides/sys_template.php
@@ -15,5 +15,5 @@
 ExtensionManagementUtility::addStaticFile(
     Extension::KEY,
     'Configuration/TypoScript/',
-    'Code Highlight'
+    'Code Highlight',
 );
diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -25,14 +25,14 @@
             'special',
         ],
         ExtensionUtility::PLUGIN_TYPE_CONTENT_ELEMENT,
-        Extension::KEY
+        Extension::KEY,
     );
 
     $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist'][$contentType] = 'pi_flexform';
     ExtensionManagementUtility::addPiFlexFormValue(
         '*',
         'FILE:EXT:' . Extension::KEY . '/Configuration/FlexForms/Options.xml',
-        $contentType
+        $contentType,
     );
 
     $GLOBALS['TCA']['tt_content']['types'][$contentType] = [

diff --git a/Tests/Traits/CreateEnrichCodeSnippetEventTrait.php b/Tests/Traits/CreateEnrichCodeSnippetEventTrait.php
@@ -24,7 +24,7 @@ trait CreateEnrichCodeSnippetEventTrait
     private function createEnrichCodeSnippetEvent(
         SiteConfiguration $siteConfiguration,
         Options $options,
-        ServerRequestInterface $request
+        ServerRequestInterface $request,
     ): EnrichCodeSnippetEvent {
         return new EnrichCodeSnippetEvent(
             $siteConfiguration,
@@ -35,7 +35,7 @@ private function createEnrichCodeSnippetEvent(
             new TagAttributeValuesCollector(),
             new TagAttributesCollector(),
             new TagAttributeValuesCollector(),
-            $request
+            $request,
         );
     }
 }
diff --git a/Tests/Unit/EventListener/CommandLineTest.php b/Tests/Unit/EventListener/CommandLineTest.php
@@ -33,7 +33,7 @@ public function commandLineIsDeactivated(): void
         $event = $this->createEnrichCodeSnippetEvent(
             new SiteConfiguration([]),
             new Options([]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new CommandLine();
@@ -56,7 +56,7 @@ public function commandLineIsActivated(array $options, array $siteConfiguration,
         $event = $this->createEnrichCodeSnippetEvent(
             new SiteConfiguration($siteConfiguration),
             new Options($options),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new CommandLine();

diff --git a/Tests/Unit/EventListener/CopyToClipboardTest.php b/Tests/Unit/EventListener/CopyToClipboardTest.php
@@ -40,7 +40,7 @@ protected function setUp(): void
         $languageServiceStub = $this->createStub(LanguageService::class);
         $languageServiceStub
             ->method('sL')
-            ->willReturnCallback(static fn ($input): string => $input);
+            ->willReturnCallback(static fn($input): string => $input);
 
         $this->languageServiceFactoryStub = $this->createStub(LanguageServiceFactory::class);
         $this->languageServiceFactoryStub
@@ -56,7 +56,7 @@ public function copyToClipboardIsDeactivated(): void
         $event = $this->createEnrichCodeSnippetEvent(
             new SiteConfiguration([]),
             new Options([]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new CopyToClipboard($this->languageServiceFactoryStub);
@@ -85,7 +85,7 @@ public function copyToClipboardIsActivated(): void
                 'codehighlightToolbarCopyToClipboard' => true,
             ]),
             new Options([]),
-            $requestStub
+            $requestStub,
         );
 
         $subject = new CopyToClipboard($this->languageServiceFactoryStub);

diff --git a/Tests/Unit/EventListener/HighlightLinesTest.php b/Tests/Unit/EventListener/HighlightLinesTest.php
@@ -33,7 +33,7 @@ public function highlightLinesIsSetAndUseUrlHashIsDeactivated(): void
         $event = $this->createEnrichCodeSnippetEvent(
             new SiteConfiguration([]),
             new Options([]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new HighlightLines();
@@ -57,7 +57,7 @@ public function highlightLinesIsSet(): void
             new Options([
                 'highlightLines' => '3-5',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new HighlightLines();
@@ -84,7 +84,7 @@ public function highlightLinesIsSetAndStartWithLineNumberIsGreater1(): void
                 'highlightLines' => '3-5',
                 'startWithLineNumber' => '2',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new HighlightLines();
@@ -109,7 +109,7 @@ public function highlightLinesIsSetAndStartWithLineNumberIs1(): void
                 'highlightLines' => '3-5',
                 'startWithLineNumber' => '1',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new HighlightLines();
@@ -134,7 +134,7 @@ public function highlightLinesIsNotSetAndStartWithLineNumberIsGreater0(): void
                 'highlightLines' => '',
                 'startWithLineNumber' => '2',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new HighlightLines();
@@ -158,7 +158,7 @@ public function useUrlHashIsActivated(): void
                 'codehighlightUseUrlHash' => true,
             ]),
             new Options([]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new HighlightLines();
@@ -186,7 +186,7 @@ public function useUrlHashIsActivatedAndStartWithLineNumberIsGreater1(): void
             new Options([
                 'startWithLineNumber' => 2,
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new HighlightLines();

diff --git a/Tests/Unit/EventListener/InlineColourTest.php b/Tests/Unit/EventListener/InlineColourTest.php
@@ -33,7 +33,7 @@ public function inlineColourIsDeactivated(): void
         $event = $this->createEnrichCodeSnippetEvent(
             new SiteConfiguration([]),
             new Options([]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new InlineColour();
@@ -58,7 +58,7 @@ public function inlineColourIsActivatedAndLanguageIsCss(): void
                 'inlineColour' => '1',
                 'programmingLanguage' => 'css',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new InlineColour();
@@ -87,7 +87,7 @@ public function inlineColourIsActivatedAndLanguageIsHtml(): void
                 'inlineColour' => '1',
                 'programmingLanguage' => 'html',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new InlineColour();
@@ -112,7 +112,7 @@ public function inlineColourIsActivatedAndLanguageIsPhp(): void
                 'inlineColour' => '1',
                 'programmingLanguage' => 'php',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new InlineColour();
@@ -137,7 +137,7 @@ public function inlineColourIsDeactivatedAndLanguageIsCss(): void
                 'inlineColour' => '0',
                 'programmingLanguage' => 'css',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new InlineColour();

diff --git a/Tests/Unit/EventListener/LanguageTest.php b/Tests/Unit/EventListener/LanguageTest.php
@@ -33,7 +33,7 @@ public function languageIsNotSet(): void
         $event = $this->createEnrichCodeSnippetEvent(
             new SiteConfiguration([]),
             new Options([]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new Language();
@@ -57,7 +57,7 @@ public function languageIsSet(): void
             new Options([
                 'programmingLanguage' => 'php',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new Language();
@@ -79,7 +79,7 @@ public function hasSpecialLanguageIsEnabled(): void
         $event = $this->createEnrichCodeSnippetEvent(
             new SiteConfiguration([]),
             new Options([]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
         $event->hasSpecialLanguage = true;
 

diff --git a/Tests/Unit/EventListener/LineNumbersTest.php b/Tests/Unit/EventListener/LineNumbersTest.php
@@ -33,7 +33,7 @@ public function optionShowLineNumbersIsDeactivated(): void
         $event = $this->createEnrichCodeSnippetEvent(
             new SiteConfiguration([]),
             new Options([]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new LineNumbers();
@@ -57,7 +57,7 @@ public function optionShowLineNumberIsActivated(): void
             new Options([
                 'showLineNumbers' => '1',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new LineNumbers();
@@ -84,7 +84,7 @@ public function optionShowLineNumberIsActivatedAndStartWithLineNumberGreater1():
                 'showLineNumbers' => '1',
                 'startWithLineNumber' => '2',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new LineNumbers();
@@ -109,7 +109,7 @@ public function optionShowLineNumberIsActivatedAndStartWithLineNumberIs1(): void
                 'showLineNumbers' => '1',
                 'startWithLineNumber' => '1',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new LineNumbers();
@@ -134,7 +134,7 @@ public function optionShowLineNumberIsActivatedAndStartWithLineNumberIsGreater1(
                 'showLineNumbers' => '0',
                 'startWithLineNumber' => '2',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new LineNumbers();

diff --git a/Tests/Unit/EventListener/TreeviewTest.php b/Tests/Unit/EventListener/TreeviewTest.php
@@ -30,7 +30,7 @@ public function optionTreeviewIsDeactivated(): void
         $event = $this->createEnrichCodeSnippetEvent(
             new SiteConfiguration([]),
             new Options([]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new Treeview();
@@ -54,7 +54,7 @@ public function optionTreeviewIsActivated(): void
             new Options([
                 'treeview' => '1',
             ]),
-            $this->createStub(ServerRequestInterface::class)
+            $this->createStub(ServerRequestInterface::class),
         );
 
         $subject = new Treeview();

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
 		"typo3/cms-frontend": "^12.4"
 	},
 	"require-dev": {
-		"brotkrueml/coding-standards": "~3.0.0",
+		"brotkrueml/coding-standards": "~5.1.0",
 		"ergebnis/composer-normalize": "~2.42.0",
 		"php-coveralls/php-coveralls": "^2.7",
 		"phpstan/phpstan": "1.10.57",