From ebcba76ddf9987e85528c6a86cf2fce552b99b27 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 31 Aug 2020 22:30:36 +0200 Subject: [PATCH] php cs autofix --- .github/workflows/main.yml | 2 +- Admin/Routes/Web/Backend.php | 32 +++++++++++++++--------------- Models/ClientMapper.php | 12 +++++------ Theme/Backend/clients-list.tpl.php | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d44f65c..e942af8 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 5222ad5..c0b6f3a 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,45 +8,45 @@ use phpOMS\Router\RouteVerb; return [ '^.*/sales/client/list.*$' => [ [ - 'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::CLIENT, + 'type' => PermissionType::READ, + 'state' => PermissionState::CLIENT, ], ], ], '^.*/sales/client/create.*$' => [ [ - 'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::CLIENT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::CLIENT, ], ], ], '^.*/sales/client/profile.*$' => [ [ - 'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientProfile', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientProfile', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::CLIENT, + 'type' => PermissionType::READ, + 'state' => PermissionState::CLIENT, ], ], ], '^.*/sales/client/analysis.*$' => [ [ - 'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientAnalysis', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\ClientManagement\Controller\BackendController:viewClientManagementClientAnalysis', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::ANALYSIS, + 'type' => PermissionType::READ, + 'state' => PermissionState::ANALYSIS, ], ], ], diff --git a/Models/ClientMapper.php b/Models/ClientMapper.php index e329b1f..2ae971e 100644 --- a/Models/ClientMapper.php +++ b/Models/ClientMapper.php @@ -91,16 +91,16 @@ final class ClientMapper extends DataMapperAbstract */ protected static array $hasMany = [ 'files' => [ - 'mapper' => MediaMapper::class, /* mapper of the related object */ - 'table' => 'clientmgmt_client_media', /* table of the related object, null if no relation table is used (many->1) */ + 'mapper' => MediaMapper::class, /* mapper of the related object */ + 'table' => 'clientmgmt_client_media', /* table of the related object, null if no relation table is used (many->1) */ 'external' => 'clientmgmt_client_media_dst', - 'self' => 'clientmgmt_client_media_src', + 'self' => 'clientmgmt_client_media_src', ], 'contactElements' => [ - 'mapper' => ContactElementMapper::class, - 'table' => 'clientmgmt_client_contactelement', + 'mapper' => ContactElementMapper::class, + 'table' => 'clientmgmt_client_contactelement', 'external' => 'clientmgmt_client_contactelement_dst', - 'self' => 'clientmgmt_client_contactelement_src', + 'self' => 'clientmgmt_client_contactelement_src', ], ]; } diff --git a/Theme/Backend/clients-list.tpl.php b/Theme/Backend/clients-list.tpl.php index 63bbc9d..221133d 100644 --- a/Theme/Backend/clients-list.tpl.php +++ b/Theme/Backend/clients-list.tpl.php @@ -36,7 +36,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Country'); ?> $value) : ++$count; - $url = UriFactory::build('{/prefix}sales/client/profile?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/prefix}sales/client/profile?{?}&id=' . $value->getId()); ?> printHtml($value->getNumber()); ?> printHtml($value->getProfile()->getAccount()->getName1()); ?>