chore(cgl): update php-cs, lint

.php_cs.dist.php

@@ -1,69 +1,23 @@
 <?php
 
-/**
- * This file represents the configuration for Code Sniffing PSR-2-related
- * automatic checks of coding guidelines
- * Install @fabpot's great php-cs-fixer tool via
- *
- *  $ composer global require friendsofphp/php-cs-fixer
- *
- * And then simply run
- *
- *  $ php-cs-fixer fix
- *
- * For more information read:
- *  http://www.php-fig.org/psr/psr-2/
- *  http://cs.sensiolabs.org
- */
-
-if (PHP_SAPI !== 'cli') {
-    die('This script supports command line usage only. Please check your command.');
-}
-
-$header = <<<EOF
-This file is part of the package dmind/cookieman.
-
-For the full copyright and license information, please read the
-LICENSE file that was distributed with this source code.
-EOF;
-
-return (new PhpCsFixer\Config)
-    ->setRiskyAllowed(true)
-    ->setRules([
-        '@PSR2' => true,
-        'header_comment' => [
-            'header' => $header
+$config = \TYPO3\CodingStandards\CsFixerConfig::create();
+$config->setFinder(
+    PhpCsFixer\Finder::create()
+        ->ignoreVCS(true)
+        ->ignoreVCSIgnored(true)
+        ->notName(['ext_localconf.php', 'ext_tables.php', 'ext_emconf.php', 'additional.php'])
+        ->exclude(['Tests/Acceptance/Support/_generated/'])
+        ->in(__DIR__)
+);
+$config->addRules(
+    [
+        'yoda_style' => false, // dude, I love yoda style
+        'function_declaration' => [
+            'closure_function_spacing' => 'none',
+            'closure_fn_spacing' => 'none',
         ],
-        'declare_strict_types' => true,
-        'no_leading_import_slash' => true,
-        'no_trailing_comma_in_singleline_array' => true,
-        'no_singleline_whitespace_before_semicolons' => true,
-        'no_unused_imports' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'no_whitespace_in_blank_line' => true,
-        'ordered_imports' => true,
-        'single_quote' => true,
-        'no_empty_statement' => true,
-        'no_extra_blank_lines' => true,
-        'phpdoc_no_package' => true,
-        'phpdoc_scalar' => true,
-        'no_blank_lines_after_phpdoc' => true,
-        'array_syntax' => ['syntax' => 'short'],
-        'whitespace_after_comma_in_array' => true,
-        'function_typehint_space' => true,
-        'single_line_comment_style' => true,
-        'no_alias_functions' => true,
-        'lowercase_cast' => true,
-        'no_leading_namespace_whitespace' => true,
-        'native_function_casing' => true,
-        'self_accessor' => true,
-        'no_short_bool_cast' => true,
-        'no_unneeded_control_parentheses' => true
-    ])
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->ignoreVCS(true)
-            ->ignoreVCSIgnored(true)
-            ->notName(['ext_localconf.php', 'ext_tables.php', 'ext_emconf.php', 'additional.php'])
-            ->in(__DIR__)
-    );
+        'single_line_empty_body' => false,
+    ]
+);
+
+return $config;

Classes/DataProcessing/TypoScriptSettingsProcessor.php

@@ -18,14 +18,8 @@
 
 class TypoScriptSettingsProcessor implements DataProcessorInterface
 {
-    /**
-     * @var ConfigurationManagerInterface
-     */
-    protected $configurationManager;
-
-    public function __construct(ConfigurationManager $configurationManager)
+    public function __construct(protected ConfigurationManager $configurationManager)
     {
-        $this->configurationManager = $configurationManager;
     }
 
     /**
@@ -59,7 +53,7 @@ public function process(
     /**
      * Prepare TypoScript for the frontend.
      */
-    protected function sanitizeSettings(array $settings, ContentObjectRenderer $cObj)
+    protected function sanitizeSettings(array $settings, ContentObjectRenderer $cObj): array
     {
         foreach (($settings['groups'] ?? []) as $groupId => $group) {
             if (isset($group['preselected'])) {

Classes/ViewHelpers/ShownTrackingObjectsViewHelper.php

@@ -19,7 +19,7 @@
  */
 class ShownTrackingObjectsViewHelper extends AbstractViewHelper
 {
-    public function initializeArguments()
+    public function initializeArguments(): void
     {
         $this->registerArgument(
             'group',

Configuration/TCA/Overrides/sys_template.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /*
  * This file is part of the package dmind/cookieman.
@@ -10,7 +12,7 @@
 defined('TYPO3') or die();
 
 // static TypoScript
-(static function () {
+(static function() {
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addStaticFile(
         'cookieman',
         'Configuration/TypoScript',

composer.json

@@ -26,12 +26,14 @@
         "dmind/cookieman-test": "@dev",
         "dmind/cookieman-test-bootstrap5-modal": "@dev",
         "friendsofphp/php-cs-fixer": "^3.14",
+        "friendsofphp/php-cs-fixer": "^3.49",
         "helhum/typo3-console": "^8.0",
         "phpspec/prophecy-phpunit": "^2.1",
         "phpunit/phpunit": "^10.5",
         "typo3/cms-install": "^12 || 12.*.x-dev || dev-main",
         "typo3/cms-tstemplate": "^12 || 12.*.x-dev || dev-main",
-        "typo3/tailor": "^1.3",
+        "typo3/coding-standards": "0.7.1",
+        "typo3/tailor": "^1.5",
         "typo3/testing-framework": "^7.0"
     },
     "config": {
@@ -146,7 +148,7 @@
             "codecept run --env firefox -d -c Build/local.codeception.yml -- acceptance"
         ],
         "test:cgl": [
-            "php-cs-fixer --config=.php_cs.dist.php fix -v --using-cache=no --dry-run"
+            "php-cs-fixer --config=.php_cs.dist.php fix -v --diff --using-cache=no --dry-run"
         ],
         "test:unit": [
             "@putenv XDEBUG_MODE=coverage",