Jingga/oms-HumanResourceTimeRecording
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-HumanResourceTimeRecording.git synced 2026-02-10 18:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

php cs autofix

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-08-31 22:30:36 +02:00
parent f4aa4cb9a7
commit db09029fc1
8 changed files with 43 additions and 43 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, "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)

16
Admin/Routes/Web/Api.php
View File

@ -8,23 +8,23 @@ use phpOMS\Router\RouteVerb;
return [ return [
'^.*/humanresource/timerecording/session.*$' => [ '^.*/humanresource/timerecording/session.*$' => [
[ [
'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionCreate', 'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::SESSION, 'state' => PermissionState::SESSION,
], ],
], ],
], ],
'^.*/humanresource/timerecording/element.*$' => [ '^.*/humanresource/timerecording/element.*$' => [
[ [
'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionElementCreate', 'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionElementCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [ 'permission' => [
'module' => ApiController::MODULE_NAME, 'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::SESSION_ELEMENT, 'state' => PermissionState::SESSION_ELEMENT,
], ],
], ],
], ],

24
Admin/Routes/Web/Backend.php
View File

@ -8,34 +8,34 @@ use phpOMS\Router\RouteVerb;
return [ return [
'^.*/humanresource/timerecording/dashboard.*$' => [ '^.*/humanresource/timerecording/dashboard.*$' => [
[ [
'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewDashboard', 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewDashboard',
'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,
], ],
], ],
], ],
'^.*/private/timerecording/dashboard.*$' => [ '^.*/private/timerecording/dashboard.*$' => [
[ [
'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateDashboard', 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::PRIVATE_DASHBOARD, 'state' => PermissionState::PRIVATE_DASHBOARD,
], ],
], ],
], ],
'^.*/private/timerecording/session.*$' => [ '^.*/private/timerecording/session.*$' => [
[ [
'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateSession', 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateSession',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => BackendController::MODULE_NAME, 'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::PRIVATE_DASHBOARD, 'state' => PermissionState::PRIVATE_DASHBOARD,
], ],
], ],
], ],

16
Admin/Routes/Web/Timerecording.php
View File

@ -8,23 +8,23 @@ use phpOMS\Router\RouteVerb;
return [ return [
'^/timerecording$' => [ '^/timerecording$' => [
[ [
'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => TimerecordingController::MODULE_NAME, 'module' => TimerecordingController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DASHBOARD, 'state' => PermissionState::DASHBOARD,
], ],
], ],
], ],
'^.*/timerecording/dashboard.*$' => [ '^.*/timerecording/dashboard.*$' => [
[ [
'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [ 'permission' => [
'module' => TimerecordingController::MODULE_NAME, 'module' => TimerecordingController::MODULE_NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::DASHBOARD, 'state' => PermissionState::DASHBOARD,
], ],
], ],
], ],

16
Application/Timerecording/Routes.php
View File

@ -2,23 +2,23 @@
return [ return [
'^/timerecording$' => [ '^/timerecording$' => [
0 => [ 0 => [
'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard',
'verb' => 1, 'verb' => 1,
'permission' => [ 'permission' => [
'module' => 'HumanResourceTimeRecording', 'module' => 'HumanResourceTimeRecording',
'type' => 2, 'type' => 2,
'state' => 1, 'state' => 1,
], ],
], ],
], ],
'^.*/timerecording/dashboard.*$' => [ '^.*/timerecording/dashboard.*$' => [
0 => [ 0 => [
'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard',
'verb' => 1, 'verb' => 1,
'permission' => [ 'permission' => [
'module' => 'HumanResourceTimeRecording', 'module' => 'HumanResourceTimeRecording',
'type' => 2, 'type' => 2,
'state' => 1, 'state' => 1,
], ],
], ],
], ],

6
Models/SessionMapper.php
View File

@ -53,10 +53,10 @@ final class SessionMapper extends DataMapperAbstract
*/ */
protected static array $hasMany = [ protected static array $hasMany = [
'sessionElements' => [ 'sessionElements' => [
'mapper' => SessionElementMapper::class, 'mapper' => SessionElementMapper::class,
'table' => 'hr_timerecording_session_element', 'table' => 'hr_timerecording_session_element',
'external' => 'hr_timerecording_session_element_session', 'external' => 'hr_timerecording_session_element_session',
'self' => null, 'self' => null,
], ],
]; ];

4
Theme/Backend/private-dashboard.tpl.php
View File

@ -38,7 +38,7 @@ $endMonth = $startMonth->createModify(0, 1, -1);
$busy = [ $busy = [
'total' => 0, 'total' => 0,
'month' => 0, 'month' => 0,
'week' => 0, 'week' => 0,
]; ];
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>
@ -125,7 +125,7 @@ echo $this->getData('nav')->render(); ?>
<tbody> <tbody>
<?php <?php
$count = 0; foreach ($sessions as $session) : ++$count; $count = 0; foreach ($sessions as $session) : ++$count;
$url = \phpOMS\Uri\UriFactory::build('{/prefix}private/timerecording/session?{?}&id=' . $session->getId()); $url = \phpOMS\Uri\UriFactory::build('{/prefix}private/timerecording/session?{?}&id=' . $session->getId());
?> ?>
<tr data-href="<?= $url; ?>"> <tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"> <td><a href="<?= $url; ?>">

2
tests/Models/SessionMapperTest.php
View File

@ -32,7 +32,7 @@ class SessionMapperTest extends \PHPUnit\Framework\TestCase
{ {
$session = new Session(1); $session = new Session(1);
$dt = new \DateTime(\date('Y-m-d', \strtotime('now')) . ' 7:55:34'); $dt = new \DateTime(\date('Y-m-d', \strtotime('now')) . ' 7:55:34');
$element = new SessionElement($session, $dt); $element = new SessionElement($session, $dt);
$element->setStatus(ClockingStatus::START); $element->setStatus(ClockingStatus::START);
$session->addSessionElement($element); $session->addSessionElement($element);