mirror of
https://github.com/Karaka-Management/oms-Profile.git
synced 2026-01-11 15:28:40 +00:00
phpcs autofixes
This commit is contained in:
Dennis Eichhorn
parent
aa2fd5c080
commit
35891337a5
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -13,97 +13,97 @@
|
|||
declare(strict_types=1);
|
||||
|
||||
return ['Profile' => [
|
||||
'Account' => 'Account',
|
||||
'Account/Group' => 'Account/Group',
|
||||
'Activity' => 'Activity',
|
||||
'Address' => 'Address',
|
||||
'Amount' => '{Amount}',
|
||||
'Area' => 'Area',
|
||||
'Birthday' => 'Birthday',
|
||||
'Change' => 'Change',
|
||||
'City' => 'City',
|
||||
'Community' => 'Community',
|
||||
'Contact' => 'Contact',
|
||||
'ContactInformation' => 'Contact Information',
|
||||
'Country' => 'Country',
|
||||
'CreateProfile' => 'Create Profile',
|
||||
'Currency' => 'Currency',
|
||||
'Currencyformat' => 'Currencyformat',
|
||||
'Customized' => 'Customized',
|
||||
'DateDelim' => 'Date Separator',
|
||||
'DecimalPoint' => 'Decimal Point',
|
||||
'Defaults' => 'Defaults',
|
||||
'Email' => 'Email',
|
||||
'Fast' => 'Fast',
|
||||
'General' => 'General',
|
||||
'Glass' => 'Glass',
|
||||
'Heavy' => 'Heavy',
|
||||
'Language' => 'Language',
|
||||
'Large' => 'Large',
|
||||
'LastLogin' => 'Last Login',
|
||||
'Length' => 'Length',
|
||||
'Light' => 'Light',
|
||||
'Load' => 'Load',
|
||||
'Localization' => 'Localization',
|
||||
'Long' => 'Long',
|
||||
'Medium' => 'Medium',
|
||||
'Name' => 'Name',
|
||||
'OldPassword' => 'Old Password',
|
||||
'NewPassword' => 'New Password',
|
||||
'Account' => 'Account',
|
||||
'Account/Group' => 'Account/Group',
|
||||
'Activity' => 'Activity',
|
||||
'Address' => 'Address',
|
||||
'Amount' => '{Amount}',
|
||||
'Area' => 'Area',
|
||||
'Birthday' => 'Birthday',
|
||||
'Change' => 'Change',
|
||||
'City' => 'City',
|
||||
'Community' => 'Community',
|
||||
'Contact' => 'Contact',
|
||||
'ContactInformation' => 'Contact Information',
|
||||
'Country' => 'Country',
|
||||
'CreateProfile' => 'Create Profile',
|
||||
'Currency' => 'Currency',
|
||||
'Currencyformat' => 'Currencyformat',
|
||||
'Customized' => 'Customized',
|
||||
'DateDelim' => 'Date Separator',
|
||||
'DecimalPoint' => 'Decimal Point',
|
||||
'Defaults' => 'Defaults',
|
||||
'Email' => 'Email',
|
||||
'Fast' => 'Fast',
|
||||
'General' => 'General',
|
||||
'Glass' => 'Glass',
|
||||
'Heavy' => 'Heavy',
|
||||
'Language' => 'Language',
|
||||
'Large' => 'Large',
|
||||
'LastLogin' => 'Last Login',
|
||||
'Length' => 'Length',
|
||||
'Light' => 'Light',
|
||||
'Load' => 'Load',
|
||||
'Localization' => 'Localization',
|
||||
'Long' => 'Long',
|
||||
'Medium' => 'Medium',
|
||||
'Name' => 'Name',
|
||||
'OldPassword' => 'Old Password',
|
||||
'NewPassword' => 'New Password',
|
||||
'RepeatPassword' => 'Repeat Password',
|
||||
'Password' => 'Password',
|
||||
'NoAddressSpecified' => 'No address specified',
|
||||
'NoContactSpecified' => 'No contact specified',
|
||||
'Numberformat' => 'Numberformat',
|
||||
'Numeric' => 'Numeric',
|
||||
'OFF' => 'OFF',
|
||||
'ON' => 'ON',
|
||||
'Occupation' => 'Occupation',
|
||||
'Phone' => 'Phone',
|
||||
'Precision' => 'Precision',
|
||||
'Profile' => 'Profile',
|
||||
'ProfileImage' => 'Profile Image',
|
||||
'Profiles' => 'Profiles',
|
||||
'Ranks' => 'Ranks',
|
||||
'Registered' => 'Registered',
|
||||
'Sea' => 'Sea',
|
||||
'Search' => 'Search',
|
||||
'Short' => 'Short',
|
||||
'Skype' => 'Skype',
|
||||
'Slow' => 'Slow',
|
||||
'Small' => 'Small',
|
||||
'Speed' => 'Speed',
|
||||
'Status' => 'Status',
|
||||
'Tablespoon' => 'Tablespoon',
|
||||
'Teaspoon' => 'Teaspoon',
|
||||
'Temperature' => 'Temperature',
|
||||
'ThousandsSeparator' => 'Thousands Separator',
|
||||
'Time' => 'Time',
|
||||
'TimeDelim' => 'Time Separator',
|
||||
'Timeformat' => 'Timeformat',
|
||||
'Timezone' => 'Timezone',
|
||||
'VeryFast' => 'Very Fast',
|
||||
'VeryHeavy' => 'Very Heavy',
|
||||
'VeryLarge' => 'Very Large',
|
||||
'VeryLight' => 'Very Light',
|
||||
'VeryLong' => 'Very Long',
|
||||
'VeryShort' => 'Very Short',
|
||||
'VerySlow' => 'Very Slow',
|
||||
'VerySmall' => 'Very Small',
|
||||
'Visibility' => 'Visibility',
|
||||
'Volume' => 'Volume',
|
||||
'Weight' => 'Weight',
|
||||
'Zip' => 'Zip',
|
||||
'aType1' => 'Home',
|
||||
'aType2' => 'Business',
|
||||
'aType3' => 'Shipping',
|
||||
'aType4' => 'Billing',
|
||||
'aType5' => 'Work',
|
||||
'aType6' => 'Contract',
|
||||
'aType7' => 'Other',
|
||||
'cType1' => 'Phone',
|
||||
'cType2' => 'Fax',
|
||||
'cType3' => 'Website',
|
||||
'cType4' => 'Email',
|
||||
'IMG_alt_user' => 'User image',
|
||||
'Password' => 'Password',
|
||||
'NoAddressSpecified' => 'No address specified',
|
||||
'NoContactSpecified' => 'No contact specified',
|
||||
'Numberformat' => 'Numberformat',
|
||||
'Numeric' => 'Numeric',
|
||||
'OFF' => 'OFF',
|
||||
'ON' => 'ON',
|
||||
'Occupation' => 'Occupation',
|
||||
'Phone' => 'Phone',
|
||||
'Precision' => 'Precision',
|
||||
'Profile' => 'Profile',
|
||||
'ProfileImage' => 'Profile Image',
|
||||
'Profiles' => 'Profiles',
|
||||
'Ranks' => 'Ranks',
|
||||
'Registered' => 'Registered',
|
||||
'Sea' => 'Sea',
|
||||
'Search' => 'Search',
|
||||
'Short' => 'Short',
|
||||
'Skype' => 'Skype',
|
||||
'Slow' => 'Slow',
|
||||
'Small' => 'Small',
|
||||
'Speed' => 'Speed',
|
||||
'Status' => 'Status',
|
||||
'Tablespoon' => 'Tablespoon',
|
||||
'Teaspoon' => 'Teaspoon',
|
||||
'Temperature' => 'Temperature',
|
||||
'ThousandsSeparator' => 'Thousands Separator',
|
||||
'Time' => 'Time',
|
||||
'TimeDelim' => 'Time Separator',
|
||||
'Timeformat' => 'Timeformat',
|
||||
'Timezone' => 'Timezone',
|
||||
'VeryFast' => 'Very Fast',
|
||||
'VeryHeavy' => 'Very Heavy',
|
||||
'VeryLarge' => 'Very Large',
|
||||
'VeryLight' => 'Very Light',
|
||||
'VeryLong' => 'Very Long',
|
||||
'VeryShort' => 'Very Short',
|
||||
'VerySlow' => 'Very Slow',
|
||||
'VerySmall' => 'Very Small',
|
||||
'Visibility' => 'Visibility',
|
||||
'Volume' => 'Volume',
|
||||
'Weight' => 'Weight',
|
||||
'Zip' => 'Zip',
|
||||
'aType1' => 'Home',
|
||||
'aType2' => 'Business',
|
||||
'aType3' => 'Shipping',
|
||||
'aType4' => 'Billing',
|
||||
'aType5' => 'Work',
|
||||
'aType6' => 'Contract',
|
||||
'aType7' => 'Other',
|
||||
'cType1' => 'Phone',
|
||||
'cType2' => 'Fax',
|
||||
'cType3' => 'Website',
|
||||
'cType4' => 'Email',
|
||||
'IMG_alt_user' => 'User image',
|
||||
]];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
*/
|
||||
declare(strict_types=1);
|
||||
|
||||
use Modules\Media\Models\NullMedia;
|
||||
use Modules\Profile\Models\ContactType;
|
||||
use phpOMS\Localization\ISO3166NameEnum;
|
||||
use phpOMS\Localization\ISO3166TwoEnum;
|
||||
|
|
|
|||
|
|
@ -60,14 +60,14 @@ final class ApiControllerTest 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->l11nManager = new L11nManager();
|
||||
$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->l11nManager = new L11nManager();
|
||||
$this->app->eventManager->importFromFile(__DIR__ . '/../../../Web/Api/Hooks.php');
|
||||
|
||||
$account = new Account();
|
||||
|
|
|
|||
|
|
@ -16,11 +16,9 @@ namespace Modules\Profile\tests\Models;
|
|||
|
||||
use Modules\Admin\Models\NullAccount;
|
||||
use Modules\Media\Models\NullMedia;
|
||||
use Modules\Profile\Models\ContactElement;
|
||||
use Modules\Profile\Models\GenderType;
|
||||
use Modules\Profile\Models\Profile;
|
||||
use Modules\Profile\Models\SexType;
|
||||
use phpOMS\Stdlib\Base\Location;
|
||||
|
||||
/**
|
||||
* @internal
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user