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

Merge branch 'MDL-56372_static_bind_clean_return_val' of https://github.com/BenKelada/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2016-11-02 15:14:46 +00:00
parent cb2b9a905c d96030ce07
commit ab64cd40b0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/externallib.php
+6 -6
View File
@@ -316,7 +316,7 @@ class external_api {
}
if ($subdesc->required == VALUE_DEFAULT) {
try {
$result[$key] = self::validate_parameters($subdesc, $subdesc->default);
$result[$key] = static::validate_parameters($subdesc, $subdesc->default);
} catch (invalid_parameter_exception $e) {
//we are only interested by exceptions returned by validate_param() and validate_parameters()
//(in order to build the path to the faulty attribut)
@@ -325,7 +325,7 @@ class external_api {
}
} else {
try {
$result[$key] = self::validate_parameters($subdesc, $params[$key]);
$result[$key] = static::validate_parameters($subdesc, $params[$key]);
} catch (invalid_parameter_exception $e) {
//we are only interested by exceptions returned by validate_param() and validate_parameters()
//(in order to build the path to the faulty attribut)
@@ -346,7 +346,7 @@ class external_api {
}
$result = array();
foreach ($params as $param) {
$result[] = self::validate_parameters($description->content, $param);
$result[] = static::validate_parameters($description->content, $param);
}
return $result;
@@ -409,7 +409,7 @@ class external_api {
if ($subdesc instanceof external_value) {
if ($subdesc->required == VALUE_DEFAULT) {
try {
$result[$key] = self::clean_returnvalue($subdesc, $subdesc->default);
$result[$key] = static::clean_returnvalue($subdesc, $subdesc->default);
} catch (invalid_response_exception $e) {
//build the path to the faulty attribut
throw new invalid_response_exception($key." => ".$e->getMessage() . ': ' . $e->debuginfo);
@@ -418,7 +418,7 @@ class external_api {
}
} else {
try {
$result[$key] = self::clean_returnvalue($subdesc, $response[$key]);
$result[$key] = static::clean_returnvalue($subdesc, $response[$key]);
} catch (invalid_response_exception $e) {
//build the path to the faulty attribut
throw new invalid_response_exception($key." => ".$e->getMessage() . ': ' . $e->debuginfo);
@@ -436,7 +436,7 @@ class external_api {
}
$result = array();
foreach ($response as $param) {
$result[] = self::clean_returnvalue($description->content, $param);
$result[] = static::clean_returnvalue($description->content, $param);
}
return $result;