From 88b8359de36d82bb73691fba645169c0acd84dd9 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 | 32 ++++++++++++++++---------------- Admin/Routes/Web/Backend.php | 24 ++++++++++++------------ Models/L11nTagMapper.php | 8 ++++---- Models/TagMapper.php | 10 +++++----- Theme/Backend/tag-list.tpl.php | 2 +- tests/Models/L11nTagTest.php | 12 ++++++------ tests/Models/TagTest.php | 4 ++-- 8 files changed, 47 insertions(+), 47 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 11b2975..1ef2110 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -8,41 +8,41 @@ use phpOMS\Router\RouteVerb; return [ '^.*/tag$' => [ [ - 'dest' => '\Modules\Tag\Controller\ApiController:apiTagCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\Tag\Controller\ApiController:apiTagCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::TAG, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::TAG, ], ], [ - 'dest' => '\Modules\Tag\Controller\ApiController:apiTagUpdate', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Tag\Controller\ApiController:apiTagUpdate', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::MODIFY, - 'state' => PermissionState::TAG, + 'type' => PermissionType::MODIFY, + 'state' => PermissionState::TAG, ], ], [ - 'dest' => '\Modules\Tag\Controller\ApiController:apiTagDelete', - 'verb' => RouteVerb::DELETE, + 'dest' => '\Modules\Tag\Controller\ApiController:apiTagDelete', + 'verb' => RouteVerb::DELETE, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::DELETE, - 'state' => PermissionState::TAG, + 'type' => PermissionType::DELETE, + 'state' => PermissionState::TAG, ], ], ], '^.*/tag/find.*$' => [ [ - 'dest' => '\Modules\Tag\Controller\ApiController:apiTagFind', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Tag\Controller\ApiController:apiTagFind', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::TAG, + 'type' => PermissionType::READ, + 'state' => PermissionState::TAG, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 4f32bed..6d1b3be 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,34 +8,34 @@ use phpOMS\Router\RouteVerb; return [ '^.*/tag/create.*$' => [ [ - 'dest' => '\Modules\Tag\Controller\BackendController:viewTagCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Tag\Controller\BackendController:viewTagCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::TAG, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::TAG, ], ], ], '^.*/tag/list.*$' => [ [ - 'dest' => '\Modules\Tag\Controller\BackendController:viewTagList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Tag\Controller\BackendController:viewTagList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::TAG, + 'type' => PermissionType::READ, + 'state' => PermissionState::TAG, ], ], ], '^.*/tag/single.*$' => [ [ - 'dest' => '\Modules\Tag\Controller\BackendController:viewTagSingle', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Tag\Controller\BackendController:viewTagSingle', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::TAG, + 'type' => PermissionType::READ, + 'state' => PermissionState::TAG, ], ], ], diff --git a/Models/L11nTagMapper.php b/Models/L11nTagMapper.php index a0b93a1..c17c8d9 100755 --- a/Models/L11nTagMapper.php +++ b/Models/L11nTagMapper.php @@ -50,10 +50,10 @@ final class L11nTagMapper extends DataMapperAbstract */ protected static array $ownsOne = [ 'language' => [ - 'mapper' => LanguageMapper::class, - 'self' => 'tag_l11n_language', - 'by' => 'code2', - 'column' => 'code2', + 'mapper' => LanguageMapper::class, + 'self' => 'tag_l11n_language', + 'by' => 'code2', + 'column' => 'code2', 'conditional' => true, ], ]; diff --git a/Models/TagMapper.php b/Models/TagMapper.php index 455d248..6106710 100755 --- a/Models/TagMapper.php +++ b/Models/TagMapper.php @@ -52,12 +52,12 @@ final class TagMapper extends DataMapperAbstract */ protected static array $hasMany = [ 'title' => [ - 'mapper' => L11nTagMapper::class, - 'table' => 'tag_l11n', - 'external' => 'tag_l11n_tag', - 'column' => 'title', + 'mapper' => L11nTagMapper::class, + 'table' => 'tag_l11n', + 'external' => 'tag_l11n_tag', + 'column' => 'title', 'conditional' => true, - 'self' => null, + 'self' => null, ], ]; diff --git a/Theme/Backend/tag-list.tpl.php b/Theme/Backend/tag-list.tpl.php index affe9eb..6515182 100755 --- a/Theme/Backend/tag-list.tpl.php +++ b/Theme/Backend/tag-list.tpl.php @@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Color'); ?> $value) : ++$count; - $url = UriFactory::build('{/prefix}tag/single?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/prefix}tag/single?{?}&id=' . $value->getId()); ?> printHtml($value->getTitle()); ?>            diff --git a/tests/Models/L11nTagTest.php b/tests/Models/L11nTagTest.php index 45b780f..2fde71b 100644 --- a/tests/Models/L11nTagTest.php +++ b/tests/Models/L11nTagTest.php @@ -32,18 +32,18 @@ class L11nTagTest extends \PHPUnit\Framework\TestCase self::assertEquals(ISO639x1Enum::_EN, $tag->getLanguage()); self::assertEquals( [ - 'id' => 0, - 'title' => '', - 'tag' => 0, + 'id' => 0, + 'title' => '', + 'tag' => 0, 'language' => ISO639x1Enum::_EN, ], $tag->toArray() ); self::assertEquals( [ - 'id' => 0, - 'title' => '', - 'tag' => 0, + 'id' => 0, + 'title' => '', + 'tag' => 0, 'language' => ISO639x1Enum::_EN, ], $tag->jsonSerialize() diff --git a/tests/Models/TagTest.php b/tests/Models/TagTest.php index 6f6c88c..f16ceec 100644 --- a/tests/Models/TagTest.php +++ b/tests/Models/TagTest.php @@ -34,7 +34,7 @@ class TagTest extends \PHPUnit\Framework\TestCase self::assertEquals('', $tag->getTitle()); self::assertEquals( [ - 'id' => 0, + 'id' => 0, 'title' => '', 'color' => '00000000', ], @@ -42,7 +42,7 @@ class TagTest extends \PHPUnit\Framework\TestCase ); self::assertEquals( [ - 'id' => 0, + 'id' => 0, 'title' => '', 'color' => '00000000', ],