From 8704b2b01f0f363c74b259731ea4f3253f64fe45 Mon Sep 17 00:00:00 2001 From: Patryk Mroczko Date: Tue, 23 Dec 2025 12:11:02 +0100 Subject: [PATCH 1/6] Update plugin versions for 5.0.4 release --- version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.php b/version.php index a926fc15b..eb5fe2def 100644 --- a/version.php +++ b/version.php @@ -26,9 +26,9 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2025040815; +$plugin->version = 2025040820; $plugin->requires = 2025040800; -$plugin->release = '5.0.3'; +$plugin->release = '5.0.4'; $plugin->component = 'local_o365'; $plugin->maturity = MATURITY_STABLE; $plugin->dependencies = [ From 86cd94b7096488b56948f866bcc5082e64541749 Mon Sep 17 00:00:00 2001 From: Patryk Mroczko Date: Tue, 23 Dec 2025 12:11:02 +0100 Subject: [PATCH 2/6] Update plugin versions for 5.0.4 release --- version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.php b/version.php index eb5fe2def..ce672e62c 100644 --- a/version.php +++ b/version.php @@ -32,5 +32,5 @@ $plugin->component = 'local_o365'; $plugin->maturity = MATURITY_STABLE; $plugin->dependencies = [ - 'auth_oidc' => 2025040810, + 'auth_oidc' => 2025040815, ]; From 4e289b4c5025ab8bd5b42cb01eb218ab0d3ba0c4 Mon Sep 17 00:00:00 2001 From: Lai Wei Date: Tue, 20 Jan 2026 14:56:35 +0000 Subject: [PATCH 3/6] Update signature of local_o365/httpclient::put() to match with curl::put() following changes in MDL-86802 --- classes/httpclient.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/httpclient.php b/classes/httpclient.php index d4222db9c..78d721089 100644 --- a/classes/httpclient.php +++ b/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'); } From 1d93812fd4919e4fa3d092a467a71aeee42f9a25 Mon Sep 17 00:00:00 2001 From: Patryk Mroczko Date: Tue, 10 Feb 2026 08:14:24 +0100 Subject: [PATCH 4/6] Fix Moodle 5.1+ compatibility for course request form --- classes/form/courserequestform.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/classes/form/courserequestform.php b/classes/form/courserequestform.php index d4385780c..14ab1992f 100644 --- a/classes/form/courserequestform.php +++ b/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. * From 5c178d932f196da69e427147b549aa3092c815c0 Mon Sep 17 00:00:00 2001 From: Lai Wei Date: Tue, 10 Feb 2026 09:47:31 +0000 Subject: [PATCH 5/6] update Moodle plugin CI config for Moodle 5.1 release --- .github/workflows/ci.yml | 4 ++-- .gitlab-ci.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39aaa297d..59a4fc78b 100644 --- a/.github/workflows/ci.yml +++ b/.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] diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49e61ceb1..411969469 100644 --- a/.gitlab-ci.yml +++ b/.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' From ca83fda4c1cd617bdb8bbe0da72d82898769ec75 Mon Sep 17 00:00:00 2001 From: Lai Wei Date: Tue, 10 Feb 2026 09:54:24 +0000 Subject: [PATCH 6/6] Update plugin versions for Moodle 5.1.0 release --- version.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/version.php b/version.php index ce672e62c..831f6cf8a 100644 --- a/version.php +++ b/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, ];