php cs autofix

This commit is contained in:
Dennis Eichhorn 2020-08-31 22:30:36 +02:00
parent a7da6b6995
commit fcd1ffbc6f
5 changed files with 17 additions and 17 deletions

View File

@ -26,7 +26,7 @@ jobs:
- name: Setup Composer
run: composer install
- name: Autoformat
run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes'
run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes'
- name: Check for modified files
id: git-check
run: echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)

View File

@ -8,12 +8,12 @@ use phpOMS\Router\RouteVerb;
return [
'^.*/calendar/dashboard.*$' => [
[
'dest' => '\Modules\Calendar\Controller\BackendController:viewCalendarDashboard',
'verb' => RouteVerb::GET,
'dest' => '\Modules\Calendar\Controller\BackendController:viewCalendarDashboard',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::CALENDAR,
'type' => PermissionType::READ,
'state' => PermissionState::CALENDAR,
],
],
],

View File

@ -51,10 +51,10 @@ final class CalendarMapper extends DataMapperAbstract
*/
protected static array $hasMany = [
'events' => [
'mapper' => EventMapper::class,
'table' => 'calendar_event',
'mapper' => EventMapper::class,
'table' => 'calendar_event',
'external' => 'calendar_event_calendar',
'self' => null,
'self' => null,
],
];

View File

@ -18,14 +18,14 @@
for ($i = 0; $i < 6; ++$i) : ?>
<ul class="days">
<?php for ($j = 0; $j < 7; ++$j) :
$isActiveMonth = ((int) $current[$i*7+$j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth;
$isActiveMonth = ((int) $current[$i * 7 + $j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth;
?>
<?php if ($isActiveMonth) :?>
<li class="day<?= $this->calendar->hasEventOnDate($current[$i*7+$j]) ? ' has-event' : '';?>">
<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
<li class="day<?= $this->calendar->hasEventOnDate($current[$i * 7 + $j]) ? ' has-event' : '';?>">
<div class="date"><?= $current[$i * 7 + $j]->format('d'); ?></div>
<?php else: ?>
<li class="day other-month<?= $this->calendar->hasEventOnDate($current[$i*7+$j]) ? ' has-event' : '';?>">
<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
<li class="day other-month<?= $this->calendar->hasEventOnDate($current[$i * 7 + $j]) ? ' has-event' : '';?>">
<div class="date"><?= $current[$i * 7 + $j]->format('d'); ?></div>
<?php endif; ?>
<?php endfor; ?>
</li>

View File

@ -42,17 +42,17 @@ $calendar = $this->getData('calendar');
for ($i = 0; $i < 6; ++$i) : ?>
<ul class="days">
<?php for ($j = 0; $j < 7; ++$j) :
$isActiveMonth = ((int) $current[$i*7+$j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth;
$isActiveMonth = ((int) $current[$i * 7 + $j]->format('d') === 1) ? !$isActiveMonth : $isActiveMonth;
?>
<?php if ($isActiveMonth) :?>
<li class="day">
<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
<div class="date"><?= $current[$i * 7 + $j]->format('d'); ?></div>
<?php else: ?>
<li class="day other-month">
<div class="date"><?= $current[$i*7+$j]->format('d'); ?></div>
<div class="date"><?= $current[$i * 7 + $j]->format('d'); ?></div>
<?php endif; ?>
<?php
$events = $calendar->getEventByDate($current[$i*7+$j]);
$events = $calendar->getEventByDate($current[$i * 7 + $j]);
foreach ($events as $event) : ?>
<div id="event-tag-<?= $this->printHtml($event->getId()); ?>" class="event">
<div class="event-desc"><?= $this->printHtml($event->getName()); ?></div>