Skip to content

Commit bca6033

Browse files
skerbisgithub-actions[bot]
authored andcommitted
Apply php-cs-fixer changes
1 parent 67733ea commit bca6033

6 files changed

Lines changed: 37 additions & 37 deletions

File tree

.php-cs-fixer.cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"php":"8.3.20","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":{"lib\/QuickNavigation\/Utility\/BuildNavigationArray.php":"d2a23cc394de4fd4e83bb34da8b3c0bc","lib\/QuickNavigation\/Media\/QuickNavigationMedia.php":"cb133a466b0024e0d2682de04cefdf0c","lib\/QuickNavigation\/LinkMap\/QuickNavigationLinkMap.php":"3060d0975067e724f1dd427eadb02d47","lib\/QuickNavigation\/rex_api_quicknavigation_render.php":"bf8a3f8aa45712984014768a68ba441f","lib\/QuickNavigation\/Minibar\/ArticleHistoryElement.php":"fa606bdfb8e44afdcd46695f36b5d327","lib\/QuickNavigation\/QuickNavigationApi.php":"4eabc25eae94790b9095085102dc278a","lib\/QuickNavigation\/Button\/ButtonInterface.php":"943bf3db82d39b6854401e16fe7e36b6","lib\/QuickNavigation\/Button\/ArticleNavigationButton.php":"0036d750da4417a5cf81bda896b01de7","lib\/QuickNavigation\/Button\/ButtonRegistry.php":"0ecf7951feeb0b3524fa1b8c92ac6288","lib\/QuickNavigation\/Button\/ArticleHistoryButton.php":"b60589453343c834038edfd26f3c7220","lib\/QuickNavigation\/Button\/CategoryButton.php":"fa0637c3410b461739392b4f4aa50c9d","lib\/QuickNavigation\/Button\/FavoriteButton.php":"382a3446b216ca0aaef31fa2f21e82d4","lib\/QuickNavigation\/Button\/WatsonButton.php":"ef0d3641591e83b6e7dfec54008e36a8","lib\/QuickNavigation\/Button\/YformButton.php":"0f33ef81e17add648d4bf64770faf19e","lib\/QuickNavigation\/QuickNavigation.php":"e7879d206a5a091437921d1570285cd9","lib\/QuickNavigation\/ApiFunction\/MenuRender.php":"fa555351a229780f110eba970ed42a59","fragments\/QuickNavigation\/MinibarList.php":"6c40eb3f991f48d730f45b8d222914b1","fragments\/QuickNavigation\/Dropdown.php":"7cc52d767a1b8fa704e4d89c9a3e48a7","fragments\/QuickNavigation\/NoResult.php":"9b879a1abf902a8aa81cb9e6ce5d921a","fragments\/QuickNavigation\/List.php":"e90ddecd29ce153eec1083841a3088e2","pages\/config.php":"dbdfa612c57ba9c8a2818118317d92db","pages\/index.php":"daf2b1a819e7a27391553c599d053802","update.php":"77c556570fd24e393bfa5653a276578f","boot.php":"0c2623ef04ca59e9779af0fcabdc361a"}}
1+
{"php":"8.3.20","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":{"lib\/QuickNavigation\/Utility\/BuildNavigationArray.php":"d2a23cc394de4fd4e83bb34da8b3c0bc","lib\/QuickNavigation\/Media\/QuickNavigationMedia.php":"53ed78c69f00c24375da79a9725e837c","lib\/QuickNavigation\/LinkMap\/QuickNavigationLinkMap.php":"3060d0975067e724f1dd427eadb02d47","lib\/QuickNavigation\/rex_api_quicknavigation_render.php":"bf8a3f8aa45712984014768a68ba441f","lib\/QuickNavigation\/Minibar\/ArticleHistoryElement.php":"fa606bdfb8e44afdcd46695f36b5d327","lib\/QuickNavigation\/QuickNavigationApi.php":"4eabc25eae94790b9095085102dc278a","lib\/QuickNavigation\/Button\/ButtonInterface.php":"943bf3db82d39b6854401e16fe7e36b6","lib\/QuickNavigation\/Button\/ArticleNavigationButton.php":"0036d750da4417a5cf81bda896b01de7","lib\/QuickNavigation\/Button\/ButtonRegistry.php":"0ecf7951feeb0b3524fa1b8c92ac6288","lib\/QuickNavigation\/Button\/ArticleHistoryButton.php":"b60589453343c834038edfd26f3c7220","lib\/QuickNavigation\/Button\/CategoryButton.php":"fa0637c3410b461739392b4f4aa50c9d","lib\/QuickNavigation\/Button\/FavoriteButton.php":"382a3446b216ca0aaef31fa2f21e82d4","lib\/QuickNavigation\/Button\/WatsonButton.php":"ef0d3641591e83b6e7dfec54008e36a8","lib\/QuickNavigation\/Button\/YformButton.php":"0f33ef81e17add648d4bf64770faf19e","lib\/QuickNavigation\/QuickNavigation.php":"e7879d206a5a091437921d1570285cd9","lib\/QuickNavigation\/ApiFunction\/MenuRender.php":"fa555351a229780f110eba970ed42a59","fragments\/QuickNavigation\/MinibarList.php":"6c40eb3f991f48d730f45b8d222914b1","fragments\/QuickNavigation\/Dropdown.php":"7cc52d767a1b8fa704e4d89c9a3e48a7","fragments\/QuickNavigation\/NoResult.php":"9b879a1abf902a8aa81cb9e6ce5d921a","fragments\/QuickNavigation\/List.php":"e90ddecd29ce153eec1083841a3088e2","pages\/config.php":"9f7cf272364c09f38e33d861d33e9727","pages\/index.php":"daf2b1a819e7a27391553c599d053802","update.php":"77c556570fd24e393bfa5653a276578f","boot.php":"0d9560c256e3636dccd102fc6a2b2ab1","lib\/QuickNavigation\/Button\/MediaSortButton.php":"11b7ff2c4b53cddada3229d898b9ed95","lib\/QuickNavigation\/Media\/MediaSorter.php":"427ad7f2ac3595cae5dca56ef85da78e"}}

