Jingga/oms-Organization
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Organization.git synced 2026-02-17 16:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

phpcs autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-28 12:19:03 +00:00
parent aebd912505
commit 8c23363950
10 changed files with 42 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
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, "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 - 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)

6
Controller/ApiController.php
View File

@ -31,19 +31,14 @@ use Modules\Organization\Models\DepartmentMapper;
use Modules\Organization\Models\NullDepartment; use Modules\Organization\Models\NullDepartment;
use Modules\Organization\Models\NullPosition; use Modules\Organization\Models\NullPosition;
use Modules\Organization\Models\NullUnit; use Modules\Organization\Models\NullUnit;
use Modules\Organization\Models\NullUnitAttributeType;
use Modules\Organization\Models\NullUnitAttributeValue;
use Modules\Organization\Models\Position; use Modules\Organization\Models\Position;
use Modules\Organization\Models\PositionMapper; use Modules\Organization\Models\PositionMapper;
use Modules\Organization\Models\SettingsEnum; use Modules\Organization\Models\SettingsEnum;
use Modules\Organization\Models\Status; use Modules\Organization\Models\Status;
use Modules\Organization\Models\Unit; use Modules\Organization\Models\Unit;
use Modules\Organization\Models\UnitAttribute;
use Modules\Organization\Models\UnitAttributeMapper; use Modules\Organization\Models\UnitAttributeMapper;
use Modules\Organization\Models\UnitAttributeType;
use Modules\Organization\Models\UnitAttributeTypeL11nMapper; use Modules\Organization\Models\UnitAttributeTypeL11nMapper;
use Modules\Organization\Models\UnitAttributeTypeMapper; use Modules\Organization\Models\UnitAttributeTypeMapper;
use Modules\Organization\Models\UnitAttributeValue;
use Modules\Organization\Models\UnitAttributeValueL11nMapper; use Modules\Organization\Models\UnitAttributeValueL11nMapper;
use Modules\Organization\Models\UnitAttributeValueMapper; use Modules\Organization\Models\UnitAttributeValueMapper;
use Modules\Organization\Models\UnitMapper; use Modules\Organization\Models\UnitMapper;
@ -271,7 +266,6 @@ final class ApiController extends Controller
$oldAddr = clone $unit->mainAddress; $oldAddr = clone $unit->mainAddress;
$addr = $this->updateUnitMainAddressFromRequest($request, $unit); $addr = $this->updateUnitMainAddressFromRequest($request, $unit);
$this->updateModel($request->header->account, $oldAddr, $addr, AddressMapper::class, 'address', $request->getOrigin()); $this->updateModel($request->header->account, $oldAddr, $addr, AddressMapper::class, 'address', $request->getOrigin());
} else { } else {
$addr = $this->createUnitMainAddressFromRequest($request); $addr = $this->createUnitMainAddressFromRequest($request);
$this->createModel($request->header->account, $addr, AddressMapper::class, 'address', $request->getOrigin()); $this->createModel($request->header->account, $addr, AddressMapper::class, 'address', $request->getOrigin());

2
Controller/BackendController.php
View File

@ -172,7 +172,7 @@ final class BackendController extends Controller
$tree[$component->id] = [ $tree[$component->id] = [
'obj' => $component, 'obj' => $component,
'ref' => $ref 'ref' => $ref,
]; ];
} }

6
Theme/Backend/organigram.tpl.php
View File

@ -47,7 +47,7 @@ function renderTree($parent, $ref, &$unitTree, &$depTree, &$posTree, $type = 'un
$result .= '<li><span><section class="box">' . $leaf['obj']->name . '</section>'; $result .= '<li><span><section class="box">' . $leaf['obj']->name . '</section>';
if ($type === 'unit') { 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 !== '') { if ($temp !== '') {
$result .= '<ul class="tree">'; $result .= '<ul class="tree">';
@ -58,7 +58,7 @@ function renderTree($parent, $ref, &$unitTree, &$depTree, &$posTree, $type = 'un
$result .= '</span>'; $result .= '</span>';
$result .= renderTree($leaf['obj']->id, $ref, $unitTree, $depTree, $posTree, $type); $result .= \renderTree($leaf['obj']->id, $ref, $unitTree, $depTree, $posTree, $type);
$result .= '</li>'; $result .= '</li>';
} }
@ -74,7 +74,7 @@ function renderTree($parent, $ref, &$unitTree, &$depTree, &$posTree, $type = 'un
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<ul class="tree wf-100"> <ul class="tree wf-100">
<?= renderTree(0, 0, $unitTree, $depTree, $posTree, 'unit') ?> <?= \renderTree(0, 0, $unitTree, $depTree, $posTree, 'unit'); ?>
</ul> </ul>
</div> </div>
</div> </div>

1
Theme/Backend/unit-list.tpl.php
View File

@ -12,7 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use Modules\Media\Models\NullMedia;
use phpOMS\Uri\UriFactory; use phpOMS\Uri\UriFactory;
/** /**

1
Theme/Backend/unit-profile.tpl.php
View File

@ -12,7 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use Modules\Media\Models\NullMedia;
use Modules\Organization\Models\Status; use Modules\Organization\Models\Status;
use phpOMS\Localization\ISO3166NameEnum; use phpOMS\Localization\ISO3166NameEnum;
use phpOMS\Localization\ISO3166TwoEnum; use phpOMS\Localization\ISO3166TwoEnum;