Merge branch 'MDL-82845-main' of https://github.com/ferranrecio/moodle

.upgradenotes/MDL-82845-2024091708245574.yml

@@ -0,0 +1,8 @@
+issueNumber: MDL-82845
+notes:
+  core:
+    - message: >-
+        The section_info class now includes a new method called
+        get_sequence_cm_infos that retrieves all cm_info instances associated
+        with the course section.
+      type: improved

.upgradenotes/MDL-82845-2024091710272206.yml

@@ -0,0 +1,7 @@
+issueNumber: MDL-82845
+notes:
+  core:
+    - message: >-
+        The global_navigation::load_section_activities method is now deprecated
+        and replaced by global_navigation::load_section_activities_navigation.
+      type: deprecated

course/format/classes/base.php

@@ -860,7 +860,7 @@ public function ajax_section_move() {
      * of the view script, it is not enough to change just this function. Do not forget
      * to add proper redirection.
      *
-     * @param int|stdClass $section Section object from database or just field course_sections.section
+     * @param int|stdClass|section_info $section Section object from database or just field course_sections.section
      *     if null the course view page is returned
      * @param array $options options for view URL. At the moment core uses:
      *     'navigation' (bool) if true and section not empty, the function returns section page; otherwise, it returns course page.

lib/modinfolib.php

@@ -3226,6 +3226,9 @@ class section_info implements IteratorAggregate {
      */
     private ?sectiondelegate $_delegateinstance = null;
 
+    /** @var cm_info[]|null Section cm_info activities, null when it is not loaded yet. */
+    private array|null $_sequencecminfos = null;
+
     /**
      * @var bool|null $_isorphan True if the section is orphan for some reason.
      */
@@ -3625,6 +3628,27 @@ private function get_sequence() {
         }
     }
 
+    /**
+     * Returns the course modules in this section.
+     *
+     * @return cm_info[]
+     */
+    public function get_sequence_cm_infos(): array {
+        if ($this->_sequencecminfos !== null) {
+            return $this->_sequencecminfos;
+        }
+        $sequence = $this->modinfo->sections[$this->_sectionnum] ?? [];
+        $cms = $this->modinfo->get_cms();
+        $result = [];
+        foreach ($sequence as $cmid) {
+            if (isset($cms[$cmid])) {
+                $result[] = $cms[$cmid];
+            }
+        }
+        $this->_sequencecminfos = $result;
+        return $result;
+    }
+
     /**
      * Returns course ID - from course_sections table
      *