php cs autofix

This commit is contained in:
Dennis Eichhorn 2020-08-31 22:30:36 +02:00
parent 03ef353232
commit da548d76e6
12 changed files with 71 additions and 71 deletions

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)

View File

@ -8,23 +8,23 @@ use phpOMS\Router\RouteVerb;
return [ return [
'^.*/admin/exchange/import/profile.*$' => [ '^.*/admin/exchange/import/profile.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeImport', 'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeImport',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::IMPORT, 'state' => PermissionState::IMPORT,
], ],
], ],
], ],
'^.*/admin/exchange/export/profile.*$' => [ '^.*/admin/exchange/export/profile.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeExport', 'dest' => '\Modules\Exchange\Controller\ApiController:apiExchangeExport',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::EXPORT, 'state' => PermissionState::EXPORT,
], ],
], ],
], ],

View File

@ -8,56 +8,56 @@ use phpOMS\Router\RouteVerb;
return [ return [
'^.*/admin/exchange/import/list.*$' => [ '^.*/admin/exchange/import/list.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImportList', 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImportList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::IMPORT, 'state' => PermissionState::IMPORT,
], ],
], ],
], ],
'^.*/admin/exchange/export/list.*$' => [ '^.*/admin/exchange/export/list.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExportList', 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExportList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::EXPORT, 'state' => PermissionState::EXPORT,
], ],
], ],
], ],
'^.*/admin/exchange/import/profile.*$' => [ '^.*/admin/exchange/import/profile.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImport', 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeImport',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::IMPORT, 'state' => PermissionState::IMPORT,
], ],
], ],
], ],
'^.*/admin/exchange/export/profile.*$' => [ '^.*/admin/exchange/export/profile.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExport', 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeExport',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::EXPORT, 'state' => PermissionState::EXPORT,
], ],
], ],
], ],
'^.*/admin/exchange/dashboard.*$' => [ '^.*/admin/exchange/dashboard.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeDashboard', 'dest' => '\Modules\Exchange\Controller\BackendController:viewExchangeDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DASHBOARD, 'state' => PermissionState::DASHBOARD,
], ],
], ],
], ],

View File

@ -57,8 +57,8 @@ final class ApiController extends Controller
} }
$response->set($request->getUri()->__toString(), [ $response->set($request->getUri()->__toString(), [
'status' => $status, 'status' => $status,
'title' => 'Exchange', 'title' => 'Exchange',
'message' => $message, 'message' => $message,
]); ]);
} }

View File

@ -33,19 +33,19 @@ final class GSDAddressMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ protected static array $columns = [
'AdressRowId' => ['name' => 'AdressRowId', 'type' => 'int', 'internal' => 'id'], 'AdressRowId' => ['name' => 'AdressRowId', 'type' => 'int', 'internal' => 'id'],
'row_create_time' => ['name' => 'row_create_time', 'type' => 'DateTime', 'internal' => 'createdAt', 'readonly' => true], '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_create_user' => ['name' => 'row_create_user', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],
'NAME1' => ['name' => 'NAME1', 'type' => 'string', 'internal' => 'name1'], 'NAME1' => ['name' => 'NAME1', 'type' => 'string', 'internal' => 'name1'],
'NAME2' => ['name' => 'NAME2', 'type' => 'string', 'internal' => 'name2'], 'NAME2' => ['name' => 'NAME2', 'type' => 'string', 'internal' => 'name2'],
'NAME3' => ['name' => 'NAME3', 'type' => 'string', 'internal' => 'name3'], 'NAME3' => ['name' => 'NAME3', 'type' => 'string', 'internal' => 'name3'],
'ORT' => ['name' => 'ORT', 'type' => 'string', 'internal' => 'city'], 'ORT' => ['name' => 'ORT', 'type' => 'string', 'internal' => 'city'],
'PLZ' => ['name' => 'PLZ', 'type' => 'string', 'internal' => 'zip'], 'PLZ' => ['name' => 'PLZ', 'type' => 'string', 'internal' => 'zip'],
'STRASSE' => ['name' => 'STRASSE', 'type' => 'string', 'internal' => 'street'], 'STRASSE' => ['name' => 'STRASSE', 'type' => 'string', 'internal' => 'street'],
'LAND' => ['name' => 'LAND', 'type' => 'string', 'internal' => 'country'], 'LAND' => ['name' => 'LAND', 'type' => 'string', 'internal' => 'country'],
'TELEFON' => ['name' => 'TELEFON', 'type' => 'string', 'internal' => 'phone'], 'TELEFON' => ['name' => 'TELEFON', 'type' => 'string', 'internal' => 'phone'],
'Fax' => ['name' => 'Fax', 'type' => 'string', 'internal' => 'fax'], 'Fax' => ['name' => 'Fax', 'type' => 'string', 'internal' => 'fax'],
'Email' => ['name' => 'Email', 'type' => 'string', 'internal' => 'email'], 'Email' => ['name' => 'Email', 'type' => 'string', 'internal' => 'email'],
'InternetAdresse' => ['name' => 'InternetAdresse', 'type' => 'string', 'internal' => 'website'], 'InternetAdresse' => ['name' => 'InternetAdresse', 'type' => 'string', 'internal' => 'website'],
]; ];

View File

