From 326a53d57b8b10d02b486d5b160138717cffd210 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/Api.php | 96 +++++++++++++-------------- Admin/Routes/Web/Backend.php | 64 +++++++++--------- Models/WikiCategoryMapper.php | 2 +- Models/WikiDocMapper.php | 8 +-- Theme/Backend/Lang/de.lang.php | 18 ++--- Theme/Backend/Lang/en.lang.php | 18 ++--- Theme/Backend/wiki-doc-create.tpl.php | 2 +- 8 files changed, 105 insertions(+), 105 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/Api.php b/Admin/Routes/Web/Api.php index 723ad7e..f26d2ef 100644 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -8,117 +8,117 @@ use phpOMS\Router\RouteVerb; return [ '^.*/wiki/doc.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::WIKI, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::WIKI, ], ], [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::WIKI, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::WIKI, ], ], [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::WIKI, + 'type' => PermissionType::READ, + 'state' => PermissionState::WIKI, ], ], [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::DELETE, - 'state' => PermissionState::WIKI, + 'type' => PermissionType::DELETE, + 'state' => PermissionState::WIKI, ], ], ], '^.*/wiki/category.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::CATEGORY, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::CATEGORY, ], ], [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::CATEGORY, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::CATEGORY, ], ], [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::CATEGORY, + 'type' => PermissionType::READ, + 'state' => PermissionState::CATEGORY, ], ], [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::DELETE, - 'state' => PermissionState::CATEGORY, + 'type' => PermissionType::DELETE, + 'state' => PermissionState::CATEGORY, ], ], ], '^.*/wiki/app.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::APP, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::APP, ], ], [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::APP, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::APP, ], ], [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::APP, + 'type' => PermissionType::READ, + 'state' => PermissionState::APP, ], ], [ - 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::DELETE, - 'state' => PermissionState::APP, + 'type' => PermissionType::DELETE, + 'state' => PermissionState::APP, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 1a20031..4ad0c05 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,89 +8,89 @@ use phpOMS\Router\RouteVerb; return [ '^.*/wiki.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\BackendController:setUpBackend', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\BackendController:setUpBackend', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::WIKI, + 'type' => PermissionType::READ, + 'state' => PermissionState::WIKI, ], ], ], '^.*/wiki/dashboard.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDashboard', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDashboard', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::WIKI, + 'type' => PermissionType::READ, + 'state' => PermissionState::WIKI, ], ], ], '^.*/wiki/category/list.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::CATEGORY, + 'type' => PermissionType::READ, + 'state' => PermissionState::CATEGORY, ], ], ], '^.*/wiki/category/single.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategory', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategory', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::CATEGORY, + 'type' => PermissionType::READ, + 'state' => PermissionState::CATEGORY, ], ], ], '^.*/wiki/category/create.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::CATEGORY, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::CATEGORY, ], ], ], '^.*/wiki/doc/single.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDoc', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDoc', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::WIKI, + 'type' => PermissionType::READ, + 'state' => PermissionState::WIKI, ], ], ], '^.*/wiki/doc/create.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::WIKI, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::WIKI, ], ], ], '^.*/wiki/doc/list.*$' => [ [ - 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::WIKI, + 'type' => PermissionType::READ, + 'state' => PermissionState::WIKI, ], ], ], diff --git a/Models/WikiCategoryMapper.php b/Models/WikiCategoryMapper.php index 9c6c11a..58044ff 100755 --- a/Models/WikiCategoryMapper.php +++ b/Models/WikiCategoryMapper.php @@ -53,7 +53,7 @@ final class WikiCategoryMapper extends DataMapperAbstract ], 'app' => [ 'mapper' => WikiAppMapper::class, - 'self' => 'wiki_category_app', + 'self' => 'wiki_category_app', ], ]; diff --git a/Models/WikiDocMapper.php b/Models/WikiDocMapper.php index 934c493..5c57e2c 100755 --- a/Models/WikiDocMapper.php +++ b/Models/WikiDocMapper.php @@ -51,9 +51,9 @@ final class WikiDocMapper extends DataMapperAbstract */ protected static array $hasMany = [ 'tags' => [ - 'mapper' => TagMapper::class, - 'table' => 'wiki_tag', - 'self' => 'wiki_tag_src', + 'mapper' => TagMapper::class, + 'table' => 'wiki_tag', + 'self' => 'wiki_tag_src', 'external' => 'wiki_tag_dst', ], ]; @@ -71,7 +71,7 @@ final class WikiDocMapper extends DataMapperAbstract ], 'app' => [ 'mapper' => WikiAppMapper::class, - 'self' => 'wiki_article_app', + 'self' => 'wiki_article_app', ], ]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index c022b6d..5e43fc1 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -13,14 +13,14 @@ declare(strict_types=1); return ['Knowledgebase' => [ - 'Active' => 'Aktiv', - 'App' => 'App', - 'Categories' => 'Kategorien', - 'Category' => 'Kategorie', - 'Draft' => 'Draft', + 'Active' => 'Aktiv', + 'App' => 'App', + 'Categories' => 'Kategorien', + 'Category' => 'Kategorie', + 'Draft' => 'Draft', 'Language' => 'Sprache', - 'Name' => 'Name', - 'Parent' => 'Übergeordnet', - 'Wiki' => 'Wiki', - 'Status' => 'Status', + 'Name' => 'Name', + 'Parent' => 'Übergeordnet', + 'Wiki' => 'Wiki', + 'Status' => 'Status', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 5459f24..d0efcb1 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,14 +13,14 @@ declare(strict_types=1); return ['Knowledgebase' => [ - 'Active' => 'Active', - 'App' => 'App', - 'Categories' => 'Categories', - 'Category' => 'Category', - 'Draft' => 'Draft', + 'Active' => 'Active', + 'App' => 'App', + 'Categories' => 'Categories', + 'Category' => 'Category', + 'Draft' => 'Draft', 'Language' => 'Language', - 'Name' => 'Name', - 'Parent' => 'Parent', - 'Wiki' => 'Wiki', - 'Status' => 'Status', + 'Name' => 'Name', + 'Parent' => 'Parent', + 'Wiki' => 'Wiki', + 'Status' => 'Status', ]]; diff --git a/Theme/Backend/wiki-doc-create.tpl.php b/Theme/Backend/wiki-doc-create.tpl.php index fbe862e..1299f20 100755 --- a/Theme/Backend/wiki-doc-create.tpl.php +++ b/Theme/Backend/wiki-doc-create.tpl.php @@ -18,7 +18,7 @@ use phpOMS\Uri\UriFactory; /** @var \Modules\Knowledgebase\Models\WikiDoc $wiki */ $wiki = $this->getData('doc') ?? new NullWikiDoc(); -$isNewDoc = $wiki instanceof NullWikiDoc; +$isNewDoc = $wiki instanceof NullWikiDoc; $languages = \phpOMS\Localization\ISO639Enum::getConstants(); /** @var \phpOMS\Views\View $this */