Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-11 07:38:39 +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 3f8e613a2d
commit 90ad47aff2
9 changed files with 80 additions and 80 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
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)

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

@ -8,59 +8,59 @@ use phpOMS\Router\RouteVerb;
return [
'^.*/task(\?.*|$)' => [
[
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskCreate',
'verb' => RouteVerb::PUT,
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskCreate',
'verb' => RouteVerb::PUT,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::TASK,
'type' => PermissionType::CREATE,
'state' => PermissionState::TASK,
],
],
[
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskSet',
'verb' => RouteVerb::SET,
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskSet',
'verb' => RouteVerb::SET,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionState::TASK,
'type' => PermissionType::MODIFY,
'state' => PermissionState::TASK,
],
],
[
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskGet',
'verb' => RouteVerb::GET,
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskGet',
'verb' => RouteVerb::GET,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
],
],
],
'^.*/task/element.*$' => [
[
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementCreate',
'verb' => RouteVerb::PUT,
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementCreate',
'verb' => RouteVerb::PUT,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::ELEMENT,
'type' => PermissionType::CREATE,
'state' => PermissionState::ELEMENT,
],
],
[
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementSet',
'verb' => RouteVerb::SET,
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementSet',
'verb' => RouteVerb::SET,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionState::ELEMENT,
'type' => PermissionType::MODIFY,
'state' => PermissionState::ELEMENT,
],
],
[
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementGet',
'verb' => RouteVerb::GET,
'dest' => '\Modules\Tasks\Controller\ApiController:apiTaskElementGet',
'verb' => RouteVerb::GET,
'permission' => [
'module' => ApiController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
],
],
],

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

@ -8,45 +8,45 @@ use phpOMS\Router\RouteVerb;
return [
'^.*/task/dashboard.*$' => [
[
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskDashboard',
'verb' => RouteVerb::GET,
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskDashboard',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
],
],
],
'^.*/task/single.*$' => [
[
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskView',
'verb' => RouteVerb::GET,
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskView',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
],
],
],
'^.*/task/create.*$' => [
[
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskCreate',
'verb' => RouteVerb::GET,
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskCreate',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::TASK,
'type' => PermissionType::CREATE,
'state' => PermissionState::TASK,
],
],
],
'^.*/task/analysis.*$' => [
[
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskAnalysis',
'verb' => RouteVerb::GET,
'dest' => '\Modules\Tasks\Controller\BackendController:viewTaskAnalysis',
'verb' => RouteVerb::GET,
'permission' => [
'module' => BackendController::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::ANALYSIS,
'type' => PermissionType::READ,
'state' => PermissionState::ANALYSIS,
],
],
],

18
Models/TaskElementMapper.php
View File

@ -54,22 +54,22 @@ final class TaskElementMapper extends DataMapperAbstract
*/
protected static array $hasMany = [
'media' => [
'mapper' => MediaMapper::class,
'table' => 'task_element_media',
'mapper' => MediaMapper::class,
'table' => 'task_element_media',
'external' => 'task_element_media_src',
'self' => 'task_element_media_dst',
'self' => 'task_element_media_dst',
],
'accRelation' => [
'mapper' => AccountRelationMapper::class,
'table' => 'task_account',
'mapper' => AccountRelationMapper::class,
'table' => 'task_account',
'external' => 'task_account_task_element',
'self' => null,
'self' => null,
],
'grpRelation' => [
'mapper' => GroupRelationMapper::class,
'table' => 'task_group',
'mapper' => GroupRelationMapper::class,
'table' => 'task_group',
'external' => 'task_group_task_element',
'self' => null,
'self' => null,
],
];

14
Theme/Backend/Components/Tasks/list.tpl.php
View File

