Skip to content

Commit 6b21d65

Browse files
OscarNadjarTheBryanOpen228
OscarNadjar
authored and
TheBryanOpen228
committed
INT-17886: Fix code checker 3.1.0
1 parent d20c40b commit 6b21d65

File tree

94 files changed

+213
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+213
-345
lines changed

‎classes/activity_meta.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@
1515
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
1616

1717
namespace theme_snap;
18-
1918
use \theme_snap\traits\null_object;
2019

21-
defined('MOODLE_INTERNAL') || die();
22-
2320
/**
2421
* Activity meta data.
2522
*

‎classes/admin_setting_configcolorcategory.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
use theme_snap\color_contrast;
2020

21-
defined('MOODLE_INTERNAL') || die();
22-
2321
/**
2422
* Class to render a text box which validates a JSON string for categories color configuration.
2523
* @package theme_snap
@@ -145,4 +143,4 @@ private function validate_text($data) {
145143
return $cont;
146144
}
147145

148-
}
146+
}

‎classes/admin_setting_configcolorwithcontrast.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,4 @@ public function output_html($data, $query='') {
6363
}
6464
return $html;
6565
}
66-
}
66+
}

‎classes/admin_setting_configcourseid.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
namespace theme_snap;
1818

19-
defined('MOODLE_INTERNAL') || die();
20-
2119
/**
2220
* Class to render input of type url in settings pages.
2321
* @package theme_snap

‎classes/admin_setting_configradiobuttons.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
namespace theme_snap;
1818

19-
defined('MOODLE_INTERNAL') || die();
20-
2119
/**
2220
* Class to render radio buttons in settings pages.
2321
* @package theme_snap

‎classes/admin_setting_configurl.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
namespace theme_snap;
1818

19-
defined('MOODLE_INTERNAL') || die();
20-
2119
/**
2220
* Class to render input of type url in settings pages.
2321
* @package theme_snap

‎classes/calendar/event/container.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
*/
2424

2525
namespace theme_snap\calendar\event;
26-
27-
defined('MOODLE_INTERNAL') || die();
28-
2926
use theme_snap\calendar\event\data_access\event_vault;
3027
use theme_snap\calendar\event\strategies\activity_retrieval_strategy;
3128
use core_calendar\action_factory;

‎classes/calendar/event/data_access/event_vault.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
*/
2424

2525
namespace theme_snap\calendar\event\data_access;
26-
27-
defined('MOODLE_INTERNAL') || die();
28-
2926
use core_calendar\local\event\entities\event_interface;
3027

