From b35d378bd882cc9cc396d7a7b346df1413a64369 Mon Sep 17 00:00:00 2001 From: Hannes Bochmann Date: Mon, 25 Nov 2024 10:02:31 +0100 Subject: [PATCH] Cleanup fix cs and qs --- .github/workflows/phpci.yml | 10 ++++++++++ .php-cs-fixer.php | 9 +++++++++ action/class.tx_mksearch_action_AbstractSearch.php | 1 + action/class.tx_mksearch_action_ElasticSearch.php | 1 + action/class.tx_mksearch_action_Search.php | 1 + action/class.tx_mksearch_action_SearchSolr.php | 1 + composer.json | 7 ++++++- filter/class.tx_mksearch_filter_ElasticSearchBase.php | 1 + filter/class.tx_mksearch_filter_IStoreIndex.php | 1 + filter/class.tx_mksearch_filter_SolrAutocomplete.php | 1 + hooks/class.tx_mksearch_hooks_DatabaseConnection.php | 1 + hooks/class.tx_mksearch_hooks_EngineZendLucene.php | 1 + hooks/class.tx_mksearch_hooks_IndexerAutoUpdate.php | 1 + indexer/class.tx_mksearch_indexer_BaseMedia.php | 1 + indexer/class.tx_mksearch_indexer_FAL.php | 1 + indexer/class.tx_mksearch_indexer_Page.php | 1 + indexer/class.tx_mksearch_indexer_TtAddressAddress.php | 1 + indexer/class.tx_mksearch_indexer_TtContent.php | 1 + indexer/class.tx_mksearch_indexer_TxNewsNews.php | 1 + .../class.tx_mksearch_indexer_seminars_Seminar.php | 1 + ...tx_mksearch_indexer_seminars_SeminarObjectType0.php | 1 + ...tx_mksearch_indexer_seminars_SeminarObjectType1.php | 1 + ...lass.tx_mksearch_indexer_ttcontent_Gridelements.php | 1 + .../class.tx_mksearch_indexer_ttcontent_Normal.php | 1 + interface/class.tx_mksearch_interface_Indexer.php | 1 + .../class.tx_mksearch_interface_IndexerDocument.php | 1 + interface/class.tx_mksearch_interface_IndexerField.php | 1 + interface/class.tx_mksearch_interface_SearchEngine.php | 1 + interface/class.tx_mksearch_interface_SearchHit.php | 1 + marker/class.tx_mksearch_marker_CorePage.php | 1 + marker/class.tx_mksearch_marker_CoreTtContent.php | 1 + marker/class.tx_mksearch_marker_CoreTtNews.php | 1 + marker/class.tx_mksearch_marker_Facet.php | 1 + marker/class.tx_mksearch_marker_General.php | 1 + marker/class.tx_mksearch_marker_GroupedFacet.php | 1 + marker/class.tx_mksearch_marker_Irfaq.php | 1 + marker/class.tx_mksearch_marker_Search.php | 1 + marker/class.tx_mksearch_marker_SearchResultSimple.php | 1 + mod1/class.tx_mksearch_mod1_Module.php | 1 + .../class.tx_mksearch_mod1_decorator_Composite.php | 1 + .../class.tx_mksearch_mod1_decorator_Index.php | 1 + .../class.tx_mksearch_mod1_decorator_IndexerConfig.php | 1 + .../class.tx_mksearch_mod1_decorator_Indizes.php | 1 + .../class.tx_mksearch_mod1_decorator_Keyword.php | 1 + .../class.tx_mksearch_mod1_util_IndexStatusHandler.php | 1 + model/class.tx_mksearch_model_Facet.php | 1 + model/class.tx_mksearch_model_IndexerDocumentBase.php | 1 + model/class.tx_mksearch_model_IndexerFieldBase.php | 1 + model/class.tx_mksearch_model_SearchHit.php | 1 + model/class.tx_mksearch_model_SolrHit.php | 1 + model/class.tx_mksearch_model_Suggestion.php | 1 + ...mksearch_model_engineSpecific_solr_IndexerField.php | 1 + .../class.tx_mksearch_model_internal_Composite.php | 1 + .../class.tx_mksearch_model_internal_Config.php | 1 + .../class.tx_mksearch_model_internal_Index.php | 1 + scheduler/class.tx_mksearch_scheduler_IndexTask.php | 1 + ...tx_mksearch_scheduler_IndexTaskAddFieldProvider.php | 1 + search/class.tx_mksearch_search_Composite.php | 1 + search/class.tx_mksearch_search_Config.php | 1 + search/class.tx_mksearch_search_Index.php | 1 + service/class.tx_mksearch_service_Base.php | 1 + .../class.tx_mksearch_service_engine_ElasticSearch.php | 1 + .../engine/class.tx_mksearch_service_engine_Solr.php | 1 + .../class.tx_mksearch_service_engine_ZendLucene.php | 1 + ...x_mksearch_service_engine_lucene_DataTypeMapper.php | 1 + .../class.tx_mksearch_service_internal_Base.php | 1 + .../class.tx_mksearch_service_internal_Composite.php | 1 + .../class.tx_mksearch_service_internal_Config.php | 1 + .../class.tx_mksearch_service_internal_Index.php | 1 + ...lass.tx_mksearch_tests_action_ElasticSearchTest.php | 1 + tests/class.tx_mksearch_tests_Testcase.php | 1 + .../class.tx_mksearch_tests_fixtures_indexer_Dummy.php | 1 + ....tx_mksearch_tests_hooks_DatabaseConnectionTest.php | 1 + ...s.tx_mksearch_tests_hooks_IndexerAutoUpdateTest.php | 1 + .../class.tx_mksearch_tests_indexer_BaseMediaTest.php | 1 + .../class.tx_mksearch_tests_indexer_BaseTest.php | 1 + .../class.tx_mksearch_tests_indexer_FALTest.php | 1 + .../class.tx_mksearch_tests_indexer_PageTest.php | 1 + .../class.tx_mksearch_tests_indexer_TtContentTest.php | 1 + .../class.tx_mksearch_tests_indexer_TxNewsNewsTest.php | 1 + ...search_tests_indexer_ttcontent_GridelementsTest.php | 1 + ....tx_mksearch_tests_indexer_ttcontent_NormalTest.php | 1 + ...tx_mksearch_tests_model_IndexerDocumentBaseTest.php | 1 + .../class.tx_mksearch_tests_model_SolrHitTest.php | 1 + ...mksearch_tests_service_engine_ElasticSearchTest.php | 1 + ..._tests_service_engine_lucene_DataTypeMapperTest.php | 1 + ...ss.tx_mksearch_tests_service_internal_IndexTest.php | 1 + .../class.tx_mksearch_tests_util_FacetBuilderTest.php | 1 + tests/util/class.tx_mksearch_tests_util_FilterTest.php | 1 + .../util/class.tx_mksearch_tests_util_IndexerTest.php | 1 + .../class.tx_mksearch_tests_util_KeyValueFacetTest.php | 1 + tests/util/class.tx_mksearch_tests_util_MiscTest.php | 1 + .../class.tx_mksearch_tests_util_ResolverT3DBTest.php | 1 + .../class.tx_mksearch_tests_util_SearchBuilderTest.php | 1 + ...ass.tx_mksearch_tests_util_SolrAutocompleteTest.php | 1 + ...ss.tx_mksearch_tests_util_SuggestionBuilderTest.php | 1 + tests/util/class.tx_mksearch_tests_util_TikaTest.php | 1 + .../util/class.tx_mksearch_tests_util_UserFuncTest.php | 1 + util/class.tx_mksearch_util_Config.php | 1 + util/class.tx_mksearch_util_FacetBuilder.php | 1 + util/class.tx_mksearch_util_Filter.php | 1 + util/class.tx_mksearch_util_KeyValueFacet.php | 1 + util/class.tx_mksearch_util_Misc.php | 1 + util/class.tx_mksearch_util_ResolverT3DB.php | 1 + util/class.tx_mksearch_util_SearchBuilder.php | 1 + util/class.tx_mksearch_util_ServiceRegistry.php | 1 + util/class.tx_mksearch_util_SolrAutocomplete.php | 1 + util/class.tx_mksearch_util_Status.php | 1 + util/class.tx_mksearch_util_SuggestionBuilder.php | 1 + util/class.tx_mksearch_util_TCA.php | 1 + util/class.tx_mksearch_util_Tika.php | 1 + util/class.tx_mksearch_util_UserFunc.php | 1 + util/class.tx_mksearch_util_UserGroups.php | 1 + view/class.tx_mksearch_view_Search.php | 1 + view/class.tx_mksearch_view_SearchSolr.php | 1 + 115 files changed, 137 insertions(+), 1 deletion(-) diff --git a/.github/workflows/phpci.yml b/.github/workflows/phpci.yml index a662dc6f..9d283d93 100644 --- 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 index 907795b5..ad8ecebe 100644 --- 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 index 3c652dd3..5790a049 100644 --- a/action/class.tx_mksearch_action_AbstractSearch.php +++ b/action/class.tx_mksearch_action_AbstractSearch.php @@ -1,4 +1,5 @@ * diff --git a/indexer/class.tx_mksearch_indexer_TxNewsNews.php b/indexer/class.tx_mksearch_indexer_TxNewsNews.php index c4ef6238..952ada24 100644 --- a/indexer/class.tx_mksearch_indexer_TxNewsNews.php +++ b/indexer/class.tx_mksearch_indexer_TxNewsNews.php @@ -1,4 +1,5 @@ * diff --git a/interface/class.tx_mksearch_interface_Indexer.php b/interface/class.tx_mksearch_interface_Indexer.php index 9df3041a..6670dac7 100644 --- a/interface/class.tx_mksearch_interface_Indexer.php +++ b/interface/class.tx_mksearch_interface_Indexer.php @@ -1,4 +1,5 @@