Merge pull request #195 from pagemachine/php-cs-fixer

Replace PHPCS with PHP-CS-Fixer

.editorconfig

@@ -1,24 +1,60 @@
-root = true
-charset = utf-8
+# EditorConfig is awesome: http://EditorConfig.org
 
-trim_trailing_whitespace = true
+# top-most EditorConfig file
+root = true
 
+# Unix-style newlines with a newline ending every file
 [*]
+charset = utf-8
 end_of_line = lf
-insert_final_newline = true
-
-[composer.json]
 indent_style = space
 indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.less]
-indent_style = space
+# TS/JS-Files
+[*.{ts,js}]
 indent_size = 2
 
-[*.php]
-indent_style = space
+# JSON-Files
+[*.json]
+indent_style = tab
+
+# ReST-Files
+[*.{rst,rst.txt}]
 indent_size = 4
+max_line_length = 80
 
-[*.ts]
-indent_style = space
+# Markdown-Files
+[*.md]
+max_line_length = 80
+
+# YAML-Files
+[*.{yaml,yml}]
+indent_size = 2
+
+# NEON-Files
+[*.neon]
+indent_size = 2
+indent_style = tab
+
+# package.json
+[package.json]
 indent_size = 2
+
+# TypoScript
+[*.{typoscript,tsconfig}]
+indent_size = 2
+
+# XLF-Files
+[*.xlf]
+indent_style = tab
+
+# SQL-Files
+[*.sql]
+indent_style = tab
+indent_size = 2
+
+# .htaccess
+[{_.htaccess,.htaccess}]
+indent_style = tab

.gitattributes

@@ -3,13 +3,13 @@
 .github export-ignore
 .gitignore export-ignore
 .phpunit.result.cache export-ignore
+.php-cs-fixer.* export-ignore
 bower.json export-ignore
 composer.lock export-ignore
 docker-compose.yml export-ignore
 Gruntfile.js export-ignore
 package.json export-ignore
 package-lock.json export-ignore
-phpcs.xml export-ignore
 phpstan*.neon export-ignore
 phpunit-functional.xml export-ignore
 phpunit.xml export-ignore

.gitignore

@@ -1,3 +1,4 @@
+/.php-cs-fixer.cache
 /.phpunit.result.cache
 /bower_components
 /composer.lock

.php-cs-fixer.dist.php

@@ -0,0 +1,11 @@
+<?php
+
+$config = \TYPO3\CodingStandards\CsFixerConfig::create();
+$config->getFinder()
+    ->in(__DIR__)
+    ->exclude([
+        'var',
+        'web',
+    ]);
+
+return $config;

Classes/Controller/Backend/FormLogController.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Controller\Backend;
 
@@ -28,17 +28,14 @@
  */
 class FormLogController extends ActionController
 {
-
     protected array $viewFormatToExportMap = [
         'csv' => CsvExport::class,
         'xlsx' => XlsxExport::class,
     ];
 
     protected FormLogEntryRepository $formLogEntryRepository;
 
-    public function __construct(protected ModuleTemplateFactory $moduleTemplateFactory)
-    {
-    }
+    public function __construct(protected ModuleTemplateFactory $moduleTemplateFactory) {}
 
     public function injectFormLogEntryRepository(FormLogEntryRepository $formLogEntryRepository)
     {
@@ -47,8 +44,6 @@ public function injectFormLogEntryRepository(FormLogEntryRepository $formLogEntr
 
     /**
      * Initialize all actions
-     *
-     * @return void
      */
     public function initializeAction()
     {

Classes/Controller/Backend/FormLogSuggestController.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Controller\Backend;
 
@@ -18,9 +18,7 @@
  */
 final class FormLogSuggestController
 {
-    public function __construct(private Suggestions $suggestions, private ResponseFactoryInterface $responseFactory)
-    {
-    }
+    public function __construct(private Suggestions $suggestions, private ResponseFactoryInterface $responseFactory) {}
 
     public function searchAction(ServerRequestInterface $request): ResponseInterface
     {

Classes/Domain/Data/JsonData.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\Data;
 

Classes/Domain/Form/Finishers/LoggerFinisher.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\Form\Finishers;
 

Classes/Domain/FormLog/DateRangeFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\FormLog;
 
@@ -13,9 +13,7 @@
  */
 class DateRangeFilter implements FilterInterface
 {
-    public function __construct(protected ?\DateTime $startDate = null, protected ?\DateTime $endDate = null)
-    {
-    }
+    public function __construct(protected ?\DateTime $startDate = null, protected ?\DateTime $endDate = null) {}
 
     public function getStartDate(): ?\DateTime
     {

Classes/Domain/FormLog/FilterInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\FormLog;
 

Classes/Domain/FormLog/Filters.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\FormLog;
 

Classes/Domain/FormLog/Suggestions.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\FormLog;
 
@@ -15,9 +15,7 @@
  */
 final class Suggestions
 {
-    public function __construct(private ConnectionPool $connectionPool)
-    {
-    }
+    public function __construct(private ConnectionPool $connectionPool) {}
 
     /**
      * Get suggestions for a form log property

Classes/Domain/FormLog/ValueFilter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\FormLog;
 
@@ -13,9 +13,7 @@
  */
 class ValueFilter implements FilterInterface
 {
-    public function __construct(protected string $value = '')
-    {
-    }
+    public function __construct(protected string $value = '') {}
 
     public function getValue(): string
     {

Classes/Domain/Model/FormLogEntry.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\Model;
 

Classes/Domain/Model/FormLogEntry/Page.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\Model\FormLogEntry;
 

Classes/Domain/Repository/FormLogEntryRepository.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Domain\Repository;
 

Classes/Export/AbstractExport.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Export;
 

Classes/Export/CsvExport.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Export;
 

Classes/Export/XlsxExport.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Export;
 

Classes/Form/Element/JSONDataElement.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Form\Element;
 

Classes/Json.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog;
 
@@ -35,7 +35,5 @@ public static function encode(mixed $value): string
         return $encoded;
     }
 
-    private function __construct()
-    {
-    }
+    private function __construct() {}
 }

Classes/Rendering/ValueFormatter.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\Rendering;
 

Classes/ViewHelpers/Format/FormValueViewHelper.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Pagemachine\Formlog\ViewHelpers\Format;
 

Configuration/ContentSecurityPolicies.php

@@ -5,9 +5,8 @@
 use TYPO3\CMS\Core\Security\ContentSecurityPolicy\MutationCollection;
 use TYPO3\CMS\Core\Security\ContentSecurityPolicy\MutationMode;
 use TYPO3\CMS\Core\Security\ContentSecurityPolicy\Scope;
-use TYPO3\CMS\Core\Security\ContentSecurityPolicy\SourceKeyword;
-use TYPO3\CMS\Core\Type\Map;
 use TYPO3\CMS\Core\Security\ContentSecurityPolicy\UriValue;
+use TYPO3\CMS\Core\Type\Map;
 
 return Map::fromEntries([
     Scope::backend(),

Configuration/TCA/tx_formlog_entries.php

@@ -1,4 +1,5 @@
 <?php
+
 defined('TYPO3') or die();
 
 return [