Merge branch 'MDL-53808-master' of git://github.com/cescobedo/moodle

lib/deprecatedlib.php

@@ -4131,19 +4131,11 @@ function site_scale_used($scaleid, &$courses) {
 }
 
 /**
- * Returns detailed function information
- *
- * @deprecated since Moodle 3.1
- * @param string|object $function name of external function or record from external_function
- * @param int $strictness IGNORE_MISSING means compatible mode, false returned if record not found, debug message if more found;
- *                        MUST_EXIST means throw exception if no record or multiple records found
- * @return stdClass description or false if not found or exception thrown
- * @since Moodle 2.0
+ * @deprecated since Moodle 3.1. Use external_api::external_function_info().
  */
 function external_function_info($function, $strictness=MUST_EXIST) {
-    debugging('external_function_info() is deprecated. Please use external_api::external_function_info() instead.',
-              DEBUG_DEVELOPER);
-    return external_api::external_function_info($function, $strictness);
+    throw new coding_exception('external_function_info() can not be used any'.
+        'more. Please use external_api::external_function_info() instead.');
 }
 
 /**

lib/upgrade.txt

@@ -1,6 +1,12 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+=== 3.6 ===
+
+* The following functions have been finally deprecated and can not be used any more:
+
+- external_function_info()
+
 === 3.5 ===
 
 * There is a new privacy API that every subsystem and plugin has to implement so that the site can become GDPR