Skip to content

Commit 97ee470

Browse files
skerbisskerbis
authored
Merge pull request #205 from FriendsOfREDAXO/cs_fixer_and_removed_deprecated
cs_fixer aktualisiert , deprecated methoden und classes entfernt
2 parents 7cab023 + daf1b55 commit 97ee470

16 files changed

Lines changed: 68 additions & 95 deletions

‎.github/workflows/PHP-CS-Fixer.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: composer install --prefer-dist --no-progress
3232

3333
- name: Run PHP CS Fixer
34-
run: vendor/bin/php-cs-fixer fix . --diff --verbose
34+
run: PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix . --diff --verbose
3535

3636
- name: Commit and push fixed files
3737
uses: stefanzweifel/git-auto-commit-action@v4

‎.php-cs-fixer.cache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"php":"8.3.25","version":"3.64.0:v3.64.0#58dd9c931c785a79739310aef5178928305ffa67","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":{"default":"at_least_single_space"},"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"braces_position":{"allow_single_line_empty_anonymous_classes":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_parentheses":true,"no_blank_lines_after_class_opening":true,"no_extra_blank_lines":{"tokens":["use"]},"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":{"imports_order":["class","function","const"],"sort_algorithm":"none"},"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_space_around_construct":{"constructs_followed_by_a_single_space":["abstract","as","case","catch","class","const_import","do","else","elseif","final","finally","for","foreach","function","function_import","if","insteadof","interface","namespace","new","private","protected","public","static","switch","trait","try","use","use_lambda","while"],"constructs_preceded_by_a_single_space":["as","else","elseif","use_lambda"]},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"unary_operator_spaces":{"only_dec_inc":true},"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"attribute_placement":"ignore","on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true},"hashes":{"boot.php":"500a96fae5d036cc7cace6094bdca28f","pages\/config.php":"cae53f73bf533cc8bb59dadf1cbdebe4","pages\/index.php":"daf2b1a819e7a27391553c599d053802","fragments\/QuickNavigation\/NoResult.php":"9b879a1abf902a8aa81cb9e6ce5d921a","fragments\/QuickNavigation\/Dropdown.php":"7cc52d767a1b8fa704e4d89c9a3e48a7","fragments\/QuickNavigation\/MinibarList.php":"6c40eb3f991f48d730f45b8d222914b1","fragments\/QuickNavigation\/List.php":"e90ddecd29ce153eec1083841a3088e2","update.php":"d6e8377314743b0306a045ec165b99ea","lib\/rex_api_quicknavigation_media_search.php":"76ec8e934d1525c986bee325bc37e954","lib\/QuickNavigation\/QuickNavigation.php":"e7879d206a5a091437921d1570285cd9","lib\/QuickNavigation\/ApiFunction\/MenuRender.php":"fa555351a229780f110eba970ed42a59","lib\/QuickNavigation\/ApiFunction\/MediaSearch.php":"b77c2fde9791ab25dfc9e6d7f5e8a329","lib\/QuickNavigation\/LinkMap\/QuickNavigationLinkMap.php":"3060d0975067e724f1dd427eadb02d47","lib\/QuickNavigation\/Button\/ArticleHistoryButton.php":"b60589453343c834038edfd26f3c7220","lib\/QuickNavigation\/Button\/ButtonInterface.php":"943bf3db82d39b6854401e16fe7e36b6","lib\/QuickNavigation\/Button\/ButtonRegistry.php":"0ecf7951feeb0b3524fa1b8c92ac6288","lib\/QuickNavigation\/Button\/FavoriteButton.php":"382a3446b216ca0aaef31fa2f21e82d4","lib\/QuickNavigation\/Button\/CategoryButton.php":"fa0637c3410b461739392b4f4aa50c9d","lib\/QuickNavigation\/Button\/ArticleNavigationButton.php":"0036d750da4417a5cf81bda896b01de7","lib\/QuickNavigation\/Button\/YformButton.php":"b44a64de32aef2e566d0febca56f6128","lib\/QuickNavigation\/Button\/WatsonButton.php":"ef0d3641591e83b6e7dfec54008e36a8","lib\/QuickNavigation\/QuickNavigationApi.php":"4eabc25eae94790b9095085102dc278a","lib\/QuickNavigation\/Utility\/BuildNavigationArray.php":"d2a23cc394de4fd4e83bb34da8b3c0bc","lib\/QuickNavigation\/Minibar\/ArticleHistoryElement.php":"fa606bdfb8e44afdcd46695f36b5d327","lib\/QuickNavigation\/Media\/MediaSorter.php":"161a68caa4895fe8887470db5265ea82","lib\/QuickNavigation\/Media\/QuickNavigationMedia.php":"624d087e36608a981f2276f37737c71a","lib\/QuickNavigation\/rex_api_quicknavigation_render.php":"bf8a3f8aa45712984014768a68ba441f","lib\/LinkMap\/QuickNavigationLinkMap.php":"3060d0975067e724f1dd427eadb02d47","lib\/Utility\/BuildNavigationArray.php":"d2a23cc394de4fd4e83bb34da8b3c0bc","lib\/Minibar\/ArticleHistoryElement.php":"fa606bdfb8e44afdcd46695f36b5d327","lib\/QuickNavigationApi.php":"4eabc25eae94790b9095085102dc278a","lib\/ApiFunction\/MenuRender.php":"fa555351a229780f110eba970ed42a59","lib\/ApiFunction\/MediaSearch.php":"b77c2fde9791ab25dfc9e6d7f5e8a329","lib\/Button\/FavoriteButton.php":"382a3446b216ca0aaef31fa2f21e82d4","lib\/Button\/ButtonRegistry.php":"0ecf7951feeb0b3524fa1b8c92ac6288","lib\/Button\/YformButton.php":"b44a64de32aef2e566d0febca56f6128","lib\/Button\/ArticleHistoryButton.php":"b60589453343c834038edfd26f3c7220","lib\/Button\/ButtonInterface.php":"943bf3db82d39b6854401e16fe7e36b6","lib\/Button\/ArticleNavigationButton.php":"0036d750da4417a5cf81bda896b01de7","lib\/Button\/WatsonButton.php":"ef0d3641591e83b6e7dfec54008e36a8","lib\/Button\/CategoryButton.php":"fa0637c3410b461739392b4f4aa50c9d","lib\/Media\/MediaSorter.php":"161a68caa4895fe8887470db5265ea82","lib\/Media\/QuickNavigationMedia.php":"624d087e36608a981f2276f37737c71a","lib\/QuickNavigation.php":"e7879d206a5a091437921d1570285cd9","lib\/rex_api_quicknavigation_render.php":"bf8a3f8aa45712984014768a68ba441f","lib\/QuickNavigation\/rex_api_quicknavigation_media_search.php":"76ec8e934d1525c986bee325bc37e954"}}
1+
{"php":"8.3.25","version":"3.64.0:v3.64.0#58dd9c931c785a79739310aef5178928305ffa67","indent":" ","lineEnding":"\n","rules":{"binary_operator_spaces":{"default":"at_least_single_space"},"blank_line_after_opening_tag":true,"blank_line_between_import_groups":true,"blank_lines_before_namespace":true,"braces_position":{"allow_single_line_empty_anonymous_classes":true},"class_definition":{"inline_constructor_arguments":false,"space_before_parenthesis":true},"compact_nullable_type_declaration":true,"declare_equal_normalize":true,"lowercase_cast":true,"lowercase_static_reference":true,"new_with_parentheses":true,"no_blank_lines_after_class_opening":true,"no_extra_blank_lines":{"tokens":["use"]},"no_leading_import_slash":true,"no_whitespace_in_blank_line":true,"ordered_class_elements":{"order":["use_trait"]},"ordered_imports":true,"return_type_declaration":true,"short_scalar_cast":true,"single_import_per_statement":{"group_to_single_imports":false},"single_space_around_construct":{"constructs_followed_by_a_single_space":["abstract","as","case","catch","class","const_import","do","else","elseif","final","finally","for","foreach","function","function_import","if","insteadof","interface","namespace","new","private","protected","public","static","switch","trait","try","use","use_lambda","while"],"constructs_preceded_by_a_single_space":["as","else","elseif","use_lambda"]},"single_trait_insert_per_statement":true,"ternary_operator_spaces":true,"unary_operator_spaces":{"only_dec_inc":true},"visibility_required":true,"blank_line_after_namespace":true,"constant_case":true,"control_structure_braces":true,"control_structure_continuation_position":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":{"attribute_placement":"ignore","on_multiline":"ensure_fully_multiline"},"no_break_comment":true,"no_closing_tag":true,"no_multiple_statements_per_line":true,"no_space_around_double_colon":true,"no_spaces_after_function_name":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":{"elements":["property"]},"single_line_after_imports":true,"spaces_inside_parentheses":true,"statement_indentation":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"no_unused_imports":true,"single_quote":true,"trailing_comma_in_multiline":true},"hashes":{"fragments\/QuickNavigation\/Dropdown.php":"7cc52d767a1b8fa704e4d89c9a3e48a7","fragments\/QuickNavigation\/List.php":"e90ddecd29ce153eec1083841a3088e2","fragments\/QuickNavigation\/NoResult.php":"9b879a1abf902a8aa81cb9e6ce5d921a","fragments\/QuickNavigation\/MinibarList.php":"6c40eb3f991f48d730f45b8d222914b1","pages\/config.php":"cae53f73bf533cc8bb59dadf1cbdebe4","pages\/index.php":"daf2b1a819e7a27391553c599d053802","lib\/LinkMap\/QuickNavigationLinkMap.php":"3060d0975067e724f1dd427eadb02d47","lib\/Utility\/BuildNavigationArray.php":"d2a23cc394de4fd4e83bb34da8b3c0bc","lib\/Minibar\/ArticleHistoryElement.php":"fa606bdfb8e44afdcd46695f36b5d327","lib\/QuickNavigationApi.php":"4eabc25eae94790b9095085102dc278a","lib\/ApiFunction\/MenuRender.php":"fa555351a229780f110eba970ed42a59","lib\/ApiFunction\/MediaSearch.php":"04d4e816aa6766f1f2bf889482187287","lib\/Button\/FavoriteButton.php":"c8163f9adb12699453fe458de325515e","lib\/Button\/ButtonRegistry.php":"0ecf7951feeb0b3524fa1b8c92ac6288","lib\/Button\/YformButton.php":"cb3c1d7608735d18b5732b7425f3c14a","lib\/Button\/ArticleHistoryButton.php":"3851f59535b0647f184a5d706da08aba","lib\/Button\/ButtonInterface.php":"943bf3db82d39b6854401e16fe7e36b6","lib\/Button\/ArticleNavigationButton.php":"a81f2e97e73f235cba29ffcad4db1854","lib\/Button\/WatsonButton.php":"ef0d3641591e83b6e7dfec54008e36a8","lib\/Button\/CategoryButton.php":"3854696ad9b32dffad7d25d881fd2b18","lib\/Media\/MediaSorter.php":"4af98d56992a2e58b4d440ff1545af50","lib\/Media\/QuickNavigationMedia.php":"aa21d3042a12fc77d87e15ccb9c66319","lib\/QuickNavigation.php":"9a208b43632faa9d39923ff64c22f056","update.php":"d6e8377314743b0306a045ec165b99ea","boot.php":"85e4410621c51370487316f2c7de01b4"}}

