moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-42021 events: Debug message when objecttable set without an objectid

Browse source
This commit is contained in:
Frederic Massart 2013-09-27 14:13:30 +08:00
parent 7f3836d15a
commit 31e571cdf0
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/classes/event/base.php
View file

@ -463,6 +463,9 @@ abstract class base implements \IteratorAggregate {
if (!$DB->get_manager()->table_exists($this->data['objecttable'])) { if (!$DB->get_manager()->table_exists($this->data['objecttable'])) {
debugging('Unknown table specified in objecttable field', DEBUG_DEVELOPER); debugging('Unknown table specified in objecttable field', DEBUG_DEVELOPER);
} }
if (!isset($this->data['objectid'])) {
debugging('Event property objectid must be set when objecttable is defined', DEBUG_DEVELOPER);
}
} }
} }
} }

10
lib/tests/event_test.php
View file

@ -619,17 +619,21 @@ class core_event_testcase extends advanced_testcase {
@$event->trigger(); @$event->trigger();
$this->assertDebuggingCalled(); $this->assertDebuggingCalled();
$event = \core_tests\event\bad_event6::create(array('context'=>\context_system::instance())); $event = \core_tests\event\bad_event6::create(array('objectid'=>1, 'context'=>\context_system::instance()));
$event->trigger(); $event->trigger();
$this->assertDebuggingCalled(); $this->assertDebuggingCalled('Unknown table specified in objecttable field');
$event = \core_tests\event\bad_event7::create(array('objectid'=>1, 'context'=>\context_system::instance())); $event = \core_tests\event\bad_event7::create(array('objectid'=>1, 'context'=>\context_system::instance()));
try { try {
$event->trigger(); $event->trigger();
$this->fail('Exception expected when $data contains objectid by objecttable not specified'); $this->fail('Exception expected when $data contains objectid but objecttable not specified');
} catch (\moodle_exception $e) { } catch (\moodle_exception $e) {
$this->assertInstanceOf('\coding_exception', $e); $this->assertInstanceOf('\coding_exception', $e);
} }
$event = \core_tests\event\bad_event8::create(array('context'=>\context_system::instance()));
$event->trigger();
$this->assertDebuggingCalled('Event property objectid must be set when objecttable is defined');
} }
public function test_problematic_events() { public function test_problematic_events() {

8
lib/tests/fixtures/event_fixtures.php vendored
View file

@ -174,6 +174,14 @@ class bad_event7 extends \core\event\base {
} }
} }
class bad_event8 extends \core\event\base {
protected function init() {
$this->data['crud'] = 'c';
$this->data['level'] = self::LEVEL_OTHER;
$this->data['objecttable'] = 'user';
}
}
class problematic_event1 extends \core\event\base { class problematic_event1 extends \core\event\base {
protected function init() { protected function init() {
$this->data['crud'] = 'u'; $this->data['crud'] = 'u';