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

MDL-57841 exporter: Allow scalars as related objects

Browse Source
This commit is contained in:
Damyon Wiese 2017-02-01 14:45:53 +08:00
parent e7059ec5e2
commit 13fb78a4f6
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/external/exporter.php vendored
View File

@ -96,7 +96,11 @@ abstract class exporter {
}
} else {
if (array_key_exists($key, $related) && $related[$key] instanceof $classname) {
$scalartypes = ['string', 'int', 'bool', 'float'];
$scalarcheck = 'is_' . $classname;
if (array_key_exists($key, $related) &&
((in_array($classname, $scalartypes) && $scalarcheck($related[$key])) ||
($related[$key] instanceof $classname))) {
$this->related[$key] = $related[$key];
} else {
throw new coding_exception($missingdataerr . $key . ' => ' . $classname);

21
lib/tests/exporter_test.php
View File

@ -41,8 +41,22 @@ class core_exporter_testcase extends advanced_testcase {
public function setUp() {
$s = new stdClass();
$this->validrelated = array('simplestdClass' => $s, 'arrayofstdClass' => array($s, $s), 'context' => null);
$this->invalidrelated = array('simplestdClass' => 'a string', 'arrayofstdClass' => 5, 'context' => null);
$this->validrelated = array(
'simplestdClass' => $s,
'arrayofstdClass' => array($s, $s),
'context' => null,
'aint' => 5,
'astring' => 'valid string',
'abool' => false
);
$this->invalidrelated = array(
'simplestdClass' => 'a string',
'arrayofstdClass' => 5,
'context' => null,
'aint' => false,
'astring' => 4,
'abool' => 'not a boolean'
);
$this->validdata = array('stringA' => 'A string', 'stringAformat' => FORMAT_HTML, 'intB' => 4);
@ -166,7 +180,8 @@ class core_testable_exporter extends \core\external\exporter {
protected static function define_related() {
// We cache the context so it does not need to be retrieved from the course.
return array('simplestdClass' => 'stdClass', 'arrayofstdClass' => 'stdClass[]', 'context' => 'context?');
return array('simplestdClass' => 'stdClass', 'arrayofstdClass' => 'stdClass[]', 'context' => 'context?',
'astring' => 'string', 'abool' => 'bool', 'aint' => 'int');
}
protected function get_other_values(renderer_base $output) {