MDL-55188 events: Final deprecation events_trigger.

diff --git a/lib/deprecatedlib.php b/lib/deprecatedlib.php
index daf12c4..f025079 100644 (file)
--- a/lib/deprecatedlib.php
+++ b/lib/deprecatedlib.php
@@ -58,17 +58,11 @@ function add_to_log($courseid, $module, $action, $url='', $info='', $cm=0, $user
 }
 
 /**
- * Function to call all event handlers when triggering an event
- *
  * @deprecated since 2.6
- *
- * @param string $eventname name of the event
- * @param mixed $eventdata event data object
- * @return int number of failed events
  */
 function events_trigger($eventname, $eventdata) {
-    debugging('events_trigger() is deprecated, please use new events instead', DEBUG_DEVELOPER);
-    return events_trigger_legacy($eventname, $eventdata);
+    throw new coding_exception('events_trigger() can not be used any more.'.
+        ' Please use new events instead.');
 }
 
 /**

diff --git a/lib/tests/eventslib_test.php b/lib/tests/eventslib_test.php
index c62d5cf..9f5f000 100644 (file)
--- a/lib/tests/eventslib_test.php
+++ b/lib/tests/eventslib_test.php
@@ -216,16 +216,11 @@ class core_eventslib_testcase extends advanced_testcase {
     }
 
     /**
-     * Tests events_trigger() function.
+     * Tests that events_trigger throws an exception.
      */
-    public function test_events_trigger_debugging() {
-
-        events_update_definition('unittest');
-        $this->assertDebuggingCalled(self::DEBUGGING_MSG, DEBUG_DEVELOPER);
-
-        $this->assertEquals(0, events_trigger('test_instant', 'ok'));
-        $debugmessages = array('events_trigger() is deprecated, please use new events instead', self::DEBUGGING_MSG);
-        $this->assertDebuggingCalledCount(2, $debugmessages, array(DEBUG_DEVELOPER, DEBUG_DEVELOPER));
+    public function test_events_trigger_exception() {
+        $this->expectException('coding_exception');
+        events_trigger('test_instant', 'ok');
     }
 }
 

diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index f2e8d0b..565a808 100644 (file)
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -8,6 +8,7 @@ information provided here is intended especially for developers.
   example, to inform the user that there are too many items matching the current search criteria.
 * The following functions have been finally deprecated and can not be used any more:
   - external_function_info()
+  - events_trigger()
 * Following api's have been removed in behat_config_manager, please use behat_config_util instead.
     - get_features_with_tags()
     - get_components_steps_definitions()