From 07d4fc89b8b63ebec5758dc12a791e17aa5cf2db Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Tue, 1 Oct 2024 10:25:56 +1300 Subject: [PATCH 1/2] Fix #343 - rename function to prevent unit test failure in 4.5 --- .../maintenance_static_page_test.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/local/controllers/maintenance_static_page_test.php b/tests/local/controllers/maintenance_static_page_test.php index 5ee43fb..2fb469f 100644 --- a/tests/local/controllers/maintenance_static_page_test.php +++ b/tests/local/controllers/maintenance_static_page_test.php @@ -98,7 +98,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase { * Test remove script tags. */ public function test_updatelinkstylesheet() { - $localcsslink = $this->get_fixture_path('simple.css'); + $localcsslink = $this->get_fixture_path_location('simple.css'); $externalcsslink = 'http://google.com/coolstuff.css'; $html = "\n". 'Title'. @@ -114,7 +114,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase { * Test update link style sheet urls. */ public function test_updatelinkstylesheet_urls() { - $localcsslink = $this->get_fixture_path('withurls.css'); + $localcsslink = $this->get_fixture_path_location('withurls.css'); $html = "\n". 'Title'. 'Content'; @@ -132,7 +132,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase { * Test update link style sheet urls quoted. */ public function test_updatelinkstylesheet_urls_quoted() { - $localcsslink = $this->get_fixture_path('withurls-quoted.css'); + $localcsslink = $this->get_fixture_path_location('withurls-quoted.css'); $html = "\n". 'Title'. 'Content'; @@ -150,7 +150,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase { * Test update link style sheet urls with sub dir. */ public function test_updatelinkstylesheet_urls_subdir() { - $localcsslink = $this->get_fixture_path('subdir/withurls-subdir.css'); + $localcsslink = $this->get_fixture_path_location('subdir/withurls-subdir.css'); $html = "\n". 'Title'. 'Content'; @@ -168,7 +168,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase { * Test update images to file.php style link. */ public function test_updateimages() { - $localimglink = $this->get_fixture_path('catalyst.png'); + $localimglink = $this->get_fixture_path_location('catalyst.png'); $externalimglink = 'http://google.com/coolstyle.css'; $html = "\n". 'Title'. @@ -184,7 +184,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase { * Test update favicon to file.php style link. */ public function test_updatelinkfavicon() { - $link = $this->get_fixture_path('catalyst.png'); + $link = $this->get_fixture_path_location('catalyst.png'); $html = "\n". 'Title'. 'Content'; @@ -253,7 +253,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase { * Test update preview path to file.php style link. */ public function test_previewpath() { - $link = $this->get_fixture_path('catalyst.png'); + $link = $this->get_fixture_path_location('catalyst.png'); $html = "\n". 'Title'. 'Content'; @@ -313,7 +313,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase { public function test_createdfile() { global $CFG; - $link = $this->get_fixture_path('catalyst.png'); + $link = $this->get_fixture_path_location('catalyst.png'); $html = "\n". 'Title'. 'Content'; @@ -337,7 +337,7 @@ class maintenance_static_page_test extends \auth_outage\base_testcase { * * @return string */ - private function get_fixture_path($file) { + private function get_fixture_path_location($file) { return (string)new \moodle_url('/auth/outage/tests/local/controllers/fixtures/'.$file); } From 329e92445c4ded900776ae8a888ce7b2e749b945 Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Tue, 1 Oct 2024 10:27:31 +1300 Subject: [PATCH 2/2] Add supported 405 branch. --- version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.php b/version.php index 35d28a2..14df994 100644 --- a/version.php +++ b/version.php @@ -32,4 +32,4 @@ $plugin->version = 2024081900; // The current plugin version (D $plugin->release = 2024081900; // Human-readable release information. $plugin->requires = 2017111309; // 2017111309 = T13, but this really requires 3.9 and higher. $plugin->maturity = MATURITY_STABLE; // Suitable for PRODUCTION environments! -$plugin->supported = [39, 404]; // A range of branch numbers of supported moodle versions. +$plugin->supported = [39, 405]; // A range of branch numbers of supported moodle versions.