From 78decc2133bd64e641608858fa3a7412ee331809 Mon Sep 17 00:00:00 2001 From: Justus Dieckmann <justusdieckmann@wwu.de> Date: Fri, 27 Sep 2019 18:10:04 +0200 Subject: [PATCH] Move Non-API 2nd level namespaces to tool_lifecycle\local\* --- activeprocesses.php | 2 +- adminlib.php | 30 +++++++++---------- classes/event/process_proceeded.php | 2 +- classes/event/process_rollback.php | 2 +- classes/event/process_triggered.php | 2 +- .../backup/backup_lifecycle_workflow.php | 14 ++++----- .../backup/restore_lifecycle_workflow.php | 14 ++++----- classes/{ => local}/entity/process.php | 2 +- classes/{ => local}/entity/step_subplugin.php | 2 +- classes/{ => local}/entity/subplugin.php | 2 +- .../{ => local}/entity/trigger_subplugin.php | 2 +- classes/{ => local}/entity/workflow.php | 2 +- .../{ => local}/form/form_step_instance.php | 8 ++--- .../form/form_trigger_instance.php | 10 +++---- .../{ => local}/form/form_upload_workflow.php | 2 +- .../form/form_workflow_instance.php | 4 +-- .../{ => local}/manager/backup_manager.php | 2 +- .../manager/delayed_courses_manager.php | 2 +- .../manager/interaction_manager.php | 6 ++-- classes/{ => local}/manager/lib_manager.php | 2 +- .../manager/process_data_manager.php | 6 ++-- .../{ => local}/manager/process_manager.php | 4 +-- .../{ => local}/manager/settings_manager.php | 4 +-- classes/{ => local}/manager/step_manager.php | 4 +-- .../{ => local}/manager/subplugin_manager.php | 2 +- .../{ => local}/manager/trigger_manager.php | 6 ++-- .../{ => local}/manager/workflow_manager.php | 6 ++-- .../response/step_interactive_response.php | 2 +- .../{ => local}/response/step_response.php | 2 +- .../{ => local}/response/trigger_response.php | 2 +- .../active_automatic_workflows_table.php | 10 +++---- .../table/active_manual_workflows_table.php | 12 ++++---- .../table/active_processes_table.php | 2 +- .../table/active_workflows_table.php | 12 ++++---- .../table/course_backups_table.php | 2 +- .../table/deactivated_workflows_table.php | 8 ++--- .../table/interaction_attention_table.php | 8 ++--- .../table/interaction_remaining_table.php | 6 ++-- .../{ => local}/table/interaction_table.php | 12 ++++---- classes/{ => local}/table/step_table.php | 12 ++++---- .../table/workflow_definition_table.php | 12 ++++---- classes/{ => local}/table/workflow_table.php | 12 ++++---- classes/plugininfo/lifecyclestep.php | 4 +-- classes/plugininfo/lifecycletrigger.php | 8 ++--- classes/processor.php | 20 ++++++------- classes/task/lifecycle_task.php | 4 +-- classes/view_controller.php | 18 +++++------ coursebackups.php | 2 +- db/upgrade.php | 8 ++--- deactivatedworkflows.php | 4 +-- renderer.php | 2 +- restore.php | 2 +- step/createbackup/db/upgrade.php | 4 +-- step/createbackup/lib.php | 6 ++-- step/deletecourse/db/upgrade.php | 4 +-- step/deletecourse/lib.php | 4 +-- step/duplicate/classes/form_duplicate.php | 2 +- step/duplicate/interactionlib.php | 10 +++---- step/duplicate/lib.php | 10 +++---- step/email/interactionlib.php | 14 ++++----- step/email/lib.php | 10 +++---- step/interactionlib.php | 6 ++-- step/lib.php | 4 +-- tests/active_workflow_is_manual_test.php | 4 +-- .../active_workflow_sortindex_updown_test.php | 2 +- tests/backup_and_restore_workflow_test.php | 14 ++++----- tests/backup_manager_test.php | 2 +- tests/generator/lib.php | 16 +++++----- tests/manual_trigger_tools_test.php | 6 ++-- tests/manually_triggered_process_test.php | 10 +++---- .../persistence/persist_process_data_test.php | 8 ++--- tests/persistence/persist_process_test.php | 6 ++-- tests/persistence/persist_step_test.php | 4 +-- tests/persistence/persist_workflow_test.php | 4 +-- tests/process_status_message_test.php | 14 ++++----- tests/settings_manager_test.php | 16 +++++----- tests/workflow_actions_testcase.php | 4 +-- ...rkflow_activate_disable_duplicate_test.php | 8 ++--- trigger/categories/lib.php | 4 +-- trigger/categories/tests/generator/lib.php | 10 +++---- trigger/categories/tests/trigger_test.php | 4 +-- trigger/delayedcourses/db/install.php | 2 +- trigger/delayedcourses/lib.php | 4 +-- .../delayedcourses/tests/generator/lib.php | 8 ++--- trigger/delayedcourses/tests/trigger_test.php | 6 ++-- trigger/lib.php | 2 +- trigger/sitecourse/db/install.php | 2 +- trigger/sitecourse/lib.php | 2 +- trigger/sitecourse/tests/generator/lib.php | 8 ++--- trigger/sitecourse/tests/trigger_test.php | 4 +-- trigger/specificdate/lib.php | 6 ++-- trigger/startdatedelay/lib.php | 4 +-- .../startdatedelay/tests/generator/lib.php | 10 +++---- trigger/startdatedelay/tests/trigger_test.php | 2 +- view.php | 6 ++-- workflowsettings.php | 2 +- 96 files changed, 304 insertions(+), 304 deletions(-) rename classes/{ => local}/entity/process.php (98%) rename classes/{ => local}/entity/step_subplugin.php (98%) rename classes/{ => local}/entity/subplugin.php (98%) rename classes/{ => local}/entity/trigger_subplugin.php (98%) rename classes/{ => local}/entity/workflow.php (99%) rename classes/{ => local}/form/form_step_instance.php (97%) rename classes/{ => local}/form/form_trigger_instance.php (96%) rename classes/{ => local}/form/form_upload_workflow.php (97%) rename classes/{ => local}/form/form_workflow_instance.php (98%) rename classes/{ => local}/manager/backup_manager.php (99%) rename classes/{ => local}/manager/delayed_courses_manager.php (99%) rename classes/{ => local}/manager/interaction_manager.php (98%) rename classes/{ => local}/manager/lib_manager.php (99%) rename classes/{ => local}/manager/process_data_manager.php (96%) rename classes/{ => local}/manager/process_manager.php (98%) rename classes/{ => local}/manager/settings_manager.php (98%) rename classes/{ => local}/manager/step_manager.php (99%) rename classes/{ => local}/manager/subplugin_manager.php (98%) rename classes/{ => local}/manager/trigger_manager.php (98%) rename classes/{ => local}/manager/workflow_manager.php (99%) rename classes/{ => local}/response/step_interactive_response.php (98%) rename classes/{ => local}/response/step_response.php (98%) rename classes/{ => local}/response/trigger_response.php (98%) rename classes/{ => local}/table/active_automatic_workflows_table.php (94%) rename classes/{ => local}/table/active_manual_workflows_table.php (90%) rename classes/{ => local}/table/active_processes_table.php (98%) rename classes/{ => local}/table/active_workflows_table.php (93%) rename classes/{ => local}/table/course_backups_table.php (99%) rename classes/{ => local}/table/deactivated_workflows_table.php (96%) rename classes/{ => local}/table/interaction_attention_table.php (96%) rename classes/{ => local}/table/interaction_remaining_table.php (98%) rename classes/{ => local}/table/interaction_table.php (92%) rename classes/{ => local}/table/step_table.php (97%) rename classes/{ => local}/table/workflow_definition_table.php (94%) rename classes/{ => local}/table/workflow_table.php (95%) diff --git a/activeprocesses.php b/activeprocesses.php index c2a227a..6e41392 100644 --- a/activeprocesses.php +++ b/activeprocesses.php @@ -32,7 +32,7 @@ admin_externalpage_setup('tool_lifecycle_activeprocesses'); $PAGE->set_url(new \moodle_url('/admin/tool/lifecycle/activeprocesses.php')); -$table = new tool_lifecycle\table\active_processes_table('tool_lifecycle_active_processes'); +$table = new tool_lifecycle\local\table\active_processes_table('tool_lifecycle_active_processes'); $PAGE->set_title(get_string('active_processes_list_header', 'tool_lifecycle')); $PAGE->set_heading(get_string('active_processes_list_header', 'tool_lifecycle')); diff --git a/adminlib.php b/adminlib.php index 90ea5a1..afb56d0 100644 --- a/adminlib.php +++ b/adminlib.php @@ -23,22 +23,22 @@ */ namespace tool_lifecycle; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\form\form_workflow_instance; -use tool_lifecycle\form\form_upload_workflow; -use tool_lifecycle\form\form_step_instance; -use tool_lifecycle\form\form_trigger_instance; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\form\form_workflow_instance; +use tool_lifecycle\local\form\form_upload_workflow; +use tool_lifecycle\local\form\form_step_instance; +use tool_lifecycle\local\form\form_trigger_instance; use tool_lifecycle\local\backup\restore_lifecycle_workflow; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\manager\workflow_manager; -use tool_lifecycle\table\active_manual_workflows_table; -use tool_lifecycle\table\workflow_definition_table; -use tool_lifecycle\table\active_automatic_workflows_table; -use tool_lifecycle\table\step_table; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\manager\workflow_manager; +use tool_lifecycle\local\table\active_manual_workflows_table; +use tool_lifecycle\local\table\workflow_definition_table; +use tool_lifecycle\local\table\active_automatic_workflows_table; +use tool_lifecycle\local\table\step_table; defined('MOODLE_INTERNAL') || die; diff --git a/classes/event/process_proceeded.php b/classes/event/process_proceeded.php index 47a9775..0df4ac7 100644 --- a/classes/event/process_proceeded.php +++ b/classes/event/process_proceeded.php @@ -24,7 +24,7 @@ namespace tool_lifecycle\event; use moodle_url; -use \tool_lifecycle\entity\process; +use tool_lifecycle\local\entity\process; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/event/process_rollback.php b/classes/event/process_rollback.php index 85331a6..8f333b3 100644 --- a/classes/event/process_rollback.php +++ b/classes/event/process_rollback.php @@ -25,7 +25,7 @@ namespace tool_lifecycle\event; use moodle_url; -use \tool_lifecycle\entity\process; +use tool_lifecycle\local\entity\process; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/event/process_triggered.php b/classes/event/process_triggered.php index ab25e44..dcde222 100644 --- a/classes/event/process_triggered.php +++ b/classes/event/process_triggered.php @@ -25,7 +25,7 @@ namespace tool_lifecycle\event; use moodle_url; -use \tool_lifecycle\entity\process; +use tool_lifecycle\local\entity\process; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/local/backup/backup_lifecycle_workflow.php b/classes/local/backup/backup_lifecycle_workflow.php index 1abe072..81eb2d0 100644 --- a/classes/local/backup/backup_lifecycle_workflow.php +++ b/classes/local/backup/backup_lifecycle_workflow.php @@ -22,13 +22,13 @@ */ namespace tool_lifecycle\local\backup; -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\workflow_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\settings_manager; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\workflow_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\settings_manager; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/local/backup/restore_lifecycle_workflow.php b/classes/local/backup/restore_lifecycle_workflow.php index d02b184..39d5470 100644 --- a/classes/local/backup/restore_lifecycle_workflow.php +++ b/classes/local/backup/restore_lifecycle_workflow.php @@ -22,13 +22,13 @@ */ namespace tool_lifecycle\local\backup; -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\workflow_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\settings_manager; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\workflow_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\settings_manager; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/entity/process.php b/classes/local/entity/process.php similarity index 98% rename from classes/entity/process.php rename to classes/local/entity/process.php index 5a21cb0..d77f2f9 100644 --- a/classes/entity/process.php +++ b/classes/local/entity/process.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\entity; +namespace tool_lifecycle\local\entity; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/entity/step_subplugin.php b/classes/local/entity/step_subplugin.php similarity index 98% rename from classes/entity/step_subplugin.php rename to classes/local/entity/step_subplugin.php index 4e4ce20..81cca5b 100644 --- a/classes/entity/step_subplugin.php +++ b/classes/local/entity/step_subplugin.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\entity; +namespace tool_lifecycle\local\entity; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/entity/subplugin.php b/classes/local/entity/subplugin.php similarity index 98% rename from classes/entity/subplugin.php rename to classes/local/entity/subplugin.php index ca8f51c..d01510b 100644 --- a/classes/entity/subplugin.php +++ b/classes/local/entity/subplugin.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\entity; +namespace tool_lifecycle\local\entity; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/entity/trigger_subplugin.php b/classes/local/entity/trigger_subplugin.php similarity index 98% rename from classes/entity/trigger_subplugin.php rename to classes/local/entity/trigger_subplugin.php index 9d50937..ddcbf77 100644 --- a/classes/entity/trigger_subplugin.php +++ b/classes/local/entity/trigger_subplugin.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\entity; +namespace tool_lifecycle\local\entity; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/entity/workflow.php b/classes/local/entity/workflow.php similarity index 99% rename from classes/entity/workflow.php rename to classes/local/entity/workflow.php index f442da1..eb69247 100644 --- a/classes/entity/workflow.php +++ b/classes/local/entity/workflow.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\entity; +namespace tool_lifecycle\local\entity; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/form/form_step_instance.php b/classes/local/form/form_step_instance.php similarity index 97% rename from classes/form/form_step_instance.php rename to classes/local/form/form_step_instance.php index c098a66..542817c 100644 --- a/classes/form/form_step_instance.php +++ b/classes/local/form/form_step_instance.php @@ -21,12 +21,12 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\form; +namespace tool_lifecycle\local\form; use tool_lifecycle\action; -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\workflow_manager; use tool_lifecycle\step\libbase; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/form/form_trigger_instance.php b/classes/local/form/form_trigger_instance.php similarity index 96% rename from classes/form/form_trigger_instance.php rename to classes/local/form/form_trigger_instance.php index 4847b0b..71653a7 100644 --- a/classes/form/form_trigger_instance.php +++ b/classes/local/form/form_trigger_instance.php @@ -21,13 +21,13 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\form; +namespace tool_lifecycle\local\form; use tool_lifecycle\action; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; use tool_lifecycle\trigger\base; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/form/form_upload_workflow.php b/classes/local/form/form_upload_workflow.php similarity index 97% rename from classes/form/form_upload_workflow.php rename to classes/local/form/form_upload_workflow.php index 8573c0d..5ce328c 100644 --- a/classes/form/form_upload_workflow.php +++ b/classes/local/form/form_upload_workflow.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\form; +namespace tool_lifecycle\local\form; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/form/form_workflow_instance.php b/classes/local/form/form_workflow_instance.php similarity index 98% rename from classes/form/form_workflow_instance.php rename to classes/local/form/form_workflow_instance.php index 71e934d..6355962 100644 --- a/classes/form/form_workflow_instance.php +++ b/classes/local/form/form_workflow_instance.php @@ -21,9 +21,9 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\form; +namespace tool_lifecycle\local\form; -use tool_lifecycle\entity\workflow; +use tool_lifecycle\local\entity\workflow; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/manager/backup_manager.php b/classes/local/manager/backup_manager.php similarity index 99% rename from classes/manager/backup_manager.php rename to classes/local/manager/backup_manager.php index 7c270ba..89ee086 100644 --- a/classes/manager/backup_manager.php +++ b/classes/local/manager/backup_manager.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/manager/delayed_courses_manager.php b/classes/local/manager/delayed_courses_manager.php similarity index 99% rename from classes/manager/delayed_courses_manager.php rename to classes/local/manager/delayed_courses_manager.php index d07a698..cb989ec 100644 --- a/classes/manager/delayed_courses_manager.php +++ b/classes/local/manager/delayed_courses_manager.php @@ -22,7 +22,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; defined('MOODLE_INTERNAL') || die(); /** diff --git a/classes/manager/interaction_manager.php b/classes/local/manager/interaction_manager.php similarity index 98% rename from classes/manager/interaction_manager.php rename to classes/local/manager/interaction_manager.php index 67996fc..5dbe2d4 100644 --- a/classes/manager/interaction_manager.php +++ b/classes/local/manager/interaction_manager.php @@ -21,11 +21,11 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; -use tool_lifecycle\entity\process; +use tool_lifecycle\local\entity\process; use tool_lifecycle\processor; -use tool_lifecycle\response\step_interactive_response; +use tool_lifecycle\local\response\step_interactive_response; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/manager/lib_manager.php b/classes/local/manager/lib_manager.php similarity index 99% rename from classes/manager/lib_manager.php rename to classes/local/manager/lib_manager.php index 3d4873d..7e82777 100644 --- a/classes/manager/lib_manager.php +++ b/classes/local/manager/lib_manager.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; use tool_lifecycle\step\libbase; use tool_lifecycle\trigger\base; diff --git a/classes/manager/process_data_manager.php b/classes/local/manager/process_data_manager.php similarity index 96% rename from classes/manager/process_data_manager.php rename to classes/local/manager/process_data_manager.php index afd2dd9..fb3f168 100644 --- a/classes/manager/process_data_manager.php +++ b/classes/local/manager/process_data_manager.php @@ -25,10 +25,10 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; -use tool_lifecycle\entity\process; -use tool_lifecycle\entity\trigger_subplugin; +use tool_lifecycle\local\entity\process; +use tool_lifecycle\local\entity\trigger_subplugin; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/manager/process_manager.php b/classes/local/manager/process_manager.php similarity index 98% rename from classes/manager/process_manager.php rename to classes/local/manager/process_manager.php index 97af8d4..48268d6 100644 --- a/classes/manager/process_manager.php +++ b/classes/local/manager/process_manager.php @@ -21,9 +21,9 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; -use tool_lifecycle\entity\process; +use tool_lifecycle\local\entity\process; use tool_lifecycle\event\process_proceeded; use tool_lifecycle\event\process_rollback; diff --git a/classes/manager/settings_manager.php b/classes/local/manager/settings_manager.php similarity index 98% rename from classes/manager/settings_manager.php rename to classes/local/manager/settings_manager.php index fbdd296..b6ca7de 100644 --- a/classes/manager/settings_manager.php +++ b/classes/local/manager/settings_manager.php @@ -21,12 +21,12 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); -require_once(__DIR__.'/../../lib.php'); +require_once(__DIR__.'/../../../lib.php'); /** * Manager to retrive the local settings for each step subplugin. diff --git a/classes/manager/step_manager.php b/classes/local/manager/step_manager.php similarity index 99% rename from classes/manager/step_manager.php rename to classes/local/manager/step_manager.php index 3eb7698..4a03f4e 100644 --- a/classes/manager/step_manager.php +++ b/classes/local/manager/step_manager.php @@ -21,10 +21,10 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; use tool_lifecycle\action; -use tool_lifecycle\entity\step_subplugin; +use tool_lifecycle\local\entity\step_subplugin; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/manager/subplugin_manager.php b/classes/local/manager/subplugin_manager.php similarity index 98% rename from classes/manager/subplugin_manager.php rename to classes/local/manager/subplugin_manager.php index 1e53076..8728582 100644 --- a/classes/manager/subplugin_manager.php +++ b/classes/local/manager/subplugin_manager.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; defined('MOODLE_INTERNAL') || die(); // This file is part of Moodle - http://moodle.org/ diff --git a/classes/manager/trigger_manager.php b/classes/local/manager/trigger_manager.php similarity index 98% rename from classes/manager/trigger_manager.php rename to classes/local/manager/trigger_manager.php index ddae60b..e59a8a4 100644 --- a/classes/manager/trigger_manager.php +++ b/classes/local/manager/trigger_manager.php @@ -21,11 +21,11 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; use tool_lifecycle\action; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/manager/workflow_manager.php b/classes/local/manager/workflow_manager.php similarity index 99% rename from classes/manager/workflow_manager.php rename to classes/local/manager/workflow_manager.php index 6aa0d25..690d139 100644 --- a/classes/manager/workflow_manager.php +++ b/classes/local/manager/workflow_manager.php @@ -21,11 +21,11 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\manager; +namespace tool_lifecycle\local\manager; use tool_lifecycle\action; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; use tool_lifecycle\local\backup\backup_lifecycle_workflow; use tool_lifecycle\local\data\manual_trigger_tool; use tool_lifecycle\settings_type; diff --git a/classes/response/step_interactive_response.php b/classes/local/response/step_interactive_response.php similarity index 98% rename from classes/response/step_interactive_response.php rename to classes/local/response/step_interactive_response.php index d373404..f9c89d4 100644 --- a/classes/response/step_interactive_response.php +++ b/classes/local/response/step_interactive_response.php @@ -21,7 +21,7 @@ * @copyright 2018 WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\response; +namespace tool_lifecycle\local\response; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/response/step_response.php b/classes/local/response/step_response.php similarity index 98% rename from classes/response/step_response.php rename to classes/local/response/step_response.php index 9a1c643..f6301d7 100644 --- a/classes/response/step_response.php +++ b/classes/local/response/step_response.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\response; +namespace tool_lifecycle\local\response; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/response/trigger_response.php b/classes/local/response/trigger_response.php similarity index 98% rename from classes/response/trigger_response.php rename to classes/local/response/trigger_response.php index 4c3fcec..9e4f097 100644 --- a/classes/response/trigger_response.php +++ b/classes/local/response/trigger_response.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\response; +namespace tool_lifecycle\local\response; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/table/active_automatic_workflows_table.php b/classes/local/table/active_automatic_workflows_table.php similarity index 94% rename from classes/table/active_automatic_workflows_table.php rename to classes/local/table/active_automatic_workflows_table.php index b647704..58b4203 100644 --- a/classes/table/active_automatic_workflows_table.php +++ b/classes/local/table/active_automatic_workflows_table.php @@ -21,17 +21,17 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; use tool_lifecycle\action; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die; require_once($CFG->libdir . '/tablelib.php'); -require_once(__DIR__ . '/../../lib.php'); +require_once(__DIR__ . '/../../../lib.php'); /** * Table listing all active automatically triggered workflows. diff --git a/classes/table/active_manual_workflows_table.php b/classes/local/table/active_manual_workflows_table.php similarity index 90% rename from classes/table/active_manual_workflows_table.php rename to classes/local/table/active_manual_workflows_table.php index f1bdfd6..5452a92 100644 --- a/classes/table/active_manual_workflows_table.php +++ b/classes/local/table/active_manual_workflows_table.php @@ -21,17 +21,17 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; -use tool_lifecycle\manager\process_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\process_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die; require_once($CFG->libdir . '/tablelib.php'); -require_once(__DIR__ . '/../../lib.php'); +require_once(__DIR__ . '/../../../lib.php'); /** * Table listing all active manually triggered workflows. diff --git a/classes/table/active_processes_table.php b/classes/local/table/active_processes_table.php similarity index 98% rename from classes/table/active_processes_table.php rename to classes/local/table/active_processes_table.php index 6330869..b545f82 100644 --- a/classes/table/active_processes_table.php +++ b/classes/local/table/active_processes_table.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; defined('MOODLE_INTERNAL') || die; diff --git a/classes/table/active_workflows_table.php b/classes/local/table/active_workflows_table.php similarity index 93% rename from classes/table/active_workflows_table.php rename to classes/local/table/active_workflows_table.php index 9bd5d81..d3f35c4 100644 --- a/classes/table/active_workflows_table.php +++ b/classes/local/table/active_workflows_table.php @@ -21,18 +21,18 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; use tool_lifecycle\action; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die; require_once($CFG->libdir . '/tablelib.php'); -require_once(__DIR__ . '/../../lib.php'); +require_once(__DIR__ . '/../../../lib.php'); /** * Table listing all active workflow definitions. diff --git a/classes/table/course_backups_table.php b/classes/local/table/course_backups_table.php similarity index 99% rename from classes/table/course_backups_table.php rename to classes/local/table/course_backups_table.php index 78d1f08..b803a30 100644 --- a/classes/table/course_backups_table.php +++ b/classes/local/table/course_backups_table.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; defined('MOODLE_INTERNAL') || die; diff --git a/classes/table/deactivated_workflows_table.php b/classes/local/table/deactivated_workflows_table.php similarity index 96% rename from classes/table/deactivated_workflows_table.php rename to classes/local/table/deactivated_workflows_table.php index 7c7f59e..d16ce42 100644 --- a/classes/table/deactivated_workflows_table.php +++ b/classes/local/table/deactivated_workflows_table.php @@ -21,12 +21,12 @@ * @copyright 2018 Yorick Reum, JMU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; use tool_lifecycle\action; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die; diff --git a/classes/table/interaction_attention_table.php b/classes/local/table/interaction_attention_table.php similarity index 96% rename from classes/table/interaction_attention_table.php rename to classes/local/table/interaction_attention_table.php index 845b413..3375a57 100644 --- a/classes/table/interaction_attention_table.php +++ b/classes/local/table/interaction_attention_table.php @@ -21,11 +21,11 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; -use tool_lifecycle\manager\interaction_manager; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\step_manager; +use tool_lifecycle\local\manager\interaction_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\step_manager; defined('MOODLE_INTERNAL') || die; diff --git a/classes/table/interaction_remaining_table.php b/classes/local/table/interaction_remaining_table.php similarity index 98% rename from classes/table/interaction_remaining_table.php rename to classes/local/table/interaction_remaining_table.php index 8d84ea9..27cc90e 100644 --- a/classes/table/interaction_remaining_table.php +++ b/classes/local/table/interaction_remaining_table.php @@ -21,10 +21,10 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die; diff --git a/classes/table/interaction_table.php b/classes/local/table/interaction_table.php similarity index 92% rename from classes/table/interaction_table.php rename to classes/local/table/interaction_table.php index 8b2db10..68a1573 100644 --- a/classes/table/interaction_table.php +++ b/classes/local/table/interaction_table.php @@ -21,13 +21,13 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\manager\interaction_manager; -use tool_lifecycle\manager\process_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\manager\interaction_manager; +use tool_lifecycle\local\manager\process_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die; diff --git a/classes/table/step_table.php b/classes/local/table/step_table.php similarity index 97% rename from classes/table/step_table.php rename to classes/local/table/step_table.php index 0b85115..b55a9c0 100644 --- a/classes/table/step_table.php +++ b/classes/local/table/step_table.php @@ -21,18 +21,18 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; use tool_lifecycle\action; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die; require_once($CFG->libdir . '/tablelib.php'); -require_once(__DIR__ . '/../../lib.php'); +require_once(__DIR__ . '/../../../lib.php'); /** * Table listing step instances diff --git a/classes/table/workflow_definition_table.php b/classes/local/table/workflow_definition_table.php similarity index 94% rename from classes/table/workflow_definition_table.php rename to classes/local/table/workflow_definition_table.php index 631865c..5666037 100644 --- a/classes/table/workflow_definition_table.php +++ b/classes/local/table/workflow_definition_table.php @@ -21,18 +21,18 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; use tool_lifecycle\action; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die; require_once($CFG->libdir . '/tablelib.php'); -require_once(__DIR__ . '/../../lib.php'); +require_once(__DIR__ . '/../../../lib.php'); /** * Table listing all workflow definitions. diff --git a/classes/table/workflow_table.php b/classes/local/table/workflow_table.php similarity index 95% rename from classes/table/workflow_table.php rename to classes/local/table/workflow_table.php index 6ad6527..8634d38 100644 --- a/classes/table/workflow_table.php +++ b/classes/local/table/workflow_table.php @@ -21,18 +21,18 @@ * @copyright 2018 Jan Dageförde WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace tool_lifecycle\table; +namespace tool_lifecycle\local\table; use tool_lifecycle\action; -use tool_lifecycle\manager\process_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\process_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die; require_once($CFG->libdir . '/tablelib.php'); -require_once(__DIR__ . '/../../lib.php'); +require_once(__DIR__ . '/../../../lib.php'); /** * Table listing all active automatically triggered workflows. diff --git a/classes/plugininfo/lifecyclestep.php b/classes/plugininfo/lifecyclestep.php index cfc53df..59ff802 100644 --- a/classes/plugininfo/lifecyclestep.php +++ b/classes/plugininfo/lifecyclestep.php @@ -24,8 +24,8 @@ namespace tool_lifecycle\plugininfo; use core\plugininfo\base; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\workflow_manager; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/plugininfo/lifecycletrigger.php b/classes/plugininfo/lifecycletrigger.php index 12652a3..ba68642 100644 --- a/classes/plugininfo/lifecycletrigger.php +++ b/classes/plugininfo/lifecycletrigger.php @@ -24,10 +24,10 @@ namespace tool_lifecycle\plugininfo; use core\plugininfo\base; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; use tool_usertours\step; defined('MOODLE_INTERNAL') || die(); diff --git a/classes/processor.php b/classes/processor.php index 3256c59..7ed8f10 100644 --- a/classes/processor.php +++ b/classes/processor.php @@ -23,17 +23,17 @@ */ namespace tool_lifecycle; -use tool_lifecycle\entity\trigger_subplugin; +use tool_lifecycle\local\entity\trigger_subplugin; use tool_lifecycle\event\process_triggered; -use tool_lifecycle\manager\process_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\workflow_manager; -use tool_lifecycle\manager\delayed_courses_manager; -use tool_lifecycle\response\step_interactive_response; -use tool_lifecycle\response\step_response; -use tool_lifecycle\response\trigger_response; +use tool_lifecycle\local\manager\process_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\workflow_manager; +use tool_lifecycle\local\manager\delayed_courses_manager; +use tool_lifecycle\local\response\step_interactive_response; +use tool_lifecycle\local\response\step_response; +use tool_lifecycle\local\response\trigger_response; defined('MOODLE_INTERNAL') || die; diff --git a/classes/task/lifecycle_task.php b/classes/task/lifecycle_task.php index a1b5481..d956865 100644 --- a/classes/task/lifecycle_task.php +++ b/classes/task/lifecycle_task.php @@ -23,8 +23,8 @@ */ namespace tool_lifecycle\task; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\step_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\step_manager; use tool_lifecycle\processor; defined('MOODLE_INTERNAL') || die; diff --git a/classes/view_controller.php b/classes/view_controller.php index 28d636d..5e1d808 100644 --- a/classes/view_controller.php +++ b/classes/view_controller.php @@ -24,15 +24,15 @@ namespace tool_lifecycle; use core\notification; -use tool_lifecycle\manager\interaction_manager; -use tool_lifecycle\manager\lib_manager; -use tool_lifecycle\manager\process_manager; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\table\interaction_log_table; -use tool_lifecycle\table\interaction_remaining_table; -use tool_lifecycle\table\interaction_attention_table; +use tool_lifecycle\local\manager\interaction_manager; +use tool_lifecycle\local\manager\lib_manager; +use tool_lifecycle\local\manager\process_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\table\interaction_log_table; +use tool_lifecycle\local\table\interaction_remaining_table; +use tool_lifecycle\local\table\interaction_attention_table; defined('MOODLE_INTERNAL') || die(); diff --git a/coursebackups.php b/coursebackups.php index 6c8aee2..0b15719 100644 --- a/coursebackups.php +++ b/coursebackups.php @@ -32,7 +32,7 @@ admin_externalpage_setup('tool_lifecycle_coursebackups'); $PAGE->set_url(new \moodle_url('/admin/tool/lifecycle/coursebackups.php')); -$table = new tool_lifecycle\table\course_backups_table('tool_lifecycle_course_backups'); +$table = new tool_lifecycle\local\table\course_backups_table('tool_lifecycle_course_backups'); $PAGE->set_title(get_string('course_backups_list_header', 'tool_lifecycle')); $PAGE->set_heading(get_string('course_backups_list_header', 'tool_lifecycle')); diff --git a/db/upgrade.php b/db/upgrade.php index 2d970f4..1ee58e3 100644 --- a/db/upgrade.php +++ b/db/upgrade.php @@ -247,13 +247,13 @@ function xmldb_tool_lifecycle_upgrade($oldversion) { } if ($oldversion < 2018022005) { - $workflows = \tool_lifecycle\manager\workflow_manager::get_active_workflows(); + $workflows = \tool_lifecycle\local\manager\workflow_manager::get_active_workflows(); foreach ($workflows as $workflow) { if ($workflow->manual === null) { - $trigger = \tool_lifecycle\manager\trigger_manager::get_triggers_for_workflow($workflow->id)[0]; - $lib = \tool_lifecycle\manager\lib_manager::get_trigger_lib($trigger->subpluginname); + $trigger = \tool_lifecycle\local\manager\trigger_manager::get_triggers_for_workflow($workflow->id)[0]; + $lib = \tool_lifecycle\local\manager\lib_manager::get_trigger_lib($trigger->subpluginname); $workflow->manual = $lib->is_manual_trigger(); - \tool_lifecycle\manager\workflow_manager::insert_or_update($workflow); + \tool_lifecycle\local\manager\workflow_manager::insert_or_update($workflow); } } // Lifecycle savepoint reached. diff --git a/deactivatedworkflows.php b/deactivatedworkflows.php index f501630..8ce81b8 100644 --- a/deactivatedworkflows.php +++ b/deactivatedworkflows.php @@ -25,7 +25,7 @@ require_once(__DIR__ . '/../../../config.php'); require_once(__DIR__ . '/adminlib.php'); -use tool_lifecycle\table\deactivated_workflows_table; +use tool_lifecycle\local\table\deactivated_workflows_table; $PAGE->set_context(context_system::instance()); require_login(null, false); @@ -42,7 +42,7 @@ admin_externalpage_setup('tool_lifecycle_deactivatedworkflows'); $workflowid = optional_param('workflowid', null, PARAM_INT); $action = optional_param('action', null, PARAM_TEXT); if ($workflowid && $action) { - \tool_lifecycle\manager\workflow_manager::handle_action($action, $workflowid); + \tool_lifecycle\local\manager\workflow_manager::handle_action($action, $workflowid); } $renderer = $PAGE->get_renderer('tool_lifecycle'); diff --git a/renderer.php b/renderer.php index 2785700..745f433 100644 --- a/renderer.php +++ b/renderer.php @@ -57,7 +57,7 @@ class tool_lifecycle_renderer extends plugin_renderer_base { /** * Renders the workflow upload form including errors, which occured during upload. - * @param \tool_lifecycle\form\form_upload_workflow $form + * @param \tool_lifecycle\local\form\form_upload_workflow $form * @param array $errors * @throws coding_exception */ diff --git a/restore.php b/restore.php index 37277f4..55b276c 100644 --- a/restore.php +++ b/restore.php @@ -23,7 +23,7 @@ */ require_once(__DIR__ . '/../../../config.php'); -use tool_lifecycle\manager\backup_manager; +use tool_lifecycle\local\manager\backup_manager; $PAGE->set_context(context_system::instance()); require_login(null, false); diff --git a/step/createbackup/db/upgrade.php b/step/createbackup/db/upgrade.php index 2884072..bfa92b8 100644 --- a/step/createbackup/db/upgrade.php +++ b/step/createbackup/db/upgrade.php @@ -22,8 +22,8 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\step_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\step_manager; defined('MOODLE_INTERNAL') || die(); diff --git a/step/createbackup/lib.php b/step/createbackup/lib.php index 2e9a9a8..5c0fa5a 100644 --- a/step/createbackup/lib.php +++ b/step/createbackup/lib.php @@ -23,9 +23,9 @@ */ namespace tool_lifecycle\step; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\response\step_response; -use tool_lifecycle\manager\backup_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\response\step_response; +use tool_lifecycle\local\manager\backup_manager; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/step/deletecourse/db/upgrade.php b/step/deletecourse/db/upgrade.php index b6dd64a..668a910 100644 --- a/step/deletecourse/db/upgrade.php +++ b/step/deletecourse/db/upgrade.php @@ -22,8 +22,8 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\step_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\step_manager; defined('MOODLE_INTERNAL') || die(); diff --git a/step/deletecourse/lib.php b/step/deletecourse/lib.php index a11f014..bf14d91 100644 --- a/step/deletecourse/lib.php +++ b/step/deletecourse/lib.php @@ -23,8 +23,8 @@ */ namespace tool_lifecycle\step; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\response\step_response; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\response\step_response; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/step/duplicate/classes/form_duplicate.php b/step/duplicate/classes/form_duplicate.php index 183328c..2a852db 100644 --- a/step/duplicate/classes/form_duplicate.php +++ b/step/duplicate/classes/form_duplicate.php @@ -23,7 +23,7 @@ */ namespace lifecyclestep_duplicate; -use tool_lifecycle\manager\process_manager; +use tool_lifecycle\local\manager\process_manager; use tool_lifecycle\step\interactionduplicate; defined('MOODLE_INTERNAL') || die(); diff --git a/step/duplicate/interactionlib.php b/step/duplicate/interactionlib.php index 169c8e2..f3d04ac 100644 --- a/step/duplicate/interactionlib.php +++ b/step/duplicate/interactionlib.php @@ -24,11 +24,11 @@ namespace tool_lifecycle\step; use lifecyclestep_duplicate\form_duplicate; -use tool_lifecycle\entity\process; -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\manager\process_data_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\response\step_interactive_response; +use tool_lifecycle\local\entity\process; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\manager\process_data_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\response\step_interactive_response; defined('MOODLE_INTERNAL') || die(); diff --git a/step/duplicate/lib.php b/step/duplicate/lib.php index 4a969b9..201c997 100644 --- a/step/duplicate/lib.php +++ b/step/duplicate/lib.php @@ -23,11 +23,11 @@ */ namespace tool_lifecycle\step; -use tool_lifecycle\manager\process_manager; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\response\step_response; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\process_data_manager; +use tool_lifecycle\local\manager\process_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\response\step_response; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\process_data_manager; use tool_usertours\step; defined('MOODLE_INTERNAL') || die(); diff --git a/step/email/interactionlib.php b/step/email/interactionlib.php index f438bd9..9124cff 100644 --- a/step/email/interactionlib.php +++ b/step/email/interactionlib.php @@ -23,13 +23,13 @@ */ namespace tool_lifecycle\step; -use tool_lifecycle\entity\process; -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\manager\process_data_manager; -use tool_lifecycle\manager\process_manager; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\response\step_interactive_response; +use tool_lifecycle\local\entity\process; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\manager\process_data_manager; +use tool_lifecycle\local\manager\process_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\response\step_interactive_response; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/step/email/lib.php b/step/email/lib.php index 7d9eb36..f063d2d 100644 --- a/step/email/lib.php +++ b/step/email/lib.php @@ -23,11 +23,11 @@ namespace tool_lifecycle\step; use core_user; -use tool_lifecycle\manager\process_manager; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\response\step_response; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\process_data_manager; +use tool_lifecycle\local\manager\process_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\response\step_response; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\process_data_manager; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/step/interactionlib.php b/step/interactionlib.php index 038042e..9e27698 100644 --- a/step/interactionlib.php +++ b/step/interactionlib.php @@ -27,9 +27,9 @@ namespace tool_lifecycle\step; use core_user; use MongoDB\BSON\Timestamp; -use tool_lifecycle\entity\process; -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\response\step_interactive_response; +use tool_lifecycle\local\entity\process; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\response\step_interactive_response; defined('MOODLE_INTERNAL') || die(); diff --git a/step/lib.php b/step/lib.php index ae70a17..e9ee290 100644 --- a/step/lib.php +++ b/step/lib.php @@ -24,8 +24,8 @@ */ namespace tool_lifecycle\step; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\response\step_response; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\response\step_response; defined('MOODLE_INTERNAL') || die(); diff --git a/tests/active_workflow_is_manual_test.php b/tests/active_workflow_is_manual_test.php index 2799297..0ae330d 100644 --- a/tests/active_workflow_is_manual_test.php +++ b/tests/active_workflow_is_manual_test.php @@ -28,8 +28,8 @@ require_once(__DIR__ . '/generator/lib.php'); require_once(__DIR__ . '/../lib.php'); use tool_lifecycle\action; -use tool_lifecycle\manager\workflow_manager; -use tool_lifecycle\entity\workflow; +use tool_lifecycle\local\manager\workflow_manager; +use tool_lifecycle\local\entity\workflow; /** * Tests the field is manual after activating workflows. diff --git a/tests/active_workflow_sortindex_updown_test.php b/tests/active_workflow_sortindex_updown_test.php index 85affab..8233578 100644 --- a/tests/active_workflow_sortindex_updown_test.php +++ b/tests/active_workflow_sortindex_updown_test.php @@ -30,7 +30,7 @@ require_once(__DIR__ . '/../lib.php'); require_once(__DIR__ . '/workflow_actions_testcase.php'); use tool_lifecycle\action; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\manager\workflow_manager; /** * Tests the different state changes of the workflow sortindex for up and down action. diff --git a/tests/backup_and_restore_workflow_test.php b/tests/backup_and_restore_workflow_test.php index b006cce..ed81356 100644 --- a/tests/backup_and_restore_workflow_test.php +++ b/tests/backup_and_restore_workflow_test.php @@ -29,11 +29,11 @@ require_once(__DIR__ . '/../lib.php'); use tool_lifecycle\local\backup\backup_lifecycle_workflow; use tool_lifecycle\local\backup\restore_lifecycle_workflow; -use tool_lifecycle\manager\workflow_manager; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\entity\workflow; +use tool_lifecycle\local\manager\workflow_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\entity\workflow; use tool_lifecycle\settings_type; /** @@ -109,7 +109,7 @@ class tool_lifecycle_backup_and_restore_workflow_testcase extends \advanced_test $this->assertEquals($newworkflow->id, $newstep->workflowid); $oldsettings = settings_manager::get_settings($oldstep->id, settings_type::STEP); $newsettings = settings_manager::get_settings($newstep->id, settings_type::STEP); - $lib = \tool_lifecycle\manager\lib_manager::get_step_lib($newstep->subpluginname); + $lib = \tool_lifecycle\local\manager\lib_manager::get_step_lib($newstep->subpluginname); $settingsdef = $lib->instance_settings(); foreach ($settingsdef as $def) { if (array_key_exists($def->name, $oldsettings)) { @@ -131,7 +131,7 @@ class tool_lifecycle_backup_and_restore_workflow_testcase extends \advanced_test $this->assertEquals($newworkflow->id, $newtrig->workflowid); $oldsettings = settings_manager::get_settings($oldtrig->id, settings_type::TRIGGER); $newsettings = settings_manager::get_settings($newtrig->id, settings_type::TRIGGER); - $lib = \tool_lifecycle\manager\lib_manager::get_trigger_lib($newtrig->subpluginname); + $lib = \tool_lifecycle\local\manager\lib_manager::get_trigger_lib($newtrig->subpluginname); $settingsdef = $lib->instance_settings(); foreach ($settingsdef as $def) { if (array_key_exists($def->name, $oldsettings)) { diff --git a/tests/backup_manager_test.php b/tests/backup_manager_test.php index dadf053..9e9865a 100644 --- a/tests/backup_manager_test.php +++ b/tests/backup_manager_test.php @@ -24,7 +24,7 @@ */ defined('MOODLE_INTERNAL') || die(); -use tool_lifecycle\manager\backup_manager; +use tool_lifecycle\local\manager\backup_manager; /** * Tests the beckup manager. diff --git a/tests/generator/lib.php b/tests/generator/lib.php index 254c12d..35a4ac7 100644 --- a/tests/generator/lib.php +++ b/tests/generator/lib.php @@ -24,14 +24,14 @@ */ defined('MOODLE_INTERNAL') || die(); -use tool_lifecycle\entity\process; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\process; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\workflow_manager; use tool_lifecycle\settings_type; /** diff --git a/tests/manual_trigger_tools_test.php b/tests/manual_trigger_tools_test.php index a23ebf4..81ba80a 100644 --- a/tests/manual_trigger_tools_test.php +++ b/tests/manual_trigger_tools_test.php @@ -25,9 +25,9 @@ defined('MOODLE_INTERNAL') || die(); use tool_lifecycle\action; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\workflow_manager; -use tool_lifecycle\manager\trigger_manager; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\workflow_manager; +use tool_lifecycle\local\manager\trigger_manager; use tool_lifecycle\local\data\manual_trigger_tool; /** diff --git a/tests/manually_triggered_process_test.php b/tests/manually_triggered_process_test.php index 96546cc..5251f40 100644 --- a/tests/manually_triggered_process_test.php +++ b/tests/manually_triggered_process_test.php @@ -29,11 +29,11 @@ require_once(__DIR__ . '/generator/lib.php'); require_once(__DIR__ . '/../lib.php'); use tool_lifecycle\action; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\workflow_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\process_manager; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\workflow_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\process_manager; use tool_lifecycle\processor; use tool_lifecycle\settings_type; diff --git a/tests/persistence/persist_process_data_test.php b/tests/persistence/persist_process_data_test.php index 676a76e..2803171 100644 --- a/tests/persistence/persist_process_data_test.php +++ b/tests/persistence/persist_process_data_test.php @@ -26,10 +26,10 @@ defined('MOODLE_INTERNAL') || die(); require_once(__DIR__ . '/../../lib.php'); -use tool_lifecycle\entity\process; -use \tool_lifecycle\manager\process_manager; -use \tool_lifecycle\manager\process_data_manager; -use \tool_lifecycle\manager\step_manager; +use tool_lifecycle\local\entity\process; +use tool_lifecycle\local\manager\process_manager; +use tool_lifecycle\local\manager\process_data_manager; +use tool_lifecycle\local\manager\step_manager; /** * Tests creating storing and retrieving process data. diff --git a/tests/persistence/persist_process_test.php b/tests/persistence/persist_process_test.php index f66d51e..08a7cfa 100644 --- a/tests/persistence/persist_process_test.php +++ b/tests/persistence/persist_process_test.php @@ -26,9 +26,9 @@ defined('MOODLE_INTERNAL') || die(); require_once(__DIR__ . '/../../lib.php'); -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\delayed_courses_manager; -use \tool_lifecycle\manager\process_manager; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\delayed_courses_manager; +use tool_lifecycle\local\manager\process_manager; /** * Tests creating storing and retrieving a process object. diff --git a/tests/persistence/persist_step_test.php b/tests/persistence/persist_step_test.php index a6ffd24..0432a67 100644 --- a/tests/persistence/persist_step_test.php +++ b/tests/persistence/persist_step_test.php @@ -27,8 +27,8 @@ defined('MOODLE_INTERNAL') || die(); require_once(__DIR__ . '/../../lib.php'); use tool_lifecycle\action; -use \tool_lifecycle\entity\workflow; -use \tool_lifecycle\manager\step_manager; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\step_manager; /** * Tests creating storing and retrieving a step object. diff --git a/tests/persistence/persist_workflow_test.php b/tests/persistence/persist_workflow_test.php index 7f86028..57dc4c0 100644 --- a/tests/persistence/persist_workflow_test.php +++ b/tests/persistence/persist_workflow_test.php @@ -26,8 +26,8 @@ defined('MOODLE_INTERNAL') || die(); require_once(__DIR__ . '/../../lib.php'); -use \tool_lifecycle\entity\workflow; -use \tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\workflow_manager; /** * Tests creating storing and retrieving a workflow object. diff --git a/tests/process_status_message_test.php b/tests/process_status_message_test.php index 1b07f79..1a9105c 100644 --- a/tests/process_status_message_test.php +++ b/tests/process_status_message_test.php @@ -25,8 +25,8 @@ defined('MOODLE_INTERNAL') || die(); use tool_lifecycle\action; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\workflow_manager; /** * Tests assembly of manual trigger tools. @@ -78,15 +78,15 @@ class tool_lifecycle_process_status_message_testcase extends \advanced_testcase */ public function test_get_status_message() { $process = $this->generator->create_process(2, $this->workflow->id); - $message = \tool_lifecycle\manager\interaction_manager::get_process_status_message($process->id); + $message = \tool_lifecycle\local\manager\interaction_manager::get_process_status_message($process->id); $this->assertEquals(get_string("workflow_started", "tool_lifecycle"), $message); - \tool_lifecycle\manager\process_manager::proceed_process($process); - $message = \tool_lifecycle\manager\interaction_manager::get_process_status_message($process->id); + \tool_lifecycle\local\manager\process_manager::proceed_process($process); + $message = \tool_lifecycle\local\manager\interaction_manager::get_process_status_message($process->id); $this->assertEquals(get_string("workflow_is_running", "tool_lifecycle"), $message); - \tool_lifecycle\manager\process_manager::proceed_process($process); - $message = \tool_lifecycle\manager\interaction_manager::get_process_status_message($process->id); + \tool_lifecycle\local\manager\process_manager::proceed_process($process); + $message = \tool_lifecycle\local\manager\interaction_manager::get_process_status_message($process->id); $this->assertEquals(get_string('status_message_requiresattention', 'lifecyclestep_email'), $message); } } \ No newline at end of file diff --git a/tests/settings_manager_test.php b/tests/settings_manager_test.php index d2eb759..4e5c770 100644 --- a/tests/settings_manager_test.php +++ b/tests/settings_manager_test.php @@ -24,13 +24,13 @@ */ defined('MOODLE_INTERNAL') || die(); -use tool_lifecycle\entity\step_subplugin; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\subplugin_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\step_subplugin; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\subplugin_manager; +use tool_lifecycle\local\manager\workflow_manager; use tool_lifecycle\settings_type; /** @@ -66,7 +66,7 @@ class tool_lifecycle_settings_manager_testcase extends \advanced_testcase { $this->workflow = $generator->create_workflow(); $this->step = new step_subplugin('instancename', 'email', $this->workflow->id); step_manager::insert_or_update($this->step); - $this->trigger = \tool_lifecycle\manager\trigger_manager::get_triggers_for_workflow($this->workflow->id)[0]; + $this->trigger = \tool_lifecycle\local\manager\trigger_manager::get_triggers_for_workflow($this->workflow->id)[0]; } /** diff --git a/tests/workflow_actions_testcase.php b/tests/workflow_actions_testcase.php index e3a81b6..cc9ee82 100644 --- a/tests/workflow_actions_testcase.php +++ b/tests/workflow_actions_testcase.php @@ -27,8 +27,8 @@ defined('MOODLE_INTERNAL') || die(); require_once(__DIR__ . '/generator/lib.php'); require_once(__DIR__ . '/../lib.php'); -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\workflow_manager; /** * Setup for workflow actions tests. diff --git a/tests/workflow_activate_disable_duplicate_test.php b/tests/workflow_activate_disable_duplicate_test.php index f63f2e9..a888076 100644 --- a/tests/workflow_activate_disable_duplicate_test.php +++ b/tests/workflow_activate_disable_duplicate_test.php @@ -30,8 +30,8 @@ require_once(__DIR__ . '/../lib.php'); require_once(__DIR__ . '/workflow_actions_testcase.php'); use tool_lifecycle\action; -use tool_lifecycle\manager\workflow_manager; -use tool_lifecycle\entity\workflow; +use tool_lifecycle\local\manager\workflow_manager; +use tool_lifecycle\local\entity\workflow; /** * Tests activating, disabling and duplicating workflows @@ -105,8 +105,8 @@ class tool_lifecycle_workflow_activate_disable_duplicate_testcase extends workfl } } $this->assertEquals($this->workflow1->displaytitle, $duplicate->displaytitle); - $workflow1stepcount = count(\tool_lifecycle\manager\step_manager::get_step_instances($this->workflow1->id)); - $duplicatestepcount = count(\tool_lifecycle\manager\step_manager::get_step_instances($duplicate->id)); + $workflow1stepcount = count(\tool_lifecycle\local\manager\step_manager::get_step_instances($this->workflow1->id)); + $duplicatestepcount = count(\tool_lifecycle\local\manager\step_manager::get_step_instances($duplicate->id)); $this->assertEquals($workflow1stepcount, $duplicatestepcount); } diff --git a/trigger/categories/lib.php b/trigger/categories/lib.php index 902231a..acb2961 100644 --- a/trigger/categories/lib.php +++ b/trigger/categories/lib.php @@ -24,8 +24,8 @@ namespace tool_lifecycle\trigger; use coursecat; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\response\trigger_response; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\response\trigger_response; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/trigger/categories/tests/generator/lib.php b/trigger/categories/tests/generator/lib.php index 6cc8b9f..8d3bb50 100644 --- a/trigger/categories/tests/generator/lib.php +++ b/trigger/categories/tests/generator/lib.php @@ -24,11 +24,11 @@ */ defined('MOODLE_INTERNAL') || die(); -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; use tool_lifecycle\settings_type; /** diff --git a/trigger/categories/tests/trigger_test.php b/trigger/categories/tests/trigger_test.php index b841b12..3c92c85 100644 --- a/trigger/categories/tests/trigger_test.php +++ b/trigger/categories/tests/trigger_test.php @@ -24,9 +24,9 @@ */ namespace tool_lifecycle\trigger; -use tool_lifecycle\entity\trigger_subplugin; +use tool_lifecycle\local\entity\trigger_subplugin; use tool_lifecycle\processor; -use tool_lifecycle\response\trigger_response; +use tool_lifecycle\local\response\trigger_response; defined('MOODLE_INTERNAL') || die(); diff --git a/trigger/delayedcourses/db/install.php b/trigger/delayedcourses/db/install.php index fe8eb61..a107f77 100644 --- a/trigger/delayedcourses/db/install.php +++ b/trigger/delayedcourses/db/install.php @@ -22,7 +22,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -use tool_lifecycle\manager\trigger_manager; +use tool_lifecycle\local\manager\trigger_manager; defined('MOODLE_INTERNAL') || die(); diff --git a/trigger/delayedcourses/lib.php b/trigger/delayedcourses/lib.php index df77584..054385c 100644 --- a/trigger/delayedcourses/lib.php +++ b/trigger/delayedcourses/lib.php @@ -23,8 +23,8 @@ */ namespace tool_lifecycle\trigger; -use tool_lifecycle\response\trigger_response; -use tool_lifecycle\manager\delayed_courses_manager; +use tool_lifecycle\local\response\trigger_response; +use tool_lifecycle\local\manager\delayed_courses_manager; defined('MOODLE_INTERNAL') || die(); require_once(__DIR__ . '/../lib.php'); diff --git a/trigger/delayedcourses/tests/generator/lib.php b/trigger/delayedcourses/tests/generator/lib.php index 34c50e8..1561e1d 100644 --- a/trigger/delayedcourses/tests/generator/lib.php +++ b/trigger/delayedcourses/tests/generator/lib.php @@ -24,10 +24,10 @@ */ defined('MOODLE_INTERNAL') || die(); -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; /** * lifecycletrigger_delayedcourses generator tests diff --git a/trigger/delayedcourses/tests/trigger_test.php b/trigger/delayedcourses/tests/trigger_test.php index 2ffaf2a..6560af5 100644 --- a/trigger/delayedcourses/tests/trigger_test.php +++ b/trigger/delayedcourses/tests/trigger_test.php @@ -24,10 +24,10 @@ */ namespace tool_lifecycle\trigger; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; use tool_lifecycle\processor; -use tool_lifecycle\manager\delayed_courses_manager; +use tool_lifecycle\local\manager\delayed_courses_manager; use tool_lifecycle_trigger_delayedcourses_generator as trigger_generator; defined('MOODLE_INTERNAL') || die(); diff --git a/trigger/lib.php b/trigger/lib.php index 1c68d0c..f36d216 100644 --- a/trigger/lib.php +++ b/trigger/lib.php @@ -25,7 +25,7 @@ */ namespace tool_lifecycle\trigger; -use tool_lifecycle\response\trigger_response; +use tool_lifecycle\local\response\trigger_response; defined('MOODLE_INTERNAL') || die(); diff --git a/trigger/sitecourse/db/install.php b/trigger/sitecourse/db/install.php index 6f5600a..bb52925 100644 --- a/trigger/sitecourse/db/install.php +++ b/trigger/sitecourse/db/install.php @@ -21,7 +21,7 @@ * @copyright 2017 Tobias Reischmann WWU * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -use tool_lifecycle\manager\trigger_manager; +use tool_lifecycle\local\manager\trigger_manager; defined('MOODLE_INTERNAL') || die(); diff --git a/trigger/sitecourse/lib.php b/trigger/sitecourse/lib.php index 3dea124..14809c7 100644 --- a/trigger/sitecourse/lib.php +++ b/trigger/sitecourse/lib.php @@ -23,7 +23,7 @@ */ namespace tool_lifecycle\trigger; -use tool_lifecycle\response\trigger_response; +use tool_lifecycle\local\response\trigger_response; defined('MOODLE_INTERNAL') || die(); require_once(__DIR__ . '/../lib.php'); diff --git a/trigger/sitecourse/tests/generator/lib.php b/trigger/sitecourse/tests/generator/lib.php index 94d01c2..4942d8c 100644 --- a/trigger/sitecourse/tests/generator/lib.php +++ b/trigger/sitecourse/tests/generator/lib.php @@ -24,10 +24,10 @@ */ defined('MOODLE_INTERNAL') || die(); -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; /** * lifecycletrigger_sitecourse generator tests diff --git a/trigger/sitecourse/tests/trigger_test.php b/trigger/sitecourse/tests/trigger_test.php index 66622f1..1cec1ea 100644 --- a/trigger/sitecourse/tests/trigger_test.php +++ b/trigger/sitecourse/tests/trigger_test.php @@ -24,8 +24,8 @@ */ namespace tool_lifecycle\trigger; -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\response\trigger_response; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\response\trigger_response; defined('MOODLE_INTERNAL') || die(); diff --git a/trigger/specificdate/lib.php b/trigger/specificdate/lib.php index 2782a49..297016d 100644 --- a/trigger/specificdate/lib.php +++ b/trigger/specificdate/lib.php @@ -24,9 +24,9 @@ namespace tool_lifecycle\trigger; use DateTime; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\response\trigger_response; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\response\trigger_response; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/trigger/startdatedelay/lib.php b/trigger/startdatedelay/lib.php index 4cfac5a..7d0cd64 100644 --- a/trigger/startdatedelay/lib.php +++ b/trigger/startdatedelay/lib.php @@ -23,8 +23,8 @@ */ namespace tool_lifecycle\trigger; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\response\trigger_response; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\response\trigger_response; use tool_lifecycle\settings_type; defined('MOODLE_INTERNAL') || die(); diff --git a/trigger/startdatedelay/tests/generator/lib.php b/trigger/startdatedelay/tests/generator/lib.php index aa4bde4..c3bd5ce 100644 --- a/trigger/startdatedelay/tests/generator/lib.php +++ b/trigger/startdatedelay/tests/generator/lib.php @@ -24,11 +24,11 @@ */ defined('MOODLE_INTERNAL') || die(); -use tool_lifecycle\entity\trigger_subplugin; -use tool_lifecycle\entity\workflow; -use tool_lifecycle\manager\settings_manager; -use tool_lifecycle\manager\trigger_manager; -use tool_lifecycle\manager\workflow_manager; +use tool_lifecycle\local\entity\trigger_subplugin; +use tool_lifecycle\local\entity\workflow; +use tool_lifecycle\local\manager\settings_manager; +use tool_lifecycle\local\manager\trigger_manager; +use tool_lifecycle\local\manager\workflow_manager; use tool_lifecycle\settings_type; /** diff --git a/trigger/startdatedelay/tests/trigger_test.php b/trigger/startdatedelay/tests/trigger_test.php index 434aa27..eeab387 100644 --- a/trigger/startdatedelay/tests/trigger_test.php +++ b/trigger/startdatedelay/tests/trigger_test.php @@ -24,7 +24,7 @@ */ namespace tool_lifecycle\trigger; -use tool_lifecycle\entity\trigger_subplugin; +use tool_lifecycle\local\entity\trigger_subplugin; use tool_lifecycle\processor; defined('MOODLE_INTERNAL') || die(); diff --git a/view.php b/view.php index b971491..b0970e7 100644 --- a/view.php +++ b/view.php @@ -23,9 +23,9 @@ */ require_once(__DIR__ . '/../../../config.php'); -use tool_lifecycle\manager\step_manager; -use tool_lifecycle\manager\interaction_manager; -use tool_lifecycle\table\interaction_attention_table; +use tool_lifecycle\local\manager\step_manager; +use tool_lifecycle\local\manager\interaction_manager; +use tool_lifecycle\local\table\interaction_attention_table; require_login(null, false); diff --git a/workflowsettings.php b/workflowsettings.php index 0b020fa..27321b6 100644 --- a/workflowsettings.php +++ b/workflowsettings.php @@ -30,7 +30,7 @@ require_capability('moodle/site:config', context_system::instance()); $workflowid = required_param('workflowid', PARAM_INT); -$workflow = tool_lifecycle\manager\workflow_manager::get_workflow($workflowid); +$workflow = tool_lifecycle\local\manager\workflow_manager::get_workflow($workflowid); if (!$workflow) { throw new moodle_exception('workflownotfound', 'tool_lifecycle', -- GitLab