@ -10,13 +10,13 @@ use Modules\Tasks\Models\TaskStatus;
<td class="wf-100"><?= $this->getHtml('Title', 'Tasks'); ?>
<tfoot>
<tbody>
<?php $c = 0; foreach ($this->tasks as $key => $task) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('{/prefix}task/single?{?}&id=' . $task->getId());
$color = 'darkred';
if ($task->getStatus() === TaskStatus::DONE) { $color = 'green'; }
elseif ($task->getStatus() === TaskStatus::OPEN) { $color = 'darkblue'; }
elseif ($task->getStatus() === TaskStatus::WORKING) { $color = 'purple'; }
elseif ($task->getStatus() === TaskStatus::CANCELED) { $color = 'red'; }
<?php $c = 0; foreach ($this->tasks as $key => $task) : ++$c;
$url = \phpOMS\Uri\UriFactory::build('{/prefix}task/single?{?}&id=' . $task->getId());
$color = 'darkred';
if ($task->getStatus() === TaskStatus::DONE) { $color = 'green'; }
elseif ($task->getStatus() === TaskStatus::OPEN) { $color = 'darkblue'; }
elseif ($task->getStatus() === TaskStatus::WORKING) { $color = 'purple'; }
elseif ($task->getStatus() === TaskStatus::CANCELED) { $color = 'red'; }
elseif ($task->getStatus() === TaskStatus::SUSPENDED) { $color = 'yellow'; } ?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>"><span class="tag <?= $this->printHtml($color); ?>"><?= $this->getHtml('S' . $task->getStatus(), 'Tasks'); ?></span></a>

2
Theme/Backend/task-dashboard.tpl.php
View File

@ -46,7 +46,7 @@ echo $this->getData('nav')->render(); ?>
<tfoot>
<tbody>
<?php
$c = 0; foreach ($tasks as $key => $task) : ++$c;
$c = 0; foreach ($tasks as $key => $task) : ++$c;
$url = UriFactory::build('{/prefix}task/single?{?}&id=' . $task->getId());
?>
<tr tabindex="0" data-href="<?= $url; ?>">

4
tests/Models/AccountRelationTest.php
View File

@ -38,8 +38,8 @@ class AccountRelationTest extends \PHPUnit\Framework\TestCase
self::assertEquals(DutyType::CC, $obj->getDuty());
self::assertEquals([
'id' => 0,
'duty' => DutyType::CC,
'id' => 0,
'duty' => DutyType::CC,
'relation' => $a,
], $obj->toArray());
self::assertEquals($obj->toArray(), $obj->jsonSerialize());

4
tests/Models/GroupRelationTest.php
View File

@ -38,8 +38,8 @@ class GroupRelationTest extends \PHPUnit\Framework\TestCase
self::assertEquals(DutyType::CC, $obj->getDuty());
self::assertEquals([
'id' => 0,
'duty' => DutyType::CC,
'id' => 0,
'duty' => DutyType::CC,
'relation' => $g,
], $obj->toArray());
self::assertEquals($obj->toArray(), $obj->jsonSerialize());

36
tests/Models/TaskTest.php
View File

@ -214,16 +214,16 @@ class TaskTest extends \PHPUnit\Framework\TestCase
$task = new Task();
$arr = [
'id' => 0,
'createdBy' => $task->getCreatedBy(),
'createdAt' => $task->getCreatedAt(),
'title' => $task->getTitle(),
'id' => 0,
'createdBy' => $task->getCreatedBy(),
'createdAt' => $task->getCreatedAt(),
'title' => $task->getTitle(),
'description' => $task->getDescription(),
'status' => $task->getStatus(),
'type' => $task->getType(),
'priority' => $task->getPriority(),
'due' => $task->getDue(),
'done' => $task->getDone(),
'status' => $task->getStatus(),
'type' => $task->getType(),
'priority' => $task->getPriority(),
'due' => $task->getDue(),
'done' => $task->getDone(),
];
$isSubset = true;
@ -242,16 +242,16 @@ class TaskTest extends \PHPUnit\Framework\TestCase
$task = new Task();
$arr = [
'id' => 0,
'createdBy' => $task->getCreatedBy(),
'createdAt' => $task->getCreatedAt(),
'title' => $task->getTitle(),
'id' => 0,
'createdBy' => $task->getCreatedBy(),
'createdAt' => $task->getCreatedAt(),
'title' => $task->getTitle(),
'description' => $task->getDescription(),
'status' => $task->getStatus(),
'type' => $task->getType(),
'priority' => $task->getPriority(),
'due' => $task->getDue(),
'done' => $task->getDone(),
'status' => $task->getStatus(),
'type' => $task->getType(),
'priority' => $task->getPriority(),
'due' => $task->getDue(),
'done' => $task->getDone(),
];
$isSubset = true;