Jingga/oms-Editor
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Editor.git synced 2026-02-15 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

php cs autofix

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-08-31 22:30:36 +02:00
parent cbc477133d
commit 5123994638
7 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
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)

32
Admin/Routes/Web/Api.php
View File

@ -8,39 +8,39 @@ use phpOMS\Router\RouteVerb;
return [ return [
'^.*/editor.*$' => [ '^.*/editor.*$' => [
[ [
'dest' => '\Modules\Editor\Controller\ApiController:apiEditorCreate', 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
], ],
[ [
'dest' => '\Modules\Editor\Controller\ApiController:apiEditorUpdate', 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
], ],
[ [
'dest' => '\Modules\Editor\Controller\ApiController:apiEditorGet', 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
], ],
[ [
'dest' => '\Modules\Editor\Controller\ApiController:apiEditorDelete', 'dest' => '\Modules\Editor\Controller\ApiController:apiEditorDelete',
'verb' => RouteVerb::DELETE, 'verb' => RouteVerb::DELETE,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::DELETE, 'type' => PermissionType::DELETE,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
], ],
], ],

40
Admin/Routes/Web/Backend.php
View File

@ -8,54 +8,54 @@ use phpOMS\Router\RouteVerb;
return [ return [
'^.*/editor/create.*$' => [ '^.*/editor/create.*$' => [
[ [
'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor', 'dest' => '\Modules\Editor\Controller\BackendController:setUpEditorEditor',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
], ],
[ [
'dest' => '\Modules\Editor\Controller\BackendController:viewEditorCreate', 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
], ],
], ],
'^.*/editor/list.*$' => [ '^.*/editor/list.*$' => [
[ [
'dest' => '\Modules\Editor\Controller\BackendController:viewEditorList', 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
], ],
], ],
'^.*/editor/single.*$' => [ '^.*/editor/single.*$' => [
[ [
'dest' => '\Modules\Editor\Controller\BackendController:viewEditorSingle', 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorSingle',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
], ],
], ],
'^.*/editor/edit.*$' => [ '^.*/editor/edit.*$' => [
[ [
'dest' => '\Modules\Editor\Controller\BackendController:viewEditorEdit', 'dest' => '\Modules\Editor\Controller\BackendController:viewEditorEdit',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::MODIFY, 'type' => PermissionType::MODIFY,
'state' => PermissionState::DOC, 'state' => PermissionState::DOC,
], ],
], ],
], ],

8
Models/EditorDoc.php
View File

@ -288,10 +288,10 @@ class EditorDoc implements \JsonSerializable, ArrayableInterface
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'title' => $this->title, 'title' => $this->title,
'plain' => $this->plain, 'plain' => $this->plain,
'content' => $this->content, 'content' => $this->content,
'createdAt' => $this->createdAt, 'createdAt' => $this->createdAt,
'createdBy' => $this->createdBy, 'createdBy' => $this->createdBy,
]; ];

6
Models/EditorDocMapper.php
View File

@ -65,9 +65,9 @@ final class EditorDocMapper extends DataMapperAbstract
*/ */
protected static array $hasMany = [ protected static array $hasMany = [
'tags' => [ 'tags' => [
'mapper' => TagMapper::class, 'mapper' => TagMapper::class,
'table' => 'editor_doc_tag', 'table' => 'editor_doc_tag',
'self' => 'editor_doc_tag_src', 'self' => 'editor_doc_tag_src',
'external' => 'editor_doc_tag_dst', 'external' => 'editor_doc_tag_dst',
], ],
]; ];

2
Theme/Backend/editor-list.tpl.php
View File

@ -38,7 +38,7 @@ echo $this->getData('nav')->render(); ?>
<td><?= $this->getHtml('Created'); ?> <td><?= $this->getHtml('Created'); ?>
<tbody> <tbody>
<?php $count = 0; foreach ($docs as $key => $value) : ++$count; <?php $count = 0; foreach ($docs as $key => $value) : ++$count;
$url = UriFactory::build('{/prefix}editor/single?{?}&id=' . $value->getId()); ?> $url = UriFactory::build('{/prefix}editor/single?{?}&id=' . $value->getId()); ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a> <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
<td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a> <td data-label="<?= $this->getHtml('Creator'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a>

8
tests/Models/EditorDocTest.php
View File

@ -54,10 +54,10 @@ class EditorDocTest extends \PHPUnit\Framework\TestCase
self::assertEquals('/some/path', $doc->getPath()); self::assertEquals('/some/path', $doc->getPath());
$arr = [ $arr = [
'id' => 0, 'id' => 0,
'title' => $doc->getTitle(), 'title' => $doc->getTitle(),
'plain' => $doc->getPlain(), 'plain' => $doc->getPlain(),
'content' => $doc->getContent(), 'content' => $doc->getContent(),
'createdAt' => $doc->getCreatedAt(), 'createdAt' => $doc->getCreatedAt(),
'createdBy' => $doc->getCreatedBy(), 'createdBy' => $doc->getCreatedBy(),
]; ];