L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-63225-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2018-10-10 23:26:00 +02:00
parent 447b4bdf5a d14393fb3d
commit 33b264e80a
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/externallib.php
+2 -1
View File
@@ -380,8 +380,9 @@ class external_api {
return (bool)$response;
}
}
$responsetype = gettype($response);
$debuginfo = 'Invalid external api response: the value is "' . $response .
'", the server was expecting "' . $description->type . '" type';
'" of PHP type "' . $responsetype . '", the server was expecting "' . $description->type . '" type';
try {
return validate_param($response, $description->type, $description->allownull, $debuginfo);
} catch (invalid_parameter_exception $e) {
lib/tests/externallib_test.php
+21
View File
@@ -232,6 +232,27 @@ class core_externallib_testcase extends advanced_testcase {
$settings->set_filter($currentfilter);
}
/**
* Test for clean_returnvalue() for testing that returns the PHP type.
*/
public function test_clean_returnvalue_return_php_type() {
$returndesc = new external_single_structure(
array(
'value' => new external_value(PARAM_RAW, 'Some text', VALUE_OPTIONAL, null, NULL_NOT_ALLOWED)
)
);
// Check return type on exception because the external values does not allow NULL values.
$testdata = array('value' => null);
try {
$cleanedvalue = external_api::clean_returnvalue($returndesc, $testdata);
} catch (moodle_exception $e) {
$this->assertInstanceOf('invalid_response_exception', $e);
$this->assertContains('of PHP type "NULL"', $e->debuginfo);
}
}
/**
* Test for clean_returnvalue().
*/