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

diff --git a/admin/roles/classes/capability_table_base.php b/admin/roles/classes/capability_table_base.php
index 9c9d7f9..11cadee 100644 (file)
--- a/admin/roles/classes/capability_table_base.php
+++ b/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. */

diff --git a/admin/webservice/forms.php b/admin/webservice/forms.php
index 6a1cc49..b1c09ae 100644 (file)
--- a/admin/webservice/forms.php
+++ b/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');

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 7d39fc1..afcc469 100644 (file)
--- a/lib/accesslib.php
+++ b/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

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index d8babf2..7b6bb02 100644 (file)
--- a/lib/deprecatedlib.php
+++ b/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()

diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php
index 9c9f8d8..763ee61 100644 (file)
--- a/lib/tests/accesslib_test.php
+++ b/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);
     }
 

diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index 19e9d2e..2257ef7 100644 (file)
--- a/lib/upgrade.txt
+++ b/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().