From 7162628c2e1f7a2fdaa31330a31f25f1daba28ad 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/Install/Settings.install.php | 12 +-- Admin/Routes/Web/Api.php | 128 +++++++++++++------------- Admin/Routes/Web/Backend.php | 88 +++++++++--------- Theme/Backend/department-list.tpl.php | 2 +- Theme/Backend/organigram.tpl.php | 4 +- Theme/Backend/position-list.tpl.php | 2 +- 7 files changed, 119 insertions(+), 119 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/Install/Settings.install.php b/Admin/Install/Settings.install.php index 8754f8f..d82d50b 100755 --- a/Admin/Install/Settings.install.php +++ b/Admin/Install/Settings.install.php @@ -17,18 +17,18 @@ use Modules\Organization\Models\SettingsEnum; return [ [ - 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_UNIT, + 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_UNIT, 'content' => '1', - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::MODULE_NAME, ], [ - 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_DEPARTMENT, + 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_DEPARTMENT, 'content' => '1', - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::MODULE_NAME, ], [ - 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_POSITION, + 'name' => SettingsEnum::GROUP_GENERATE_AUTOMATICALLY_POSITION, 'content' => '1', - 'module' => ApiController::MODULE_NAME, + 'module' => ApiController::MODULE_NAME, ], ]; diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index a628490..2d51273 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -8,161 +8,161 @@ use phpOMS\Router\RouteVerb; return [ '^.*/organization/position.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::POSITION, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::POSITION, ], ], [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::POSITION, + 'type' => PermissionType::READ, + 'state' => PermissionState::POSITION, ], ], [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionSet', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionSet', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::POSITION, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::POSITION, ], ], [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::DELETE, - 'state' => PermissionState::POSITION, + 'type' => PermissionType::DELETE, + 'state' => PermissionState::POSITION, ], ], ], '^.*/organization/department.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::DEPARTMENT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::DEPARTMENT, ], ], [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DEPARTMENT, + 'type' => PermissionType::READ, + 'state' => PermissionState::DEPARTMENT, ], ], [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentSet', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentSet', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::DEPARTMENT, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::DEPARTMENT, ], ], [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::DELETE, - 'state' => PermissionState::DEPARTMENT, + 'type' => PermissionType::DELETE, + 'state' => PermissionState::DEPARTMENT, ], ], ], '^.*/organization/unit(\?.*|$)' => [ [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::UNIT, ], ], [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::READ, + 'state' => PermissionState::UNIT, ], ], [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitSet', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitSet', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::UNIT, ], ], [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::UNIT, ], ], ], '^.*/organization/unit/image(\?.*|$)' => [ [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitImageSet', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitImageSet', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::UNIT, ], ], ], '^.*/organization/find/unit.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitFind', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiUnitFind', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::READ, + 'state' => PermissionState::UNIT, ], ], ], '^.*/organization/find/department.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentFind', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiDepartmentFind', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DEPARTMENT, + 'type' => PermissionType::READ, + 'state' => PermissionState::DEPARTMENT, ], ], ], '^.*/organization/find/position.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionFind', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\ApiController:apiPositionFind', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::POSITION, + 'type' => PermissionType::READ, + 'state' => PermissionState::POSITION, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 3877b9e..afb6f38 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,120 +8,120 @@ use phpOMS\Router\RouteVerb; return [ '^.*/organization/organigram.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewOrganigram', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewOrganigram', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::ORGANIGRAM, + 'type' => PermissionType::READ, + 'state' => PermissionState::ORGANIGRAM, ], ], ], '^.*/organization/unit/list.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::READ, + 'state' => PermissionState::UNIT, ], ], ], '^.*/organization/unit/profile.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitProfile', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitProfile', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::READ, + 'state' => PermissionState::UNIT, ], ], ], '^.*/organization/unit/create.*$' => [ [ - 'dest' => '\Modules\Media\Controller\BackendController::setUpFileUploader', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Media\Controller\BackendController::setUpFileUploader', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::UNIT, ], ], [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewUnitCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::UNIT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::UNIT, ], ], ], '^.*/organization/department/list.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DEPARTMENT, + 'type' => PermissionType::READ, + 'state' => PermissionState::DEPARTMENT, ], ], ], '^.*/organization/department/profile.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentProfile', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentProfile', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DEPARTMENT, + 'type' => PermissionType::READ, + 'state' => PermissionState::DEPARTMENT, ], ], ], '^.*/organization/department/create.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewDepartmentCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::DEPARTMENT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::DEPARTMENT, ], ], ], '^.*/organization/position/list.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::POSITION, + 'type' => PermissionType::READ, + 'state' => PermissionState::POSITION, ], ], ], '^.*/organization/position/profile.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionProfile', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionProfile', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::POSITION, + 'type' => PermissionType::READ, + 'state' => PermissionState::POSITION, ], ], ], '^.*/organization/position/create.*$' => [ [ - 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Organization\Controller\BackendController:viewPositionCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::POSITION, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::POSITION, ], ], ], diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php index 7c0dfc4..9b67eb5 100755 --- a/Theme/Backend/department-list.tpl.php +++ b/Theme/Backend/department-list.tpl.php @@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Unit'); ?> $value) : ++$c; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}organization/department/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}organization/department/profile?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/organigram.tpl.php b/Theme/Backend/organigram.tpl.php index cb9642a..2520685 100755 --- a/Theme/Backend/organigram.tpl.php +++ b/Theme/Backend/organigram.tpl.php @@ -96,7 +96,7 @@ $unitRoot = $unitTree[null][0]['children']; $depEle = $depEle['children'][0] ?? []; } // if no more children go back to parrent?> - ', $toCloseDep*2); ?> + ', $toCloseDep * 2); ?> @@ -124,7 +124,7 @@ $unitRoot = $unitTree[null][0]['children']; $unitEle = $unitEle['children'][0] ?? []; } // if no more children go back to parrent?> - ', $toCloseUnit*2); ?> + ', $toCloseUnit * 2); ?> diff --git a/Theme/Backend/position-list.tpl.php b/Theme/Backend/position-list.tpl.php index eb1425f..ce434fc 100755 --- a/Theme/Backend/position-list.tpl.php +++ b/Theme/Backend/position-list.tpl.php @@ -39,7 +39,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Department'); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}organization/position/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}organization/position/profile?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> printHtml($value->getName()); ?>