Cleanup fix cs and qs

DMKEBUSINESSGMBH · Nov 25, 2024 · b35d378 · b35d378
1 parent 93be8b7
commit b35d378
Show file tree

Hide file tree

Showing 115 changed files with 137 additions and 1 deletion.
diff --git a/.github/workflows/phpci.yml b/.github/workflows/phpci.yml
@@ -24,6 +24,7 @@ jobs:
                     - "8.0"
                     - "8.1"
                     - "8.2"
+                    - "8.3"
 
         steps:
             -
@@ -74,6 +75,7 @@ jobs:
                     - "8.0"
                     - "8.1"
                     - "8.2"
+                    - "8.3"
 
         steps:
             -
@@ -122,10 +124,18 @@ jobs:
                         php-version: "7.4"
                     -   typo3-version: "^11.5"
                         php-version: "8.0"
+                    -   typo3-version: "^11.5"
+                        php-version: "8.1"
+                    -   typo3-version: "^11.5"
+                        php-version: "8.2"
+                    -   typo3-version: "^11.5"
+                        php-version: "8.3"
                     -   typo3-version: "^12.4"
                         php-version: "8.1"
                     -   typo3-version: "^12.4"
                         php-version: "8.2"
+                    -   typo3-version: "^12.4"
+                        php-version: "8.3"
 
         steps:
             -

diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
@@ -17,5 +17,14 @@
         'no_superfluous_phpdoc_tags' => false,
         'fully_qualified_strict_types' => false,
         'php_unit_method_casing' => false,
+        'trailing_comma_in_multiline' => [
+            'after_heredoc' => true,
+            // no support for "arguments" and "parameters" as we need support for PHP 7.4
+            'elements' => [
+                'array_destructuring',
+                'arrays',
+                'match',
+            ],
+        ],
     ])
     ->setLineEnding("\n");
diff --git a/action/class.tx_mksearch_action_AbstractSearch.php b/action/class.tx_mksearch_action_AbstractSearch.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  * Copyright notice
  *

diff --git a/action/class.tx_mksearch_action_ElasticSearch.php b/action/class.tx_mksearch_action_ElasticSearch.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  * Copyright notice
  *

diff --git a/action/class.tx_mksearch_action_Search.php b/action/class.tx_mksearch_action_Search.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  * Copyright notice
  *

diff --git a/action/class.tx_mksearch_action_SearchSolr.php b/action/class.tx_mksearch_action_SearchSolr.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  * Copyright notice
  *

diff --git a/composer.json b/composer.json
@@ -111,7 +111,8 @@
             "@test:phpcompatibility:7.4",
             "@test:phpcompatibility:8.0",
             "@test:phpcompatibility:8.1",
-            "@test:phpcompatibility:8.2"
+            "@test:phpcompatibility:8.2",
+            "@test:phpcompatibility:8.3"
         ],
         "test:phpcompatibility:7.4": [
             "[ -e .Build/bin/phpcs ] || composer update",
@@ -129,6 +130,10 @@
             "[ -e .Build/bin/phpcs ] || composer update",
             ".Build/bin/phpcs --ignore=.Build/*,/Resources/Public/JavaScript/*,./Resources/Private/PHP/Elastica/Composer/elasticsearch/elasticsearch/src/Elasticsearch/Endpoints/Indices/Split.php -p . --standard=.Build/vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 8.2"
         ],
