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 5eef250..e7258c9 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -8,39 +8,39 @@ use phpOMS\Router\RouteVerb; return [ '^.*/editor.*$' => [ [ - 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::DOC, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::DOC, ], ], [ - 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::DOC, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::DOC, ], ], [ - 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorGet', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorGet', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DOC, + 'type' => PermissionType::READ, + 'state' => PermissionState::DOC, ], ], [ - 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::DELETE, - 'state' => PermissionState::DOC, + 'type' => PermissionType::DELETE, + 'state' => PermissionState::DOC, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index d6e57aa..c5e0166 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,54 +8,54 @@ use phpOMS\Router\RouteVerb; return [ '^.*/editor/create.*$' => [ [ - 'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::DOC, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::DOC, ], ], [ - 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::DOC, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::DOC, ], ], ], '^.*/editor/list.*$' => [ [ - 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DOC, + 'type' => PermissionType::READ, + 'state' => PermissionState::DOC, ], ], ], '^.*/editor/single.*$' => [ [ - 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorSingle', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorSingle', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DOC, + 'type' => PermissionType::READ, + 'state' => PermissionState::DOC, ], ], ], '^.*/editor/edit.*$' => [ [ - 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorEdit', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorEdit', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::DOC, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::DOC, ], ], ], diff --git a/Models/EditorDoc.php b/Models/EditorDoc.php index 7a2977c..7d90364 100755 --- a/Models/EditorDoc.php +++ b/Models/EditorDoc.php @@ -288,10 +288,10 @@ class EditorDoc implements \JsonSerializable, ArrayableInterface public function toArray() : array { return [ - 'id' => $this->id, - 'title' => $this->title, - 'plain' => $this->plain, - 'content' => $this->content, + 'id' => $this->id, + 'title' => $this->title, + 'plain' => $this->plain, + 'content' => $this->content, 'createdAt' => $this->createdAt, 'createdBy' => $this->createdBy, ]; diff --git a/Models/EditorDocMapper.php b/Models/EditorDocMapper.php index 3576a3d..ecbe5a2 100755 --- a/Models/EditorDocMapper.php +++ b/Models/EditorDocMapper.php @@ -65,9 +65,9 @@ final class EditorDocMapper extends DataMapperAbstract */ protected static array $hasMany = [ 'tags' => [ - 'mapper' => TagMapper::class, - 'table' => 'editor_doc_tag', - 'self' => 'editor_doc_tag_src', + 'mapper' => TagMapper::class, + 'table' => 'editor_doc_tag', + 'self' => 'editor_doc_tag_src', 'external' => 'editor_doc_tag_dst', ], ]; diff --git a/Theme/Backend/editor-list.tpl.php b/Theme/Backend/editor-list.tpl.php index 33bacd6..100f67f 100755 --- a/Theme/Backend/editor-list.tpl.php +++ b/Theme/Backend/editor-list.tpl.php @@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Created'); ?> $value) : ++$count; - $url = UriFactory::build('{/prefix}editor/single?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/prefix}editor/single?{?}&id=' . $value->getId()); ?> printHtml($value->getTitle()); ?> printHtml($value->getCreatedBy()->getName1()); ?> diff --git a/tests/Models/EditorDocTest.php b/tests/Models/EditorDocTest.php index 972927c..75eb676 100755 --- a/tests/Models/EditorDocTest.php +++ b/tests/Models/EditorDocTest.php @@ -54,10 +54,10 @@ class EditorDocTest extends \PHPUnit\Framework\TestCase self::assertEquals('/some/path', $doc->getPath()); $arr = [ - 'id' => 0, - 'title' => $doc->getTitle(), - 'plain' => $doc->getPlain(), - 'content' => $doc->getContent(), + 'id' => 0, + 'title' => $doc->getTitle(), + 'plain' => $doc->getPlain(), + 'content' => $doc->getContent(), 'createdAt' => $doc->getCreatedAt(), 'createdBy' => $doc->getCreatedBy(), ];