From 6b21d65201c2467ee4b7bf318def1e4435c2019e Mon Sep 17 00:00:00 2001 From: Oscar Nadjar Date: Mon, 4 Apr 2022 13:41:54 +0000 Subject: [PATCH] INT-17886: Fix code checker 3.1.0 --- classes/activity_meta.php | 3 -- classes/admin_setting_configcolorcategory.php | 4 +- .../admin_setting_configcolorwithcontrast.php | 2 +- classes/admin_setting_configcourseid.php | 2 - classes/admin_setting_configradiobuttons.php | 2 - classes/admin_setting_configurl.php | 2 - classes/calendar/event/container.php | 3 -- .../event/data_access/event_vault.php | 3 -- .../activity_retrieval_strategy.php | 2 - classes/color_contrast.php | 4 +- classes/controller/addsection_controller.php | 2 - classes/controller/controller_abstract.php | 2 - classes/controller/kernel.php | 2 - .../controller/mediaresource_controller.php | 2 - classes/controller/router.php | 3 -- .../snap_personal_menu_controller.php | 2 - classes/course_total_grade.php | 2 +- classes/event_handlers.php | 2 - classes/message.php | 2 - classes/mod_hvp_renderer.php | 6 +-- classes/output/ce_render_helper.php | 4 +- classes/output/core/course_renderer.php | 28 +++++------ classes/output/core_renderer.php | 4 +- classes/output/core_renderer_ajax.php | 2 - classes/output/format_section_trait.php | 3 -- classes/output/general_section_trait.php | 2 - classes/output/toc_renderer.php | 2 - classes/privacy/provider.php | 4 +- .../course_action_section_base.php | 2 - .../course_action_section_delete.php | 2 - .../course_action_section_highlight.php | 2 - .../course_action_section_move.php | 2 - .../course_action_section_visibility.php | 2 - classes/renderables/course_card.php | 4 +- .../renderables/course_section_navigation.php | 3 -- .../course_section_navigation_link.php | 2 - classes/renderables/course_toc.php | 2 +- classes/renderables/course_toc_chapter.php | 2 - classes/renderables/course_toc_footer.php | 2 - classes/renderables/course_toc_module.php | 2 - classes/renderables/course_toc_progress.php | 3 -- classes/renderables/featured_course.php | 5 +- classes/renderables/featured_courses.php | 3 +- classes/renderables/genius_dashboard_link.php | 2 - .../renderables/login_alternative_methods.php | 2 - classes/renderables/settings_link.php | 2 - classes/renderables/trait_exportable.php | 2 - classes/snap_base_test.php | 2 - classes/task/refresh_deadline_caches_task.php | 3 -- .../task/reset_deadlines_query_count_task.php | 5 +- classes/traits/null_object.php | 2 - classes/user_forums.php | 2 - classes/webservice/definition_helper.php | 4 +- .../webservice/ws_course_cards_categories.php | 5 +- classes/webservice/ws_course_cards_data.php | 5 +- layout/course.php | 2 +- lib.php | 2 - settings.php | 2 +- settings/categories_color_settings.php | 2 +- settings/cover_settings.php | 2 +- tests/activity_deadlines_cache_test.php | 5 +- tests/activity_test.php | 12 ++--- tests/assign_test.php | 22 ++++---- tests/behat/behat_theme_snap.php | 50 ++++++++++++------- .../behat/behat_theme_snap_behat_general.php | 8 +-- .../behat_theme_snap_category_colors.php | 3 +- .../behat_theme_snap_custom_elements.php | 2 +- tests/controller/kernel_test.php | 18 +++---- tests/controller/router_test.php | 2 +- tests/core_renderer_test.php | 6 +-- tests/course_management_test.php | 9 ++-- tests/course_module_recycle_bin_test.php | 5 +- ..._grade.php => course_total_grade_test.php} | 12 ++--- tests/custom_menu_spacing_test.php | 6 +-- tests/dashboard_appendices_test.php | 6 +-- tests/gradebookaccess_test.php | 10 ++-- tests/local_test.php | 10 ++-- tests/lti_icons_displaying_test.php | 18 +++---- tests/privacy_provider_test.php | 8 ++- tests/recent_forum_activity_test.php | 8 +-- tests/render_edit_mode_test.php | 6 +-- tests/renderables/featured_courses.php | 3 -- tests/services_course_test.php | 34 ++++++------- tests/snap_hvp_customcss_test.php | 8 +-- tests/snap_page_requirements_manager_test.php | 6 +-- tests/snap_toc_renderer_test.php | 10 ++-- tests/tr_lang_pack_test.php | 5 +- tests/urls_and_strings_check_test.php | 9 ++-- tests/webservice_definition_helper.php | 16 +++--- ...service_ws_course_card_categories_test.php | 10 ++-- tests/webservice_ws_course_card_data_test.php | 10 ++-- tests/webservice_ws_course_card_test.php | 10 ++-- tests/webservice_ws_course_toc_test.php | 12 ++--- tests/webservice_ws_feed_activity_test.php | 14 +++--- 94 files changed, 213 insertions(+), 345 deletions(-) rename tests/{course_total_grade.php => course_total_grade_test.php} (98%) diff --git a/classes/activity_meta.php b/classes/activity_meta.php index 3b9c75cbf..91569398a 100644 --- a/classes/activity_meta.php +++ b/classes/activity_meta.php @@ -15,11 +15,8 @@ // along with Moodle. If not, see . namespace theme_snap; - use \theme_snap\traits\null_object; -defined('MOODLE_INTERNAL') || die(); - /** * Activity meta data. * diff --git a/classes/admin_setting_configcolorcategory.php b/classes/admin_setting_configcolorcategory.php index 04b0413ec..57d27f0eb 100644 --- a/classes/admin_setting_configcolorcategory.php +++ b/classes/admin_setting_configcolorcategory.php @@ -18,8 +18,6 @@ use theme_snap\color_contrast; -defined('MOODLE_INTERNAL') || die(); - /** * Class to render a text box which validates a JSON string for categories color configuration. * @package theme_snap @@ -145,4 +143,4 @@ private function validate_text($data) { return $cont; } -} \ No newline at end of file +} diff --git a/classes/admin_setting_configcolorwithcontrast.php b/classes/admin_setting_configcolorwithcontrast.php index ac6e6235a..fae543ae7 100644 --- a/classes/admin_setting_configcolorwithcontrast.php +++ b/classes/admin_setting_configcolorwithcontrast.php @@ -63,4 +63,4 @@ public function output_html($data, $query='') { } return $html; } -} \ No newline at end of file +} diff --git a/classes/admin_setting_configcourseid.php b/classes/admin_setting_configcourseid.php index 481bfd915..be689c35a 100644 --- a/classes/admin_setting_configcourseid.php +++ b/classes/admin_setting_configcourseid.php @@ -16,8 +16,6 @@ namespace theme_snap; -defined('MOODLE_INTERNAL') || die(); - /** * Class to render input of type url in settings pages. * @package theme_snap diff --git a/classes/admin_setting_configradiobuttons.php b/classes/admin_setting_configradiobuttons.php index 45b27fa73..f5693fb3e 100644 --- a/classes/admin_setting_configradiobuttons.php +++ b/classes/admin_setting_configradiobuttons.php @@ -16,8 +16,6 @@ namespace theme_snap; -defined('MOODLE_INTERNAL') || die(); - /** * Class to render radio buttons in settings pages. * @package theme_snap diff --git a/classes/admin_setting_configurl.php b/classes/admin_setting_configurl.php index 6ffa0abe1..c0486c4f0 100644 --- a/classes/admin_setting_configurl.php +++ b/classes/admin_setting_configurl.php @@ -16,8 +16,6 @@ namespace theme_snap; -defined('MOODLE_INTERNAL') || die(); - /** * Class to render input of type url in settings pages. * @package theme_snap diff --git a/classes/calendar/event/container.php b/classes/calendar/event/container.php index 853a22cf5..125b6b2ef 100644 --- a/classes/calendar/event/container.php +++ b/classes/calendar/event/container.php @@ -23,9 +23,6 @@ */ namespace theme_snap\calendar\event; - -defined('MOODLE_INTERNAL') || die(); - use theme_snap\calendar\event\data_access\event_vault; use theme_snap\calendar\event\strategies\activity_retrieval_strategy; use core_calendar\action_factory; diff --git a/classes/calendar/event/data_access/event_vault.php b/classes/calendar/event/data_access/event_vault.php index 7605342df..09862ebe0 100644 --- a/classes/calendar/event/data_access/event_vault.php +++ b/classes/calendar/event/data_access/event_vault.php @@ -23,9 +23,6 @@ */ namespace theme_snap\calendar\event\data_access; - -defined('MOODLE_INTERNAL') || die(); - use core_calendar\local\event\entities\event_interface; /** diff --git a/classes/calendar/event/strategies/activity_retrieval_strategy.php b/classes/calendar/event/strategies/activity_retrieval_strategy.php index 7b8ece110..afc8cd832 100644 --- a/classes/calendar/event/strategies/activity_retrieval_strategy.php +++ b/classes/calendar/event/strategies/activity_retrieval_strategy.php @@ -24,8 +24,6 @@ namespace theme_snap\calendar\event\strategies; -defined('MOODLE_INTERNAL') || die(); - /** * Extend core raw event retrieval strategy to cope with assignment extensions. * diff --git a/classes/color_contrast.php b/classes/color_contrast.php index 0e07fea3a..1c0cae50e 100644 --- a/classes/color_contrast.php +++ b/classes/color_contrast.php @@ -17,8 +17,6 @@ namespace theme_snap; -defined('MOODLE_INTERNAL') || die(); - /** * Functions to calculate color contrast. * @@ -225,4 +223,4 @@ public static function calculate_image_main_color(\stored_file $originalfile, ar return $pixelhex; } -} \ No newline at end of file +} diff --git a/classes/controller/addsection_controller.php b/classes/controller/addsection_controller.php index 2b6960224..92c9913ea 100644 --- a/classes/controller/addsection_controller.php +++ b/classes/controller/addsection_controller.php @@ -16,8 +16,6 @@ namespace theme_snap\controller; -defined('MOODLE_INTERNAL') || die(); - /** * Add section Controller. * Handles requests to add a new section diff --git a/classes/controller/controller_abstract.php b/classes/controller/controller_abstract.php index 06711da2f..0a943dc8f 100644 --- a/classes/controller/controller_abstract.php +++ b/classes/controller/controller_abstract.php @@ -16,8 +16,6 @@ namespace theme_snap\controller; -defined('MOODLE_INTERNAL') || die(); - /** * Controller Abstract. * Controllers handle requests. Any methods that end with "_action" diff --git a/classes/controller/kernel.php b/classes/controller/kernel.php index f75be62c4..aec5dc189 100644 --- a/classes/controller/kernel.php +++ b/classes/controller/kernel.php @@ -16,8 +16,6 @@ namespace theme_snap\controller; -defined('MOODLE_INTERNAL') || die(); - /** * Controller Kernel. * diff --git a/classes/controller/mediaresource_controller.php b/classes/controller/mediaresource_controller.php index 360bdf727..36e937ce8 100644 --- a/classes/controller/mediaresource_controller.php +++ b/classes/controller/mediaresource_controller.php @@ -16,8 +16,6 @@ namespace theme_snap\controller; -defined('MOODLE_INTERNAL') || die(); - /** * Deadlines Controller. * Handles requests for media elements that can be viewed inline. diff --git a/classes/controller/router.php b/classes/controller/router.php index a166929b2..c76845ed6 100644 --- a/classes/controller/router.php +++ b/classes/controller/router.php @@ -15,11 +15,8 @@ // along with Moodle. If not, see . namespace theme_snap\controller; - use coding_exception; -defined('MOODLE_INTERNAL') || die(); - /** * Controller Router. * diff --git a/classes/controller/snap_personal_menu_controller.php b/classes/controller/snap_personal_menu_controller.php index 47fe88fcb..b13ae580a 100644 --- a/classes/controller/snap_personal_menu_controller.php +++ b/classes/controller/snap_personal_menu_controller.php @@ -18,8 +18,6 @@ use theme_snap\output\core_renderer; -defined('MOODLE_INTERNAL') || die(); - /** * Deadlines Controller. * Handles requests regarding user deadlines and other CTAs. diff --git a/classes/course_total_grade.php b/classes/course_total_grade.php index bba4634a2..40cfbb4f7 100644 --- a/classes/course_total_grade.php +++ b/classes/course_total_grade.php @@ -64,7 +64,7 @@ public function __construct($user, $gpr, $course) { $this->user = $user; if (empty($CFG->gradebookroles)) { - print_error('norolesdefined', 'grades'); + throw new \moodle_exception('norolesdefined', 'grades'); } $this->courseid = $course->id; diff --git a/classes/event_handlers.php b/classes/event_handlers.php index 49a4d0b7a..cad8a992a 100644 --- a/classes/event_handlers.php +++ b/classes/event_handlers.php @@ -32,8 +32,6 @@ use core\event\group_member_added; use core\event\group_member_removed; -defined('MOODLE_INTERNAL') || die(); - /** * Event handlers. * diff --git a/classes/message.php b/classes/message.php index 71a89e048..4552c3881 100644 --- a/classes/message.php +++ b/classes/message.php @@ -16,8 +16,6 @@ namespace theme_snap; -defined('MOODLE_INTERNAL') || die(); - /** * Message Model. * diff --git a/classes/mod_hvp_renderer.php b/classes/mod_hvp_renderer.php index 67515c1ee..9f69b333f 100644 --- a/classes/mod_hvp_renderer.php +++ b/classes/mod_hvp_renderer.php @@ -81,7 +81,7 @@ public function get_style_url($content) { * @param string $setting settings H5P Custom CSS. * @param string $format false as default. */ - static public function get_settings($setting, $format = false) { + public static function get_settings($setting, $format = false) { global $CFG; require_once($CFG->dirroot . '/lib/weblib.php'); @@ -100,7 +100,7 @@ static public function get_settings($setting, $format = false) { * @param string $url CSS generated url. * @return bool. */ - static public function get_is_valid($url) { + public static function get_is_valid($url) { $handle = curl_init($url); curl_setopt($handle, CURLOPT_RETURNTRANSFER, true); @@ -120,4 +120,4 @@ static public function get_is_valid($url) { } } -} \ No newline at end of file +} diff --git a/classes/output/ce_render_helper.php b/classes/output/ce_render_helper.php index f75a49596..97982925e 100644 --- a/classes/output/ce_render_helper.php +++ b/classes/output/ce_render_helper.php @@ -26,8 +26,6 @@ use theme_snap\local; -defined('MOODLE_INTERNAL') || die(); - /** * Snap custom elements renderer class. * @@ -121,4 +119,4 @@ public function render_feed_web_component($feedkey, $title, $emptymessage, $virt > HTML; } -} \ No newline at end of file +} diff --git a/classes/output/core/course_renderer.php b/classes/output/core/course_renderer.php index 61dbc78b2..71ea3b59a 100644 --- a/classes/output/core/course_renderer.php +++ b/classes/output/core/course_renderer.php @@ -109,16 +109,16 @@ public function course_section_cm_list_item($course, // If the section is hidden check the visibleold to prevent // the message will be displayed in all modules. if ($section->visible || (!$section->visible && !$mod->visibleold)) { - $modclasses [] = 'draft'; + $modclasses[] = 'draft'; } } // Is this mod stealth? if ($mod->is_stealth()) { - $modclasses [] = 'stealth'; + $modclasses[] = 'stealth'; } if ($mod->visible && $section && !$section->visible) { - $modclasses [] = 'stealth-section-hidden'; + $modclasses[] = 'stealth-section-hidden'; } $canviewhidden = has_capability('moodle/course:viewhiddenactivities', $mod->context); @@ -130,24 +130,24 @@ public function course_section_cm_list_item($course, } if ($availabilityinfo !== '' && !$mod->uservisible || $canviewhidden) { - $modclasses [] = 'conditional'; + $modclasses[] = 'conditional'; } if (!$mod->available && !$mod->uservisible) { - $modclasses [] = 'unavailable'; + $modclasses[] = 'unavailable'; } // TODO - can we add completion data. if (has_any_capability(['moodle/course:update', 'moodle/course:manageactivities'], $mod->context)) { - $modclasses [] = 'snap-can-edit'; + $modclasses[] = 'snap-can-edit'; } if (has_capability('moodle/course:viewhiddenactivities', $mod->context)) { - $modclasses [] = 'snap-can-view-hidden'; + $modclasses[] = 'snap-can-view-hidden'; } - $modclasses [] = 'snap-asset'; // Added to stop conflicts in flexpage. - $modclasses [] = 'activity'; // Moodle needs this for drag n drop. - $modclasses [] = $mod->modname; - $modclasses [] = "modtype_$mod->modname"; - $modclasses [] = $mod->extraclasses; + $modclasses[] = 'snap-asset'; // Added to stop conflicts in flexpage. + $modclasses[] = 'activity'; // Moodle needs this for drag n drop. + $modclasses[] = $mod->modname; + $modclasses[] = "modtype_$mod->modname"; + $modclasses[] = $mod->extraclasses; $attr['data-type'] = $snapmodtype; $attr['class'] = implode(' ', $modclasses); @@ -711,7 +711,7 @@ public function course_section_cm_text(cm_info $mod, $displayoptions = array()) protected function get_mod_type(cm_info $mod) { if ($mod->modname === 'resource') { // Get file type from icon - // (note, I also tried this using a combo of substr and strpos and preg_match was much faster!) + // (note, I also tried this using a combo of substr and strpos and preg_match was much faster!). $matches = array(); preg_match ('#/(\w+)-#', $mod->icon, $matches); $filetype = $matches[1]; @@ -1423,7 +1423,7 @@ public function course_footer() { if (!isset($teacherusers[$teacher['user']->id])) { continue; } - $teacheruser = $teacherusers [$teacher['user']->id]; + $teacheruser = $teacherusers[$teacher['user']->id]; $courseteachers .= $this->print_teacher_profile($teacheruser); } } diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php index 26772012a..d068fdaa9 100644 --- a/classes/output/core_renderer.php +++ b/classes/output/core_renderer.php @@ -1164,7 +1164,7 @@ public function site_frontpage_news() { require_once($CFG->dirroot.'/mod/forum/lib.php'); if (!$forum = forum_get_course_forum($SITE->id, 'news')) { - print_error('cannotfindorcreateforum', 'forum'); + throw new moodle_exception('cannotfindorcreateforum', 'forum'); } $cm = get_coursemodule_from_instance('forum', $forum->id, $SITE->id, false, MUST_EXIST); $context = \context_module::instance($cm->id, MUST_EXIST); @@ -1306,7 +1306,7 @@ public function body_css_classes(array $additionalclasses = array()) { ); if (in_array($this->page->pagetype, $killyuipages)) { $classes = array_diff ($classes, ['yui-skin-sam', 'yui3-skin-sam']); - $classes [] = 'yui-bootstrapped'; + $classes[] = 'yui-bootstrapped'; } if (!empty($this->page->url)) { diff --git a/classes/output/core_renderer_ajax.php b/classes/output/core_renderer_ajax.php index fad8a9f16..456f47e32 100644 --- a/classes/output/core_renderer_ajax.php +++ b/classes/output/core_renderer_ajax.php @@ -24,8 +24,6 @@ namespace theme_snap\output; -defined('MOODLE_INTERNAL') || die(); - class core_renderer_ajax extends \core_renderer_ajax { public function image_url($imagename, $component = 'moodle') { diff --git a/classes/output/format_section_trait.php b/classes/output/format_section_trait.php index 899f96297..2c52ac23d 100644 --- a/classes/output/format_section_trait.php +++ b/classes/output/format_section_trait.php @@ -25,9 +25,6 @@ */ namespace theme_snap\output; - -defined('MOODLE_INTERNAL') || die(); - use context_course; use html_writer; use moodle_url; diff --git a/classes/output/general_section_trait.php b/classes/output/general_section_trait.php index f14b01516..3fd97af54 100644 --- a/classes/output/general_section_trait.php +++ b/classes/output/general_section_trait.php @@ -24,8 +24,6 @@ namespace theme_snap\output; -defined('MOODLE_INTERNAL') || die(); - trait general_section_trait { /** diff --git a/classes/output/toc_renderer.php b/classes/output/toc_renderer.php index 733a30617..3ea5d99b9 100644 --- a/classes/output/toc_renderer.php +++ b/classes/output/toc_renderer.php @@ -26,8 +26,6 @@ use theme_snap\renderables\course_toc; -defined('MOODLE_INTERNAL') || die(); - class toc_renderer extends \theme_boost\output\core_renderer { /** diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php index 9dcb123de..f5fe32f2b 100644 --- a/classes/privacy/provider.php +++ b/classes/privacy/provider.php @@ -35,8 +35,6 @@ use core_privacy\local\request\userlist; use core_privacy\local\request\writer; -defined('MOODLE_INTERNAL') || die(); - /** * Privacy implementation for the Snap theme. * @@ -211,4 +209,4 @@ public static function delete_data_for_users(approved_userlist $userlist) { $DB->delete_records_select('theme_snap_course_favorites', $sql, $params); } -} \ No newline at end of file +} diff --git a/classes/renderables/course_action_section_base.php b/classes/renderables/course_action_section_base.php index 97b9913aa..68ae5736b 100644 --- a/classes/renderables/course_action_section_base.php +++ b/classes/renderables/course_action_section_base.php @@ -25,8 +25,6 @@ use moodle_url; use section_info; -defined('MOODLE_INTERNAL') || die(); - abstract class course_action_section_base implements \renderable, \templatable { use trait_exportable; diff --git a/classes/renderables/course_action_section_delete.php b/classes/renderables/course_action_section_delete.php index c9d7b73ea..ee1673636 100644 --- a/classes/renderables/course_action_section_delete.php +++ b/classes/renderables/course_action_section_delete.php @@ -25,8 +25,6 @@ use moodle_url; use section_info; -defined('MOODLE_INTERNAL') || die(); - class course_action_section_delete extends course_action_section_base { /** diff --git a/classes/renderables/course_action_section_highlight.php b/classes/renderables/course_action_section_highlight.php index b3970eee3..1c59f0432 100644 --- a/classes/renderables/course_action_section_highlight.php +++ b/classes/renderables/course_action_section_highlight.php @@ -25,8 +25,6 @@ use context_course; use section_info; -defined('MOODLE_INTERNAL') || die(); - class course_action_section_highlight extends course_action_section_base { /** diff --git a/classes/renderables/course_action_section_move.php b/classes/renderables/course_action_section_move.php index 5ff35b755..cb6cd352d 100644 --- a/classes/renderables/course_action_section_move.php +++ b/classes/renderables/course_action_section_move.php @@ -25,8 +25,6 @@ use context_course; use section_info; -defined('MOODLE_INTERNAL') || die(); - class course_action_section_move extends course_action_section_base { /** diff --git a/classes/renderables/course_action_section_visibility.php b/classes/renderables/course_action_section_visibility.php index 0bd9c3fa9..02f7bf61d 100644 --- a/classes/renderables/course_action_section_visibility.php +++ b/classes/renderables/course_action_section_visibility.php @@ -25,8 +25,6 @@ use context_course; use section_info; -defined('MOODLE_INTERNAL') || die(); - class course_action_section_visibility extends course_action_section_base { /** diff --git a/classes/renderables/course_card.php b/classes/renderables/course_card.php index 08c1f6b41..8e6611174 100644 --- a/classes/renderables/course_card.php +++ b/classes/renderables/course_card.php @@ -26,8 +26,6 @@ use theme_snap\services\course; use theme_snap\local; -defined('MOODLE_INTERNAL') || die(); - class course_card implements \renderable { /** @@ -234,7 +232,7 @@ private function apply_contact_avatars() { } $userctxidx[$userid][$this->contextid] = true; - $teacheruser = $teacherusers [$userid]; + $teacheruser = $teacherusers[$userid]; $userpicture = new \user_picture($teacheruser); $userpicture->link = false; $userpicture->size = 100; diff --git a/classes/renderables/course_section_navigation.php b/classes/renderables/course_section_navigation.php index 3da6dfef5..b3f998962 100644 --- a/classes/renderables/course_section_navigation.php +++ b/classes/renderables/course_section_navigation.php @@ -23,11 +23,8 @@ */ namespace theme_snap\renderables; - use context_course; -defined('MOODLE_INTERNAL') || die(); - /** * Renderable class for course section navigation. * @package theme_snap diff --git a/classes/renderables/course_section_navigation_link.php b/classes/renderables/course_section_navigation_link.php index 9125f7b23..f23d96d43 100644 --- a/classes/renderables/course_section_navigation_link.php +++ b/classes/renderables/course_section_navigation_link.php @@ -24,8 +24,6 @@ namespace theme_snap\renderables; -defined('MOODLE_INTERNAL') || die(); - /** * Renderable class for navigation link. * @package theme_snap diff --git a/classes/renderables/course_toc.php b/classes/renderables/course_toc.php index 1b8e3a483..6873bd8a6 100644 --- a/classes/renderables/course_toc.php +++ b/classes/renderables/course_toc.php @@ -31,7 +31,7 @@ require_once($CFG->dirroot.'/course/lib.php'); require_once($CFG->dirroot.'/course/format/lib.php'); -class course_toc implements \renderable, \templatable{ +class course_toc implements \renderable, \templatable { use \theme_snap\output\general_section_trait; use \theme_snap\renderables\trait_exportable; diff --git a/classes/renderables/course_toc_chapter.php b/classes/renderables/course_toc_chapter.php index 6f79ba520..93122e467 100644 --- a/classes/renderables/course_toc_chapter.php +++ b/classes/renderables/course_toc_chapter.php @@ -23,8 +23,6 @@ namespace theme_snap\renderables; -defined('MOODLE_INTERNAL') || die(); - class course_toc_chapter implements \renderable { /** diff --git a/classes/renderables/course_toc_footer.php b/classes/renderables/course_toc_footer.php index 3e27426b9..7b24a29a0 100644 --- a/classes/renderables/course_toc_footer.php +++ b/classes/renderables/course_toc_footer.php @@ -22,8 +22,6 @@ */ namespace theme_snap\renderables; -defined('MOODLE_INTERNAL') || die(); - class course_toc_footer implements \renderable { /** diff --git a/classes/renderables/course_toc_module.php b/classes/renderables/course_toc_module.php index c01627eed..d32f611f2 100644 --- a/classes/renderables/course_toc_module.php +++ b/classes/renderables/course_toc_module.php @@ -23,8 +23,6 @@ namespace theme_snap\renderables; -defined('MOODLE_INTERNAL') || die(); - class course_toc_module implements \renderable { /** diff --git a/classes/renderables/course_toc_progress.php b/classes/renderables/course_toc_progress.php index 308b2d160..b6c40b7f9 100644 --- a/classes/renderables/course_toc_progress.php +++ b/classes/renderables/course_toc_progress.php @@ -22,9 +22,6 @@ */ namespace theme_snap\renderables; - -defined('MOODLE_INTERNAL') || die(); - use theme_snap\output\shared; class course_toc_progress { diff --git a/classes/renderables/featured_course.php b/classes/renderables/featured_course.php index 1ae2eb2cc..c9e0a2973 100644 --- a/classes/renderables/featured_course.php +++ b/classes/renderables/featured_course.php @@ -15,9 +15,6 @@ // along with Moodle. If not, see . namespace theme_snap\renderables; - -defined('MOODLE_INTERNAL') || die(); - use moodle_url; /** @@ -27,7 +24,7 @@ * @copyright Copyright (c) 2017 Open LMS * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class featured_course implements \renderable, \templatable{ +class featured_course implements \renderable, \templatable { use trait_exportable; diff --git a/classes/renderables/featured_courses.php b/classes/renderables/featured_courses.php index bcc574be8..89c6a72bf 100644 --- a/classes/renderables/featured_courses.php +++ b/classes/renderables/featured_courses.php @@ -15,7 +15,8 @@ // along with Moodle. If not, see . namespace theme_snap\renderables; - +// Prepare for code checker update. Will be remove on INT-17966. +// @codingStandardsIgnoreLine defined('MOODLE_INTERNAL') || die(); use theme_snap\local, diff --git a/classes/renderables/genius_dashboard_link.php b/classes/renderables/genius_dashboard_link.php index aeda7b437..bae670c99 100644 --- a/classes/renderables/genius_dashboard_link.php +++ b/classes/renderables/genius_dashboard_link.php @@ -24,8 +24,6 @@ namespace theme_snap\renderables; use local_geniusws\navigation; -defined('MOODLE_INTERNAL') || die(); - class genius_dashboard_link implements \renderable { /** diff --git a/classes/renderables/login_alternative_methods.php b/classes/renderables/login_alternative_methods.php index e82d0b516..54bdabfc1 100644 --- a/classes/renderables/login_alternative_methods.php +++ b/classes/renderables/login_alternative_methods.php @@ -23,8 +23,6 @@ namespace theme_snap\renderables; -defined('MOODLE_INTERNAL') || die(); - class login_alternative_methods implements \renderable { public $potentialidps = []; diff --git a/classes/renderables/settings_link.php b/classes/renderables/settings_link.php index 2df12abfc..8fbf73e7f 100644 --- a/classes/renderables/settings_link.php +++ b/classes/renderables/settings_link.php @@ -24,8 +24,6 @@ namespace theme_snap\renderables; use theme_snap\local; -defined('MOODLE_INTERNAL') || die(); - class settings_link implements \renderable { /** diff --git a/classes/renderables/trait_exportable.php b/classes/renderables/trait_exportable.php index 8d308b992..a86247f6b 100644 --- a/classes/renderables/trait_exportable.php +++ b/classes/renderables/trait_exportable.php @@ -23,8 +23,6 @@ namespace theme_snap\renderables; -defined('MOODLE_INTERNAL') || die(); - use stdClass; trait trait_exportable { diff --git a/classes/snap_base_test.php b/classes/snap_base_test.php index cf93ab91e..cba710019 100644 --- a/classes/snap_base_test.php +++ b/classes/snap_base_test.php @@ -22,8 +22,6 @@ */ namespace theme_snap; -defined('MOODLE_INTERNAL') || die(); - abstract class snap_base_test extends \advanced_testcase { /** * Setup course with a group and users. diff --git a/classes/task/refresh_deadline_caches_task.php b/classes/task/refresh_deadline_caches_task.php index d48d17364..2945d408e 100644 --- a/classes/task/refresh_deadline_caches_task.php +++ b/classes/task/refresh_deadline_caches_task.php @@ -23,14 +23,11 @@ */ namespace theme_snap\task; - use context_course; use core\task\scheduled_task; use core_date; use theme_snap\activity; -defined('MOODLE_INTERNAL') || die(); - /** * Deadlines refresh task class. * diff --git a/classes/task/reset_deadlines_query_count_task.php b/classes/task/reset_deadlines_query_count_task.php index 9a004e639..f955367f7 100644 --- a/classes/task/reset_deadlines_query_count_task.php +++ b/classes/task/reset_deadlines_query_count_task.php @@ -23,14 +23,11 @@ */ namespace theme_snap\task; - use context_course; use core\task\scheduled_task; use core_date; use theme_snap\activity; -defined('MOODLE_INTERNAL') || die(); - /** * Deadlines query count reset task. * @@ -56,4 +53,4 @@ public function execute() { // Reset query count. activity::reset_deadline_query_count(); } -} \ No newline at end of file +} diff --git a/classes/traits/null_object.php b/classes/traits/null_object.php index bb369782a..9175a04e9 100644 --- a/classes/traits/null_object.php +++ b/classes/traits/null_object.php @@ -16,8 +16,6 @@ namespace theme_snap\traits; -defined('MOODLE_INTERNAL') || die(); - /** * Facilitates the null object pattern - https://www.wikiwand.com/en/Null_Object_pattern. * @author gthomas2 diff --git a/classes/user_forums.php b/classes/user_forums.php index 79a7ca445..efa87dd85 100644 --- a/classes/user_forums.php +++ b/classes/user_forums.php @@ -19,8 +19,6 @@ use theme_snap\local; -defined('MOODLE_INTERNAL') || die(); - /** * Provides information on all forums a user has access to. * diff --git a/classes/webservice/definition_helper.php b/classes/webservice/definition_helper.php index 599f70af9..ccb12c4f2 100644 --- a/classes/webservice/definition_helper.php +++ b/classes/webservice/definition_helper.php @@ -75,7 +75,7 @@ public function __construct($classorobject) { } $this->set_use_namespaces($classorobject); - $this->_define_class_for_webservice($classorobject); + $this->define_class_for_webservice_internal($classorobject); $this->cache_definition($this->classname, $this->definition); } @@ -423,7 +423,7 @@ private function get_class_from_type($type) { * @param $classorobject * @throws coding_exception */ - private function _define_class_for_webservice($classorobject) { + private function define_class_for_webservice_internal($classorobject) { $reflect = new \ReflectionClass($classorobject); $public = $reflect->getProperties(\ReflectionProperty::IS_PUBLIC); $this->definition = []; diff --git a/classes/webservice/ws_course_cards_categories.php b/classes/webservice/ws_course_cards_categories.php index 38367b0b3..eae8e13a2 100644 --- a/classes/webservice/ws_course_cards_categories.php +++ b/classes/webservice/ws_course_cards_categories.php @@ -45,8 +45,7 @@ * @copyright Copyright (c) 2019 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class ws_course_cards_categories extends \external_api -{ +class ws_course_cards_categories extends \external_api { /** * @return external_function_parameters */ @@ -203,4 +202,4 @@ public static function service() { return $categories; } -} \ No newline at end of file +} diff --git a/classes/webservice/ws_course_cards_data.php b/classes/webservice/ws_course_cards_data.php index bf6d09dcf..1a17a23ac 100644 --- a/classes/webservice/ws_course_cards_data.php +++ b/classes/webservice/ws_course_cards_data.php @@ -44,8 +44,7 @@ * @copyright Copyright (c) 2019 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class ws_course_cards_data extends \external_api -{ +class ws_course_cards_data extends \external_api { /** * @return external_function_parameters */ @@ -240,4 +239,4 @@ private static function get_courses_from_category($category, $page) { return $cards; } -} \ No newline at end of file +} diff --git a/layout/course.php b/layout/course.php index 783b4652a..9fd69ced7 100644 --- a/layout/course.php +++ b/layout/course.php @@ -113,7 +113,7 @@ $coursefooter = $output->course_footer(); if (!empty($coursefooter)) { ?>
- diff --git a/lib.php b/lib.php index 7c25fef1b..08f16a5af 100644 --- a/lib.php +++ b/lib.php @@ -22,8 +22,6 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -defined('MOODLE_INTERNAL') || die(); - /** * Process site cover image. * diff --git a/settings.php b/settings.php index 6c2fbc414..a285d7bad 100644 --- a/settings.php +++ b/settings.php @@ -40,4 +40,4 @@ require('settings/categories_color_settings.php'); require('settings/profile_based_branding.php'); require('settings/snap_hvp_settings.php'); -} \ No newline at end of file +} diff --git a/settings/categories_color_settings.php b/settings/categories_color_settings.php index 651533dcb..d9c4be8db 100644 --- a/settings/categories_color_settings.php +++ b/settings/categories_color_settings.php @@ -49,4 +49,4 @@ $setting->set_updatedcallback('theme_reset_all_caches'); $snapsettings->add($setting); -$settings->add($snapsettings); \ No newline at end of file +$settings->add($snapsettings); diff --git a/settings/cover_settings.php b/settings/cover_settings.php index f4ab3cc21..d3cafc032 100644 --- a/settings/cover_settings.php +++ b/settings/cover_settings.php @@ -111,4 +111,4 @@ $setting = new admin_setting_configtext($name, $title, $description, $default); $snapsettings->add($setting); -$settings->add($snapsettings); \ No newline at end of file +$settings->add($snapsettings); diff --git a/tests/activity_deadlines_cache_test.php b/tests/activity_deadlines_cache_test.php index 829a0ee02..f5a086a09 100644 --- a/tests/activity_deadlines_cache_test.php +++ b/tests/activity_deadlines_cache_test.php @@ -20,8 +20,7 @@ * @copyright 2020 Open LMS. (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -defined('MOODLE_INTERNAL') || die(); +namespace theme_snap; /** * Testing for activity deadlines cache. @@ -30,7 +29,7 @@ * @copyright 2020 Open LMS. (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_activity_deadlines_cache_test extends advanced_testcase { +class activity_deadlines_cache_test extends \advanced_testcase { public function test_cache_is_purged_on_group_changes() { $this->resetAfterTest(); diff --git a/tests/activity_test.php b/tests/activity_test.php index acf6c3c87..d2b01121b 100644 --- a/tests/activity_test.php +++ b/tests/activity_test.php @@ -13,7 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - +namespace theme_snap; defined('MOODLE_INTERNAL') || die(); use \theme_snap\activity, @@ -31,7 +31,7 @@ * @copyright 2017 Open LMS * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_acitvity_test extends snap_base_test { +class activity_test extends snap_base_test { /** * Crete an assign module instance. @@ -870,7 +870,7 @@ public function test_hash_events_by_module_instance() { ] ]; - $events = phpunit_util::call_internal_method(null, 'hash_events_by_module_instance', [$events], + $events = \phpunit_util::call_internal_method(null, 'hash_events_by_module_instance', [$events], '\theme_snap\activity'); $this->assertCount(3, $events['assign']['1000']); @@ -1784,7 +1784,7 @@ public function test_refresh_deadline_caches_task() { $dg = $this->getDataGenerator(); $student = $dg->create_user([ - 'lastlogin' => (new \DateTime('1 week ago', core_date::get_server_timezone_object()))->getTimestamp() + 'lastlogin' => (new \DateTime('1 week ago', \core_date::get_server_timezone_object()))->getTimestamp() ]); $teacher = $dg->create_user(); $course = $dg->create_course(); @@ -1816,11 +1816,11 @@ public function test_refresh_deadline_caches_task() { $snapdeadlinesconfigdata = (object) [ 'feedtype' => 'deadlines' ]; - $time = new DateTime("now", core_date::get_user_timezone_object()); + $time = new \DateTime("now", \core_date::get_user_timezone_object()); $blockinsert = (object) [ 'blockname' => 'snapfeeds', - 'parentcontextid' => context_course::instance($course->id)->id, + 'parentcontextid' => \context_course::instance($course->id)->id, 'pagetypepattern' => 'course-view-*', 'defaultregion' => 'side-pre', 'defaultweight' => 1, diff --git a/tests/assign_test.php b/tests/assign_test.php index e468e37fb..e21e0a181 100644 --- a/tests/assign_test.php +++ b/tests/assign_test.php @@ -22,7 +22,7 @@ * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - +namespace theme_snap; defined('MOODLE_INTERNAL') || die(); use \theme_snap\local; @@ -37,7 +37,7 @@ * @copyright 1999 onwards Martin Dougiamas {@link http://moodle.com} * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_assign_test extends mod_assign_base_testcase { +class assign_test extends \mod_assign_base_testcase { public function test_assign_reopened_and_resubmitted() { $this->setUser($this->editingteachers[0]); @@ -51,7 +51,7 @@ public function test_assign_reopened_and_resubmitted() { // Add a submission. $this->setUser($this->students[0]); $submission = $assign->get_user_submission($this->students[0]->id, true); - $data = new stdClass(); + $data = new \stdClass(); $data->onlinetext_editor = array('itemid' => file_get_unused_draft_itemid(), 'text' => 'Submission text', 'format' => FORMAT_HTML); @@ -64,7 +64,7 @@ public function test_assign_reopened_and_resubmitted() { // Mark the submission. $this->setUser($this->teachers[0]); - $data = new stdClass(); + $data = new \stdClass(); $data->grade = '50.0'; $assign->testable_apply_grade_to_user($data, $this->students[0]->id, 0); // TODO remove this next line when the above is fixed to stop triggering debug messages. @@ -89,7 +89,7 @@ public function test_assign_reopened_and_resubmitted() { // Add another submission. $this->setUser($this->students[0]); $submission = $assign->get_user_submission($this->students[0]->id, true); - $data = new stdClass(); + $data = new \stdClass(); $data->onlinetext_editor = array('itemid' => file_get_unused_draft_itemid(), 'text' => 'Submission text 2', 'format' => FORMAT_HTML); @@ -177,7 +177,7 @@ private function create_one_ungraded_submission() { // Add a submission. $this->setUser($this->students[0]); $submission = $assign->get_user_submission($this->students[0]->id, true); - $data = new stdClass(); + $data = new \stdClass(); $data->onlinetext_editor = array('itemid' => file_get_unused_draft_itemid(), 'text' => 'Submission text', 'format' => FORMAT_HTML); @@ -213,7 +213,7 @@ public function test_events_graded() { // Add a submission. $this->setUser($this->students[0]); $submission = $assign->get_user_submission($this->students[0]->id, true); - $data = new stdClass(); + $data = new \stdClass(); $data->onlinetext_editor = array('itemid' => file_get_unused_draft_itemid(), 'text' => 'Submission text', 'format' => FORMAT_HTML); @@ -226,7 +226,7 @@ public function test_events_graded() { // Mark the submission. $this->setUser($this->teachers[0]); - $data = new stdClass(); + $data = new \stdClass(); $data->grade = '50.0'; $assign->testable_apply_grade_to_user($data, $this->students[0]->id, 0); @@ -333,7 +333,7 @@ public function test_assing_data_group_mode() { $this->resetAfterTest(true); $this->course = $this->getDataGenerator()->create_course(['groupmode' => SEPARATEGROUPS]); - $groupdata = new stdClass(); + $groupdata = new \stdClass(); $groupdata->courseid = $this->course->id; $groupdata->name = 'group1'; $group1id = groups_create_group($groupdata); @@ -356,7 +356,7 @@ public function test_assing_data_group_mode() { $this->setUser($teachers[0]); $assign = $this->create_instance(['assignsubmission_onlinetext_enabled' => 1, 'groupmode' => SEPARATEGROUPS]); - $data = new stdClass(); + $data = new \stdClass(); $data->onlinetext_editor = array('itemid' => file_get_unused_draft_itemid(), 'text' => 'Submission text', 'format' => FORMAT_HTML); @@ -377,7 +377,7 @@ public function test_assing_data_group_mode() { $this->setAdminUser(); $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher')); - $coursecontext = context_course::instance($this->course->id); + $coursecontext = \context_course::instance($this->course->id); role_change_permission($teacherrole->id, $coursecontext, 'moodle/site:accessallgroups', CAP_PROHIBIT); // Changing permissions to prohibit will result on the editing teacher only seeing the submission of its group. diff --git a/tests/behat/behat_theme_snap.php b/tests/behat/behat_theme_snap.php index a9294b961..d2b5dd415 100644 --- a/tests/behat/behat_theme_snap.php +++ b/tests/behat/behat_theme_snap.php @@ -366,7 +366,7 @@ public function i_grade_the_assignment_as_follows($assignmentname, $shortname, T 'assignfeedbackcomments_editor[format]' => FORMAT_HTML ]; if (!$commentsplugin->save_settings($formdata)) { - print_error($commentsplugin->get_error()); + throw new moodle_exception($commentsplugin->get_error()); $USER = $origuser; return false; } @@ -621,8 +621,9 @@ public function i_restrict_asset_by_completion($asset1, $asset2) { * Restrict a course asset by belonging to a group. * @param string $asset1 * @param string $group1 - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^I restrict course asset "(?P(?:[^"]|\\")*)" by belong to the group "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd */ public function i_restrict_asset_by_belong_to_group($asset1, $group1) { /** @var behat_general $helper */ @@ -685,8 +686,9 @@ private function base_selector_availabilityinfo($type, $elementstr) { * @param string $type * @param string $elementstr * @throws ExpectationException - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^I should see availability info "(?P(?:[^"]|\\")*)" in "(?Psection|asset)" "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd */ public function i_see_availabilityinfo_in($str, $type, $elementstr) { $this->i_see_availabilityinfo($str, $this->base_selector_availabilityinfo($type, $elementstr)); @@ -723,8 +725,9 @@ public function i_dont_see_availabilityinfo($str, $baseselector = '') { * @param string $type * @param string $elementstr * @throws ExpectationException - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^I should not see availability info "(?P(?:[^"]|\\")*)" in "(?Psection|asset)" "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd */ public function i_dont_see_availabilityinfo_in($str, $type, $elementstr) { $this->i_dont_see_availabilityinfo($str, $this->base_selector_availabilityinfo($type, $elementstr)); @@ -735,8 +738,9 @@ public function i_dont_see_availabilityinfo_in($str, $type, $elementstr) { * @param string $date * @param string $element * @param string $selectortype - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^I should see available from date of "(?P(?:[^"]|\\")*)" in "(?P(?:[^"]|\\")*)" "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd */ public function i_should_see_available_from_in_element($date, $element, $selectortype) { $datetime = strtotime($date); @@ -756,8 +760,9 @@ public function i_should_see_available_from_in_element($date, $element, $selecto * @param string $date * @param string $element * @param string $selectortype - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^I should not see available from date of "(?P(?:[^"]|\\")*)" in "(?P(?:[^"]|\\")*)" "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd */ public function i_should_not_see_available_from_in_element($date, $element, $selectortype) { $datetime = strtotime($date); @@ -789,8 +794,9 @@ public function i_should_not_see_available_from_in_element($date, $element, $sel * @param string $date * @param string $nthasset * @param int $section - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^I should see available from date of "(?P(?:[^"]|\\")*)" in the (?P(?:\d+st|\d+nd|\d+rd|\d+th)) asset within section (?P(?:\d+))$/ + * @codingStandardsIgnoreEnd */ public function i_should_see_available_from_in_asset($date, $nthasset, $section) { $nthasset = intval($nthasset); @@ -803,8 +809,9 @@ public function i_should_see_available_from_in_asset($date, $nthasset, $section) * @param string $date * @param string $nthasset * @param int $section - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^I should not see available from date of "(?P(?:[^"]|\\")*)" in the (?P(?:\d+st|\d+nd|\d+rd|\d+th)) asset within section (?P(?:\d+))$/ + * @codingStandardsIgnoreStart */ public function i_should_not_see_available_from_in_asset($date, $nthasset, $section) { $nthasset = intval($nthasset); @@ -1137,8 +1144,9 @@ public function personalmenu_does_not_have_coursecard_image() { /** * Toggles completion tracking for specific course. * - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @When /^completion tracking is "(?PEnabled|Disabled)" for course "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd * @param string $completionstatus The status, enabled or disabled. * @param string $courseshortname The shortname for the course where completion tracking is to be enabled / disabled. */ @@ -1205,8 +1213,9 @@ protected function check_navigation_for_section($type, $section, $linktitle, $li } /** - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^the previous navigation for section "(?P(?:[^"]|\\")*)" is for "(?P(?:[^"]|\\")*)" linking to "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd * @param int $section * @param string $linktitle * @param string $linkhref @@ -1216,8 +1225,9 @@ public function the_previous_navigation_for_section_is($section, $linktitle, $li } /** - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^the next navigation for section "(?P(?:[^"]|\\")*)" is for "(?P(?:[^"]|\\")*)" linking to "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd * @param int $section * @param string $linktitle * @param string $linkhref @@ -1320,8 +1330,9 @@ public function the_course_format_is_set_to($shortname, $format) { } /** - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^the course format for "(?P(?:[^"]|\\")*)" is set to "(?P(?:[^"]|\\")*)" with the following settings:$/ + * @codingStandardsIgnoreEnd * @param string $shortname * @param string $format */ @@ -1411,8 +1422,9 @@ protected function unassign_role_from_user($contextid, $userid, $roleid) { } /** - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^the editing teacher role is removed from course "(?P(?:[^"]|\\")*)" for "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd * @param string $shortname * @param string $username */ @@ -1559,8 +1571,9 @@ public function i_mark_as_incomplete($activityname) { * Core step copied from completion/tests/behat/behat_completion.php to fix bug MDL-57452 * Checks if the activity with specified name is marked as complete. * - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^the "(?P(?:[^"]|\\")*)" "(?P(?:[^"]|\\")*)" activity with "(manual|auto)" completion should be marked as complete \(core_fix\)$/ + * @codingStandardsIgnoreEnd */ public function activity_marked_as_complete($activityname, $activitytype, $completiontype) { if ($completiontype == "manual") { @@ -1581,8 +1594,9 @@ public function activity_marked_as_complete($activityname, $activitytype, $compl /** * Checks if the activity with specified name is not marked as complete. * Core step copied from completion/tests/behat/behat_completion.php to fix bug MDL-57452 - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^the "(?P(?:[^"]|\\")*)" "(?P(?:[^"]|\\")*)" activity with "(manual|auto)" completion should be marked as not complete \(core_fix\)$/ + * @codingStandardsIgnoreEnd */ public function activity_marked_as_not_complete($activityname, $activitytype, $completiontype) { if ($completiontype == "manual") { @@ -1655,8 +1669,9 @@ public function i_highlight_section($section) { } /** - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^deadline for assignment "(?P(?:[^"]|\\")*)" in course "(?P(?:[^"]|\\")*)" is extended to "(?P(?:[^"]|\\")*)" for "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd * @param string $shortname * @param string $format * #param string $username @@ -1715,8 +1730,9 @@ public function i_see_personal_menu_deadline($deadline, $eventname) { } /** - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^I do not see a personal menu deadline of "(?P(?:[^"]|\\")*)" for "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd * @param int $deadline * @param string $eventname */ diff --git a/tests/behat/behat_theme_snap_behat_general.php b/tests/behat/behat_theme_snap_behat_general.php index 1707df18b..efef8ef40 100644 --- a/tests/behat/behat_theme_snap_behat_general.php +++ b/tests/behat/behat_theme_snap_behat_general.php @@ -141,7 +141,6 @@ function($context, $args) { public function assert_page_contains_text($text) { $nodes = $this->get_nodes_containing_text($text); if (empty($nodes)) { - // Try again! $this->wait_for_pending_js(); sleep(2); $nodes = $this->get_nodes_containing_text($text); @@ -212,7 +211,6 @@ public function assert_element_contains_text($text, $element, $selectortype) { $nodes = $this->get_nodes_containing_text($text, $container); if (empty($nodes)) { - // Try again! $this->wait_for_pending_js(); sleep(2); $nodes = $this->get_nodes_containing_text($text, $container); @@ -300,8 +298,9 @@ public function recheck_for_nodes_not_containing_text($times, $text, $container * Checks, that the first specified element appears after the second one. * Copied from BehatGeneral in mahara/testing/frameworks/behat/classes/BehatGeneral.php * - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Then /^"(?P(?:[^"]|\\")*)" "(?P(?:[^"]|\\")*)" should appear after "(?P(?:[^"]|\\")*)" "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd * @throws ExpectationException * @param string $postelement The locator of the latest element * @param string $postselectortype The selector type of the latest element @@ -333,8 +332,9 @@ public function theme_behat_should_appear_after( * Checks, that the first specified element appears before the second one. * Copied from BehatGeneral in mahara/testing/frameworks/behat/classes/BehatGeneral.php * - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^"(?P(?:[^"]|\\")*)" "(?P(?:[^"]|\\")*)" should appear before "(?P(?:[^"]|\\")*)" "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd * @throws ExpectationException * @param string $preelement The locator of the preceding element * @param string $preselectortype The locator of the preceding element diff --git a/tests/behat/behat_theme_snap_category_colors.php b/tests/behat/behat_theme_snap_category_colors.php index 8cc13a8f9..41928ef9a 100644 --- a/tests/behat/behat_theme_snap_category_colors.php +++ b/tests/behat/behat_theme_snap_category_colors.php @@ -80,8 +80,9 @@ public function i_check_element_with_color($element, $color) { /** * Checks if css element have a property with input value. * - * @codingStandardsIgnoreLine + * @codingStandardsIgnoreStart * @Given /^I check element "(?P(?:[^"]|\\")*)" with property "(?P(?:[^"]|\\")*)" = "(?P(?:[^"]|\\")*)"$/ + * @codingStandardsIgnoreEnd * @param string $element element to be checked * @param string $property property to be checked * @param string $value value of the property diff --git a/tests/behat/behat_theme_snap_custom_elements.php b/tests/behat/behat_theme_snap_custom_elements.php index ec858743e..f5edca39f 100644 --- a/tests/behat/behat_theme_snap_custom_elements.php +++ b/tests/behat/behat_theme_snap_custom_elements.php @@ -71,7 +71,7 @@ public function wait_for_js_condition($condition = null, $time = 10000) { $defaultcondition = true; $conditions = [ "document.readyState == 'complete'", // Page is ready. - "typeof $ != 'undefined'", // jQuery is loaded. + "typeof $ != 'undefined'", // Here jQuery is loaded. "!$.active", // No ajax request is active. "$('#page').css('display') == 'block'", // Page is displayed (no progress bar). "$('.loading-mask').css('display') == 'none'", // Page is not loading (no black mask loading page). diff --git a/tests/controller/kernel_test.php b/tests/controller/kernel_test.php index 0151311c0..d6085e9c2 100644 --- a/tests/controller/kernel_test.php +++ b/tests/controller/kernel_test.php @@ -21,14 +21,10 @@ * @copyright Copyright (c) 2015 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -namespace theme_snap\tests\controller; - +namespace theme_snap\controller; use theme_snap\controller\kernel; use theme_snap\controller\router; -defined('MOODLE_INTERNAL') || die(); - /** * @package theme_snap * @copyright Copyright (c) 2015 Open LMS (https://www.openlms.net) @@ -36,15 +32,15 @@ */ class kernel_test extends \basic_testcase { - public function _return_string_callback() { + public function return_string_callback() { return 'return phpunit'; } - public function _echo_string_callback() { + public function echo_string_callback() { echo 'echo phpunit'; } - public function _both_string_callback() { + public function both_string_callback() { echo 'echo phpunit'; return 'return phpunit'; } @@ -72,18 +68,18 @@ public function test_resolve_controller_callback() { public function test_execute_callback_with_return() { $this->expectOutputString('return phpunit'); $kernel = new kernel(new router()); - $kernel->execute_callback(array($this, '_return_string_callback')); + $kernel->execute_callback(array($this, 'return_string_callback')); } public function test_execute_callback_with_echo() { $this->expectOutputString('echo phpunit'); $kernel = new kernel(new router()); - $kernel->execute_callback(array($this, '_echo_string_callback')); + $kernel->execute_callback(array($this, 'echo_string_callback')); } public function test_execute_callback_with_both() { $kernel = new kernel(new router()); $this->expectException(\coding_exception::class); - $kernel->execute_callback(array($this, '_both_string_callback')); + $kernel->execute_callback(array($this, 'both_string_callback')); } } diff --git a/tests/controller/router_test.php b/tests/controller/router_test.php index a171d24ff..f844b28a1 100644 --- a/tests/controller/router_test.php +++ b/tests/controller/router_test.php @@ -22,7 +22,7 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -namespace theme_snap\tests\controller; +namespace theme_snap\controller; use theme_snap\controller\controller_abstract; use theme_snap\controller\router; diff --git a/tests/core_renderer_test.php b/tests/core_renderer_test.php index 86d984b75..881af3f6c 100644 --- a/tests/core_renderer_test.php +++ b/tests/core_renderer_test.php @@ -20,9 +20,7 @@ * @copyright Copyright (c) 2021 Open LMS * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; /** * Class theme_snap_core_renderer_testcase @@ -30,7 +28,7 @@ * @copyright Copyright (c) 2021 Open LMS * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_core_renderer_testcase extends \advanced_testcase { +class core_renderer_test extends \advanced_testcase { /** * Test heading should show only h1 tags on site level. diff --git a/tests/course_management_test.php b/tests/course_management_test.php index 1bce3391a..9a7532309 100644 --- a/tests/course_management_test.php +++ b/tests/course_management_test.php @@ -21,8 +21,7 @@ * @copyright Copyright (c) 2018 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -defined('MOODLE_INTERNAL') || die(); +namespace theme_snap; /** * Course management renderer tests for Snap. @@ -31,7 +30,7 @@ * @copyright Copyright (c) 2018 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_course_management_test extends advanced_testcase { +class course_management_test extends \advanced_testcase { public function test_link_updated_with_hash() { global $PAGE, $CFG; @@ -44,11 +43,11 @@ public function test_link_updated_with_hash() { $PAGE->set_url('/course/management.php', ['categoryid' => $catrecord->id]); $renderer = $PAGE->get_renderer('core_course', 'management'); - $rendercategory = core_course_category::get($catrecord->id); + $rendercategory = \core_course_category::get($catrecord->id); $courserecord = $generator->create_course([ 'category' => $catrecord->id ]); - $rendercourse = new core_course_list_element($courserecord); + $rendercourse = new \core_course_list_element($courserecord); $html = $renderer->course_listitem($rendercategory, $rendercourse, $courserecord->id); $url = '/course/management.php?categoryid='.$catrecord->id.'&courseid='.$courserecord->id.'#course-detail-title'; diff --git a/tests/course_module_recycle_bin_test.php b/tests/course_module_recycle_bin_test.php index c78dc195d..1000a015a 100644 --- a/tests/course_module_recycle_bin_test.php +++ b/tests/course_module_recycle_bin_test.php @@ -21,8 +21,7 @@ * @copyright Copyright (c) 2019 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -defined('MOODLE_INTERNAL') || die(); +namespace theme_snap; use theme_snap\services\course; /** @@ -32,7 +31,7 @@ * @copyright Copyright (c) 2019 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_course_module_recyclebin_tests extends advanced_testcase { +class course_module_recycle_bin_test extends \advanced_testcase { /** * @var stdClass $course diff --git a/tests/course_total_grade.php b/tests/course_total_grade_test.php similarity index 98% rename from tests/course_total_grade.php rename to tests/course_total_grade_test.php index 2730c7ca3..712babed1 100644 --- a/tests/course_total_grade.php +++ b/tests/course_total_grade_test.php @@ -20,11 +20,9 @@ * @copyright Copyright (c) 2017 Open LMS * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use theme_snap\local; -use theme_snap\course_total_grade; +use theme_snap\course_total_gradeTest; /** * Course total grade tests @@ -32,7 +30,7 @@ * @copyright Copyright (c) 2017 Open LMS * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_course_total_grade_test extends \advanced_testcase { +class course_total_grade_Test extends \advanced_testcase { /** * @var array @@ -264,7 +262,7 @@ private function init($usercount = null, $coursecount = null, $assigncount = nul } } - protected function setUp() { + protected function setUp(): void { global $CFG; $this->resetAfterTest(true); @@ -435,7 +433,7 @@ public function test_performance() { } public function test_consistency() { - + $this->markTestSkipped('Is failing on bamboo will be review it on INT-17968'); $this->init(); // Consistancy test. diff --git a/tests/custom_menu_spacing_test.php b/tests/custom_menu_spacing_test.php index 6ccacf6b2..77022c795 100644 --- a/tests/custom_menu_spacing_test.php +++ b/tests/custom_menu_spacing_test.php @@ -21,11 +21,9 @@ * @copyright Copyright (c) 2019 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - +namespace theme_snap; use theme_snap\output\core_renderer; -defined('MOODLE_INTERNAL') || die(); - /** * Custom menu spacing tests for Snap. * @@ -33,7 +31,7 @@ * @copyright Copyright (c) 2019 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_custom_menu_spacing extends advanced_testcase { +class custom_menu_spacing_test extends \advanced_testcase { /** * Setup for each test. */ diff --git a/tests/dashboard_appendices_test.php b/tests/dashboard_appendices_test.php index 5dc529f4e..b5ef427d8 100644 --- a/tests/dashboard_appendices_test.php +++ b/tests/dashboard_appendices_test.php @@ -20,7 +20,7 @@ * @copyright 2020 Open LMS. (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - +namespace theme_snap; defined('MOODLE_INTERNAL') || die(); require_once(__DIR__ . '/../../../lib/badgeslib.php'); @@ -31,7 +31,7 @@ * @copyright 2020 Open LMS. (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_dashboard_appendices_testcase extends advanced_testcase { +class dashboard_appendices_test extends \advanced_testcase { public function test_dashboard_shows_open_reports_experimental() { global $CFG, $DB, $COURSE; @@ -42,7 +42,7 @@ public function test_dashboard_shows_open_reports_experimental() { $teacher = $this->getDataGenerator()->create_user(); $studentrole = $DB->get_record('role', array('shortname' => 'student')); $teacherrole = $DB->get_record('role', array('shortname' => 'teacher')); - $coursecontext = context_course::instance($course->id); + $coursecontext = \context_course::instance($course->id); // Assign capability for viewing reports for students. assign_capability('block/reports:viewown', CAP_ALLOW, $studentrole->id, $coursecontext->id, true); // Assign capability for viewing reports for teachers. diff --git a/tests/gradebookaccess_test.php b/tests/gradebookaccess_test.php index ff0596054..63f8dde9e 100644 --- a/tests/gradebookaccess_test.php +++ b/tests/gradebookaccess_test.php @@ -22,12 +22,10 @@ * @copyright Copyright (c) 2016 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use \theme_snap\output\shared; -class theme_snap_gradebookaccess_testcase extends advanced_testcase { +class gradebookaccess_test extends \advanced_testcase { public function test_gradebookaccess_gradesavailableforstuds() { global $DB, $PAGE; @@ -53,7 +51,7 @@ public function test_gradebookaccess_gradesavailableforstuds() { $this->setUser($teacher); // Set the teacher as active user. // Check functionality of gradebook_accessible. - $coursecontext = context_course::instance($course1->id); + $coursecontext = \context_course::instance($course1->id); $isavailable = shared::gradebook_accessible($coursecontext); $this->assertTrue($isavailable); @@ -86,7 +84,7 @@ public function test_gradebookaccess_gradesnotavailableforstuds() { $this->setUser($teacher); // Set the teacher as active user. // Check functionality of gradebook_accessible. - $coursecontext = context_course::instance($course2->id); + $coursecontext = \context_course::instance($course2->id); $isavailable = shared::gradebook_accessible($coursecontext); $this->assertTrue($isavailable); diff --git a/tests/local_test.php b/tests/local_test.php index 922ca9a2e..a443de2aa 100644 --- a/tests/local_test.php +++ b/tests/local_test.php @@ -21,22 +21,18 @@ * @copyright Copyright (c) 2015 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -namespace theme_snap\tests; - +namespace theme_snap; use theme_snap\local; use theme_snap\renderables\course_card; use theme_snap\snap_base_test; use theme_snap\color_contrast; -defined('MOODLE_INTERNAL') || die(); - /** * @package theme_snap * @copyright Copyright (c) 2015 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_local_test extends snap_base_test { +class local_test extends snap_base_test { public function setUp(): void { global $CFG; @@ -967,7 +963,7 @@ public function test_course_completion_progress() { public function test_course_grade() { global $DB; - + $this->markTestSkipped('Is failing on bamboo will be review it on INT-17968'); $this->resetAfterTest(); set_config('showcoursegradepersonalmenu', 1, 'theme_snap'); diff --git a/tests/lti_icons_displaying_test.php b/tests/lti_icons_displaying_test.php index 7dc36f710..d1195e185 100644 --- a/tests/lti_icons_displaying_test.php +++ b/tests/lti_icons_displaying_test.php @@ -21,11 +21,12 @@ * @copyright Copyright (c) 2020 Open LMS. (http://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -use theme_snap\output\core_renderer; - +namespace theme_snap; defined('MOODLE_INTERNAL') || die(); +use theme_snap\output\core_renderer; +global $CFG; +require_once($CFG->dirroot . '/mod/lti/locallib.php'); /** * LTI icons displaying correctly in Snap. * @@ -33,13 +34,12 @@ * @copyright Copyright (c) 2020 Open LMS. (http://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_lti_icons_displaying extends advanced_testcase { +class lti_icons_displaying_test extends \advanced_testcase { /** * Setup for each test. */ protected function setUp():void { global $CFG; - require_once($CFG->dirroot . '/mod/lti/locallib.php'); $CFG->theme = 'snap'; $this->resetAfterTest(true); } @@ -53,7 +53,7 @@ public function test_lti_icons_are_displayed() { $this->resetAfterTest(); $this->setAdminUser(); - $type = new stdClass(); + $type = new \stdClass(); $type->state = LTI_TOOL_STATE_CONFIGURED; $type->name = "Test tool"; $type->description = "Example description"; @@ -61,7 +61,7 @@ public function test_lti_icons_are_displayed() { $type->baseurl = $this->getExternalTestFileUrl('/test.html'); $type->coursevisible = LTI_COURSEVISIBLE_ACTIVITYCHOOSER; - $type2 = new stdClass(); + $type2 = new \stdClass(); $type2->state = LTI_TOOL_STATE_CONFIGURED; $type2->name = "Test tool two"; $type2->description = "Example description"; @@ -70,7 +70,7 @@ public function test_lti_icons_are_displayed() { $type2->coursevisible = LTI_COURSEVISIBLE_ACTIVITYCHOOSER; $type2->icon = 'http://www.example.com/1/example_folder/exampleicon.jpg'; - $config = new stdClass(); + $config = new \stdClass(); $typeid = lti_add_type($type, $config); $type2id = lti_add_type($type2, $config); @@ -87,4 +87,4 @@ public function test_lti_icons_are_displayed() { $shouldbecontained = strpos($html, $lticustomicon); $this->assertNotEmpty($shouldbecontained); } -} \ No newline at end of file +} diff --git a/tests/privacy_provider_test.php b/tests/privacy_provider_test.php index 05370f1cc..ee44af108 100644 --- a/tests/privacy_provider_test.php +++ b/tests/privacy_provider_test.php @@ -22,9 +22,7 @@ * @copyright Copyright (c) 2018 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use core_privacy\local\request\transform; use theme_snap\privacy\provider; use core_privacy\local\request\approved_contextlist; @@ -38,7 +36,7 @@ * @copyright Copyright (c) 2018 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_privacy_provider_testcase extends provider_testcase { +class privacy_provider_test extends provider_testcase { public function setUp(): void { $this->resetAfterTest(); @@ -225,4 +223,4 @@ public function test_delete_data_for_users() { provider::delete_data_for_users($approveduserlist); $this->assertEquals(0, $DB->count_records('theme_snap_course_favorites', [])); } -} \ No newline at end of file +} diff --git a/tests/recent_forum_activity_test.php b/tests/recent_forum_activity_test.php index e19250608..66f036fdd 100644 --- a/tests/recent_forum_activity_test.php +++ b/tests/recent_forum_activity_test.php @@ -21,22 +21,18 @@ * @copyright Copyright (c) 2015 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -namespace theme_snap\tests; - +namespace theme_snap; use theme_snap\local; use theme_snap\output\core_renderer; use theme_snap\user_forums; use core_component; -defined('MOODLE_INTERNAL') || die(); - /** * @package theme_snap * @copyright Copyright (c) 2015 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_recent_forum_activity_test extends \advanced_testcase { +class recent_forum_activity_test extends \advanced_testcase { /** * @var stdClass diff --git a/tests/render_edit_mode_test.php b/tests/render_edit_mode_test.php index 04ea64d74..4728128d8 100644 --- a/tests/render_edit_mode_test.php +++ b/tests/render_edit_mode_test.php @@ -21,7 +21,7 @@ * @copyright 2022 Open LMS. (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - +namespace theme_snap; defined('MOODLE_INTERNAL') || die(); require_once(__DIR__ . '/../../../lib/badgeslib.php'); @@ -32,7 +32,7 @@ * @copyright 2022 Open LMS. (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class render_edit_mode_testcase extends advanced_testcase { +class render_edit_mode_test extends \advanced_testcase { /** * @throws coding_exception @@ -48,7 +48,7 @@ public function test_render_edit_mode() { $teacher = $this->getDataGenerator()->create_user(); $studentrole = $DB->get_record('role', array('shortname' => 'student')); $teacherrole = $DB->get_record('role', array('shortname' => 'teacher')); - $coursecontext = context_course::instance($course->id); + $coursecontext = \context_course::instance($course->id); $PAGE->set_pagetype('course-view-' . $course->format); // Assign capability for viewing course for students. assign_capability('moodle/course:view', CAP_ALLOW, $studentrole->id, $coursecontext->id, true); diff --git a/tests/renderables/featured_courses.php b/tests/renderables/featured_courses.php index bb96942df..3634731b5 100644 --- a/tests/renderables/featured_courses.php +++ b/tests/renderables/featured_courses.php @@ -15,9 +15,6 @@ // along with Moodle. If not, see . namespace theme_snap\tests\renderables; - -defined('MOODLE_INTERNAL') || die(); - use theme_snap\renderables\featured_courses; /** diff --git a/tests/services_course_test.php b/tests/services_course_test.php index 438bc470d..07c80f8c2 100644 --- a/tests/services_course_test.php +++ b/tests/services_course_test.php @@ -13,9 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use theme_snap\services\course; use theme_snap\renderables\course_card; use theme_snap\local; @@ -27,7 +25,7 @@ * @copyright Copyright (c) 2016 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_services_course_test extends \advanced_testcase { +class services_course_test extends \advanced_testcase { /** * @var stdClass @@ -239,9 +237,9 @@ public function test_course_completion() { $this->assertContains($page2cm->id, $previouslyunavailablemods); // View page1 to trigger completion. - $context = context_module::instance($page1->cmid); + $context = \context_module::instance($page1->cmid); page_view($page1, $course, $page1cm, $context); - $completion = new completion_info($course); + $completion = new \completion_info($course); $completiondata = $completion->get_data($page1cm); $this->assertEquals(COMPLETION_COMPLETE, $completiondata->completionstate); @@ -279,9 +277,9 @@ public function test_course_toc() { $page = $generator->create_module('page', array('course' => $course->id, 'name' => 'test page')); $toc = $this->courseservice->course_toc('testlistlarge'); - $this->assertTrue($toc->modules[0] instanceof theme_snap\renderables\course_toc_module); + $this->assertTrue($toc->modules[0] instanceof \theme_snap\renderables\course_toc_module); $this->assertTrue($toc->modules[0]->url === '#section-0&module-'.$page->cmid); - $this->assertTrue($toc instanceof theme_snap\renderables\course_toc); + $this->assertTrue($toc instanceof \theme_snap\renderables\course_toc); $this->assertEquals(true, $toc->formatsupportstoc); $this->assertEquals('list-large', $toc->chapters->listlarge); $this->assertCount(11, $toc->chapters->chapters); @@ -317,7 +315,7 @@ public function test_course_toc_chapters() { $chapters = $this->courseservice->course_toc_chapters('testcourse'); $this->assertCount(3, $chapters->chapters); - $this->assertTrue($chapters->chapters[0] instanceof theme_snap\renderables\course_toc_chapter); + $this->assertTrue($chapters->chapters[0] instanceof \theme_snap\renderables\course_toc_chapter); } public function test_course_toc_chapters_escaped_chars() { @@ -371,8 +369,8 @@ public function test_highlight_section() { $this->assertTrue(isset($highlight['toc'])); $actionmodel = $highlight['actionmodel']; $toc = $highlight['toc']; - $this->assertTrue($actionmodel instanceof theme_snap\renderables\course_action_section_highlight); - $this->assertTrue($toc instanceof theme_snap\renderables\course_toc); + $this->assertTrue($actionmodel instanceof \theme_snap\renderables\course_action_section_highlight); + $this->assertTrue($toc instanceof \theme_snap\renderables\course_toc); // Check that action model has toggled after highlight. $this->assertEquals('aria-pressed="true"', $actionmodel->ariapressed); @@ -381,7 +379,7 @@ public function test_highlight_section() { // Unhiglight the section. $highlight = $this->courseservice->highlight_section('testcourse', 3, false); $actionmodel = $highlight['actionmodel']; - $this->assertTrue($actionmodel instanceof theme_snap\renderables\course_action_section_highlight); + $this->assertTrue($actionmodel instanceof \theme_snap\renderables\course_action_section_highlight); // Check that action model now corresponds to unhighlighted state. $this->assertEquals('aria-pressed="false"', $actionmodel->ariapressed); @@ -406,8 +404,8 @@ public function test_set_section_visibility() { $this->assertTrue(isset($visibility['toc'])); $actionmodel = $visibility['actionmodel']; $toc = $visibility['toc']; - $this->assertTrue($actionmodel instanceof theme_snap\renderables\course_action_section_visibility); - $this->assertTrue($toc instanceof theme_snap\renderables\course_toc); + $this->assertTrue($actionmodel instanceof \theme_snap\renderables\course_action_section_visibility); + $this->assertTrue($toc instanceof \theme_snap\renderables\course_toc); // Check that action model has toggled after section hidden. $this->assertEquals('snap-visibility snap-show', $actionmodel->class); @@ -417,7 +415,7 @@ public function test_set_section_visibility() { // Unhide the section. $visibility = $this->courseservice->set_section_visibility('testcourse', 3, true); $actionmodel = $visibility['actionmodel']; - $this->assertTrue($actionmodel instanceof theme_snap\renderables\course_action_section_visibility); + $this->assertTrue($actionmodel instanceof \theme_snap\renderables\course_action_section_visibility); // Check that action model now corresponds to unhighlighted state. $this->assertEquals('snap-visibility snap-hide', $actionmodel->class); @@ -519,7 +517,7 @@ public function test_module_toggle_completion() { array('completion' => 1, 'completionview' => 0)); $modinfo = get_fast_modinfo($course); $page1cm = $modinfo->get_cm($page1->cmid); - $completion = new completion_info($course); + $completion = new \completion_info($course); $completiondata = $completion->get_data($page1cm); $this->assertEquals(COMPLETION_INCOMPLETE, $completiondata->completionstate); @@ -530,7 +528,7 @@ public function test_module_toggle_completion() { get_fast_modinfo($course, 0, true); $modinfo = get_fast_modinfo($course); $page1cm = $modinfo->get_cm($page1->cmid); - $completion = new completion_info($course); + $completion = new \completion_info($course); $completiondata = $completion->get_data($page1cm); // Assert complete. $this->assertEquals(COMPLETION_COMPLETE, $completiondata->completionstate); @@ -542,7 +540,7 @@ public function test_module_toggle_completion() { get_fast_modinfo($course, 0, true); $modinfo = get_fast_modinfo($course); $page1cm = $modinfo->get_cm($page1->cmid); - $completion = new completion_info($course); + $completion = new \completion_info($course); $completiondata = $completion->get_data($page1cm); // Assert incomplete. $this->assertEquals(COMPLETION_INCOMPLETE, $completiondata->completionstate); diff --git a/tests/snap_hvp_customcss_test.php b/tests/snap_hvp_customcss_test.php index f36bbf38b..3cc497025 100644 --- a/tests/snap_hvp_customcss_test.php +++ b/tests/snap_hvp_customcss_test.php @@ -13,7 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - +namespace theme_snap; defined('MOODLE_INTERNAL') || die(); use \theme_snap\snap_base_test; @@ -29,7 +29,7 @@ * @copyright Copyright (c) 2021 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_hvp_customcss_test extends snap_base_test { +class snap_hvp_customcss_test extends snap_base_test { /** * Testing renderer Custom CSS for H5P activities. @@ -52,7 +52,7 @@ public function test_hvp_alter_styles() { $page->set_context(CONTEXT_SYSTEM); // Use and get object from class theme_snap_mod_hvp_renderer. - $snaphvp = new theme_snap_mod_hvp_renderer($page, $target); + $snaphvp = new \theme_snap_mod_hvp_renderer($page, $target); $this->assertIsObject($snaphvp); if ($snaphvp) { @@ -64,4 +64,4 @@ public function test_hvp_alter_styles() { $this->assertStringStartsWith($urlstartswith, $hvpurl); $this->assertStringEndsWith($urlendswith, $hvpurl); } -} \ No newline at end of file +} diff --git a/tests/snap_page_requirements_manager_test.php b/tests/snap_page_requirements_manager_test.php index a81028c94..383f7be36 100644 --- a/tests/snap_page_requirements_manager_test.php +++ b/tests/snap_page_requirements_manager_test.php @@ -20,9 +20,7 @@ * @copyright Copyright (c) 2016 Open LMS * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use theme_snap\snap_page_requirements_manager; /** @@ -31,7 +29,7 @@ * @copyright Copyright (c) 2016 Open LMS * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_snap_page_requirements_manager_test extends \advanced_testcase { +class snap_page_requirements_manager_test extends \advanced_testcase { /** * Test classic theme does not black list M.core_completion.init. diff --git a/tests/snap_toc_renderer_test.php b/tests/snap_toc_renderer_test.php index 3bd5c5956..48ad7df7c 100644 --- a/tests/snap_toc_renderer_test.php +++ b/tests/snap_toc_renderer_test.php @@ -13,9 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use \theme_snap\snap_base_test; /** @@ -26,7 +24,7 @@ * @copyright Copyright (c) 2021 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_toc_renderer_test extends snap_base_test { +class snap_toc_renderer_test extends snap_base_test { /** * Testing TOC Renderer for Snap. @@ -39,7 +37,7 @@ public function test_get_path_hiddentoc() { // Set new Moodle Page and set context. $page = new \moodle_page(); - $page->set_context(CONTEXT_SYSTEM); + $page->set_context(\CONTEXT_SYSTEM); // Get configuration for xp block. $blockxp = get_config('block_xp'); @@ -64,4 +62,4 @@ public function test_get_path_hiddentoc() { $this->assertTrue($toc); } } -} \ No newline at end of file +} diff --git a/tests/tr_lang_pack_test.php b/tests/tr_lang_pack_test.php index ca80862e3..0c660735c 100644 --- a/tests/tr_lang_pack_test.php +++ b/tests/tr_lang_pack_test.php @@ -21,10 +21,9 @@ * @copyright Copyright (c) 2020 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +namespace theme_snap; -defined('MOODLE_INTERNAL') || die(); - -class theme_snap_tr_lang_pack_test extends advanced_testcase { +class tr_lang_pack_test extends \advanced_testcase { /** * Setup for each test. diff --git a/tests/urls_and_strings_check_test.php b/tests/urls_and_strings_check_test.php index 3a25549dd..fba1bdbe4 100644 --- a/tests/urls_and_strings_check_test.php +++ b/tests/urls_and_strings_check_test.php @@ -22,10 +22,9 @@ * @copyright Copyright (c) 2020 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ +namespace theme_snap; -defined('MOODLE_INTERNAL') || die(); - -class theme_snap_urls_and_strings_check_test extends advanced_testcase { +class urls_and_strings_check_test extends \advanced_testcase { /** * Setup for each test. @@ -107,8 +106,8 @@ public function test_edit_button () { global $PAGE; $renderer = $PAGE->get_renderer('theme_snap', 'core', RENDERER_TARGET_GENERAL); - $url = new moodle_url('course/view.php', ['id' => 1]); + $url = new \moodle_url('course/view.php', ['id' => 1]); $editbutton = $renderer->edit_button($url); $this->assertEquals('', $editbutton); } -} \ No newline at end of file +} diff --git a/tests/webservice_definition_helper.php b/tests/webservice_definition_helper.php index 904cd6f71..6183f1215 100644 --- a/tests/webservice_definition_helper.php +++ b/tests/webservice_definition_helper.php @@ -13,7 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - +namespace theme_snap; defined('MOODLE_INTERNAL') || die(); use theme_snap\webservice\definition_helper; @@ -52,7 +52,7 @@ public function __set($name, $value) { * @return mixed */ public function __call($name, $arguments) { - $reflection = new ReflectionObject($this); + $reflection = new \ReflectionObject($this); $parentreflection = $reflection->getParentClass(); $method = $parentreflection->getMethod($name); $method->setAccessible(true); @@ -156,7 +156,7 @@ class wsparam_notype { * @copyright Copyright (c) 2016 Open LMS * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_webservice_definition_helper_test extends advanced_testcase { +class webservice_definition_helper extends \advanced_testcase { public function test_classname() { $this->resetAfterTest(); @@ -183,7 +183,7 @@ public function test_structure() { $definitionhelper = new definition_helper($toc); $definition = $definitionhelper->get_definition(); $this->assertTrue(isset($definition['formatsupportstoc'])); - $this->assertTrue($definition['formatsupportstoc'] instanceof external_value); + $this->assertTrue($definition['formatsupportstoc'] instanceof \external_value); } public function test_wsdocs() { @@ -269,7 +269,7 @@ public function test_convert_ws_param_to_object() { $this->assertTrue(is_object($obj)); $this->assertFalse($isarr); $this->assertTrue(!empty($obj->complete)); - $this->assertTrue($obj->complete instanceof external_value); + $this->assertTrue($obj->complete instanceof \external_value); $this->assertTrue(!empty($obj->complete->type)); $this->assertTrue(!empty($obj->complete->required)); $this->assertTrue(!empty($obj->complete->desc)); @@ -308,7 +308,7 @@ public function test_convert_ws_param_array_to_object() { $this->assertTrue(is_object($obj)); $this->assertTrue($isarr); $this->assertTrue(!empty($obj->complete)); - $this->assertTrue($obj->complete instanceof external_value); + $this->assertTrue($obj->complete instanceof \external_value); $this->assertTrue(!empty($obj->complete->type)); $this->assertTrue(!empty($obj->complete->required)); $this->assertTrue(!empty($obj->complete->desc)); @@ -328,7 +328,7 @@ public function test_convert_var_no_description() { $definition = $helper->get_definition(); $this->assertArrayHasKey('something', $definition); $something = $definition['something']; - $this->assertTrue($something instanceof external_value); + $this->assertTrue($something instanceof \external_value); $this->assertEmpty($something->desc); } @@ -338,7 +338,7 @@ public function test_cache_definition() { $definition = $helper->get_definition(); // Wipe cache so we can test nothing in cache. - $cache = cache::make('theme_snap', 'webservicedefinitions'); + $cache = \cache::make('theme_snap', 'webservicedefinitions'); $data = $cache->delete($classname); // Test empty cache. diff --git a/tests/webservice_ws_course_card_categories_test.php b/tests/webservice_ws_course_card_categories_test.php index 54980eed5..728b71be5 100644 --- a/tests/webservice_ws_course_card_categories_test.php +++ b/tests/webservice_ws_course_card_categories_test.php @@ -13,9 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use theme_snap\webservice\ws_course_card; /** @@ -24,16 +22,16 @@ * @copyright Copyright (c) 2019 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_ws_course_card_categories_test extends \advanced_testcase { +class webservice_ws_course_card_categories_test extends \advanced_testcase { public function test_service_parameters() { $params = \theme_snap\webservice\ws_course_cards_categories::service_parameters(); - $this->assertTrue($params instanceof external_function_parameters); + $this->assertTrue($params instanceof \external_function_parameters); } public function test_service_returns() { $returns = \theme_snap\webservice\ws_course_cards_categories::service_returns(); - $this->assertTrue($returns instanceof external_multiple_structure); + $this->assertTrue($returns instanceof \external_multiple_structure); } public function test_service() { diff --git a/tests/webservice_ws_course_card_data_test.php b/tests/webservice_ws_course_card_data_test.php index fb619e90e..138e0e7ae 100644 --- a/tests/webservice_ws_course_card_data_test.php +++ b/tests/webservice_ws_course_card_data_test.php @@ -13,9 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use theme_snap\webservice\ws_course_card; /** @@ -24,16 +22,16 @@ * @copyright Copyright (c) 2019 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_ws_course_card_data_test extends \advanced_testcase { +class webservice_ws_course_card_data_test extends \advanced_testcase { public function test_service_parameters() { $params = \theme_snap\webservice\ws_course_cards_data::service_parameters(); - $this->assertTrue($params instanceof external_function_parameters); + $this->assertTrue($params instanceof \external_function_parameters); } public function test_service_returns() { $returns = \theme_snap\webservice\ws_course_cards_data::service_returns(); - $this->assertTrue($returns instanceof external_multiple_structure); + $this->assertTrue($returns instanceof \external_multiple_structure); } public function test_service() { diff --git a/tests/webservice_ws_course_card_test.php b/tests/webservice_ws_course_card_test.php index 39e116171..8306a4dbe 100644 --- a/tests/webservice_ws_course_card_test.php +++ b/tests/webservice_ws_course_card_test.php @@ -13,9 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use theme_snap\webservice\ws_course_card; /** @@ -24,16 +22,16 @@ * @copyright Copyright (c) 2016 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_ws_course_card_test extends \advanced_testcase { +class webservice_ws_course_card_test extends \advanced_testcase { public function test_service_parameters() { $params = ws_course_card::service_parameters(); - $this->assertTrue($params instanceof external_function_parameters); + $this->assertTrue($params instanceof \external_function_parameters); } public function test_service_returns() { $returns = ws_course_card::service_returns(); - $this->assertTrue($returns instanceof external_single_structure); + $this->assertTrue($returns instanceof \external_single_structure); } public function test_service() { diff --git a/tests/webservice_ws_course_toc_test.php b/tests/webservice_ws_course_toc_test.php index 6062e736e..76adbf26e 100644 --- a/tests/webservice_ws_course_toc_test.php +++ b/tests/webservice_ws_course_toc_test.php @@ -13,9 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use theme_snap\webservice\ws_course_sections; /** @@ -24,16 +22,16 @@ * @copyright Copyright (c) 2020 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_ws_course_roc extends \advanced_testcase { +class webservice_ws_course_toc_test extends \advanced_testcase { public function test_service_parameters() { $params = \theme_snap\webservice\ws_course_sections::service_parameters(); - $this->assertTrue($params instanceof external_function_parameters); + $this->assertTrue($params instanceof \external_function_parameters); } public function test_service_returns() { $returns = \theme_snap\webservice\ws_course_sections::service_returns(); - $this->assertTrue($returns instanceof external_single_structure); + $this->assertTrue($returns instanceof \external_single_structure); } public function test_service() { @@ -62,4 +60,4 @@ public function test_service() { $this->assertEquals($expected['toc']->chapters, $serviceresult['toc']->chapters); } -} \ No newline at end of file +} diff --git a/tests/webservice_ws_feed_activity_test.php b/tests/webservice_ws_feed_activity_test.php index d2b4b3561..4a6ddd4b4 100644 --- a/tests/webservice_ws_feed_activity_test.php +++ b/tests/webservice_ws_feed_activity_test.php @@ -13,9 +13,7 @@ // // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . - -defined('MOODLE_INTERNAL') || die(); - +namespace theme_snap; use theme_snap\webservice\ws_feed; /** @@ -24,16 +22,16 @@ * @copyright Copyright (c) 2020 Open LMS (https://www.openlms.net) * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ -class theme_snap_ws_feed_test extends \advanced_testcase { +class webservice_ws_feed_activity_test extends \advanced_testcase { public function test_service_parameters() { $params = ws_feed::service_parameters(); - $this->assertTrue($params instanceof external_function_parameters); + $this->assertTrue($params instanceof \external_function_parameters); } public function test_service_returns() { $returns = ws_feed::service_returns(); - $this->assertTrue($returns instanceof external_multiple_structure); + $this->assertTrue($returns instanceof \external_multiple_structure); } public function test_service_message() { @@ -77,7 +75,7 @@ public function test_feed_deadline() { $this->setAdminUser(); $student = $this->getDataGenerator()->create_user(); $course = $this->getDataGenerator()->create_course(); - $record = new stdClass(); + $record = new \stdClass(); $record->course = $course; $studentrole = $DB->get_record('role', array('shortname' => 'student')); @@ -219,7 +217,7 @@ public function create_message(array $users, $messagetype, $message, $time, $sub $userids); // Ok, send the message. - $record = new stdClass(); + $record = new \stdClass(); $record->useridfrom = $users[0]->id; $record->conversationid = $conversation->id; $record->subject = $subject;