3128
/**

‎classes/calendar/event/strategies/activity_retrieval_strategy.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
namespace theme_snap\calendar\event\strategies;
2626

27-
defined('MOODLE_INTERNAL') || die();
28-
2927
/**
3028
* Extend core raw event retrieval strategy to cope with assignment extensions.
3129
*

‎classes/color_contrast.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
namespace theme_snap;
1919

20-
defined('MOODLE_INTERNAL') || die();
21-
2220
/**
2321
* Functions to calculate color contrast.
2422
*
@@ -225,4 +223,4 @@ public static function calculate_image_main_color(\stored_file $originalfile, ar
225223

226224
return $pixelhex;
227225
}
228-
}
226+
}

‎classes/controller/addsection_controller.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
namespace theme_snap\controller;
1818

19-
defined('MOODLE_INTERNAL') || die();
20-
2119
/**
2220
* Add section Controller.
2321
* Handles requests to add a new section

‎classes/controller/controller_abstract.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
namespace theme_snap\controller;
1818

19-
defined('MOODLE_INTERNAL') || die();
20-
2119
/**
2220
* Controller Abstract.
2321
* Controllers handle requests. Any methods that end with "_action"

‎classes/controller/kernel.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
namespace theme_snap\controller;
1818

19-
defined('MOODLE_INTERNAL') || die();
20-
2119
/**
2220
* Controller Kernel.
2321
*

‎classes/controller/mediaresource_controller.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
namespace theme_snap\controller;
1818

19-
defined('MOODLE_INTERNAL') || die();
20-
2119
/**
2220
* Deadlines Controller.
2321
* Handles requests for media elements that can be viewed inline.

‎classes/controller/router.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@
1515
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
1616

1717
namespace theme_snap\controller;
18-
1918
use coding_exception;
2019

21-
defined('MOODLE_INTERNAL') || die();
22-
2320
/**
2421
* Controller Router.
2522
*

‎classes/controller/snap_personal_menu_controller.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
use theme_snap\output\core_renderer;
2020

21-
defined('MOODLE_INTERNAL') || die();
22-
2321
/**
2422
* Deadlines Controller.
2523
* Handles requests regarding user deadlines and other CTAs.

‎classes/course_total_grade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function __construct($user, $gpr, $course) {
6464
$this->user = $user;
6565

6666
if (empty($CFG->gradebookroles)) {
67-
print_error('norolesdefined', 'grades');
67+
throw new \moodle_exception('norolesdefined', 'grades');
6868
}
6969

7070
$this->courseid = $course->id;

‎classes/event_handlers.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
use core\event\group_member_added;
3333
use core\event\group_member_removed;
3434

35-
defined('MOODLE_INTERNAL') || die();
36-
3735
/**
3836
* Event handlers.
3937
*

‎classes/message.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
namespace theme_snap;
1818

19-
defined('MOODLE_INTERNAL') || die();
20-
2119
/**
2220
* Message Model.
2321
*

‎classes/mod_hvp_renderer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function get_style_url($content) {
8181
* @param string $setting settings H5P Custom CSS.
8282
* @param string $format false as default.
8383
*/
84-
static public function get_settings($setting, $format = false) {
84+
public static function get_settings($setting, $format = false) {
8585
global $CFG;
8686
require_once($CFG->dirroot . '/lib/weblib.php');
8787

@@ -100,7 +100,7 @@ static public function get_settings($setting, $format = false) {
100100
* @param string $url CSS generated url.
101101
* @return bool.
102102
*/
103-
static public function get_is_valid($url) {
103+
public static function get_is_valid($url) {
104104
$handle = curl_init($url);
105105
curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
106106

@@ -120,4 +120,4 @@ static public function get_is_valid($url) {
120120
}
121121

122122
}
123-
}
123+
}

‎classes/output/ce_render_helper.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626

2727
use theme_snap\local;
2828

29-
defined('MOODLE_INTERNAL') || die();
30-
3129
/**
3230
* Snap custom elements renderer class.
3331
*
@@ -121,4 +119,4 @@ public function render_feed_web_component($feedkey, $title, $emptymessage, $virt
121119
></snap-feed>
122120
HTML;
123121
}
124-
}
122+
}

‎classes/output/core/course_renderer.php

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,16 +109,16 @@ public function course_section_cm_list_item($course,
109109
// If the section is hidden check the visibleold to prevent
110110
// the message will be displayed in all modules.
111111
if ($section->visible || (!$section->visible && !$mod->visibleold)) {
112-
$modclasses [] = 'draft';
112+
$modclasses[] = 'draft';
113113
}
114114
}
115115

116116
// Is this mod stealth?
117117
if ($mod->is_stealth()) {
118-
$modclasses [] = 'stealth';
118+
$modclasses[] = 'stealth';
119119
}
120120
if ($mod->visible && $section && !$section->visible) {
121-
$modclasses [] = 'stealth-section-hidden';
121+
$modclasses[] = 'stealth-section-hidden';
122122
}
123123

124124
$canviewhidden = has_capability('moodle/course:viewhiddenactivities', $mod->context);
@@ -130,24 +130,24 @@ public function course_section_cm_list_item($course,
130130
}
131131

132132
if ($availabilityinfo !== '' && !$mod->uservisible || $canviewhidden) {
133-
$modclasses [] = 'conditional';
133+
$modclasses[] = 'conditional';
134134
}
135135
if (!$mod->available && !$mod->uservisible) {
136-
$modclasses [] = 'unavailable';
136+
$modclasses[] = 'unavailable';
137137
}
138138
// TODO - can we add completion data.
139139
if (has_any_capability(['moodle/course:update', 'moodle/course:manageactivities'], $mod->context)) {
140-
$modclasses [] = 'snap-can-edit';
140+
$modclasses[] = 'snap-can-edit';
141141
}
142142
if (has_capability('moodle/course:viewhiddenactivities', $mod->context)) {
143-
$modclasses [] = 'snap-can-view-hidden';
143+
$modclasses[] = 'snap-can-view-hidden';
144144
}
145145

146-
$modclasses [] = 'snap-asset'; // Added to stop conflicts in flexpage.
147-
$modclasses [] = 'activity'; // Moodle needs this for drag n drop.
148-
$modclasses [] = $mod->modname;
149-
$modclasses [] = "modtype_$mod->modname";
150-
$modclasses [] = $mod->extraclasses;
146+
$modclasses[] = 'snap-asset'; // Added to stop conflicts in flexpage.
147+
$modclasses[] = 'activity'; // Moodle needs this for drag n drop.
148+
$modclasses[] = $mod->modname;
149+
$modclasses[] = "modtype_$mod->modname";
150+
$modclasses[] = $mod->extraclasses;
151151

152152
$attr['data-type'] = $snapmodtype;
153153
$attr['class'] = implode(' ', $modclasses);
@@ -711,7 +711,7 @@ public function course_section_cm_text(cm_info $mod, $displayoptions = array())
711711
protected function get_mod_type(cm_info $mod) {
712712
if ($mod->modname === 'resource') {
713713
// Get file type from icon
714-
// (note, I also tried this using a combo of substr and strpos and preg_match was much faster!)
714+
// (note, I also tried this using a combo of substr and strpos and preg_match was much faster!).
715715
$matches = array();
716716
preg_match ('#/(\w+)-#', $mod->icon, $matches);
717717
$filetype = $matches[1];
@@ -1423,7 +1423,7 @@ public function course_footer() {
14231423
if (!isset($teacherusers[$teacher['user']->id])) {
14241424
continue;
14251425
}
1426-
$teacheruser = $teacherusers [$teacher['user']->id];
1426+
$teacheruser = $teacherusers[$teacher['user']->id];
14271427
$courseteachers .= $this->print_teacher_profile($teacheruser);
14281428
}
14291429
}

‎classes/output/core_renderer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ public function site_frontpage_news() {
11641164
require_once($CFG->dirroot.'/mod/forum/lib.php');
11651165

11661166
if (!$forum = forum_get_course_forum($SITE->id, 'news')) {
1167-
print_error('cannotfindorcreateforum', 'forum');
1167+
throw new moodle_exception('cannotfindorcreateforum', 'forum');
11681168
}
11691169
$cm = get_coursemodule_from_instance('forum', $forum->id, $SITE->id, false, MUST_EXIST);
11701170
$context = \context_module::instance($cm->id, MUST_EXIST);
@@ -1306,7 +1306,7 @@ public function body_css_classes(array $additionalclasses = array()) {
13061306
);
13071307
if (in_array($this->page->pagetype, $killyuipages)) {
13081308
$classes = array_diff ($classes, ['yui-skin-sam', 'yui3-skin-sam']);
1309-
$classes [] = 'yui-bootstrapped';
1309+
$classes[] = 'yui-bootstrapped';
13101310
}
13111311

13121312
if (!empty($this->page->url)) {

‎classes/output/core_renderer_ajax.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
namespace theme_snap\output;
2626

27-
defined('MOODLE_INTERNAL') || die();
28-
2927
class core_renderer_ajax extends \core_renderer_ajax {
3028

3129
public function image_url($imagename, $component = 'moodle') {

‎classes/output/format_section_trait.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
*/
2626

2727
namespace theme_snap\output;
28-
29-
defined('MOODLE_INTERNAL') || die();
30-
3128
use context_course;
3229
use html_writer;
3330
use moodle_url;

‎classes/output/general_section_trait.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
namespace theme_snap\output;
2626

27-
defined('MOODLE_INTERNAL') || die();
28-
2927
trait general_section_trait {
3028

3129
/**

‎classes/output/toc_renderer.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626

2727
use theme_snap\renderables\course_toc;
2828

29-
defined('MOODLE_INTERNAL') || die();
30-
3129
class toc_renderer extends \theme_boost\output\core_renderer {
3230

3331
/**

‎classes/privacy/provider.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@
3535
use core_privacy\local\request\userlist;
3636
use core_privacy\local\request\writer;
3737

38-
defined('MOODLE_INTERNAL') || die();
39-
4038
/**
4139
* Privacy implementation for the Snap theme.
4240
*
@@ -211,4 +209,4 @@ public static function delete_data_for_users(approved_userlist $userlist) {
211209

212210
$DB->delete_records_select('theme_snap_course_favorites', $sql, $params);
213211
}
214-
}
212+
}

‎classes/renderables/course_action_section_base.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
use moodle_url;
2626
use section_info;
2727

28-
defined('MOODLE_INTERNAL') || die();
29-
3028
abstract class course_action_section_base implements \renderable, \templatable {
3129

3230
use trait_exportable;

‎classes/renderables/course_action_section_delete.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
use moodle_url;
2626
use section_info;
2727

28-
defined('MOODLE_INTERNAL') || die();
29-
3028
class course_action_section_delete extends course_action_section_base {
3129

3230
/**

0 commit comments

Comments
 (0)