+        "test:phpcompatibility:8.3": [
+            "[ -e .Build/bin/phpcs ] || composer update",
+            ".Build/bin/phpcs --ignore=.Build/*,/Resources/Public/JavaScript/*,./Resources/Private/PHP/Elastica/Composer/elasticsearch/elasticsearch/src/Elasticsearch/Endpoints/Indices/Split.php -p . --standard=.Build/vendor/phpcompatibility/php-compatibility/PHPCompatibility --runtime-set testVersion 8.3"
+        ],
         "test:phpstan": [
             "[ -e .Build/bin/phpstan ] || composer update --ansi",
             ".Build/bin/phpstan analyse -c phpstan.neon --memory-limit=512M --ansi"

diff --git a/filter/class.tx_mksearch_filter_ElasticSearchBase.php b/filter/class.tx_mksearch_filter_ElasticSearchBase.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  * Copyright notice
  *

diff --git a/filter/class.tx_mksearch_filter_IStoreIndex.php b/filter/class.tx_mksearch_filter_IStoreIndex.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  * Copyright notice
  *

diff --git a/filter/class.tx_mksearch_filter_SolrAutocomplete.php b/filter/class.tx_mksearch_filter_SolrAutocomplete.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann
  *

diff --git a/hooks/class.tx_mksearch_hooks_DatabaseConnection.php b/hooks/class.tx_mksearch_hooks_DatabaseConnection.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  *  Copyright notice
  *

diff --git a/hooks/class.tx_mksearch_hooks_EngineZendLucene.php b/hooks/class.tx_mksearch_hooks_EngineZendLucene.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/hooks/class.tx_mksearch_hooks_IndexerAutoUpdate.php b/hooks/class.tx_mksearch_hooks_IndexerAutoUpdate.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/indexer/class.tx_mksearch_indexer_BaseMedia.php b/indexer/class.tx_mksearch_indexer_BaseMedia.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/indexer/class.tx_mksearch_indexer_FAL.php b/indexer/class.tx_mksearch_indexer_FAL.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/indexer/class.tx_mksearch_indexer_Page.php b/indexer/class.tx_mksearch_indexer_Page.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann
  *

diff --git a/indexer/class.tx_mksearch_indexer_TtAddressAddress.php b/indexer/class.tx_mksearch_indexer_TtAddressAddress.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  *  Copyright notice
  *

diff --git a/indexer/class.tx_mksearch_indexer_TtContent.php b/indexer/class.tx_mksearch_indexer_TtContent.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann <[email protected]>
  *

diff --git a/indexer/class.tx_mksearch_indexer_TxNewsNews.php b/indexer/class.tx_mksearch_indexer_TxNewsNews.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  * Copyright notice
  *

diff --git a/indexer/seminars/class.tx_mksearch_indexer_seminars_Seminar.php b/indexer/seminars/class.tx_mksearch_indexer_seminars_Seminar.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann
  *

diff --git a/indexer/seminars/class.tx_mksearch_indexer_seminars_SeminarObjectType0.php b/indexer/seminars/class.tx_mksearch_indexer_seminars_SeminarObjectType0.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann
  *

diff --git a/indexer/seminars/class.tx_mksearch_indexer_seminars_SeminarObjectType1.php b/indexer/seminars/class.tx_mksearch_indexer_seminars_SeminarObjectType1.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann
  *

diff --git a/indexer/ttcontent/class.tx_mksearch_indexer_ttcontent_Gridelements.php b/indexer/ttcontent/class.tx_mksearch_indexer_ttcontent_Gridelements.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  * Copyright notice
  *

diff --git a/indexer/ttcontent/class.tx_mksearch_indexer_ttcontent_Normal.php b/indexer/ttcontent/class.tx_mksearch_indexer_ttcontent_Normal.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann <[email protected]>
  *

diff --git a/interface/class.tx_mksearch_interface_Indexer.php b/interface/class.tx_mksearch_interface_Indexer.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/interface/class.tx_mksearch_interface_IndexerDocument.php b/interface/class.tx_mksearch_interface_IndexerDocument.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/interface/class.tx_mksearch_interface_IndexerField.php b/interface/class.tx_mksearch_interface_IndexerField.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/interface/class.tx_mksearch_interface_SearchEngine.php b/interface/class.tx_mksearch_interface_SearchEngine.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/interface/class.tx_mksearch_interface_SearchHit.php b/interface/class.tx_mksearch_interface_SearchHit.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/marker/class.tx_mksearch_marker_CorePage.php b/marker/class.tx_mksearch_marker_CorePage.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/marker/class.tx_mksearch_marker_CoreTtContent.php b/marker/class.tx_mksearch_marker_CoreTtContent.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/marker/class.tx_mksearch_marker_CoreTtNews.php b/marker/class.tx_mksearch_marker_CoreTtNews.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/marker/class.tx_mksearch_marker_Facet.php b/marker/class.tx_mksearch_marker_Facet.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann
  *

diff --git a/marker/class.tx_mksearch_marker_General.php b/marker/class.tx_mksearch_marker_General.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/marker/class.tx_mksearch_marker_GroupedFacet.php b/marker/class.tx_mksearch_marker_GroupedFacet.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  *  Copyright notice
  *

diff --git a/marker/class.tx_mksearch_marker_Irfaq.php b/marker/class.tx_mksearch_marker_Irfaq.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/marker/class.tx_mksearch_marker_Search.php b/marker/class.tx_mksearch_marker_Search.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/marker/class.tx_mksearch_marker_SearchResultSimple.php b/marker/class.tx_mksearch_marker_SearchResultSimple.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/mod1/class.tx_mksearch_mod1_Module.php b/mod1/class.tx_mksearch_mod1_Module.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  * Copyright notice
  *

diff --git a/mod1/decorator/class.tx_mksearch_mod1_decorator_Composite.php b/mod1/decorator/class.tx_mksearch_mod1_decorator_Composite.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  *  Copyright notice
  *

diff --git a/mod1/decorator/class.tx_mksearch_mod1_decorator_Index.php b/mod1/decorator/class.tx_mksearch_mod1_decorator_Index.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  *  Copyright notice
  *

diff --git a/mod1/decorator/class.tx_mksearch_mod1_decorator_IndexerConfig.php b/mod1/decorator/class.tx_mksearch_mod1_decorator_IndexerConfig.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  *  Copyright notice
  *

diff --git a/mod1/decorator/class.tx_mksearch_mod1_decorator_Indizes.php b/mod1/decorator/class.tx_mksearch_mod1_decorator_Indizes.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  *  Copyright notice
  *

diff --git a/mod1/decorator/class.tx_mksearch_mod1_decorator_Keyword.php b/mod1/decorator/class.tx_mksearch_mod1_decorator_Keyword.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  *  Copyright notice
  *

diff --git a/mod1/util/class.tx_mksearch_mod1_util_IndexStatusHandler.php b/mod1/util/class.tx_mksearch_mod1_util_IndexStatusHandler.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
  *  Copyright notice
  *

diff --git a/model/class.tx_mksearch_model_Facet.php b/model/class.tx_mksearch_model_Facet.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann
  *

diff --git a/model/class.tx_mksearch_model_IndexerDocumentBase.php b/model/class.tx_mksearch_model_IndexerDocumentBase.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/model/class.tx_mksearch_model_IndexerFieldBase.php b/model/class.tx_mksearch_model_IndexerFieldBase.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/model/class.tx_mksearch_model_SearchHit.php b/model/class.tx_mksearch_model_SearchHit.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/model/class.tx_mksearch_model_SolrHit.php b/model/class.tx_mksearch_model_SolrHit.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/model/class.tx_mksearch_model_Suggestion.php b/model/class.tx_mksearch_model_Suggestion.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @author Hannes Bochmann
  *

diff --git a/model/engineSpecific/solr/class.tx_mksearch_model_engineSpecific_solr_IndexerField.php b/model/engineSpecific/solr/class.tx_mksearch_model_engineSpecific_solr_IndexerField.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/model/internal/class.tx_mksearch_model_internal_Composite.php b/model/internal/class.tx_mksearch_model_internal_Composite.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/model/internal/class.tx_mksearch_model_internal_Config.php b/model/internal/class.tx_mksearch_model_internal_Config.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/model/internal/class.tx_mksearch_model_internal_Index.php b/model/internal/class.tx_mksearch_model_internal_Index.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/scheduler/class.tx_mksearch_scheduler_IndexTask.php b/scheduler/class.tx_mksearch_scheduler_IndexTask.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *

diff --git a/scheduler/class.tx_mksearch_scheduler_IndexTaskAddFieldProvider.php b/scheduler/class.tx_mksearch_scheduler_IndexTaskAddFieldProvider.php
@@ -1,4 +1,5 @@
 <?php
+
 /***************************************************************
 *  Copyright notice
 *
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     <?php
     /**
      * @author Hannes Bochmann
      *
@@ Expand Down @@