boot.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
});
8282
rex_extension::register('PAGE_TITLE_SHOWN', QuickNavigationLinkMap::LinkMapNavigation(...));
8383
rex_extension::register('MEDIA_LIST_TOOLBAR', QuickNavigationMedia::MediaHistory(...));
84-
84+
8585
// Registriere den Extension Point für die Mediensortierung
8686
rex_extension::register('MEDIA_LIST_QUERY', [QuickNavigationMedia::class, 'ModifyMediaListQuery']);
8787
}

lib/QuickNavigation/Button/MediaSortButton.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ public function get(): string
1414
// Prüfen, ob der Benutzer die Berechtigung hat und ob die Funktion aktiviert ist
1515
$user = rex::getUser()->getId();
1616
$package = rex_addon::get('quick_navigation');
17-
17+
1818
if (!rex::getUser() || $package->getConfig('quick_navigation_mediasort' . $user) !== '1') {
1919
return '';
2020
}
21-
21+
2222
// Aktuellen Sortierstatus aus dem Cookie oder Session auslesen
2323
$sortMode = rex_request::cookie('media_sort_alphabetical', 'string', 'false');
24-
24+
2525
// Icon und Titel basierend auf dem aktuellen Status setzen
2626
$icon = $sortMode === 'true' ? 'fa-sort-alpha-asc' : 'fa-sort-numeric-desc';
2727
$title = $sortMode === 'true' ? rex_i18n::msg('quick_navigation_media_sort_date') : rex_i18n::msg('quick_navigation_media_sort_alpha');
28-
28+
2929
return '<div class="btn-group">
3030
<a class="btn btn-default" id="qn-mediasort-toggle" title="' . $title . '">
3131
<i class="fa ' . $icon . '"></i>
@@ -54,4 +54,4 @@ function getCookie(name) {
5454
});
5555
</script>';
5656
}
57-
}
57+
}

lib/QuickNavigation/Media/MediaSorter.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class MediaSorter
1111
{
1212
/**
1313
* Verändert die Sortierung der Medienliste je nach Einstellung im Cookie
14-
*
14+
*
1515
* @param rex_extension_point $ep
1616
* @return string
1717
*/
@@ -20,26 +20,26 @@ public static function modifyMediaListQuery(rex_extension_point $ep): string
2020
// Nur ausführen, wenn der Benutzer die Berechtigung hat und die Funktion aktiviert ist
2121
$user = rex::getUser()->getId();
2222
$package = rex_addon::get('quick_navigation');
23-
23+
2424
if (!rex::getUser() || $package->getConfig('quick_navigation_mediasort' . $user) !== '1') {
2525
return $ep->getSubject();
2626
}
27-
27+
2828
// Aktuellen Sortierstatus aus dem Cookie auslesen
2929
$sortMode = rex_request::cookie('media_sort_alphabetical', 'string', 'false');
30-
30+
3131
// Wenn alphabetische Sortierung gewünscht ist
3232
if ($sortMode === 'true') {
3333
$subject = $ep->getSubject();
34-
34+
3535
// Ab REDAXO 5.13.3 ist das korrekte Feld 'f.filename'
3636
$subject = str_replace("f.updatedate", "f.filename, f.updatedate", $subject);
3737
$subject = str_replace("desc", "asc", $subject);
38-
38+
3939
return $subject;
4040
}
41-
41+
4242
// Ansonsten die Standardsortierung beibehalten
4343
return $ep->getSubject();
4444
}
45-
}
45+
}

