Merge branch 'MDL-69976' of https://github.com/paulholden/moodle

lib/deprecatedlib.php

@@ -3223,6 +3223,13 @@ function message_count_unread_messages() {
     throw new coding_exception('message_count_unread_messages has been removed.');
 }
 
+/**
+ * @deprecated since 3.10
+ */
+function serialise_tool_proxy() {
+    throw new coding_exception('serialise_tool_proxy has been removed.');
+}
+
 /**
  * Checks if current user is shown any extra fields when listing users.
  *

mod/lti/locallib.php

@@ -4299,39 +4299,6 @@ function serialise_tool_type(stdClass $type) {
     );
 }
 
-/**
- * Serialises this tool proxy.
- *
- * @param stdClass $proxy The tool proxy
- *
- * @deprecated since Moodle 3.10
- * @todo This will be finally removed for Moodle 4.2 as part of MDL-69976.
- * @return array An array of values representing this type
- */
-function serialise_tool_proxy(stdClass $proxy) {
-    $deprecatedtext = __FUNCTION__ . '() is deprecated. Please remove all references to this method.';
-    debugging($deprecatedtext, DEBUG_DEVELOPER);
-
-    return array(
-        'id' => $proxy->id,
-        'name' => $proxy->name,
-        'description' => get_string('activatetoadddescription', 'mod_lti'),
-        'urls' => get_tool_proxy_urls($proxy),
-        'state' => array(
-            'text' => get_string('pending', 'mod_lti'),
-            'pending' => true,
-            'configured' => false,
-            'rejected' => false,
-            'unknown' => false
-        ),
-        'hascapabilitygroups' => true,
-        'capabilitygroups' => array(),
-        'courseid' => 0,
-        'instanceids' => array(),
-        'instancecount' => 0
-    );
-}
-
 /**
  * Loads the cartridge information into the tool type, if the launch url is for a cartridge file
  *

mod/lti/upgrade.txt

@@ -4,6 +4,7 @@ This files describes API changes in the lti code.
 
 * get_jwt_claim_mappings() function has been added to service_base class. It allows a service subplugin to be
   compatible with LTI 1.3 by exposing its 1.1 custom parameters to LTI 1.3 claim mapping.
+* The `serialise_tool_proxy` method, deprecated since 3.10, has been removed and can no longer be used
 
 === 4.1 ===