diff --git a/.kateproject b/.kateproject index eda128c1..18da774c 100644 --- a/.kateproject +++ b/.kateproject @@ -6,7 +6,7 @@ "settings": { "intelephense": { "environment": { - "phpVersion": "7.4.0" + "phpVersion": "8.0.0" } } } diff --git a/lbplanner/classes/helpers/course_helper.php b/lbplanner/classes/helpers/course_helper.php index cebddf05..96c5a865 100644 --- a/lbplanner/classes/helpers/course_helper.php +++ b/lbplanner/classes/helpers/course_helper.php @@ -16,7 +16,7 @@ namespace local_lbplanner\helpers; -use context_course; +use core\context\course as context_course; use dml_exception; use local_lbplanner\model\course; @@ -143,6 +143,9 @@ public static function get_all_lbplanner_courses(): array { */ public static function check_access(int $courseid, int $userid): bool { $context = context_course::instance($courseid); + if ($context === false) { + return false; + } return is_enrolled($context, $userid, '', true); } diff --git a/lbplanner/classes/helpers/invite_helper.php b/lbplanner/classes/helpers/invite_helper.php index e7366ec3..4cb1921b 100644 --- a/lbplanner/classes/helpers/invite_helper.php +++ b/lbplanner/classes/helpers/invite_helper.php @@ -16,8 +16,7 @@ namespace local_lbplanner\helpers; -use external_single_structure; -use external_value; +use core_external\{external_single_structure, external_value}; /** * Helper class for plan invites diff --git a/lbplanner/classes/helpers/modules_helper.php b/lbplanner/classes/helpers/modules_helper.php index 6ab6709a..9709a191 100644 --- a/lbplanner/classes/helpers/modules_helper.php +++ b/lbplanner/classes/helpers/modules_helper.php @@ -25,10 +25,7 @@ namespace local_lbplanner\helpers; -use block_accessreview\external\get_module_data; -use external_function_parameters; -use external_single_structure; -use external_value; +use core_external\{external_single_structure, external_value}; use moodle_url; use local_lbplanner\enums\{MODULE_STATUS, MODULE_GRADE, MODULE_TYPE}; diff --git a/lbplanner/classes/helpers/notifications_helper.php b/lbplanner/classes/helpers/notifications_helper.php index 9d51951f..3487c4c9 100644 --- a/lbplanner/classes/helpers/notifications_helper.php +++ b/lbplanner/classes/helpers/notifications_helper.php @@ -25,8 +25,7 @@ namespace local_lbplanner\helpers; -use external_single_structure; -use external_value; +use core_external\{external_single_structure, external_value}; use local_lbplanner\enums\{NOTIF_STATUS, NOTIF_TRIGGER}; /** diff --git a/lbplanner/classes/helpers/plan_helper.php b/lbplanner/classes/helpers/plan_helper.php index aec2f61b..6e6beb8f 100644 --- a/lbplanner/classes/helpers/plan_helper.php +++ b/lbplanner/classes/helpers/plan_helper.php @@ -25,9 +25,7 @@ namespace local_lbplanner\helpers; -use external_single_structure; -use external_value; -use external_multiple_structure; +use core_external\{external_value, external_single_structure, external_multiple_structure}; use local_lbplanner\enums\PLAN_ACCESS_TYPE; /** diff --git a/lbplanner/classes/helpers/user_helper.php b/lbplanner/classes/helpers/user_helper.php index c205a26f..94ac85ba 100644 --- a/lbplanner/classes/helpers/user_helper.php +++ b/lbplanner/classes/helpers/user_helper.php @@ -16,7 +16,7 @@ namespace local_lbplanner\helpers; -use context_system; +use core\context\system as context_system; use dml_exception; use moodle_exception; use stdClass; diff --git a/lbplanner/classes/model/course.php b/lbplanner/classes/model/course.php index 48c2617e..ee2654e3 100644 --- a/lbplanner/classes/model/course.php +++ b/lbplanner/classes/model/course.php @@ -25,8 +25,7 @@ namespace local_lbplanner\model; -use external_single_structure; -use external_value; +use core_external\{external_single_structure, external_value}; use local_lbplanner\helpers\course_helper; /** diff --git a/lbplanner/classes/model/reservation.php b/lbplanner/classes/model/reservation.php index 76797649..f09b8ee1 100644 --- a/lbplanner/classes/model/reservation.php +++ b/lbplanner/classes/model/reservation.php @@ -27,8 +27,7 @@ use DateTimeImmutable; -use external_single_structure; -use external_value; +use core_external\{external_single_structure, external_value}; use local_lbplanner\model\slot; use local_lbplanner\helpers\slot_helper; diff --git a/lbplanner/classes/model/slot.php b/lbplanner/classes/model/slot.php index 7408f9c8..881322c2 100644 --- a/lbplanner/classes/model/slot.php +++ b/lbplanner/classes/model/slot.php @@ -28,9 +28,7 @@ use local_lbplanner\enums\WEEKDAY; use local_lbplanner\helpers\slot_helper; -use external_multiple_structure; -use external_single_structure; -use external_value; +use core_external\{external_multiple_structure, external_single_structure, external_value}; use moodle_exception; /** diff --git a/lbplanner/classes/model/slot_filter.php b/lbplanner/classes/model/slot_filter.php index acba6b52..9b34f4dd 100644 --- a/lbplanner/classes/model/slot_filter.php +++ b/lbplanner/classes/model/slot_filter.php @@ -25,8 +25,7 @@ namespace local_lbplanner\model; -use external_single_structure; -use external_value; +use core_external\{external_single_structure, external_value}; /** * Model class for a filter for slots diff --git a/lbplanner/classes/model/user.php b/lbplanner/classes/model/user.php index aef941d6..14aaa0d6 100644 --- a/lbplanner/classes/model/user.php +++ b/lbplanner/classes/model/user.php @@ -26,14 +26,14 @@ namespace local_lbplanner\model; use coding_exception; -use context_system; -use external_single_structure; -use external_value; +use core\context\system as context_system; +use core_external\{external_single_structure, external_value}; +use user_picture; + use local_lbplanner\enums\CAPABILITY; use local_lbplanner\enums\CAPABILITY_FLAG; use local_lbplanner\helpers\plan_helper; use local_lbplanner\helpers\user_helper; -use user_picture; /** * Model class for course @@ -306,7 +306,7 @@ public function prepare_for_api_short(): array { 'profileimageurl' => $this->get_pfp(), ]; - if ($capabilitybm & CAPABILITY_FLAG::STUDENT) { + if ($capabilitybm & CAPABILITY_FLAG::STUDENT && strlen($mdluser->address) > 0) { $data['vintage'] = $mdluser->address; } diff --git a/lbplanner/services/config/get_version.php b/lbplanner/services/config/get_version.php index 7538fa91..b0dabb49 100644 --- a/lbplanner/services/config/get_version.php +++ b/lbplanner/services/config/get_version.php @@ -16,10 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_single_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_single_structure, external_value}; /** * Get version service. diff --git a/lbplanner/services/courses/get_all_courses.php b/lbplanner/services/courses/get_all_courses.php index 1007f3df..a217c103 100644 --- a/lbplanner/services/courses/get_all_courses.php +++ b/lbplanner/services/courses/get_all_courses.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; +use core_external\{external_function_parameters, external_multiple_structure}; use local_lbplanner\helpers\course_helper; use local_lbplanner\model\course; @@ -31,7 +29,7 @@ * @copyright 2024 necodeIT * @license https://creativecommons.org/licenses/by-nc-sa/4.0/ CC-BY-NC-SA 4.0 International or later */ -class courses_get_all_courses extends external_api { +class courses_get_all_courses extends \core_external\external_api { /** * Has no Parameters diff --git a/lbplanner/services/courses/update_course.php b/lbplanner/services/courses/update_course.php index 749f3746..31645963 100644 --- a/lbplanner/services/courses/update_course.php +++ b/lbplanner/services/courses/update_course.php @@ -16,11 +16,7 @@ namespace local_lbplanner_services; -use dml_exception; -use external_api; -use external_function_parameters; -use external_value; -use invalid_parameter_exception; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\course_helper; use moodle_exception; diff --git a/lbplanner/services/modules/get_all_course_modules.php b/lbplanner/services/modules/get_all_course_modules.php index 9b95aeee..82c01b69 100644 --- a/lbplanner/services/modules/get_all_course_modules.php +++ b/lbplanner/services/modules/get_all_course_modules.php @@ -16,10 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_multiple_structure, external_value}; use local_lbplanner\helpers\modules_helper; /** diff --git a/lbplanner/services/modules/get_all_modules.php b/lbplanner/services/modules/get_all_modules.php index f5e7bb2d..f53a9f61 100644 --- a/lbplanner/services/modules/get_all_modules.php +++ b/lbplanner/services/modules/get_all_modules.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; +use core_external\{external_api, external_function_parameters, external_multiple_structure}; use local_lbplanner\helpers\course_helper; use local_lbplanner\helpers\modules_helper; use local_lbplanner\helpers\plan_helper; diff --git a/lbplanner/services/modules/get_module.php b/lbplanner/services/modules/get_module.php index 7fe183cc..263016f6 100644 --- a/lbplanner/services/modules/get_module.php +++ b/lbplanner/services/modules/get_module.php @@ -16,12 +16,8 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_single_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_single_structure, external_value}; use local_lbplanner\helpers\modules_helper; -use local_lbplanner\helpers\plan_helper; use local_lbplanner\helpers\user_helper; /** diff --git a/lbplanner/services/notifications/get_all_notifications.php b/lbplanner/services/notifications/get_all_notifications.php index d60c269a..f5e1fecf 100644 --- a/lbplanner/services/notifications/get_all_notifications.php +++ b/lbplanner/services/notifications/get_all_notifications.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; +use core_external\{external_api, external_function_parameters, external_multiple_structure}; use local_lbplanner\helpers\notifications_helper; /** diff --git a/lbplanner/services/notifications/update_notification.php b/lbplanner/services/notifications/update_notification.php index f2b83c06..0dbc281c 100644 --- a/lbplanner/services/notifications/update_notification.php +++ b/lbplanner/services/notifications/update_notification.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\enums\NOTIF_STATUS; use local_lbplanner\helpers\notifications_helper; diff --git a/lbplanner/services/plan/accept_invite.php b/lbplanner/services/plan/accept_invite.php index 338296b8..0b389772 100644 --- a/lbplanner/services/plan/accept_invite.php +++ b/lbplanner/services/plan/accept_invite.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\plan_helper; use local_lbplanner\helpers\notifications_helper; use local_lbplanner\enums\{PLAN_ACCESS_TYPE, PLAN_INVITE_STATE, NOTIF_TRIGGER}; diff --git a/lbplanner/services/plan/clear_plan.php b/lbplanner/services/plan/clear_plan.php index aff39357..f311b7c8 100644 --- a/lbplanner/services/plan/clear_plan.php +++ b/lbplanner/services/plan/clear_plan.php @@ -16,8 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; +use core_external\{external_api, external_function_parameters}; use local_lbplanner\helpers\plan_helper; /** diff --git a/lbplanner/services/plan/decline_invite.php b/lbplanner/services/plan/decline_invite.php index 7978fde3..1e3712ef 100644 --- a/lbplanner/services/plan/decline_invite.php +++ b/lbplanner/services/plan/decline_invite.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\plan_helper; use local_lbplanner\helpers\notifications_helper; use local_lbplanner\enums\{NOTIF_TRIGGER, PLAN_INVITE_STATE}; diff --git a/lbplanner/services/plan/delete_deadline.php b/lbplanner/services/plan/delete_deadline.php index 5062ae2e..83d5263a 100644 --- a/lbplanner/services/plan/delete_deadline.php +++ b/lbplanner/services/plan/delete_deadline.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\plan_helper; /** diff --git a/lbplanner/services/plan/get_invites.php b/lbplanner/services/plan/get_invites.php index 44dd3b84..fa0cbe7d 100644 --- a/lbplanner/services/plan/get_invites.php +++ b/lbplanner/services/plan/get_invites.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; +use core_external\{external_api, external_function_parameters, external_multiple_structure}; use local_lbplanner\helpers\invite_helper; use local_lbplanner\helpers\plan_helper; diff --git a/lbplanner/services/plan/get_plan.php b/lbplanner/services/plan/get_plan.php index c636df87..5b405f71 100644 --- a/lbplanner/services/plan/get_plan.php +++ b/lbplanner/services/plan/get_plan.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_single_structure; +use core_external\{external_function_parameters, external_single_structure}; use local_lbplanner\helpers\plan_helper; /** @@ -29,7 +27,7 @@ * @copyright 2024 necodeIT * @license https://creativecommons.org/licenses/by-nc-sa/4.0/ CC-BY-NC-SA 4.0 International or later */ -class plan_get_plan extends external_api { +class plan_get_plan extends \core_external\external_api { /** * Parameters for get_plan. * @return external_function_parameters diff --git a/lbplanner/services/plan/invite_user.php b/lbplanner/services/plan/invite_user.php index ef7b63b7..9dcae19a 100644 --- a/lbplanner/services/plan/invite_user.php +++ b/lbplanner/services/plan/invite_user.php @@ -16,10 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_single_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_single_structure, external_value}; use local_lbplanner\helpers\invite_helper; use local_lbplanner\helpers\plan_helper; use local_lbplanner\helpers\notifications_helper; diff --git a/lbplanner/services/plan/leave_plan.php b/lbplanner/services/plan/leave_plan.php index ad1b1916..2a77868f 100644 --- a/lbplanner/services/plan/leave_plan.php +++ b/lbplanner/services/plan/leave_plan.php @@ -16,8 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; +use core_external\{external_api, external_function_parameters}; use local_lbplanner\helpers\plan_helper; use local_lbplanner\helpers\notifications_helper; use local_lbplanner\enums\{NOTIF_TRIGGER, PLAN_ACCESS_TYPE, PLAN_INVITE_STATE}; diff --git a/lbplanner/services/plan/remove_user.php b/lbplanner/services/plan/remove_user.php index 05451319..37e29222 100644 --- a/lbplanner/services/plan/remove_user.php +++ b/lbplanner/services/plan/remove_user.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\plan_helper; /** diff --git a/lbplanner/services/plan/set_deadline.php b/lbplanner/services/plan/set_deadline.php index 71a612ce..4c05c8b4 100644 --- a/lbplanner/services/plan/set_deadline.php +++ b/lbplanner/services/plan/set_deadline.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\plan_helper; /** diff --git a/lbplanner/services/plan/update_access.php b/lbplanner/services/plan/update_access.php index f72c406f..045f9558 100644 --- a/lbplanner/services/plan/update_access.php +++ b/lbplanner/services/plan/update_access.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\enums\PLAN_ACCESS_TYPE; use local_lbplanner\helpers\plan_helper; diff --git a/lbplanner/services/plan/update_plan.php b/lbplanner/services/plan/update_plan.php index fe0f740e..40b41f7f 100644 --- a/lbplanner/services/plan/update_plan.php +++ b/lbplanner/services/plan/update_plan.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\plan_helper; /** diff --git a/lbplanner/services/slots/add_slot_filter.php b/lbplanner/services/slots/add_slot_filter.php index 2b87a5c3..b523cb57 100644 --- a/lbplanner/services/slots/add_slot_filter.php +++ b/lbplanner/services/slots/add_slot_filter.php @@ -16,10 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_single_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_single_structure, external_value}; use local_lbplanner\helpers\slot_helper; use local_lbplanner\model\slot_filter; diff --git a/lbplanner/services/slots/add_slot_supervisor.php b/lbplanner/services/slots/add_slot_supervisor.php index beafa729..3d3905ef 100644 --- a/lbplanner/services/slots/add_slot_supervisor.php +++ b/lbplanner/services/slots/add_slot_supervisor.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\slot_helper; use local_lbplanner\model\supervisor; diff --git a/lbplanner/services/slots/book_reservation.php b/lbplanner/services/slots/book_reservation.php index de049625..b8a22fe4 100644 --- a/lbplanner/services/slots/book_reservation.php +++ b/lbplanner/services/slots/book_reservation.php @@ -19,10 +19,7 @@ use DateTimeImmutable; use core_user; -use external_api; -use external_function_parameters; -use external_single_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_single_structure, external_value}; use local_lbplanner\enums\NOTIF_TRIGGER; use local_lbplanner\helpers\notifications_helper; use local_lbplanner\helpers\slot_helper; diff --git a/lbplanner/services/slots/create_slot.php b/lbplanner/services/slots/create_slot.php index 0c72d931..0dbff4a0 100644 --- a/lbplanner/services/slots/create_slot.php +++ b/lbplanner/services/slots/create_slot.php @@ -16,10 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_single_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_single_structure, external_value}; use local_lbplanner\enums\WEEKDAY; use local_lbplanner\helpers\slot_helper; use local_lbplanner\model\slot; diff --git a/lbplanner/services/slots/delete_slot.php b/lbplanner/services/slots/delete_slot.php index 17caf4d7..e2efbca0 100644 --- a/lbplanner/services/slots/delete_slot.php +++ b/lbplanner/services/slots/delete_slot.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\slot_helper; use local_lbplanner\helpers\notifications_helper; diff --git a/lbplanner/services/slots/delete_slot_filter.php b/lbplanner/services/slots/delete_slot_filter.php index f7bd60fc..d959ac5c 100644 --- a/lbplanner/services/slots/delete_slot_filter.php +++ b/lbplanner/services/slots/delete_slot_filter.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\slot_helper; /** diff --git a/lbplanner/services/slots/get_my_reservations.php b/lbplanner/services/slots/get_my_reservations.php index 623825eb..b53b444c 100644 --- a/lbplanner/services/slots/get_my_reservations.php +++ b/lbplanner/services/slots/get_my_reservations.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; +use core_external\{external_api, external_function_parameters, external_multiple_structure}; use local_lbplanner\helpers\slot_helper; use local_lbplanner\model\reservation; diff --git a/lbplanner/services/slots/get_my_slots.php b/lbplanner/services/slots/get_my_slots.php index 6b6ddaf6..0c7a5252 100644 --- a/lbplanner/services/slots/get_my_slots.php +++ b/lbplanner/services/slots/get_my_slots.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; +use core_external\{external_api, external_function_parameters, external_multiple_structure}; use local_lbplanner\helpers\slot_helper; use local_lbplanner\model\slot; diff --git a/lbplanner/services/slots/get_slot_filters.php b/lbplanner/services/slots/get_slot_filters.php index bcd91046..fa31ae2e 100644 --- a/lbplanner/services/slots/get_slot_filters.php +++ b/lbplanner/services/slots/get_slot_filters.php @@ -16,10 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_multiple_structure, external_value}; use local_lbplanner\helpers\slot_helper; use local_lbplanner\model\slot_filter; diff --git a/lbplanner/services/slots/get_slot_reservations.php b/lbplanner/services/slots/get_slot_reservations.php index 0b390ba9..c382c1c7 100644 --- a/lbplanner/services/slots/get_slot_reservations.php +++ b/lbplanner/services/slots/get_slot_reservations.php @@ -16,10 +16,8 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_multiple_structure, external_value}; + use local_lbplanner\helpers\slot_helper; use local_lbplanner\model\reservation; diff --git a/lbplanner/services/slots/get_student_slots.php b/lbplanner/services/slots/get_student_slots.php index 23df7b84..1d5c55b9 100644 --- a/lbplanner/services/slots/get_student_slots.php +++ b/lbplanner/services/slots/get_student_slots.php @@ -16,10 +16,8 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_multiple_structure, external_value}; + use local_lbplanner\helpers\slot_helper; use local_lbplanner\helpers\user_helper; use local_lbplanner\model\slot; diff --git a/lbplanner/services/slots/get_supervisor_slots.php b/lbplanner/services/slots/get_supervisor_slots.php index 17e6df8b..b6301dcf 100644 --- a/lbplanner/services/slots/get_supervisor_slots.php +++ b/lbplanner/services/slots/get_supervisor_slots.php @@ -16,9 +16,8 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_multiple_structure; +use core_external\{external_api, external_function_parameters, external_multiple_structure}; + use local_lbplanner\helpers\slot_helper; use local_lbplanner\model\slot; diff --git a/lbplanner/services/slots/unbook_reservation.php b/lbplanner/services/slots/unbook_reservation.php index cfdb609e..f092af4a 100644 --- a/lbplanner/services/slots/unbook_reservation.php +++ b/lbplanner/services/slots/unbook_reservation.php @@ -18,9 +18,7 @@ use DateTimeImmutable; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\slot_helper; use local_lbplanner\helpers\notifications_helper; diff --git a/lbplanner/services/slots/update_slot.php b/lbplanner/services/slots/update_slot.php index 7139da66..e11c4061 100644 --- a/lbplanner/services/slots/update_slot.php +++ b/lbplanner/services/slots/update_slot.php @@ -16,9 +16,7 @@ namespace local_lbplanner_services; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\enums\WEEKDAY; use local_lbplanner\helpers\slot_helper; diff --git a/lbplanner/services/user/delete_user.php b/lbplanner/services/user/delete_user.php index d89756ff..b952e738 100644 --- a/lbplanner/services/user/delete_user.php +++ b/lbplanner/services/user/delete_user.php @@ -17,9 +17,7 @@ namespace local_lbplanner_services; use dml_exception; -use external_api; -use external_function_parameters; -use external_value; +use core_external\{external_api, external_function_parameters, external_value}; use local_lbplanner\helpers\{user_helper, plan_helper, course_helper, notifications_helper}; use local_lbplanner\enums\{PLAN_INVITE_STATE, PLAN_ACCESS_TYPE}; use moodle_exception; diff --git a/lbplanner/services/user/get_all_users.php b/lbplanner/services/user/get_all_users.php index c5de61b4..84fae9c6 100644 --- a/lbplanner/services/user/get_all_users.php +++ b/lbplanner/services/user/get_all_users.php @@ -17,10 +17,7 @@ namespace local_lbplanner_services; use dml_exception; -use external_api; -use external_function_parameters; -use external_multiple_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_multiple_structure, external_value}; use invalid_parameter_exception; use moodle_exception; diff --git a/lbplanner/services/user/get_user.php b/lbplanner/services/user/get_user.php index ddc1f7be..b3222962 100644 --- a/lbplanner/services/user/get_user.php +++ b/lbplanner/services/user/get_user.php @@ -18,11 +18,7 @@ use coding_exception; use dml_exception; -use external_api; -use external_function_parameters; -use external_single_structure; -use external_value; -use core_user; +use core_external\{external_function_parameters, external_single_structure, external_value}; use moodle_exception; use local_lbplanner\helpers\{user_helper, plan_helper, notifications_helper}; @@ -39,7 +35,7 @@ * @copyright 2024 necodeIT * @license https://creativecommons.org/licenses/by-nc-sa/4.0/ CC-BY-NC-SA 4.0 International or later */ -class user_get_user extends external_api { +class user_get_user extends \core_external\external_api { /** * Parameters for get_user * @return external_function_parameters diff --git a/lbplanner/services/user/update_user.php b/lbplanner/services/user/update_user.php index d9b0fc52..4c28abc8 100644 --- a/lbplanner/services/user/update_user.php +++ b/lbplanner/services/user/update_user.php @@ -17,10 +17,7 @@ namespace local_lbplanner_services; use dml_exception; -use external_api; -use external_function_parameters; -use external_single_structure; -use external_value; +use core_external\{external_api, external_function_parameters, external_single_structure, external_value}; use invalid_parameter_exception; use moodle_exception;