MDL-40935 events: get_legacy_eventname() should be public and static

nealpowell · Aug 6, 2013 · 2244600 · 2244600
1 parent d2132f0
commit 2244600
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/classes/event/base.php b/lib/classes/event/base.php
@@ -361,7 +361,7 @@ public function get_logextra() {
      *
      * @return null|string legacy event name
      */
-    protected function get_legacy_eventname() {
+    public static function get_legacy_eventname() {
         return null;
     }
 
@@ -477,7 +477,7 @@ public final function trigger() {
 
         $this->dispatched = true;
 
-        if ($legacyeventname = $this->get_legacy_eventname()) {
+        if ($legacyeventname = static::get_legacy_eventname()) {
             events_trigger_legacy($legacyeventname, $this->get_legacy_eventdata());
         }
     }

diff --git a/lib/classes/event/role_assigned.php b/lib/classes/event/role_assigned.php
@@ -63,7 +63,7 @@ public function get_url() {
      *
      * @return null|string legacy event name
      */
-    protected function get_legacy_eventname() {
+    public static function get_legacy_eventname() {
         return 'role_assigned';
     }
 

diff --git a/lib/classes/event/role_unassigned.php b/lib/classes/event/role_unassigned.php
@@ -63,7 +63,7 @@ public function get_url() {
      *
      * @return null|string legacy event name
      */
-    protected function get_legacy_eventname() {
+    public static function get_legacy_eventname() {
         return 'role_unassigned';
     }
 

diff --git a/lib/tests/fixtures/event_fixtures.php b/lib/tests/fixtures/event_fixtures.php
@@ -48,7 +48,7 @@ public function get_url() {
         return new moodle_url('/somepath/somefile.php', array('id'=>$this->data['other']['sample']));
     }
 
-    protected function get_legacy_eventname() {
+    public static function get_legacy_eventname() {
         return 'test_legacy';
     }