From e832f60d3021547d4b1cc359da8cfd859e30694d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 28 May 2023 12:19:03 +0000 Subject: [PATCH] phpcs autofixes --- .github/workflows/main.yml | 2 +- Admin/Routes/Web/Api.php | 5 ----- Admin/Routes/Web/Backend.php | 6 ------ Controller/BackendController.php | 7 ------- Models/Attribute.php | 4 ++-- Models/AttributeMapper.php | 2 +- Models/AttributeValueMapper.php | 16 ++++++++-------- Theme/Backend/Lang/en.lang.php | 18 +++++++++--------- tests/Controller/ApiControllerTest.php | 12 ++++++------ 9 files changed, 27 insertions(+), 45 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6dcd721..e8d598e 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, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "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": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": 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_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": {"replacements": {"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": 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, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align", ">>=": "align", "<<=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "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": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": 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_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": {"replacements": {"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": 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 76c7635..f8b3c4d 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -12,10 +12,5 @@ */ declare(strict_types=1); -use Modules\Attribute\Controller\ApiController; -use Modules\Attribute\Models\PermissionCategory; -use phpOMS\Account\PermissionType; -use phpOMS\Router\RouteVerb; - return [ ]; diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 46661de..f8b3c4d 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -12,11 +12,5 @@ */ declare(strict_types=1); -use Modules\Attribute\Controller\BackendController; -use Modules\Attribute\Models\PermissionCategory; -use phpOMS\Account\PermissionType; -use phpOMS\Router\RouteVerb; - return [ - ]; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 6450f4c..d915443 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -14,12 +14,6 @@ declare(strict_types=1); namespace Modules\Attribute\Controller; -use phpOMS\Asset\AssetType; -use phpOMS\Contract\RenderableInterface; -use phpOMS\Message\RequestAbstract; -use phpOMS\Message\ResponseAbstract; -use phpOMS\Views\View; - /** * Attribute controller class. * @@ -30,5 +24,4 @@ use phpOMS\Views\View; */ final class BackendController extends Controller { - } diff --git a/Models/Attribute.php b/Models/Attribute.php index af3fa63..8feeddf 100755 --- a/Models/Attribute.php +++ b/Models/Attribute.php @@ -69,7 +69,7 @@ class Attribute implements \JsonSerializable public function deepClone() : self { - $clone = clone $this; + $clone = clone $this; $clone->value = clone $this->value; return $clone; @@ -94,7 +94,7 @@ class Attribute implements \JsonSerializable { return [ 'id' => $this->id, - 'ref' => $this->ref, + 'ref' => $this->ref, 'type' => $this->type, 'value' => $this->value, ]; diff --git a/Models/AttributeMapper.php b/Models/AttributeMapper.php index 1f372e9..f4773a0 100755 --- a/Models/AttributeMapper.php +++ b/Models/AttributeMapper.php @@ -37,7 +37,7 @@ final class AttributeMapper extends DataMapperFactory */ public const COLUMNS = [ 'attribute_attr_id' => ['name' => 'attribute_attr_id', 'type' => 'int', 'internal' => 'id'], - 'attribute_attr_ref' => ['name' => 'attribute_attr_ref', 'type' => 'int', 'internal' => 'ref'], + 'attribute_attr_ref' => ['name' => 'attribute_attr_ref', 'type' => 'int', 'internal' => 'ref'], 'attribute_attr_type' => ['name' => 'attribute_attr_type', 'type' => 'int', 'internal' => 'type'], 'attribute_attr_value' => ['name' => 'attribute_attr_value', 'type' => 'int', 'internal' => 'value'], ]; diff --git a/Models/AttributeValueMapper.php b/Models/AttributeValueMapper.php index 6cae408..35411de 100755 --- a/Models/AttributeValueMapper.php +++ b/Models/AttributeValueMapper.php @@ -36,14 +36,14 @@ final class AttributeValueMapper extends DataMapperFactory * @since 1.0.0 */ public const COLUMNS = [ - 'attribute_attr_value_id' => ['name' => 'attribute_attr_value_id', 'type' => 'int', 'internal' => 'id'], - 'attribute_attr_value_default' => ['name' => 'attribute_attr_value_default', 'type' => 'bool', 'internal' => 'isDefault'], - 'attribute_attr_value_valueStr' => ['name' => 'attribute_attr_value_valueStr', 'type' => 'string', 'internal' => 'valueStr'], - 'attribute_attr_value_valueInt' => ['name' => 'attribute_attr_value_valueInt', 'type' => 'int', 'internal' => 'valueInt'], - 'attribute_attr_value_valueDec' => ['name' => 'attribute_attr_value_valueDec', 'type' => 'float', 'internal' => 'valueDec'], - 'attribute_attr_value_valueDat' => ['name' => 'attribute_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'], - 'attribute_attr_value_unit' => ['name' => 'attribute_attr_value_unit', 'type' => 'string', 'internal' => 'unit'], - 'attribute_attr_value_deptype' => ['name' => 'attribute_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'], + 'attribute_attr_value_id' => ['name' => 'attribute_attr_value_id', 'type' => 'int', 'internal' => 'id'], + 'attribute_attr_value_default' => ['name' => 'attribute_attr_value_default', 'type' => 'bool', 'internal' => 'isDefault'], + 'attribute_attr_value_valueStr' => ['name' => 'attribute_attr_value_valueStr', 'type' => 'string', 'internal' => 'valueStr'], + 'attribute_attr_value_valueInt' => ['name' => 'attribute_attr_value_valueInt', 'type' => 'int', 'internal' => 'valueInt'], + 'attribute_attr_value_valueDec' => ['name' => 'attribute_attr_value_valueDec', 'type' => 'float', 'internal' => 'valueDec'], + 'attribute_attr_value_valueDat' => ['name' => 'attribute_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'], + 'attribute_attr_value_unit' => ['name' => 'attribute_attr_value_unit', 'type' => 'string', 'internal' => 'unit'], + 'attribute_attr_value_deptype' => ['name' => 'attribute_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'], 'attribute_attr_value_depvalue' => ['name' => 'attribute_attr_value_depvalue', 'type' => 'int', 'internal' => 'dependingAttributeValue'], ]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index a90c494..0711d22 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -14,13 +14,13 @@ declare(strict_types=1); return ['Attribute' => [ 'AttributeTypes' => 'Attribute Types', - 'Attribute' => 'Attribute', - 'Name' => 'Name', - 'Title' => 'Title', - 'Datatype' => 'Datatype', - 'Status' => 'Status', - 'DefaultValues' => 'Default Values', - 'Pattern' => 'Pattern', - 'IsRequired' => 'Is required?', - 'CustomValue' => 'Custom values allowed?', + 'Attribute' => 'Attribute', + 'Name' => 'Name', + 'Title' => 'Title', + 'Datatype' => 'Datatype', + 'Status' => 'Status', + 'DefaultValues' => 'Default Values', + 'Pattern' => 'Pattern', + 'IsRequired' => 'Is required?', + 'CustomValue' => 'Custom values allowed?', ]]; diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 35ddb8d..2cfe759 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -48,13 +48,13 @@ final class ControllerTest extends \PHPUnit\Framework\TestCase protected string $appName = 'Api'; }; - $this->app->dbPool = $GLOBALS['dbpool']; + $this->app->dbPool = $GLOBALS['dbpool']; $this->app->unitId = 1; - $this->app->accountManager = new AccountManager($GLOBALS['session']); - $this->app->appSettings = new CoreSettings(); - $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../Modules/'); - $this->app->dispatcher = new Dispatcher($this->app); - $this->app->eventManager = new EventManager($this->app->dispatcher); + $this->app->accountManager = new AccountManager($GLOBALS['session']); + $this->app->appSettings = new CoreSettings(); + $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../Modules/'); + $this->app->dispatcher = new Dispatcher($this->app); + $this->app->eventManager = new EventManager($this->app->dispatcher); $this->app->eventManager->importFromFile(__DIR__ . '/../../../Web/Api/Hooks.php'); $this->app->l11nManager = new L11nManager();