Coding style fixes

kabalin · Dec 23, 2023 · 3f5f45e · 3f5f45e
1 parent c9d1662
commit 3f5f45e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/amd/build/local/content/actions.min.js.map b/amd/build/local/content/actions.min.js.map
diff --git a/amd/src/local/content/actions.js b/amd/src/local/content/actions.js
@@ -204,6 +204,7 @@ export default class extends BaseComponent {
             removeOnClose: true,
         })
             .then(modal => {
+                // eslint-disable-next-line promise/no-nesting
                 Templates.render('format_flexsections/local/content/movesection', data).
                 then((body) => {
                     modal.setBody(body);
@@ -248,6 +249,7 @@ export default class extends BaseComponent {
             removeOnClose: true,
         })
             .then(modal => {
+                // eslint-disable-next-line promise/no-nesting
                 Templates.render('format_flexsections/local/content/movecm', data).
                 then((body) => {
                     modal.setBody(body);

diff --git a/classes/courseformat/stateactions.php b/classes/courseformat/stateactions.php
@@ -33,7 +33,7 @@ class stateactions extends  \core_courseformat\stateactions {
     /**
      * Moving a section
      *
-     * @param \core_courseformat\stateupdates $updates
+     * @param stateupdates $updates
      * @param stdClass $course
      * @param array $ids
      * @param int|null $targetsectionid if positive number, move AFTER this section under the same parent
@@ -43,7 +43,7 @@ class stateactions extends  \core_courseformat\stateactions {
      * @param int|null $targetcmid
      * @return void
      */
-    public function section_move(\core_courseformat\stateupdates $updates, stdClass $course, array $ids,
+    public function section_move(stateupdates $updates, stdClass $course, array $ids,
                                  ?int $targetsectionid = null, ?int $targetcmid = null): void {
         $this->validate_sections($course, $ids, __FUNCTION__);
 
@@ -137,7 +137,7 @@ public function section_mergeup(
         ?int $targetcmid = null
     ): void {
         if (!$targetsectionid) {
-            throw new \moodle_exception("Action section_mergeup requires targetsectionid");
+            throw new moodle_exception("Action section_mergeup requires targetsectionid");
         }
 
         $coursecontext = context_course::instance($course->id);
@@ -150,7 +150,7 @@ public function section_mergeup(
         $this->validate_sections($course, [$targetsectionid], __FUNCTION__);
         $targetsection = $modinfo->get_section_info_by_id($targetsectionid, MUST_EXIST);
         if (!$targetsection->parent) {
-            throw new \moodle_exception("Action section_mergeup can't merge top level parentless sections");
+            throw new moodle_exception("Action section_mergeup can't merge top level parentless sections");
         }
 
         $format->mergeup_section($targetsection);
@@ -291,14 +291,14 @@ public function section_add_subsection(\core_courseformat\stateupdates $updates,
     /**
      * Adding a subsection as the first child of the parent
      *
-     * @param \core_courseformat\stateupdates $updates
+     * @param stateupdates $updates
      * @param stdClass $course
      * @param array $ids not used
      * @param int|null $targetsectionid parent section id
      * @param int|null $targetcmid not used
      * @return void
      */
-    public function section_insert_subsection(\core_courseformat\stateupdates $updates, stdClass $course, array $ids,
+    public function section_insert_subsection(stateupdates $updates, stdClass $course, array $ids,
                             ?int $targetsectionid = null, ?int $targetcmid = null): void {
         require_capability('moodle/course:update', context_course::instance($course->id));
         /** @var \format_flexsections $format */

diff --git a/classes/output/courseformat/content.php b/classes/output/courseformat/content.php
@@ -52,6 +52,7 @@ public function get_template_name(\renderer_base $renderer): string {
      * @return \stdClass data context for a mustache template
      */
     public function export_for_template(\renderer_base $output) {
+        /** @var \stdClass $data */
         $data = parent::export_for_template($output);
 
         // If we are on course view page for particular section.

diff --git a/classes/output/courseformat/content/section/controlmenu.php b/classes/output/courseformat/content/section/controlmenu.php
@@ -69,7 +69,7 @@ public function section_control_items() {
         if (has_capability('moodle/course:update', $coursecontext) && $section->section &&
                 $sectiondepth < $format->get_max_section_depth() &&
                 (!$section->collapsed || $section->section == $this->format->get_viewed_section())) {
-            $addsubsectionurl = new \moodle_url($url, ['addchildsection' => $section->section]);
+            $addsubsectionurl = new moodle_url($url, ['addchildsection' => $section->section]);
             $controls['addsubsection'] = [
                 'url' => $addsubsectionurl,
                 'icon' => 't/add',
@@ -84,7 +84,7 @@ public function section_control_items() {
         }
 
         if ($section->section && has_capability('moodle/course:setcurrentsection', $coursecontext)) {
-            $markerurl = new \moodle_url($url);
+            $markerurl = new moodle_url($url);
             if ($course->marker == $section->section) {  // Show the "light globe" on/off.
                 $markerurl->param('marker', 0);
                 $highlightoff = get_string('highlightoff');
@@ -116,7 +116,7 @@ public function section_control_items() {
 
         if ($section->section && has_capability('moodle/course:update', $coursecontext) &&
                 $section->section != $this->format->get_viewed_section()) {
-            $collapseurl = new \moodle_url($url, ['switchcollapsed' => $section->section]);
+            $collapseurl = new moodle_url($url, ['switchcollapsed' => $section->section]);
             $attrs = [
                 'data-action-flexsections' => 'sectionSwitchCollapsed',
                 'class' => 'editing_collapsed',
@@ -143,7 +143,7 @@ public function section_control_items() {
 
         if ($section->parent && has_capability('moodle/course:update', $coursecontext) &&
                 $section->section != $this->format->get_viewed_section()) {
-            $mergeupurl = new \moodle_url($url, ['mergeup' => $section->section]);
+            $mergeupurl = new moodle_url($url, ['mergeup' => $section->section]);
             $controls['mergeup'] = [
                 'url' => $mergeupurl,
                 'icon' => 'mergeup',
@@ -213,7 +213,7 @@ public function section_control_items() {
      * @param renderer_base $output typically, the renderer that's calling this function
      * @return array data context for a mustache template
      */
-    public function export_for_template(\renderer_base $output): stdClass {
+    public function export_for_template(renderer_base $output): stdClass {
 
         $section = $this->section;
 

diff --git a/format.js b/format.js
@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 // Javascript functions for Flexible sections course format.
 
 // This is no longer used but there are errors in console if this file is missing.