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/Backend.php b/Admin/Routes/Web/Backend.php index f028633..a24ba57 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,45 +8,45 @@ use phpOMS\Router\RouteVerb; return [ '^.*/purchase/supplier/list.*$' => [ [ - 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierList', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierList', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SUPPLIER, + 'type' => PermissionType::READ, + 'state' => PermissionState::SUPPLIER, ], ], ], '^.*/purchase/supplier/create.*$' => [ [ - 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierCreate', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierCreate', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::SUPPLIER, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::SUPPLIER, ], ], ], '^.*/purchase/supplier/profile.*$' => [ [ - 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierProfile', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierProfile', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::SUPPLIER, + 'type' => PermissionType::READ, + 'state' => PermissionState::SUPPLIER, ], ], ], '^.*/purchase/supplier/analysis.*$' => [ [ - 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierAnalysis', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierAnalysis', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::ANALYSIS, + 'type' => PermissionType::READ, + 'state' => PermissionState::ANALYSIS, ], ], ], diff --git a/Models/SupplierMapper.php b/Models/SupplierMapper.php index fbedaf1..4af88e3 100644 --- a/Models/SupplierMapper.php +++ b/Models/SupplierMapper.php @@ -93,16 +93,16 @@ final class SupplierMapper extends DataMapperAbstract */ protected static array $hasMany = [ 'files' => [ - 'mapper' => MediaMapper::class, /* mapper of the related object */ - 'table' => 'suppliermgmt_supplier_media', /* table of the related object, null if no relation table is used (many->1) */ + 'mapper' => MediaMapper::class, /* mapper of the related object */ + 'table' => 'suppliermgmt_supplier_media', /* table of the related object, null if no relation table is used (many->1) */ 'external' => 'suppliermgmt_supplier_media_dst', - 'self' => 'suppliermgmt_supplier_media_src', + 'self' => 'suppliermgmt_supplier_media_src', ], 'contactElements' => [ - 'mapper' => ContactElementMapper::class, - 'table' => 'suppliermgmt_supplier_contactelement', + 'mapper' => ContactElementMapper::class, + 'table' => 'suppliermgmt_supplier_contactelement', 'external' => 'suppliermgmt_supplier_contactelement_dst', - 'self' => 'suppliermgmt_supplier_contactelement_src', + 'self' => 'suppliermgmt_supplier_contactelement_src', ], ]; } diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index d5a0a23..273b7f1 100644 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -13,57 +13,57 @@ declare(strict_types=1); return ['SupplierManagement' => [ - 'Accounting' => 'Buchhaltung', - 'Address' => 'Addresse', - 'Addresses' => 'Addressen', - 'AreaManager' => 'Area Manager', - 'Articlegroup' => 'Artikelgruppe', - 'Bonus' => 'Bonus', - 'Business' => 'Business', - 'City' => 'Stadt', - 'Client' => 'Kunde', - 'Clients' => 'Kunden', - 'Contact' => 'Kontakt', - 'Country' => 'Land', - 'Creditcard' => 'Kreditkarte', - 'Date' => 'Datum', - 'Default' => 'Standard', - 'Delivery' => 'Lieferung', - 'Discount' => 'Rabatt', - 'DiscountP' => 'Rabatt %', - 'Email' => 'Email', - 'Fax' => 'Fax', - 'Files' => 'Dateien', - 'Freightage' => 'Frachtkosten', - 'Group' => 'Gruppe', - 'ID' => 'ID', - 'Info' => 'Info', - 'Invoice' => 'Rechnung', - 'IsDefault' => 'Ist Standard?', - 'Log' => 'Log', - 'Logs' => 'Logs', - 'Master' => 'Master', - 'Name' => 'Name', - 'Name1' => 'Name1', - 'Name2' => 'Name2', - 'Name3' => 'Name3', - 'Office' => 'Büro', - 'Payment' => 'Zahlung', - 'PaymentTerm' => 'Zahlungsziel', - 'Phone' => 'Telefon', - 'Price' => 'Preis', - 'Prices' => 'Preise', - 'Private' => 'Privat', - 'Productgroup' => 'Produktgruppe', - 'Purchase' => 'Einkauf', - 'Quantity' => 'Anzahl', - 'Sales' => 'Umsatz', - 'Segment' => 'Segment', - 'Subtype' => 'Untergruppe', - 'Supplier' => 'Lieferant', + 'Accounting' => 'Buchhaltung', + 'Address' => 'Addresse', + 'Addresses' => 'Addressen', + 'AreaManager' => 'Area Manager', + 'Articlegroup' => 'Artikelgruppe', + 'Bonus' => 'Bonus', + 'Business' => 'Business', + 'City' => 'Stadt', + 'Client' => 'Kunde', + 'Clients' => 'Kunden', + 'Contact' => 'Kontakt', + 'Country' => 'Land', + 'Creditcard' => 'Kreditkarte', + 'Date' => 'Datum', + 'Default' => 'Standard', + 'Delivery' => 'Lieferung', + 'Discount' => 'Rabatt', + 'DiscountP' => 'Rabatt %', + 'Email' => 'Email', + 'Fax' => 'Fax', + 'Files' => 'Dateien', + 'Freightage' => 'Frachtkosten', + 'Group' => 'Gruppe', + 'ID' => 'ID', + 'Info' => 'Info', + 'Invoice' => 'Rechnung', + 'IsDefault' => 'Ist Standard?', + 'Log' => 'Log', + 'Logs' => 'Logs', + 'Master' => 'Master', + 'Name' => 'Name', + 'Name1' => 'Name1', + 'Name2' => 'Name2', + 'Name3' => 'Name3', + 'Office' => 'Büro', + 'Payment' => 'Zahlung', + 'PaymentTerm' => 'Zahlungsziel', + 'Phone' => 'Telefon', + 'Price' => 'Preis', + 'Prices' => 'Preise', + 'Private' => 'Privat', + 'Productgroup' => 'Produktgruppe', + 'Purchase' => 'Einkauf', + 'Quantity' => 'Anzahl', + 'Sales' => 'Umsatz', + 'Segment' => 'Segment', + 'Subtype' => 'Untergruppe', + 'Supplier' => 'Lieferant', 'Suppliers' => 'Lieferanten', - 'Support' => 'Support', - 'Type' => 'Typ', - 'Wire' => 'Wire', - 'Zip' => 'Postleitzahl', + 'Support' => 'Support', + 'Type' => 'Typ', + 'Wire' => 'Wire', + 'Zip' => 'Postleitzahl', ]];