MDL-40425 libraries: Deprecate context_instance_preload()

lib/accesslib.php

@@ -7246,18 +7246,6 @@ function context_instance_preload_sql($joinon, $contextlevel, $tablealias) {
     return array($select, $join);
 }
 
-/**
- * Preloads context information from db record and strips the cached info.
- * The db request has to contain both the $join and $select from context_instance_preload_sql()
- *
- * @deprecated since 2.2
- * @param stdClass $rec
- * @return void (modifies $rec)
- */
-function context_instance_preload(stdClass $rec) {
-    context_helper::preload_from_record($rec);
-}
-
 /**
  * Mark a context as dirty (with timestamp) so as to force reloading of the context.
  *

lib/deprecatedlib.php

@@ -5078,4 +5078,18 @@ function preload_course_contexts($courseid) {
 function context_moved(context $context, context $newparent) {
     debugging('context_moved() is deprecated, please use context::update_moved() instead.', DEBUG_DEVELOPER);
     $context->update_moved($newparent);
-}
+}
+
+/**
+ * Preloads context information from db record and strips the cached info.
+ * The db request has to contain both the $join and $select from context_instance_preload_sql()
+ *
+ * @deprecated since 2.2
+ * @see context_helper::preload_from_record()
+ * @param stdClass $rec
+ * @return void (modifies $rec)
+ */
+function context_instance_preload(stdClass $rec) {
+    debugging('context_instance_preload() is deprecated, please use context_helper::preload_from_record() instead.', DEBUG_DEVELOPER);
+    context_helper::preload_from_record($rec);
+}

lib/tests/accesslib_test.php

@@ -2432,6 +2432,8 @@ class accesslib_testcase extends advanced_testcase {
         $records = $DB->get_records_sql($sql);
         foreach ($records as $record) {
             context_instance_preload($record);
+            $this->assertDebuggingCalled('context_instance_preload() is deprecated, please use context_helper::preload_from_record() instead.',
+                    DEBUG_DEVELOPER);
             $record = (array)$record;
             $this->assertEquals(1, count($record)); // only id left
         }

lib/upgrade.txt

@@ -18,6 +18,7 @@ information provided here is intended especially for developers.
 * rebuild_contexts() is deprecated, please use $context->reset_paths().
 * preload_course_contexts() is deprecated, please use context_helper::preload_course().
 * context_moved() is deprecated, please use context::update_moved().
+* context_instance_preload() is deprecated, please use context_helper::preload_from_record().
 
 === 2.5.1 ===