Moodle 501 stable

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:14
+        image: postgres:15
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        moodle-branch: ['MOODLE_500_STABLE']
+        moodle-branch: ['MOODLE_501_STABLE']
         php: [8.2, 8.3, 8.4]
         database: [pgsql, mariadb]
 

.gitlab-ci.yml

@@ -20,7 +20,7 @@ variables:
   COMPOSER_CACHE_DIR: "$CI_PROJECT_DIR/.cache/composer"
   NPM_CONFIG_CACHE: "$CI_PROJECT_DIR/.cache/npm"
   CI_BUILD_DIR: '/tmp/plugin'
-  MOODLE_BRANCH: 'MOODLE_500_STABLE'
+  MOODLE_BRANCH: 'MOODLE_501_STABLE'
   MOODLE_BEHAT_WWWROOT: 'http://localhost:8000'
   MOODLE_BEHAT_WDHOST: 'http://behat:4444/wd/hub'
   MOODLE_START_BEHAT_SERVERS: 'no'

classes/form/courserequestform.php

@@ -27,18 +27,26 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-require_once($CFG->dirroot . '/course/request_form.php');
+$pathbelowmoodle51 = $CFG->dirroot . '/course/request_form.php';
+$pathsincemoodle51 = $CFG->dirroot . '/course/classes/form/request_course.php';
+
+if (file_exists($pathsincemoodle51)) {
+    require_once($pathsincemoodle51);
+    class_alias(\core_course\form\request_course::class, 'local_o365\form\parent_request_course');
+} else {
+    require_once($pathbelowmoodle51);
+    class_alias('course_request_form', 'local_o365\form\parent_request_course');
+}
 
 use core_course_category;
 use course_request;
-use course_request_form;
 use local_o365\feature\courserequest\main;
 use local_o365\utils;
 
 /**
  * A form for a user to request a course.
  */
-class courserequestform extends course_request_form {
+class courserequestform extends parent_request_course {
     /**
      * Form definition.
      *

classes/httpclient.php

@@ -157,9 +157,10 @@ public function merge($url, $params = '', $options = []): bool|string {
      * @param string $url
      * @param array $params
      * @param array $options
+     * @param bool $includeuserpwd
      * @return bool|string
      */
-    public function put($url, $params = [], $options = []): bool|string {
+    public function put($url, $params = [], $options = [], $includeuserpwd = true): bool|string {
         if (!isset($params['file'])) {
             throw new moodle_exception('errorhttpclientnofileinput', 'local_o365');
         }

version.php

@@ -26,11 +26,11 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2025040820;
-$plugin->requires = 2025040800;
-$plugin->release = '5.0.4';
+$plugin->version = 2025100600;
+$plugin->requires = 2025100600;
+$plugin->release = '5.1.0';
 $plugin->component = 'local_o365';
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = [
-    'auth_oidc' => 2025040815,
+    'auth_oidc' => 2025100600,
 ];