@ -37,11 +37,11 @@ final class GSDArticleMapper extends DataMapperAbstract
'row_create_time' => ['name' => 'row_create_time', 'type' => 'DateTime', 'internal' => 'createdAt', 'readonly' => true], '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_create_user' => ['name' => 'row_create_user', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],
'Artikelnummer' => ['name' => 'Artikelnummer', 'type' => 'string', 'internal' => 'number'], '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'], 'Artikelbezeichnung' => ['name' => 'Artikelbezeichnung', 'type' => 'string', 'internal' => 'name1'],
'_Artikelbezeichnung2' => ['name' => '_Artikelbezeichnung2', 'type' => 'string', 'internal' => 'name2'], '_Artikelbezeichnung2' => ['name' => '_Artikelbezeichnung2', 'type' => 'string', 'internal' => 'name2'],
'_Englisch1' => ['name' => '_Englisch1', 'type' => 'string', 'internal' => 'name1Eng'], '_Englisch1' => ['name' => '_Englisch1', 'type' => 'string', 'internal' => 'name1Eng'],
'_Englisch2' => ['name' => '_Englisch2', 'type' => 'string', 'internal' => 'name2Eng'], '_Englisch2' => ['name' => '_Englisch2', 'type' => 'string', 'internal' => 'name2Eng'],
'EUWarengruppe' => ['name' => 'EUWarengruppe', 'type' => 'string', 'internal' => 'EUitemgroup'], 'EUWarengruppe' => ['name' => 'EUWarengruppe', 'type' => 'string', 'internal' => 'EUitemgroup'],
]; ];

View File

@ -180,11 +180,11 @@ final class GSDCostCenter implements \JsonSerializable
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'createdBy' => $this->createdBy, 'createdBy' => $this->createdBy,
'createdAt' => $this->createdAt, 'createdAt' => $this->createdAt,
'description' => $this->description, 'description' => $this->description,
'costcenter' => $this->costCenter, 'costcenter' => $this->costCenter,
]; ];
} }

View File

@ -180,11 +180,11 @@ final class GSDCostObject implements \JsonSerializable
public function toArray() : array public function toArray() : array
{ {
return [ return [
'id' => $this->id, 'id' => $this->id,
'createdBy' => $this->createdBy, 'createdBy' => $this->createdBy,
'createdAt' => $this->createdAt, 'createdAt' => $this->createdAt,
'description' => $this->description, 'description' => $this->description,
'costObject' => $this->costObject, 'costObject' => $this->costObject,
]; ];
} }

View File

@ -33,15 +33,15 @@ final class GSDSupplierMapper extends DataMapperAbstract
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $columns = [ protected static array $columns = [
'row_id' => ['name' => 'row_id', 'type' => 'int', 'internal' => 'id'], 'row_id' => ['name' => 'row_id', 'type' => 'int', 'internal' => 'id'],
'row_create_time' => ['name' => 'row_create_time', 'type' => 'DateTime', 'internal' => 'createdAt', 'readonly' => true], '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_create_user' => ['name' => 'row_create_user', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true],
'LieferantenNummer' => ['name' => 'LieferantenNummer', 'type' => 'string', 'internal' => 'number'], 'LieferantenNummer' => ['name' => 'LieferantenNummer', 'type' => 'string', 'internal' => 'number'],
'Info' => ['name' => 'Info', 'type' => 'string', 'internal' => 'info'], 'Info' => ['name' => 'Info', 'type' => 'string', 'internal' => 'info'],
'Auftragssperre' => ['name' => 'Auftragssperre', 'type' => 'string', 'internal' => 'deliveryStatus'], 'Auftragssperre' => ['name' => 'Auftragssperre', 'type' => 'string', 'internal' => 'deliveryStatus'],
'Steuernummer' => ['name' => 'Steuernummer', 'type' => 'string', 'internal' => 'taxid'], 'Steuernummer' => ['name' => 'Steuernummer', 'type' => 'string', 'internal' => 'taxid'],
'BIC' => ['name' => 'BIC', 'type' => 'string', 'internal' => 'bic'], 'BIC' => ['name' => 'BIC', 'type' => 'string', 'internal' => 'bic'],
'IBAN' => ['name' => 'IBAN', 'type' => 'string', 'internal' => 'iban'], 'IBAN' => ['name' => 'IBAN', 'type' => 'string', 'internal' => 'iban'],
]; ];
protected static array $ownsOne = [ protected static array $ownsOne = [

View File

@ -13,12 +13,12 @@ declare(strict_types=1);
* @link https://orange-management.org * @link https://orange-management.org
*/ */
return [ return [
'Account' => 'Account', 'Account' => 'Account',
'Article' => 'Articls', 'Article' => 'Articls',
'CostCenter' => 'Cost Center', 'CostCenter' => 'Cost Center',
'CostObject' => 'Cost Object', 'CostObject' => 'Cost Object',
'Customer' => 'Customer', 'Customer' => 'Customer',
'Invoice' => 'Invoice', 'Invoice' => 'Invoice',
'Options' => 'Options', 'Options' => 'Options',
'Supplier' => 'Supplier', 'Supplier' => 'Supplier',
]; ];

View File

@ -27,7 +27,7 @@ echo $this->getData('nav')->render();
<td class="wf-100"><?= $this->getHtml('Title'); ?> <td class="wf-100"><?= $this->getHtml('Title'); ?>
<tbody> <tbody>
<?php $count = 0; foreach ($interfaces as $key => $value) : ++$count; <?php $count = 0; foreach ($interfaces as $key => $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()); ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a> <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
<?php endforeach; ?> <?php endforeach; ?>

View File

@ -27,7 +27,7 @@ echo $this->getData('nav')->render();
<td class="wf-100"><?= $this->getHtml('Title'); ?> <td class="wf-100"><?= $this->getHtml('Title'); ?>
<tbody> <tbody>
<?php $count = 0; foreach ($interfaces as $key => $value) : ++$count; <?php $count = 0; foreach ($interfaces as $key => $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()); ?>
<tr tabindex="0" data-href="<?= $url; ?>"> <tr tabindex="0" data-href="<?= $url; ?>">
<td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a> <td data-label="<?= $this->getHtml('Title'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
<?php endforeach; ?> <?php endforeach; ?>