[TASK] Update code style definition and apply fixers

supseven-at · Dec 15, 2023 · f216ae4 · f216ae4
1 parent d25badb
commit f216ae4
Show file tree

Hide file tree

Showing 18 changed files with 184 additions and 93 deletions.
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -2,27 +2,111 @@
 
 declare(strict_types=1);
 
-$finder = PhpCsFixer\Finder::create()
-    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'Tests')
-    ->in(__DIR__ . DIRECTORY_SEPARATOR . 'Classes');
+use Symfony\Component\Finder\Finder;
 
-$config = new PhpCsFixer\Config();
+$finder = Finder::create()
+    ->in(__DIR__)
+    ->notPath('Build')
+    ->notPath('Documentation')
+    ->notPath('Resources')
+    ->notPath('vendor');
 
-return $config->setUsingCache(true)->setRiskyAllowed(true)->setRules([
-    '@PSR12'                => true,
-    'array_indentation'     => true,
-    'no_unused_imports'     => true,
-    'cast_spaces'           => ['space' => 'none'],
-    'no_extra_blank_lines'  => [
-        'tokens' => ['break', 'case', 'continue', 'curly_brace_block', 'default', 'extra', 'parenthesis_brace_block', 'return', 'square_brace_block', 'switch', 'throw', 'use'],
-    ],
-    'types_spaces'           => ['space' => 'single'],
-    'binary_operator_spaces' => [
-        'operators' => [
-            '|'  => 'no_space',
-            '=>' => 'align',
-        ],
-    ],
-    'no_trailing_comma_in_singleline_array' => true,
-])
+return (new PhpCsFixer\Config())
+    ->setUsingCache(true)
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@DoctrineAnnotation'       => true,
+        '@PSR12'                    => true,
+        '@PHP81Migration'           => true,
+        '@PHP80Migration:risky'     => true,
+        '@PHPUnit84Migration:risky' => true,
+        'align_multiline_comment'   => [
+            'comment_type' => 'phpdocs_like',
+        ],
+        'array_syntax'           => ['syntax' => 'short'],
+        'binary_operator_spaces' => [
+            'default'   => 'single_space',
+            'operators' => [
+                '=>' => 'align_single_space_minimal',
+            ],
+        ],
+        'blank_line_before_statement' => [
+            'statements' => ['if', 'try', 'return'],
+        ],
+        'cast_spaces'                          => ['space' => 'none'],
+        'concat_space'                         => ['spacing' => 'one'],
+        'declare_equal_normalize'              => ['space' => 'none'],
+        'declare_strict_types'                 => true,
+        'doctrine_annotation_array_assignment' => [
+            'operator' => '=',
+        ],
+        'dir_constant'                => true,
+        'ereg_to_preg'                => true,
+        'escape_implicit_backslashes' => [
+            'double_quoted'  => true,
+            'heredoc_syntax' => true,
+            'single_quoted'  => true,
+        ],
+        'explicit_indirect_variable'  => true,
+        'explicit_string_variable'    => true,
+        'type_declaration_spaces'     => ['elements' => ['function', 'property']],
+        'linebreak_after_opening_tag' => true,
+        'lowercase_cast'              => true,
+        'magic_constant_casing'       => true,
+        'modernize_types_casting'     => true,
+        'native_function_casing'      => true,
+        'new_with_parentheses'        => [
+            'anonymous_class' => true,
+            'named_class'     => true,
+        ],
+        'no_alias_functions'              => true,
+        'no_blank_lines_after_phpdoc'     => true,
+        'no_empty_comment'                => true,
+        'no_empty_phpdoc'                 => true,
+        'no_empty_statement'              => true,
+        'no_extra_blank_lines'            => true,
+        'no_leading_import_slash'         => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_mixed_echo_print'             => [
+            'use' => 'echo',
+        ],
+        'no_multiline_whitespace_around_double_arrow' => true,
+        'no_null_property_initialization'             => true,
+        'no_php4_constructor'                         => true,
+        'no_short_bool_cast'                          => true,
+        'no_singleline_whitespace_before_semicolons'  => true,
+        'no_superfluous_elseif'                       => true,
+        'no_spaces_after_function_name'               => true,
+        'no_spaces_around_offset'                     => [
+            'positions' => ['inside', 'outside'],
+        ],
+        'spaces_inside_parentheses'       => ['space' => 'none'],
+        'no_trailing_comma_in_singleline' => true,
+        'no_unneeded_control_parentheses' => true,
+        'no_unused_imports'               => true,
+        'no_useless_else'                 => true,
+        'no_useless_return'               => true,
+        'no_whitespace_in_blank_line'     => true,
+        'non_printable_character'         => false,
+        'ordered_class_elements'          => true,
+        'ordered_imports'                 => true,
+        'phpdoc_indent'                   => true,
+        'phpdoc_scalar'                   => true,
+        'short_scalar_cast'               => true,
+        'single_line_comment_style'       => true,
+        'phpdoc_no_access'                => true,
+        'phpdoc_no_empty_return'          => true,
+        'phpdoc_no_package'               => true,
+        'phpdoc_trim'                     => true,
+        'phpdoc_types'                    => true,
+        'phpdoc_types_order'              => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        'return_type_declaration'         => ['space_before' => 'none'],
+        'single_quote'                    => [
+            'strings_containing_single_quote_chars' => true,
+        ],
+        'standardize_not_equals'          => true,
+        'visibility_required'             => true,
+        'ternary_operator_spaces'         => true,
+        'whitespace_after_comma_in_array' => true,
+    ])
     ->setFinder($finder);
