mirror of
https://github.com/Karaka-Management/oms-Organization.git
synced 2026-02-05 11:08:40 +00:00
phpcs autofixes
This commit is contained in:
Dennis Eichhorn
parent
aebd912505
commit
8c23363950
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)
|
||||
|
|
|
|||
|
|
@ -31,19 +31,14 @@ use Modules\Organization\Models\DepartmentMapper;
|
|||
use Modules\Organization\Models\NullDepartment;
|
||||
use Modules\Organization\Models\NullPosition;
|
||||
use Modules\Organization\Models\NullUnit;
|
||||
use Modules\Organization\Models\NullUnitAttributeType;
|
||||
use Modules\Organization\Models\NullUnitAttributeValue;
|
||||
use Modules\Organization\Models\Position;
|
||||
use Modules\Organization\Models\PositionMapper;
|
||||
use Modules\Organization\Models\SettingsEnum;
|
||||
use Modules\Organization\Models\Status;
|
||||
use Modules\Organization\Models\Unit;
|
||||
use Modules\Organization\Models\UnitAttribute;
|
||||
use Modules\Organization\Models\UnitAttributeMapper;
|
||||
use Modules\Organization\Models\UnitAttributeType;
|
||||
use Modules\Organization\Models\UnitAttributeTypeL11nMapper;
|
||||
use Modules\Organization\Models\UnitAttributeTypeMapper;
|
||||
use Modules\Organization\Models\UnitAttributeValue;
|
||||
use Modules\Organization\Models\UnitAttributeValueL11nMapper;
|
||||
use Modules\Organization\Models\UnitAttributeValueMapper;
|
||||
use Modules\Organization\Models\UnitMapper;
|
||||
|
|
@ -271,7 +266,6 @@ final class ApiController extends Controller
|
|||
$oldAddr = clone $unit->mainAddress;
|
||||
$addr = $this->updateUnitMainAddressFromRequest($request, $unit);
|
||||
$this->updateModel($request->header->account, $oldAddr, $addr, AddressMapper::class, 'address', $request->getOrigin());
|
||||
|
||||
} else {
|
||||
$addr = $this->createUnitMainAddressFromRequest($request);
|
||||
$this->createModel($request->header->account, $addr, AddressMapper::class, 'address', $request->getOrigin());
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ final class BackendController extends Controller
|
|||
|
||||
$tree[$component->id] = [
|
||||
'obj' => $component,
|
||||
'ref' => $ref
|
||||
'ref' => $ref,
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -37,14 +37,14 @@ final class UnitAttributeValueMapper extends DataMapperFactory
|
|||
* @since 1.0.0
|
||||
*/
|
||||
public const COLUMNS = [
|
||||
'unit_attr_value_id' => ['name' => 'unit_attr_value_id', 'type' => 'int', 'internal' => 'id'],
|
||||
'unit_attr_value_default' => ['name' => 'unit_attr_value_default', 'type' => 'bool', 'internal' => 'isDefault'],
|
||||
'unit_attr_value_valueStr' => ['name' => 'unit_attr_value_valueStr', 'type' => 'string', 'internal' => 'valueStr'],
|
||||
'unit_attr_value_valueInt' => ['name' => 'unit_attr_value_valueInt', 'type' => 'int', 'internal' => 'valueInt'],
|
||||
'unit_attr_value_valueDec' => ['name' => 'unit_attr_value_valueDec', 'type' => 'float', 'internal' => 'valueDec'],
|
||||
'unit_attr_value_valueDat' => ['name' => 'unit_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'],
|
||||
'unit_attr_value_unit' => ['name' => 'unit_attr_value_unit', 'type' => 'string', 'internal' => 'unit'],
|
||||
'unit_attr_value_deptype' => ['name' => 'unit_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'],
|
||||
'unit_attr_value_id' => ['name' => 'unit_attr_value_id', 'type' => 'int', 'internal' => 'id'],
|
||||
'unit_attr_value_default' => ['name' => 'unit_attr_value_default', 'type' => 'bool', 'internal' => 'isDefault'],
|
||||
'unit_attr_value_valueStr' => ['name' => 'unit_attr_value_valueStr', 'type' => 'string', 'internal' => 'valueStr'],
|
||||
'unit_attr_value_valueInt' => ['name' => 'unit_attr_value_valueInt', 'type' => 'int', 'internal' => 'valueInt'],
|
||||
'unit_attr_value_valueDec' => ['name' => 'unit_attr_value_valueDec', 'type' => 'float', 'internal' => 'valueDec'],
|
||||
'unit_attr_value_valueDat' => ['name' => 'unit_attr_value_valueDat', 'type' => 'DateTime', 'internal' => 'valueDat'],
|
||||
'unit_attr_value_unit' => ['name' => 'unit_attr_value_unit', 'type' => 'string', 'internal' => 'unit'],
|
||||
'unit_attr_value_deptype' => ['name' => 'unit_attr_value_deptype', 'type' => 'int', 'internal' => 'dependingAttributeType'],
|
||||
'unit_attr_value_depvalue' => ['name' => 'unit_attr_value_depvalue', 'type' => 'int', 'internal' => 'dependingAttributeValue'],
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ final class UnitMapper extends DataMapperFactory
|
|||
'unit_descriptionraw' => ['name' => 'unit_descriptionraw', 'type' => 'string', 'internal' => 'descriptionRaw'],
|
||||
'unit_parent' => ['name' => 'unit_parent', 'type' => 'int', 'internal' => 'parent'],
|
||||
'unit_status' => ['name' => 'unit_status', 'type' => 'int', 'internal' => 'status'],
|
||||
'unit_address' => ['name' => 'unit_address', 'type' => 'int', 'internal' => 'mainAddress'],
|
||||
'unit_address' => ['name' => 'unit_address', 'type' => 'int', 'internal' => 'mainAddress'],
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -13,26 +13,26 @@
|
|||
declare(strict_types=1);
|
||||
|
||||
return ['Organization' => [
|
||||
'Active' => 'Active',
|
||||
'Department' => 'Department',
|
||||
'Departments' => 'Departments',
|
||||
'Description' => 'Description',
|
||||
'Inactive' => 'Inactive',
|
||||
'Logo' => 'Logo',
|
||||
'Name' => 'Name',
|
||||
'Parent' => 'Parent',
|
||||
'Position' => 'Position',
|
||||
'Positions' => 'Positions',
|
||||
'Search' => 'Search',
|
||||
'Status' => 'Status',
|
||||
'Unit' => 'Unit',
|
||||
'UnitLogo' => 'Unit Logo',
|
||||
'Units' => 'Units',
|
||||
'LegalName' => 'Legal Name',
|
||||
'Address' => 'Address',
|
||||
'Postal' => 'Postal',
|
||||
'City' => 'City',
|
||||
'Country' => 'Country',
|
||||
'Active' => 'Active',
|
||||
'Department' => 'Department',
|
||||
'Departments' => 'Departments',
|
||||
'Description' => 'Description',
|
||||
'Inactive' => 'Inactive',
|
||||
'Logo' => 'Logo',
|
||||
'Name' => 'Name',
|
||||
'Parent' => 'Parent',
|
||||
'Position' => 'Position',
|
||||
'Positions' => 'Positions',
|
||||
'Search' => 'Search',
|
||||
'Status' => 'Status',
|
||||
'Unit' => 'Unit',
|
||||
'UnitLogo' => 'Unit Logo',
|
||||
'Units' => 'Units',
|
||||
'LegalName' => 'Legal Name',
|
||||
'Address' => 'Address',
|
||||
'Postal' => 'Postal',
|
||||
'City' => 'City',
|
||||
'Country' => 'Country',
|
||||
'MainAddress' => 'Main Address',
|
||||
'IMG_alt_profile' => 'Unit image',
|
||||
'IMG_alt_profile' => 'Unit image',
|
||||
]];
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ function renderTree($parent, $ref, &$unitTree, &$depTree, &$posTree, $type = 'un
|
|||
$result .= '<li><span><section class="box">' . $leaf['obj']->name . '</section>';
|
||||
|
||||
if ($type === 'unit') {
|
||||
$temp = renderTree(0, $leaf['obj']->id, $unitTree, $depTree, $posTree, $type === 'unit' ? 'dep' : 'pos');
|
||||
$temp = \renderTree(0, $leaf['obj']->id, $unitTree, $depTree, $posTree, $type === 'unit' ? 'dep' : 'pos');
|
||||
|
||||
if ($temp !== '') {
|
||||
$result .= '<ul class="tree">';
|
||||
|
|
@ -58,7 +58,7 @@ function renderTree($parent, $ref, &$unitTree, &$depTree, &$posTree, $type = 'un
|
|||
|
||||
$result .= '</span>';
|
||||
|
||||
$result .= renderTree($leaf['obj']->id, $ref, $unitTree, $depTree, $posTree, $type);
|
||||
$result .= \renderTree($leaf['obj']->id, $ref, $unitTree, $depTree, $posTree, $type);
|
||||
$result .= '</li>';
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +74,7 @@ function renderTree($parent, $ref, &$unitTree, &$depTree, &$posTree, $type = 'un
|
|||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
<ul class="tree wf-100">
|
||||
<?= renderTree(0, 0, $unitTree, $depTree, $posTree, 'unit') ?>
|
||||
<?= \renderTree(0, 0, $unitTree, $depTree, $posTree, 'unit'); ?>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -12,7 +12,6 @@
|
|||
*/
|
||||
declare(strict_types=1);
|
||||
|
||||
use Modules\Media\Models\NullMedia;
|
||||
use phpOMS\Uri\UriFactory;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@
|
|||
*/
|
||||
declare(strict_types=1);
|
||||
|
||||
use Modules\Media\Models\NullMedia;
|
||||
use Modules\Organization\Models\Status;
|
||||
use phpOMS\Localization\ISO3166NameEnum;
|
||||
use phpOMS\Localization\ISO3166TwoEnum;
|
||||
|
|
|
|||
|
|
@ -53,14 +53,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();
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user