php cs autofix

This commit is contained in:
Dennis Eichhorn 2020-08-31 22:30:36 +02:00
parent 60c41d5880
commit 326a53d57b
8 changed files with 105 additions and 105 deletions

View File

@ -26,7 +26,7 @@ jobs:
- name: Setup Composer - name: Setup Composer
run: composer install run: composer install
- name: Autoformat - 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 - name: Check for modified files
id: git-check id: git-check
run: echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi) run: echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)

View File

@ -8,117 +8,117 @@ use phpOMS\Router\RouteVerb;
return [ return [
'^.*/wiki/doc.*$' => [ '^.*/wiki/doc.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocCreate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
], ],
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocUpdate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
], ],
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocGet', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
], ],
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocDelete', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiDocDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
], ],
], ],
'^.*/wiki/category.*$' => [ '^.*/wiki/category.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryCreate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
], ],
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryUpdate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
], ],
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryGet', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
], ],
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryDelete', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiCategoryDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
], ],
], ],
'^.*/wiki/app.*$' => [ '^.*/wiki/app.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppCreate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],
], ],
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppUpdate', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],
], ],
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppGet', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],
], ],
[ [
'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppDelete', 'dest' => '\Modules\Knowledgebase\Controller\ApiController:apiWikiAppDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::APP, 'state' => PermissionState::APP,
], ],
], ],
], ],

View File

@ -8,89 +8,89 @@ use phpOMS\Router\RouteVerb;
return [ return [
'^.*/wiki.*$' => [ '^.*/wiki.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:setUpBackend', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:setUpBackend',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
], ],
], ],
'^.*/wiki/dashboard.*$' => [ '^.*/wiki/dashboard.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDashboard', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
], ],
], ],
'^.*/wiki/category/list.*$' => [ '^.*/wiki/category/list.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryList', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
], ],
], ],
'^.*/wiki/category/single.*$' => [ '^.*/wiki/category/single.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategory', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategory',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
], ],
], ],
'^.*/wiki/category/create.*$' => [ '^.*/wiki/category/create.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryCreate', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseCategoryCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::CATEGORY, 'state' => PermissionState::CATEGORY,
], ],
], ],
], ],
'^.*/wiki/doc/single.*$' => [ '^.*/wiki/doc/single.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDoc', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDoc',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
], ],
], ],
'^.*/wiki/doc/create.*$' => [ '^.*/wiki/doc/create.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocCreate', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
], ],
], ],
'^.*/wiki/doc/list.*$' => [ '^.*/wiki/doc/list.*$' => [
[ [
'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocList', 'dest' => '\Modules\Knowledgebase\Controller\BackendController:viewKnowledgebaseDocList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WIKI, 'state' => PermissionState::WIKI,
], ],
], ],
], ],

View File

@ -53,7 +53,7 @@ final class WikiCategoryMapper extends DataMapperAbstract
], ],
'app' => [ 'app' => [
'mapper' => WikiAppMapper::class, 'mapper' => WikiAppMapper::class,
'self' => 'wiki_category_app', 'self' => 'wiki_category_app',
], ],
]; ];

View File

@ -51,9 +51,9 @@ final class WikiDocMapper extends DataMapperAbstract
*/ */
protected static array $hasMany = [ protected static array $hasMany = [
'tags' => [ 'tags' => [
'mapper' => TagMapper::class, 'mapper' => TagMapper::class,
'table' => 'wiki_tag', 'table' => 'wiki_tag',
'self' => 'wiki_tag_src', 'self' => 'wiki_tag_src',
'external' => 'wiki_tag_dst', 'external' => 'wiki_tag_dst',
], ],
]; ];
@ -71,7 +71,7 @@ final class WikiDocMapper extends DataMapperAbstract
], ],
'app' => [ 'app' => [
'mapper' => WikiAppMapper::class, 'mapper' => WikiAppMapper::class,
'self' => 'wiki_article_app', 'self' => 'wiki_article_app',
], ],
]; ];

View File

@ -13,14 +13,14 @@
declare(strict_types=1); declare(strict_types=1);
return ['Knowledgebase' => [ return ['Knowledgebase' => [
'Active' => 'Aktiv', 'Active' => 'Aktiv',
'App' => 'App', 'App' => 'App',
'Categories' => 'Kategorien', 'Categories' => 'Kategorien',
'Category' => 'Kategorie', 'Category' => 'Kategorie',
'Draft' => 'Draft', 'Draft' => 'Draft',
'Language' => 'Sprache', 'Language' => 'Sprache',
'Name' => 'Name', 'Name' => 'Name',
'Parent' => 'Übergeordnet', 'Parent' => 'Übergeordnet',
'Wiki' => 'Wiki', 'Wiki' => 'Wiki',
'Status' => 'Status', 'Status' => 'Status',
]]; ]];

View File

@ -13,14 +13,14 @@
declare(strict_types=1); declare(strict_types=1);
return ['Knowledgebase' => [ return ['Knowledgebase' => [
'Active' => 'Active', 'Active' => 'Active',
'App' => 'App', 'App' => 'App',
'Categories' => 'Categories', 'Categories' => 'Categories',
'Category' => 'Category', 'Category' => 'Category',
'Draft' => 'Draft', 'Draft' => 'Draft',
'Language' => 'Language', 'Language' => 'Language',
'Name' => 'Name', 'Name' => 'Name',
'Parent' => 'Parent', 'Parent' => 'Parent',
'Wiki' => 'Wiki', 'Wiki' => 'Wiki',
'Status' => 'Status', 'Status' => 'Status',
]]; ]];

View File

@ -18,7 +18,7 @@ use phpOMS\Uri\UriFactory;
/** @var \Modules\Knowledgebase\Models\WikiDoc $wiki */ /** @var \Modules\Knowledgebase\Models\WikiDoc $wiki */
$wiki = $this->getData('doc') ?? new NullWikiDoc(); $wiki = $this->getData('doc') ?? new NullWikiDoc();
$isNewDoc = $wiki instanceof NullWikiDoc; $isNewDoc = $wiki instanceof NullWikiDoc;
$languages = \phpOMS\Localization\ISO639Enum::getConstants(); $languages = \phpOMS\Localization\ISO639Enum::getConstants();
/** @var \phpOMS\Views\View $this */ /** @var \phpOMS\Views\View $this */