lib/QuickNavigation/Media/QuickNavigationMedia.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public static function MediaHistory(rex_extension_point $ep): ?string
2727
$subject = $ep->getSubject();
2828
$drophistory = self::GenerateMediaHistoryList();
2929
$custom_media_buttons = rex_extension::registerPoint(new rex_extension_point('QUICK_NAVI_CUSTOM_MEDIA', ''));
30-
30+
3131
// Sortier-Button erzeugen mit drei Zuständen: date -> filename -> title -> date
3232
$sortMode = rex_request::cookie('media_sort_mode', 'string', 'date');
33-
33+
3434
// Icon und Titel basierend auf dem aktuellen Status setzen
3535
switch ($sortMode) {
3636
case 'filename':
@@ -50,7 +50,7 @@ public static function MediaHistory(rex_extension_point $ep): ?string
5050
$nextMode = 'filename';
5151
break;
5252
}
53-
53+
5454
$sortButton = '<div class="btn-group">
5555
<a class="btn btn-default" id="qn-mediasort-toggle" title="' . $title . '">
5656
<i class="fa ' . $icon . '"></i>
@@ -70,13 +70,13 @@ public static function MediaHistory(rex_extension_point $ep): ?string
7070
}
7171
});
7272
</script>';
73-
73+
7474
// History-Button und Sort-Button zusammen hinzufügen
7575
$buttons = $custom_media_buttons . $sortButton . '<div class="input-group-btn quickmedia clearfix">' . $drophistory . '</div>';
76-
76+
7777
// Buttons vor der Kategorieauswahl einfügen
7878
$result = str_replace('<select name="rex_file_category"', $buttons . '<select name="rex_file_category"', $subject);
79-
79+
8080
return $result;
8181
}
8282

@@ -169,22 +169,22 @@ protected static function GenerateFileNavigation(int $file_id, string $opener):
169169

170170
return $quick_file_nav;
171171
}
172-
172+
173173
/**
174174
* Generiert den Sortier-Button für den Medienpool
175175
* Diese Methode wird nicht mehr verwendet, da der Button direkt in MediaHistory generiert wird
176176
*/
177177
public static function GenerateMediaSortButton(): string
178178
{
179179
// Konfigurationsprüfung entfernt, da Button immer angezeigt werden soll
180-
180+
181181
// Aktuellen Sortierstatus aus dem Cookie oder Session auslesen
182182
$sortMode = rex_request::cookie('media_sort_alphabetical', 'string', 'false');
183-
183+
184184
// Icon und Titel basierend auf dem aktuellen Status setzen
185185
$icon = $sortMode === 'true' ? 'fa-sort-alpha-asc' : 'fa-sort-numeric-desc';
186186
$title = $sortMode === 'true' ? rex_i18n::msg('quick_navigation_media_sort_date') : rex_i18n::msg('quick_navigation_media_sort_alpha');
187-
187+
188188
return '<div class="btn-group">
189189
<a class="btn btn-default" id="qn-mediasort-toggle" title="' . $title . '">
190190
<i class="fa ' . $icon . '"></i>
@@ -213,22 +213,22 @@ function getCookie(name) {
213213
});
214214
</script>';
215215
}
216-
216+
217217
/**
218218
* Verändert die Sortierung der Medienliste je nach Einstellung im Cookie
219-
*
219+
*
220220
* @param rex_extension_point<string> $ep
221221
*/
222222
public static function ModifyMediaListQuery(rex_extension_point $ep): string
223223
{
224224
// Aktuellen Sortierstatus aus dem Cookie auslesen
225225
$sortMode = rex_request::cookie('media_sort_mode', 'string', 'date');
226-
226+
227227
$subject = $ep->getSubject();
228-
228+
229229
// Debug-Information ausgeben
230230
error_log('Original SQL: ' . $subject);
231-
231+
232232
// Je nach Sortiermodus die SQL-Abfrage anpassen
233233
if (strpos($subject, 'ORDER BY') !== false) {
234234
switch ($sortMode) {
@@ -261,7 +261,7 @@ public static function ModifyMediaListQuery(rex_extension_point $ep): string
261261
break;
262262
}
263263
}
264-
264+
265265
error_log('Modified SQL: ' . $subject);
266266
return $subject;
267267
}

vendor/composer/installed.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?php return array(
22
'root' => array(
33
'name' => '__root__',
4-
'pretty_version' => 'dev-main',
5-
'version' => 'dev-main',
6-
'reference' => 'cf546f1f23df22cb24bb77950c065ddbab7f6ee0',
4+
'pretty_version' => 'dev-75bd1472d07f7fbc4e875729b8e0217e3f9ab20e',
5+
'version' => 'dev-75bd1472d07f7fbc4e875729b8e0217e3f9ab20e',
6+
'reference' => '75bd1472d07f7fbc4e875729b8e0217e3f9ab20e',
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
1010
'dev' => true,
1111
),
1212
'versions' => array(
1313
'__root__' => array(
14-
'pretty_version' => 'dev-main',
15-
'version' => 'dev-main',
16-
'reference' => 'cf546f1f23df22cb24bb77950c065ddbab7f6ee0',
14+
'pretty_version' => 'dev-75bd1472d07f7fbc4e875729b8e0217e3f9ab20e',
15+
'version' => 'dev-75bd1472d07f7fbc4e875729b8e0217e3f9ab20e',
16+
'reference' => '75bd1472d07f7fbc4e875729b8e0217e3f9ab20e',
1717
'type' => 'library',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),

0 commit comments

Comments
 (0)