mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 08:22:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-40935-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Marina Glancy 2013-08-06 22:33:55 +10:00
commit 18a4335366
7 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/classes/event/base.php
View File

@ -361,7 +361,7 @@ abstract class base implements \IteratorAggregate {
*
* @return null|string legacy event name
*/
protected function get_legacy_eventname() {
public static function get_legacy_eventname() {
return null;
}
@ -477,7 +477,7 @@ abstract class base implements \IteratorAggregate {
$this->dispatched = true;
if ($legacyeventname = $this->get_legacy_eventname()) {
if ($legacyeventname = static::get_legacy_eventname()) {
events_trigger_legacy($legacyeventname, $this->get_legacy_eventdata());
}
}

2
lib/classes/event/role_assigned.php
View File

@ -63,7 +63,7 @@ class role_assigned extends base {
*
* @return null|string legacy event name
*/
protected function get_legacy_eventname() {
public static function get_legacy_eventname() {
return 'role_assigned';
}

2
lib/classes/event/role_unassigned.php
View File

@ -63,7 +63,7 @@ class role_unassigned extends base {
*
* @return null|string legacy event name
*/
protected function get_legacy_eventname() {
public static function get_legacy_eventname() {
return 'role_unassigned';
}

15
lib/phpunit/classes/advanced_testcase.php
View File

@ -338,21 +338,6 @@ abstract class advanced_testcase extends PHPUnit_Framework_TestCase {
$this->assertEquals($expected, $legacydata, $message);
}
/**
* Assert that an event legacy name is equal to the expected value.
*
* @param mixed $expected expected name.
* @param \core\event\base $event the event object.
* @param string $message
* @return void
*/
public function assertEventLegacyName($expected, \core\event\base $event, $message = '') {
$legacydata = phpunit_event_mock::testable_get_legacy_eventname($event);
if ($message === '') {
$message = 'Event legacy name does not match expected value.';
}
$this->assertEquals($expected, $legacydata, $message);
}
/**
* Starts message redirection.

8
lib/phpunit/classes/event_mock.php
View File

@ -35,14 +35,6 @@ require_once(__DIR__ . '/../../classes/event/base.php');
*/
abstract class phpunit_event_mock extends \core\event\base {
/**
* Returns the log data of the event.
* @return array
*/
public static function testable_get_legacy_eventname($event) {
return $event->get_legacy_eventname();
}
/**
* Returns the log data of the event.
* @return array

2
lib/tests/accesslib_test.php
View File

@ -486,7 +486,7 @@ class core_accesslib_testcase extends advanced_testcase {
$this->assertEquals($raid, $event->other['id']);
$this->assertSame('', $event->other['component']);
$this->assertEquals(0, $event->other['itemid']);
$this->assertEventLegacyName('role_assigned', $event);
$this->assertSame('role_assigned', $event::get_legacy_eventname());
}
/**

2
lib/tests/fixtures/event_fixtures.php vendored
View File

@ -48,7 +48,7 @@ class unittest_executed extends \core\event\base {
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';
}