diff --git a/Classes/CSP/SupiPolicyExtender.php b/Classes/CSP/SupiPolicyExtender.php
@@ -18,16 +18,16 @@ class SupiPolicyExtender implements SingletonInterface
 {
     private array $extensions = [];
 
-    public function addInlineScript(string $data): void
-    {
-        $hash = hash('sha256', $data);
-        $this->extensions[] = [Directive::ScriptSrc, new HashValue($hash)];
-    }
-
     public function __invoke(PolicyMutatedEvent $event): void
     {
         foreach ($this->extensions as $extension) {
             $event->getCurrentPolicy()->extend(...$extension);
         }
     }
+
+    public function addInlineScript(string $data): void
+    {
+        $hash = hash('sha256', $data);
+        $this->extensions[] = [Directive::ScriptSrc, new HashValue($hash)];
+    }
 }
diff --git a/Classes/DataProcessing/AddressProcessor.php b/Classes/DataProcessing/AddressProcessor.php
@@ -20,7 +20,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
         $address = $cObj->data[$processorConfiguration['field'] ?? 'bodytext'] ?? '';
 
         if (str_contains($address, ',')) {
-            $address = GeneralUtility::trimExplode(",", $address, true);
+            $address = GeneralUtility::trimExplode(',', $address, true);
         } else {
             $address = GeneralUtility::trimExplode("\n", $address, true);
         }

diff --git a/Classes/DataProcessing/SpotifyProcessor.php b/Classes/DataProcessing/SpotifyProcessor.php
@@ -20,6 +20,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
         $url = ($processedData['settings']['spotify']['url'] ?? '') ?: 'https://open.spotify.com/embed/playlist/{id}';
         $vals['src'] = str_replace('{id}', $id, $url);
         $processedData[$as] = json_encode($vals, JSON_FORCE_OBJECT);
+
         return $processedData;
     }
 }
diff --git a/Classes/DataProcessing/YoutubeProcessor.php b/Classes/DataProcessing/YoutubeProcessor.php
@@ -59,7 +59,7 @@ public function process(ContentObjectRenderer $cObj, array $contentObjectConfigu
         }
 
         foreach (GeneralUtility::trimExplode("\n", $cObj->data[$processorConfiguration['urlsField'] ?? 'tx_supi_youtube_urls'] ?? '', true) as $url) {
-            preg_match('%(?:youtube(?:-nocookie)?\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\.be/)([^"&?/ ]{11})%i', $url, $match);
+            preg_match('%(?:youtube(?:-nocookie)?\\.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu\\.be/)([^"&?/ ]{11})%i', $url, $match);
 
             if (is_array($match) && !empty($match[1])) {
                 $videoId = $match[1];

diff --git a/Configuration/Icons.php b/Configuration/Icons.php
@@ -1,7 +1,10 @@
 <?php
+
+declare(strict_types=1);
+
 return [
     'supi' => [
         'provider' => \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider::class,
-        'source' => 'EXT:supi/Resources/Public/Icons/Extension.svg',
+        'source'   => 'EXT:supi/Resources/Public/Icons/Extension.svg',
     ],
 ];
diff --git a/Configuration/TCA/Overrides/sys_file_reference.php b/Configuration/TCA/Overrides/sys_file_reference.php
@@ -2,20 +2,20 @@
 
 declare(strict_types=1);
 
-(function ($extKey, $table) {
+(function ($extKey, $table): void {
     $ll = 'LLL:EXT:supi/Resources/Private/Language/locallang_db.xlf:';
 
     /**
      * Additional columns
      */
     $additionalColumns = [
         'tx_supi_video_cover' => [
-            'label'   => $ll . $table . '.tx_supi_video_cover.label',
-            'description'   => $ll . $table . '.tx_supi_video_cover.description',
-            'config'  => [
-                'type' => 'file',
+            'label'       => $ll . $table . '.tx_supi_video_cover.label',
+            'description' => $ll . $table . '.tx_supi_video_cover.description',
+            'config'      => [
+                'type'     => 'file',
                 'maxitems' => 1,
-                'allowed' => ['jpg', 'jpeg', 'png', 'svg'],
+                'allowed'  => ['jpg', 'jpeg', 'png', 'svg'],
             ],
         ],
     ];