From da548d76e6e6ecdce5990fca9471b29a4cbb73b4 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 | 16 ++++----- Admin/Routes/Web/Backend.php | 40 +++++++++++----------- Controller/ApiController.php | 4 +-- Interfaces/GSD/Model/GSDAddressMapper.php | 26 +++++++------- Interfaces/GSD/Model/GSDArticleMapper.php | 6 ++-- Interfaces/GSD/Model/GSDCostCenter.php | 8 ++--- Interfaces/GSD/Model/GSDCostObject.php | 8 ++--- Interfaces/GSD/Model/GSDSupplierMapper.php | 16 ++++----- Interfaces/OMS/Lang/en.lang.php | 12 +++---- Theme/Backend/exchange-export-list.tpl.php | 2 +- Theme/Backend/exchange-import-list.tpl.php | 2 +- 12 files changed, 71 insertions(+), 71 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 1c28373..02fb4c2 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -8,23 +8,23 @@ use phpOMS\Router\RouteVerb; return [ '^.*/admin/exchange/import/profile.*$' => [ [ - 'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeImport', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeImport', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::IMPORT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::IMPORT, ], ], ], '^.*/admin/exchange/export/profile.*$' => [ [ - 'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeExport', - 'verb' => RouteVerb::SET, + 'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeExport', + 'verb' => RouteVerb::SET, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::EXPORT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::EXPORT, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 26a150b..3f164dd 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,56 +8,56 @@ use phpOMS\Router\RouteVerb; return [ '^.*/admin/exchange/import/list.*$' => [ [ - 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImportList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImportList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::IMPORT, + 'type' => PermissionType::READ, + 'state' => PermissionState::IMPORT, ], ], ], '^.*/admin/exchange/export/list.*$' => [ [ - 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExportList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExportList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::EXPORT, + 'type' => PermissionType::READ, + 'state' => PermissionState::EXPORT, ], ], ], '^.*/admin/exchange/import/profile.*$' => [ [ - 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImport', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImport', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::IMPORT, + 'type' => PermissionType::READ, + 'state' => PermissionState::IMPORT, ], ], ], '^.*/admin/exchange/export/profile.*$' => [ [ - 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExport', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExport', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::EXPORT, + 'type' => PermissionType::READ, + 'state' => PermissionState::EXPORT, ], ], ], '^.*/admin/exchange/dashboard.*$' => [ [ - 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeDashboard', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeDashboard', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DASHBOARD, + 'type' => PermissionType::READ, + 'state' => PermissionState::DASHBOARD, ], ], ], diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 6dd71ff..b00ce8d 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -57,8 +57,8 @@ final class ApiController extends Controller } $response->set($request->getUri()->__toString(), [ - 'status' => $status, - 'title' => 'Exchange', + 'status' => $status, + 'title' => 'Exchange', 'message' => $message, ]); } diff --git a/Interfaces/GSD/Model/GSDAddressMapper.php b/Interfaces/GSD/Model/GSDAddressMapper.php index cf16cf2..cbac02a 100755 --- a/Interfaces/GSD/Model/GSDAddressMapper.php +++ b/Interfaces/GSD/Model/GSDAddressMapper.php @@ -33,19 +33,19 @@ final class GSDAddressMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'AdressRowId' => ['name' => 'AdressRowId', 'type' => 'int', 'internal' => 'id'], - 'row_create_time' => ['name' => 'row_create_time', 'type' => 'DateTime', 'internal' => 'createdAt', 'readonly' => true], - 'row_create_user' => ['name' => 'row_create_user', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], - 'NAME1' => ['name' => 'NAME1', 'type' => 'string', 'internal' => 'name1'], - 'NAME2' => ['name' => 'NAME2', 'type' => 'string', 'internal' => 'name2'], - 'NAME3' => ['name' => 'NAME3', 'type' => 'string', 'internal' => 'name3'], - 'ORT' => ['name' => 'ORT', 'type' => 'string', 'internal' => 'city'], - 'PLZ' => ['name' => 'PLZ', 'type' => 'string', 'internal' => 'zip'], - 'STRASSE' => ['name' => 'STRASSE', 'type' => 'string', 'internal' => 'street'], - 'LAND' => ['name' => 'LAND', 'type' => 'string', 'internal' => 'country'], - 'TELEFON' => ['name' => 'TELEFON', 'type' => 'string', 'internal' => 'phone'], - 'Fax' => ['name' => 'Fax', 'type' => 'string', 'internal' => 'fax'], - 'Email' => ['name' => 'Email', 'type' => 'string', 'internal' => 'email'], + 'AdressRowId' => ['name' => 'AdressRowId', 'type' => 'int', 'internal' => 'id'], + 'row_create_time' => ['name' => 'row_create_time', 'type' => 'DateTime', 'internal' => 'createdAt', 'readonly' => true], + 'row_create_user' => ['name' => 'row_create_user', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], + 'NAME1' => ['name' => 'NAME1', 'type' => 'string', 'internal' => 'name1'], + 'NAME2' => ['name' => 'NAME2', 'type' => 'string', 'internal' => 'name2'], + 'NAME3' => ['name' => 'NAME3', 'type' => 'string', 'internal' => 'name3'], + 'ORT' => ['name' => 'ORT', 'type' => 'string', 'internal' => 'city'], + 'PLZ' => ['name' => 'PLZ', 'type' => 'string', 'internal' => 'zip'], + 'STRASSE' => ['name' => 'STRASSE', 'type' => 'string', 'internal' => 'street'], + 'LAND' => ['name' => 'LAND', 'type' => 'string', 'internal' => 'country'], + 'TELEFON' => ['name' => 'TELEFON', 'type' => 'string', 'internal' => 'phone'], + 'Fax' => ['name' => 'Fax', 'type' => 'string', 'internal' => 'fax'], + 'Email' => ['name' => 'Email', 'type' => 'string', 'internal' => 'email'], 'InternetAdresse' => ['name' => 'InternetAdresse', 'type' => 'string', 'internal' => 'website'], ]; diff --git a/Interfaces/GSD/Model/GSDArticleMapper.php b/Interfaces/GSD/Model/GSDArticleMapper.php index 03c8231..97a55d7 100755 --- a/Interfaces/GSD/Model/GSDArticleMapper.php +++ b/Interfaces/GSD/Model/GSDArticleMapper.php @@ -37,11 +37,11 @@ final class GSDArticleMapper extends DataMapperAbstract 'row_create_time' => ['name' => 'row_create_time', 'type' => 'DateTime', 'internal' => 'createdAt', 'readonly' => true], 'row_create_user' => ['name' => 'row_create_user', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'Artikelnummer' => ['name' => 'Artikelnummer', 'type' => 'string', 'internal' => 'number'], - 'Info' => ['name' => 'Info', 'type' => 'string', 'internal' => 'info'], + 'Info' => ['name' => 'Info', 'type' => 'string', 'internal' => 'info'], 'Artikelbezeichnung' => ['name' => 'Artikelbezeichnung', 'type' => 'string', 'internal' => 'name1'], '_Artikelbezeichnung2' => ['name' => '_Artikelbezeichnung2', 'type' => 'string', 'internal' => 'name2'], - '_Englisch1' => ['name' => '_Englisch1', 'type' => 'string', 'internal' => 'name1Eng'], - '_Englisch2' => ['name' => '_Englisch2', 'type' => 'string', 'internal' => 'name2Eng'], + '_Englisch1' => ['name' => '_Englisch1', 'type' => 'string', 'internal' => 'name1Eng'], + '_Englisch2' => ['name' => '_Englisch2', 'type' => 'string', 'internal' => 'name2Eng'], 'EUWarengruppe' => ['name' => 'EUWarengruppe', 'type' => 'string', 'internal' => 'EUitemgroup'], ]; diff --git a/Interfaces/GSD/Model/GSDCostCenter.php b/Interfaces/GSD/Model/GSDCostCenter.php index 058cf01..12dd03d 100755 --- a/Interfaces/GSD/Model/GSDCostCenter.php +++ b/Interfaces/GSD/Model/GSDCostCenter.php @@ -180,11 +180,11 @@ final class GSDCostCenter implements \JsonSerializable public function toArray() : array { return [ - 'id' => $this->id, - 'createdBy' => $this->createdBy, - 'createdAt' => $this->createdAt, + 'id' => $this->id, + 'createdBy' => $this->createdBy, + 'createdAt' => $this->createdAt, 'description' => $this->description, - 'costcenter' => $this->costCenter, + 'costcenter' => $this->costCenter, ]; } diff --git a/Interfaces/GSD/Model/GSDCostObject.php b/Interfaces/GSD/Model/GSDCostObject.php index 495d6b4..7320b0a 100755 --- a/Interfaces/GSD/Model/GSDCostObject.php +++ b/Interfaces/GSD/Model/GSDCostObject.php @@ -180,11 +180,11 @@ final class GSDCostObject implements \JsonSerializable public function toArray() : array { return [ - 'id' => $this->id, - 'createdBy' => $this->createdBy, - 'createdAt' => $this->createdAt, + 'id' => $this->id, + 'createdBy' => $this->createdBy, + 'createdAt' => $this->createdAt, 'description' => $this->description, - 'costObject' => $this->costObject, + 'costObject' => $this->costObject, ]; } diff --git a/Interfaces/GSD/Model/GSDSupplierMapper.php b/Interfaces/GSD/Model/GSDSupplierMapper.php index 840ceb1..6a8cfb4 100755 --- a/Interfaces/GSD/Model/GSDSupplierMapper.php +++ b/Interfaces/GSD/Model/GSDSupplierMapper.php @@ -33,15 +33,15 @@ final class GSDSupplierMapper extends DataMapperAbstract * @since 1.0.0 */ protected static array $columns = [ - 'row_id' => ['name' => 'row_id', 'type' => 'int', 'internal' => 'id'], - 'row_create_time' => ['name' => 'row_create_time', 'type' => 'DateTime', 'internal' => 'createdAt', 'readonly' => true], - 'row_create_user' => ['name' => 'row_create_user', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], + 'row_id' => ['name' => 'row_id', 'type' => 'int', 'internal' => 'id'], + 'row_create_time' => ['name' => 'row_create_time', 'type' => 'DateTime', 'internal' => 'createdAt', 'readonly' => true], + 'row_create_user' => ['name' => 'row_create_user', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], 'LieferantenNummer' => ['name' => 'LieferantenNummer', 'type' => 'string', 'internal' => 'number'], - 'Info' => ['name' => 'Info', 'type' => 'string', 'internal' => 'info'], - 'Auftragssperre' => ['name' => 'Auftragssperre', 'type' => 'string', 'internal' => 'deliveryStatus'], - 'Steuernummer' => ['name' => 'Steuernummer', 'type' => 'string', 'internal' => 'taxid'], - 'BIC' => ['name' => 'BIC', 'type' => 'string', 'internal' => 'bic'], - 'IBAN' => ['name' => 'IBAN', 'type' => 'string', 'internal' => 'iban'], + 'Info' => ['name' => 'Info', 'type' => 'string', 'internal' => 'info'], + 'Auftragssperre' => ['name' => 'Auftragssperre', 'type' => 'string', 'internal' => 'deliveryStatus'], + 'Steuernummer' => ['name' => 'Steuernummer', 'type' => 'string', 'internal' => 'taxid'], + 'BIC' => ['name' => 'BIC', 'type' => 'string', 'internal' => 'bic'], + 'IBAN' => ['name' => 'IBAN', 'type' => 'string', 'internal' => 'iban'], ]; protected static array $ownsOne = [ diff --git a/Interfaces/OMS/Lang/en.lang.php b/Interfaces/OMS/Lang/en.lang.php index f248ad6..5a64598 100755 --- a/Interfaces/OMS/Lang/en.lang.php +++ b/Interfaces/OMS/Lang/en.lang.php @@ -13,12 +13,12 @@ declare(strict_types=1); * @link https://orange-management.org */ return [ - 'Account' => 'Account', - 'Article' => 'Articls', + 'Account' => 'Account', + 'Article' => 'Articls', 'CostCenter' => 'Cost Center', 'CostObject' => 'Cost Object', - 'Customer' => 'Customer', - 'Invoice' => 'Invoice', - 'Options' => 'Options', - 'Supplier' => 'Supplier', + 'Customer' => 'Customer', + 'Invoice' => 'Invoice', + 'Options' => 'Options', + 'Supplier' => 'Supplier', ]; diff --git a/Theme/Backend/exchange-export-list.tpl.php b/Theme/Backend/exchange-export-list.tpl.php index 396347b..a53a896 100755 --- a/Theme/Backend/exchange-export-list.tpl.php +++ b/Theme/Backend/exchange-export-list.tpl.php @@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); getHtml('Title'); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/export/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/export/profile?{?}&id=' . $value->getId()); ?> printHtml($value->getName()); ?> diff --git a/Theme/Backend/exchange-import-list.tpl.php b/Theme/Backend/exchange-import-list.tpl.php index 4b916ef..7c2afb5 100755 --- a/Theme/Backend/exchange-import-list.tpl.php +++ b/Theme/Backend/exchange-import-list.tpl.php @@ -27,7 +27,7 @@ echo $this->getData('nav')->render(); getHtml('Title'); ?> $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/import/profile?{?}&id=' . $value->getId()); ?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/exchange/import/profile?{?}&id=' . $value->getId()); ?> printHtml($value->getName()); ?>