‎.php-cs-fixer.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
$finder = (new PhpCsFixer\Finder())
4+
->in(__DIR__)
5+
->exclude(['vendor'])
6+
->name('*.php')
7+
->ignoreDotFiles(true)
8+
->ignoreVCS(true);
9+
10+
return (new PhpCsFixer\Config())
11+
->setRules([
12+
'@PSR12' => true,
13+
'array_syntax' => ['syntax' => 'short'],
14+
'no_unused_imports' => true,
15+
'ordered_imports' => true,
16+
'single_quote' => true,
17+
'trailing_comma_in_multiline' => true,
18+
])
19+
->setFinder($finder);

‎boot.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
namespace FriendsOfRedaxo\QuickNavigation;
1313

14-
use FriendsOfRedaxo\QuickNavigation\ApiFunction\MenuRender;
1514
use FriendsOfRedaxo\QuickNavigation\ApiFunction\MediaSearch;
15+
use FriendsOfRedaxo\QuickNavigation\ApiFunction\MenuRender;
1616
use FriendsOfRedaxo\QuickNavigation\Button\ArticleHistoryButton;
17-
use FriendsOfRedaxo\QuickNavigation\Button\ButtonRegistry;
1817
use FriendsOfRedaxo\QuickNavigation\Button\ArticleNavigationButton;
18+
use FriendsOfRedaxo\QuickNavigation\Button\ButtonRegistry;
1919
use FriendsOfRedaxo\QuickNavigation\Button\CategoryButton;
2020
use FriendsOfRedaxo\QuickNavigation\Button\FavoriteButton;
2121
use FriendsOfRedaxo\QuickNavigation\Button\WatsonButton;
@@ -30,7 +30,6 @@
3030
use rex_be_controller;
3131
use rex_clang;
3232
use rex_extension;
33-
use rex_extension_point;
3433
use rex_minibar;
3534
use rex_perm;
3635
use rex_url;
@@ -39,7 +38,7 @@
3938
if (rex::isBackend() && rex::getUser() && rex_backend_login::hasSession() && rex_be_controller::getCurrentPage() != '2factor_auth_verify') {
4039
if (rex::getUser()->hasPerm('quick_navigation[]')) {
4140
rex_api_function::register('quicknavigation_api', MenuRender::class);
42-
rex_api_function::register('quicknavigation_media_search', 'rex_api_quicknavigation_media_search');
41+
rex_api_function::register('quicknavigation_media_search', MediaSearch::class);
4342
rex_view::addCssFile(rex_addon::get('quick_navigation')->getAssetsUrl('quick-navigation.css'));
4443
rex_view::addCssFile(rex_addon::get('quick_navigation')->getAssetsUrl('media-live-search.css'));
4544
rex_view::addJsFile(rex_addon::get('quick_navigation')->getAssetsUrl('quick-navigation.js'));

‎lib/ApiFunction/MediaSearch.php‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22

33
namespace FriendsOfRedaxo\QuickNavigation\ApiFunction;
44

5+
use Exception;
56
use rex;
67
use rex_api_function;
7-
use rex_api_result;
8+
use rex_formatter;
89
use rex_media;
910
use rex_media_manager;
10-
use rex_media_service;
11-
use rex_request;
12-
use rex_response;
13-
use rex_formatter;
14-
use rex_url;
1511
use rex_sql;
16-
use Exception;
12+
use rex_url;
1713

1814
/**
1915
* API function for media live search in Quick Navigation.
@@ -44,7 +40,7 @@ public function execute()
4440
if (!rex::getUser()) {
4541
$result = [
4642
'success' => false,
47-
'error' => 'Keine Berechtigung'
43+
'error' => 'Keine Berechtigung',
4844
];
4945
echo json_encode($result);
5046
exit;
@@ -53,7 +49,7 @@ public function execute()
5349
if (strlen($searchTerm) < 2) {
5450
$result = [
5551
'success' => false,
56-
'error' => 'Suchbegriff zu kurz'
52+
'error' => 'Suchbegriff zu kurz',
5753
];
5854
echo json_encode($result);
5955
exit;
@@ -118,15 +114,15 @@ public function execute()
118114
'size' => $size,
119115
'updatedate' => $updatedate,
120116
'thumbnail' => $thumbnail,
121-
'actions' => $actions
117+
'actions' => $actions,
122118
];
123119
}
124120
$sql->next();
125121
}
126122

127123
$result = [
128124
'success' => true,
129-
'results' => array_slice($results, 0, 10) // Maximal 10 Ergebnisse
125+
'results' => array_slice($results, 0, 10), // Maximal 10 Ergebnisse
130126
];
131127

132128
echo json_encode($result);
@@ -135,7 +131,7 @@ public function execute()
135131
} catch (Exception $e) {
136132
$result = [
137133
'success' => false,
138-
'error' => 'Fehler bei der Suche: ' . $e->getMessage()
134+
'error' => 'Fehler bei der Suche: ' . $e->getMessage(),
139135
];
140136
echo json_encode($result);
141137
exit;
@@ -165,7 +161,7 @@ private function generateThumbnail($media)
165161
return [
166162
'type' => 'svg',
167163
'svg' => $svg,
168-
'alt' => $media->getTitle() ?: $media->getFilename()
164+
'alt' => $media->getTitle() ?: $media->getFilename(),
169165
];
170166
}
171167
}
@@ -181,7 +177,7 @@ private function generateThumbnail($media)
181177
return [
182178
'type' => 'image',
183179
'src' => $thumbnailUrl,
184-
'alt' => $media->getTitle() ?: $media->getFilename()
180+
'alt' => $media->getTitle() ?: $media->getFilename(),
185181
];
186182
} catch (Exception $e) {
187183
// Fallback zu Icon
@@ -194,7 +190,7 @@ private function generateThumbnail($media)
194190
return [
195191
'type' => 'icon',
196192
'icon' => $icon,
197-
'title' => strtoupper($media->getExtension()) . ' Datei'
193+
'title' => strtoupper($media->getExtension()) . ' Datei',
198194
];
199195
}
200196

@@ -265,8 +261,8 @@ private function generateActions($media, $openerInputField)
265261
'url' => rex_url::backendPage('mediapool/media', [
266262
'opener_input_field' => $openerInputField,
267263
'file_id' => $media->getId(),
268-
'file_category_id' => $media->getCategoryId()
269-
])
264+
'file_category_id' => $media->getCategoryId(),
265+
]),
270266
];
271267

272268
// Wenn opener_input_field gesetzt ist, dann Auswahl-Modus
@@ -277,15 +273,15 @@ private function generateActions($media, $openerInputField)
277273
'type' => 'medialist',
278274
'filename' => $media->getFilename(),
279275
'title' => $media->getTitle() ?: $media->getFilename(),
280-
'label' => 'Übernehmen'
276+
'label' => 'Übernehmen',
281277
];
282278
} else {
283279
// Einzelmedium
284280
$actions['select'] = [
285281
'type' => 'media',
286282
'filename' => $media->getFilename(),
287283
'title' => $media->getTitle() ?: $media->getFilename(),
288-
'label' => 'Übernehmen'
284+
'label' => 'Übernehmen',
289285
];
290286
}
291287
}

‎lib/Button/ArticleHistoryButton.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace FriendsOfRedaxo\QuickNavigation\Button;
44

5+
use function count;
6+
57
use IntlDateFormatter;
68
use rex;
79
use rex_addon;
@@ -14,8 +16,6 @@
1416
use rex_url;
1517
use rex_yrewrite;
1618

17-
use function count;
18-
1919
class ArticleHistoryButton implements ButtonInterface
2020
{
2121
protected string $mode;

‎lib/Button/ArticleNavigationButton.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace FriendsOfRedaxo\QuickNavigation\Button;
44

5+
use function count;
6+
57
use rex_article;
68
use rex_be_controller;
79
use rex_category;
810
use rex_clang;
911
use rex_string;
1012
use rex_url;
1113

12-
use function count;
13-
1414
class ArticleNavigationButton implements ButtonInterface
1515
{
1616
public function get(): string
@@ -41,7 +41,7 @@ public function get(): string
4141
$attributes = [
4242
'class' => 'btn btn-default',
4343
'href' => rex_url::backendPage('content/edit', ['mode' => 'edit', 'clang' => rex_clang::getCurrentId(), 'category_id' => rex_request('category_id'), 'article_id' => $article->getId()]),
44-
'title' => $article->getName()
44+
'title' => $article->getName(),
4545
];
4646
$prev = '<a' . rex_string::buildAttributes($attributes). '><span class="fa fa-chevron-left"></span></a>';
4747
}
@@ -52,7 +52,7 @@ public function get(): string
5252
$attributes = [
5353
'class' => 'btn btn-default',
5454
'href' => rex_url::backendPage('content/edit', ['mode' => 'edit', 'clang' => rex_clang::getCurrentId(), 'category_id' => rex_request('category_id'), 'article_id' => $article->getId()]),
55-
'title' => $article->getName()
55+
'title' => $article->getName(),
5656
];
5757
$next = '<a' . rex_string::buildAttributes($attributes). '><span class="fa fa-chevron-right"></span></a>';
5858
}

‎lib/Button/CategoryButton.php‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22

33
namespace FriendsOfRedaxo\QuickNavigation\Button;
44

5+
use FriendsOfRedaxo\QuickNavigation\Utility\BuildNavigationArray;
56
use rex;
67
use rex_addon;
7-
use rex_article;
8-
use rex_category;
98
use rex_clang;
10-
use rex_context;
119
use rex_fragment;
1210
use rex_i18n;
1311
use rex_string;
14-
use rex_url;
15-
use rex_yrewrite;
16-
use FriendsOfRedaxo\QuickNavigation\Utility\BuildNavigationArray;
1712

1813
class CategoryButton implements ButtonInterface
1914
{

0 commit comments

Comments
 (0)