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/Api.php b/Admin/Routes/Web/Api.php index c710c4b..a839463 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -8,23 +8,23 @@ use phpOMS\Router\RouteVerb; return [ '^.*/humanresource/timerecording/session.*$' => [ [ - 'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::SESSION, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::SESSION, ], ], ], '^.*/humanresource/timerecording/element.*$' => [ [ - 'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionElementCreate', - 'verb' => RouteVerb::PUT, + 'dest' => '\Modules\HumanResourceTimeRecording\Controller\ApiController:apiSessionElementCreate', + 'verb' => RouteVerb::PUT, 'permission' => [ 'module' => ApiController::MODULE_NAME, - 'type' => PermissionType::CREATE, - 'state' => PermissionState::SESSION_ELEMENT, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::SESSION_ELEMENT, ], ], ], diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index b4da764..29f0f52 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -8,34 +8,34 @@ use phpOMS\Router\RouteVerb; return [ '^.*/humanresource/timerecording/dashboard.*$' => [ [ - 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewDashboard', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewDashboard', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DASHBOARD, + 'type' => PermissionType::READ, + 'state' => PermissionState::DASHBOARD, ], ], ], '^.*/private/timerecording/dashboard.*$' => [ [ - 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateDashboard', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateDashboard', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::PRIVATE_DASHBOARD, + 'type' => PermissionType::READ, + 'state' => PermissionState::PRIVATE_DASHBOARD, ], ], ], '^.*/private/timerecording/session.*$' => [ [ - 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateSession', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\HumanResourceTimeRecording\Controller\BackendController:viewPrivateSession', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => BackendController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::PRIVATE_DASHBOARD, + 'type' => PermissionType::READ, + 'state' => PermissionState::PRIVATE_DASHBOARD, ], ], ], diff --git a/Admin/Routes/Web/Timerecording.php b/Admin/Routes/Web/Timerecording.php index 16ac398..d6b2206 100755 --- a/Admin/Routes/Web/Timerecording.php +++ b/Admin/Routes/Web/Timerecording.php @@ -8,23 +8,23 @@ use phpOMS\Router\RouteVerb; return [ '^/timerecording$' => [ [ - 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => TimerecordingController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DASHBOARD, + 'type' => PermissionType::READ, + 'state' => PermissionState::DASHBOARD, ], ], ], '^.*/timerecording/dashboard.*$' => [ [ - 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', - 'verb' => RouteVerb::GET, + 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', + 'verb' => RouteVerb::GET, 'permission' => [ 'module' => TimerecordingController::MODULE_NAME, - 'type' => PermissionType::READ, - 'state' => PermissionState::DASHBOARD, + 'type' => PermissionType::READ, + 'state' => PermissionState::DASHBOARD, ], ], ], diff --git a/Application/Timerecording/Routes.php b/Application/Timerecording/Routes.php index 1440ca8..9012cb5 100755 --- a/Application/Timerecording/Routes.php +++ b/Application/Timerecording/Routes.php @@ -2,23 +2,23 @@ return [ '^/timerecording$' => [ 0 => [ - 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', - 'verb' => 1, + 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', + 'verb' => 1, 'permission' => [ 'module' => 'HumanResourceTimeRecording', - 'type' => 2, - 'state' => 1, + 'type' => 2, + 'state' => 1, ], ], ], '^.*/timerecording/dashboard.*$' => [ 0 => [ - 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', - 'verb' => 1, + 'dest' => '\Modules\HumanResourceTimeRecording\Controller\TimerecordingController:viewDashboard', + 'verb' => 1, 'permission' => [ 'module' => 'HumanResourceTimeRecording', - 'type' => 2, - 'state' => 1, + 'type' => 2, + 'state' => 1, ], ], ], diff --git a/Models/SessionMapper.php b/Models/SessionMapper.php index 7ccefbf..da1115c 100755 --- a/Models/SessionMapper.php +++ b/Models/SessionMapper.php @@ -53,10 +53,10 @@ final class SessionMapper extends DataMapperAbstract */ protected static array $hasMany = [ 'sessionElements' => [ - 'mapper' => SessionElementMapper::class, - 'table' => 'hr_timerecording_session_element', + 'mapper' => SessionElementMapper::class, + 'table' => 'hr_timerecording_session_element', 'external' => 'hr_timerecording_session_element_session', - 'self' => null, + 'self' => null, ], ]; diff --git a/Theme/Backend/private-dashboard.tpl.php b/Theme/Backend/private-dashboard.tpl.php index ad386fa..56562b2 100755 --- a/Theme/Backend/private-dashboard.tpl.php +++ b/Theme/Backend/private-dashboard.tpl.php @@ -38,7 +38,7 @@ $endMonth = $startMonth->createModify(0, 1, -1); $busy = [ 'total' => 0, 'month' => 0, - 'week' => 0, + 'week' => 0, ]; echo $this->getData('nav')->render(); ?> @@ -125,7 +125,7 @@ echo $this->getData('nav')->render(); ?> getId()); + $url = \phpOMS\Uri\UriFactory::build('{/prefix}private/timerecording/session?{?}&id=' . $session->getId()); ?> diff --git a/tests/Models/SessionMapperTest.php b/tests/Models/SessionMapperTest.php index da4698d..e8bb638 100755 --- a/tests/Models/SessionMapperTest.php +++ b/tests/Models/SessionMapperTest.php @@ -32,7 +32,7 @@ class SessionMapperTest extends \PHPUnit\Framework\TestCase { $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->setStatus(ClockingStatus::START); $session->addSessionElement($element);