Merge branch 'MDL-79890-402' of https://github.com/andrewnicols/moodle …

…into MOODLE_402_STABLE
moodle · Nov 30, 2023 · 254d53c · 254d53c
2 parents d98419e + bed2ece
commit 254d53c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/admin/tool/usertours/classes/local/target/block.php b/admin/tool/usertours/classes/local/target/block.php
@@ -102,7 +102,7 @@ public static function add_config_to_form(\MoodleQuickForm $mform) {
      */
     public static function add_disabled_constraints_to_form(\MoodleQuickForm $mform) {
         $mform->hideIf('targetvalue_block', 'targettype', 'noteq',
-                \tool_usertours\target::get_target_constant_for_class(get_class()));
+                \tool_usertours\target::get_target_constant_for_class(self::class));
     }
 
     /**

diff --git a/admin/tool/usertours/classes/local/target/selector.php b/admin/tool/usertours/classes/local/target/selector.php
@@ -92,7 +92,7 @@ public static function add_config_to_form(\MoodleQuickForm $mform) {
      */
     public static function add_disabled_constraints_to_form(\MoodleQuickForm $mform) {
         $mform->hideIf('targetvalue_selector', 'targettype', 'noteq',
-                \tool_usertours\target::get_target_constant_for_class(get_class()));
+                \tool_usertours\target::get_target_constant_for_class(self::class));
     }
 
     /**

diff --git a/admin/tool/usertours/classes/local/target/unattached.php b/admin/tool/usertours/classes/local/target/unattached.php
@@ -81,7 +81,7 @@ public static function add_config_to_form(\MoodleQuickForm $mform) {
      * @param   MoodleQuickForm $mform      The form to add configuration to.
      */
     public static function add_disabled_constraints_to_form(\MoodleQuickForm $mform) {
-        $myvalue = \tool_usertours\target::get_target_constant_for_class(get_class());
+        $myvalue = \tool_usertours\target::get_target_constant_for_class(self::class);
 
         foreach (array_keys(self::$forcedsettings) as $settingname) {
             $mform->hideIf($settingname, 'targettype', 'eq', $myvalue);

diff --git a/lib/google/readme_moodle.txt b/lib/google/readme_moodle.txt
@@ -53,6 +53,8 @@ Local changes (to reapply until upstream upgrades contain them):
       cd lib/google/src
       for file in `find . -name '*.php' `; do sed -i '/^class /i #[AllowDynamicProperties]' $file; done
       ```
+    * MDL-46563 - PHP 8.3 compliance
+      - Converted use of `get_class()` to `static::class`
 
 Information
 -----------

diff --git a/lib/google/src/Google/Http/REST.php b/lib/google/src/Google/Http/REST.php
@@ -40,7 +40,7 @@ public static function execute(Google_Client $client, Google_Http_Request $req)
     $runner = new Google_Task_Runner(
         $client,
         sprintf('%s %s', $req->getRequestMethod(), $req->getUrl()),
-        array(get_class(), 'doExecute'),
+        array(self::class, 'doExecute'),
         array($client, $req)
     );
 

diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php
@@ -1968,7 +1968,7 @@ protected function setup_fake_plugin($pluginname) {
         $mockedplugins->setAccessible(true);
         $plugins = $mockedplugins->getValue();
         $plugins['fake'] = [$pluginname => "{$CFG->dirroot}/lib/tests/fixtures/fakeplugins/$pluginname"];
-        $mockedplugins->setValue($plugins);
+        $mockedplugins->setValue(null, $plugins);
         update_capabilities('fake_access');
         $this->resetDebugging(); // We have debugging messages here that we need to get rid of.
         // End of the component loader mock.