diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6dcd721..e8d598e 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, "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) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 04022cc..0ce2b9a 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -494,7 +494,7 @@ final class ApiController extends Controller $job = TaskFactory::create($id); - $job->interval = $settings['settings']['interval'] ?? ''; + $job->interval = $settings['settings']['interval'] ?? ''; $job->command = 'php ' . FileUtils::absolute(__DIR__ . '/../../../cli.php') . ' /workflow/instance -id ' diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 0a49125..c0b15a4 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -15,7 +15,6 @@ declare(strict_types=1); namespace Modules\Workflow\Controller; use Modules\Media\Models\CollectionMapper; -use Modules\Media\Models\NullMedia; use Modules\Workflow\Models\WorkflowControllerInterface; use Modules\Workflow\Models\WorkflowInstanceAbstractMapper; use Modules\Workflow\Models\WorkflowTemplateMapper; diff --git a/Controller/CliController.php b/Controller/CliController.php index 42870cd..64830c8 100755 --- a/Controller/CliController.php +++ b/Controller/CliController.php @@ -116,7 +116,7 @@ final class CliController extends Controller $this->createModel($request->header->account, $instance, WorkflowInstanceAbstractMapper::class, 'instance', $request->getOrigin()); $this->startInstance($request, $response, $instance); - $new = clone $instance; + $new = clone $instance; $new->end = new \DateTimeImmutable('now'); $this->updateModel($request->header->account, $instance, $new, WorkflowInstanceAbstractMapper::class, 'instance', $request->getOrigin()); @@ -162,7 +162,7 @@ final class CliController extends Controller ->where('id', (int) $request->getData('-id')) ->execute(); - $instance = new WorkflowInstance(); + $instance = new WorkflowInstance(); $instance->template = $template; return $instance; diff --git a/Models/WorkflowInstanceAbstractMapper.php b/Models/WorkflowInstanceAbstractMapper.php index 8db8a09..7cef3d9 100755 --- a/Models/WorkflowInstanceAbstractMapper.php +++ b/Models/WorkflowInstanceAbstractMapper.php @@ -37,7 +37,7 @@ final class WorkflowInstanceAbstractMapper extends DataMapperFactory 'workflow_instance_id' => ['name' => 'workflow_instance_id', 'type' => 'int', 'internal' => 'id'], 'workflow_instance_title' => ['name' => 'workflow_instance_title', 'type' => 'string', 'internal' => 'title'], 'workflow_instance_status' => ['name' => 'workflow_instance_status', 'type' => 'int', 'internal' => 'status'], - 'workflow_instance_data' => ['name' => 'workflow_instance_data', 'type' => 'string', 'internal' => 'data'], + 'workflow_instance_data' => ['name' => 'workflow_instance_data', 'type' => 'string', 'internal' => 'data'], 'workflow_instance_template' => ['name' => 'workflow_instance_template', 'type' => 'int', 'internal' => 'template'], 'workflow_instance_created_at' => ['name' => 'workflow_instance_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], 'workflow_instance_created_by' => ['name' => 'workflow_instance_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], diff --git a/Models/WorkflowTemplateMapper.php b/Models/WorkflowTemplateMapper.php index 1229fff..05f79e8 100755 --- a/Models/WorkflowTemplateMapper.php +++ b/Models/WorkflowTemplateMapper.php @@ -43,7 +43,7 @@ final class WorkflowTemplateMapper extends DataMapperFactory 'workflow_template_name' => ['name' => 'workflow_template_name', 'type' => 'string', 'internal' => 'name'], 'workflow_template_desc' => ['name' => 'workflow_template_desc', 'type' => 'string', 'internal' => 'description'], 'workflow_template_descRaw' => ['name' => 'workflow_template_descRaw', 'type' => 'string', 'internal' => 'descriptionRaw'], - 'workflow_template_schema' => ['name' => 'workflow_template_schema', 'type' => 'Json', 'internal' => 'schema'], + 'workflow_template_schema' => ['name' => 'workflow_template_schema', 'type' => 'Json', 'internal' => 'schema'], 'workflow_template_media' => ['name' => 'workflow_template_media', 'type' => 'int', 'internal' => 'source'], 'workflow_template_created_at' => ['name' => 'workflow_template_created_at', 'type' => 'DateTimeImmutable', 'internal' => 'createdAt', 'readonly' => true], 'workflow_template_created_by' => ['name' => 'workflow_template_created_by', 'type' => 'int', 'internal' => 'createdBy', 'readonly' => true], diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 8defacd..b8e98f8 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -14,22 +14,22 @@ declare(strict_types=1); return ['Workflow' => [ 'Available' => 'Available', - 'Active' => 'Active', - 'CC' => 'CC', - 'Created' => 'Created', - 'Name' => 'Name', - 'Creator' => 'Creator', - 'Due' => 'Due', - 'Media' => 'Media', - 'Message' => 'Message', - 'Next' => 'Next', - 'Select' => 'Select', - 'Status' => 'Status', - 'Task' => 'Task', - 'Title' => 'Title', - 'To' => 'To', - 'Upload' => 'Upload', - 'Workflow' => 'Workflow', - 'Workflows' => 'Workflows', - 'Instances' => 'Instances', + 'Active' => 'Active', + 'CC' => 'CC', + 'Created' => 'Created', + 'Name' => 'Name', + 'Creator' => 'Creator', + 'Due' => 'Due', + 'Media' => 'Media', + 'Message' => 'Message', + 'Next' => 'Next', + 'Select' => 'Select', + 'Status' => 'Status', + 'Task' => 'Task', + 'Title' => 'Title', + 'To' => 'To', + 'Upload' => 'Upload', + 'Workflow' => 'Workflow', + 'Workflows' => 'Workflows', + 'Instances' => 'Instances', ]]; diff --git a/Theme/Backend/workflow-template.tpl.php b/Theme/Backend/workflow-template.tpl.php index 662ae77..144f810 100755 --- a/Theme/Backend/workflow-template.tpl.php +++ b/Theme/Backend/workflow-template.tpl.php @@ -12,18 +12,17 @@ */ declare(strict_types=1); -use phpOMS\Uri\UriFactory; use phpOMS\Views\View; /** - * @var \phpOMS\Views\View $this + * @var \phpOMS\Views\View $this * @var \Modules\Workflow\Models\Template $template */ $template = $this->getData('template'); $actions = \json_decode(\file_get_contents(__DIR__ . '/../../Definitions/actions.json'), true); -function renderWorkflow(array $leaf, array $actions) +function renderWorkflow(array $leaf, array $actions) : void { foreach ($leaf as $e) { echo <<'; - renderWorkflow($e['children'], $actions); + \renderWorkflow($e['children'], $actions); echo ''; } @@ -69,7 +68,7 @@ function renderWorkflow(array $leaf, array $actions) } } -function renderElements(array $leaf, array $actions) +function renderElements(array $leaf, array $actions) : void { foreach ($leaf as $e) { $name = View::html($actions[(int) $e['id']]['name']); @@ -81,7 +80,7 @@ function renderElements(array $leaf, array $actions) NEWDOC; - renderElements($e['children'], $actions); + \renderElements($e['children'], $actions); } } @@ -98,7 +97,7 @@ if (!empty($template->schema)) :