From 720bd9d012f2b03debdb08e4e4d63b71cfa1be60 Mon Sep 17 00:00:00 2001 From: Nathan Nguyen Date: Wed, 13 Nov 2024 16:20:21 +1100 Subject: [PATCH] Support MOODLE 4.5 --- README.md | 12 ++++-------- classes/converter.php | 5 ++--- classes/provision.php | 7 +++---- classes/tester.php | 5 ++--- tests/converter_test.php | 3 --- tests/events_test.php | 3 --- tests/provision_test.php | 3 --- version.php | 11 ++++------- 8 files changed, 15 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 99289c7..1464708 100644 --- a/README.md +++ b/README.md @@ -26,14 +26,10 @@ The following sections outline the steps that need to be followed to install the ## Supported Moodle Versions This plugin currently supports Moodle: -* 3.4 -* 3.5 -* 3.6 -* 3.7 -* 3.8 -* 3.9 -* 3.10 -* 3.11 +| Moodle version | Branch | +-----------------|-------------------| +| Moodle 3.4+ | MOODLE_34_STABLE | +| Moodle 4.5+ | MOODLE_405_STABLE | ## Plugin Installation The following steps will help you install this plugin into your Moodle instance. diff --git a/classes/converter.php b/classes/converter.php index 5bf1480..1f6b505 100644 --- a/classes/converter.php +++ b/classes/converter.php @@ -25,11 +25,10 @@ defined('MOODLE_INTERNAL') || die(); -require_once($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php'); - use \core_files\conversion; use Aws\S3\S3Client; use Aws\S3\Exception\S3Exception; +use smsgateway_aws\helper; /** * Class for converting files between different formats using unoconv. @@ -108,7 +107,7 @@ public function create_client($handler=null) { // Check if we are using the Moodle proxy. if ($this->config->useproxy) { - $connectionoptions['http'] = ['proxy' => \local_aws\local\aws_helper::get_proxy_string()]; + $connectionoptions['http'] = ['proxy' => helper::get_proxy_string()]; } // Allow handler overriding for testing. diff --git a/classes/provision.php b/classes/provision.php index 7711750..bae10a1 100644 --- a/classes/provision.php +++ b/classes/provision.php @@ -25,13 +25,12 @@ defined('MOODLE_INTERNAL') || die(); -require_once($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php'); - use Aws\S3\S3Client; use Aws\S3\Exception\S3Exception; use Aws\CloudFormation\CloudFormationClient; use Aws\CloudFormation\Exception\CloudFormationException; use Aws\Exception\AwsException; +use smsgateway_aws\helper; /** * Class for provisioning AWS resources. @@ -173,7 +172,7 @@ protected function create_s3_client($handler=null) { // Check if we are using the Moodle proxy. if ($this->useproxy) { - $connectionoptions['http'] = ['proxy' => \local_aws\local\aws_helper::get_proxy_string()]; + $connectionoptions['http'] = ['proxy' => helper::get_proxy_string()]; } // Allow handler overriding for testing. @@ -290,7 +289,7 @@ protected function create_cloudformation_client($handler=null) { // Check if we are using the Moodle proxy. if ($this->useproxy) { - $connectionoptions['http'] = ['proxy' => \local_aws\local\aws_helper::get_proxy_string()]; + $connectionoptions['http'] = ['proxy' => helper::get_proxy_string()]; } // Allow handler overriding for testing. diff --git a/classes/tester.php b/classes/tester.php index 2570d53..758849f 100644 --- a/classes/tester.php +++ b/classes/tester.php @@ -25,11 +25,10 @@ defined('MOODLE_INTERNAL') || die(); -require_once($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php'); - use Aws\S3\S3Client; use Aws\S3\Exception\S3Exception; use Aws\Iam\Exception\IamException; +use smsgateway_aws\helper; /** * Class for provisioning AWS resources. @@ -150,7 +149,7 @@ public function create_s3_client($handler=null) { // Check if we are using the Moodle proxy. if ($this->useproxy) { - $connectionoptions['http'] = ['proxy' => \local_aws\local\aws_helper::get_proxy_string()]; + $connectionoptions['http'] = ['proxy' => helper::get_proxy_string()]; } // Allow handler overriding for testing. diff --git a/tests/converter_test.php b/tests/converter_test.php index 0cafc4d..6afb527 100644 --- a/tests/converter_test.php +++ b/tests/converter_test.php @@ -27,9 +27,6 @@ defined('MOODLE_INTERNAL') || die(); -global $CFG; -require_once($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php'); - use Aws\Result; use Aws\MockHandler; use Aws\CommandInterface; diff --git a/tests/events_test.php b/tests/events_test.php index 3da6f60..db51b20 100644 --- a/tests/events_test.php +++ b/tests/events_test.php @@ -27,9 +27,6 @@ defined('MOODLE_INTERNAL') || die(); -global $CFG; -require_once($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php'); - use Aws\Result; use Aws\MockHandler; use Aws\CommandInterface; diff --git a/tests/provision_test.php b/tests/provision_test.php index feab89e..66cb6a7 100644 --- a/tests/provision_test.php +++ b/tests/provision_test.php @@ -27,9 +27,6 @@ defined('MOODLE_INTERNAL') || die(); -global $CFG; -require_once($CFG->dirroot . '/local/aws/sdk/aws-autoloader.php'); - use Aws\MockHandler; use Aws\Result; use Aws\CommandInterface; diff --git a/version.php b/version.php index 29b881a..a65b052 100644 --- a/version.php +++ b/version.php @@ -25,11 +25,8 @@ defined('MOODLE_INTERNAL') || die(); $plugin->component = 'fileconverter_librelambda'; -$plugin->release = 2023010900; -$plugin->version = 2023010900; -$plugin->requires = 2017111309; +$plugin->release = 2024111200; +$plugin->version = 2024111300; +$plugin->requires = 2024100700; $plugin->maturity = MATURITY_STABLE; -$plugin->dependencies = array( - 'local_aws' => 2023072100 -); -$plugin->supported = [34, 401]; // A range of branch numbers of supported moodle versions. +$plugin->supported = [405, 405]; // A range of branch numbers of supported moodle versions.