Merge branch 'MDL-40465-master' of git://github.com/FMCorz/moodle

admin/roles/classes/capability_table_base.php

@@ -36,7 +36,7 @@ abstract class core_role_capability_table_base {
     /** The context this table relates to. */
     protected $context;
 
-    /** The capabilities to display. Initialised as fetch_context_capabilities($context). */
+    /** The capabilities to display. Initialised as $context->get_capabilities(). */
     protected $capabilities = array();
 
     /** Added as an id="" attribute to the table on output. */

admin/webservice/forms.php

@@ -88,7 +88,7 @@ class external_service_form extends moodleform {
 
         // Prepare the list of capabilities to choose from
         $systemcontext = context_system::instance();
-        $allcapabilities = fetch_context_capabilities($systemcontext);
+        $allcapabilities = $systemcontext->get_capabilities();
         $capabilitychoices = array();
         $capabilitychoices['norequiredcapability'] = get_string('norequiredcapability',
                         'webservice');

lib/accesslib.php

@@ -7262,25 +7262,6 @@ function get_courseid_from_context(context $context) {
     }
 }
 
-/**
- * Extracts the relevant capabilities given a contextid.
- * All case based, example an instance of forum context.
- * Will fetch all forum related capabilities, while course contexts
- * Will fetch all capabilities
- *
- * capabilities
- * `name` varchar(150) NOT NULL,
- * `captype` varchar(50) NOT NULL,
- * `contextlevel` int(10) NOT NULL,
- * `component` varchar(100) NOT NULL,
- *
- * @deprecated since 2.2
- * @param context $context
- * @return array
- */
-function fetch_context_capabilities(context $context) {
-    return $context->get_capabilities();
-}
 
 /**
  * Runs get_records select on context table and returns the result

lib/deprecatedlib.php

@@ -4033,6 +4033,28 @@ function context_moved(context $context, context $newparent) {
     $context->update_moved($newparent);
 }
 
+/**
+ * Extracts the relevant capabilities given a contextid.
+ * All case based, example an instance of forum context.
+ * Will fetch all forum related capabilities, while course contexts
+ * Will fetch all capabilities
+ *
+ * capabilities
+ * `name` varchar(150) NOT NULL,
+ * `captype` varchar(50) NOT NULL,
+ * `contextlevel` int(10) NOT NULL,
+ * `component` varchar(100) NOT NULL,
+ *
+ * @see context::get_capabilities()
+ * @deprecated since 2.2
+ * @param context $context
+ * @return array
+ */
+function fetch_context_capabilities(context $context) {
+    debugging('fetch_context_capabilities() is deprecated, please use $context->get_capabilities() instead.', DEBUG_DEVELOPER);
+    return $context->get_capabilities();
+}
+
 /**
  * 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()

lib/tests/accesslib_test.php

@@ -2492,7 +2492,8 @@ class accesslib_testcase extends advanced_testcase {
         $this->assertEquals(get_courseid_from_context($context), $pagecm->course);
 
         $caps = fetch_context_capabilities($systemcontext);
-        $this->assertTrue(is_array($caps));
+        $this->assertDebuggingCalled('fetch_context_capabilities() is deprecated, please use $context->get_capabilities() instead.', DEBUG_DEVELOPER);
+        $this->assertEquals($systemcontext->get_capabilities(), $caps);
         unset($caps);
     }
 

lib/upgrade.txt

@@ -19,6 +19,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().
+* fetch_context_capabilities() is deprecated, please use $context->get_capabilities().
 * context_instance_preload() is deprecated, please use context_helper::preload_from_record().
 * get_contextlevel_name() is deprecated, please use context_helper::get_level_name().
 * print_context_name() is deprecated, please use $context->get_context_name().