Merge branch 'master' into moodle_50_only_load_sections_on_page

Author: james-cnz

.github/workflows/moodle-ci.yml

@@ -11,7 +11,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:13 # Moodle 4.2: >=13
+        image: postgres:15 # Moodle 5.1
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -20,7 +20,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
 
       mariadb:
-        image: mariadb:10.6 # Moodle 4.2 >=10.6.7
+        image: mariadb:10.11 # Moodle 5.0
         env:
           MYSQL_USER: 'root'
           MYSQL_ALLOW_EMPTY_PASSWORD: "true"
@@ -35,42 +35,20 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Moodle 4.0, PHP 7.3, PostgreSQL
-          - php: '7.3' # 7.3-8.0
-            moodle-branch: 'MOODLE_400_STABLE'
+          # Moodle 5.0, PHP 8.2, PostgreSQL
+          - php: '8.2' # 8.2-8.4
+            moodle-branch: 'MOODLE_500_STABLE'
             database: pgsql
-            plugin-ci: ^3
-          # Moodle 4.1, PHP 7.4, MariaDB
-          - php: '7.4' # 7.4-8.1
-            moodle-branch: 'MOODLE_401_STABLE'
-            database: mariadb
-            plugin-ci: ^3
-          # Moodle 4.2, PHP 8.0, PostgreSQL
-          - php: '8.0' # 8.0-8.2
-            moodle-branch: 'MOODLE_402_STABLE'
-            database: pgsql
-            plugin-ci: ^4
-            # extensions: xmlrpc-beta
-          # Moodle 4.3, PHP 8.1, MariaDB
-          - php: '8.1' # 8.0-8.2
-            moodle-branch: 'MOODLE_403_STABLE'
-            database: mariadb
             plugin-ci: ^4
             # extensions: xmlrpc-beta
-          # Moodle 4.4, PHP 8.2, PostgreSQL
-          - php: '8.2' # 8.1-8.3
-            moodle-branch: 'MOODLE_404_STABLE'
-            database: pgsql
-            plugin-ci: ^4
-            # extensions: xmlrpc-beta
-          # Moodle 4.5, PHP 8.3, MariaDB
-          - php: '8.3'
-            moodle-branch: 'MOODLE_405_STABLE'
+          # Moodle 5.1, PHP 8.3, MariaDB
+          - php: '8.3' # 8.2-8.4
+            moodle-branch: 'main'
             database: mariadb
             plugin-ci: ^4
             # extensions: xmlrpc-beta
-          # Moodle main, PHP 8.3, PostgreSQL
-          - php: '8.3'
+          # Moodle 5.1, PHP 8.4, PostgresSQL
+          - php: '8.4' # 8.2-8.4
             moodle-branch: 'main'
             database: pgsql
             plugin-ci: ^4
@@ -128,7 +106,7 @@ jobs:
 
       - name: Moodle PHPDoc Checker
         if: ${{ !cancelled() }}
-        run: moodle-plugin-ci phpdoc
+        run: moodle-plugin-ci phpdoc --max-warnings 0
 
       - name: Validating
         if: ${{ !cancelled() }}
@@ -153,7 +131,7 @@ jobs:
       - name: Behat features
         id: behat
         if: ${{ !cancelled() }}
-        run: moodle-plugin-ci behat --profile chrome
+        run: moodle-plugin-ci behat --profile chrome --scss-deprecations
 
       - name: Upload Behat Faildump
         if: ${{ failure() && steps.behat.outcome == 'failure' }}

_course_changenumsections.php

@@ -29,10 +29,10 @@
  * @since     Moodle 2.3
  */
 
+use core_courseformat\formatactions;                                            // ADDED.
+
 require_once(__DIR__.'/../../../config.php');                                   // CHANGED.
 require_once($CFG->dirroot.'/course/lib.php');
-require_once(__DIR__.'/locallib.php');
-// ADDED LINE ABOVE: For function format_multitopic_course_create_section .
 
 $courseid = required_param('courseid', PARAM_INT);
 $increase = optional_param('increase', null, PARAM_BOOL);
@@ -114,7 +114,7 @@
     }
     $sections = [];
     for ($i = 0; $i < max($numsections, 1); $i ++) {
-        $sections[] = format_multitopic_course_create_section($course, $insertsection);
+        $sections[] = formatactions::section($course)->fmt_create_from_object($insertsection);
         // CHANGED LINE ABOVE: Use custom method, and send section info, not section number.
     }
     $returnurl = course_get_url($course, $sections[0], []);