php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-18 07:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #1156: action parameter binding now checks for array type.

Browse Source
This commit is contained in:
Qiang Xue
2013-11-08 23:21:41 -05:00
parent abb349361b
commit dbecf848f4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/yii/web/Controller.php
View File

@@ -41,7 +41,7 @@ class Controller extends \yii\base\Controller
* @param \yii\base\Action $action the action to be bound with parameters * @param \yii\base\Action $action the action to be bound with parameters
* @param array $params the parameters to be bound to the action * @param array $params the parameters to be bound to the action
* @return array the valid parameters that the action can run with. * @return array the valid parameters that the action can run with.
* @throws HttpException if there are missing parameters. * @throws HttpException if there are missing or invalid parameters.
*/ */
public function bindActionParams($action, $params) public function bindActionParams($action, $params)
{ {
@@ -57,7 +57,15 @@ class Controller extends \yii\base\Controller
foreach ($method->getParameters() as $param) { foreach ($method->getParameters() as $param) {
$name = $param->getName(); $name = $param->getName();
if (array_key_exists($name, $params)) { if (array_key_exists($name, $params)) {
$args[] = $actionParams[$name] = $params[$name]; if ($param->isArray()) {
$args[] = $actionParams[$name] = is_array($params[$name]) ? $params[$name] : [$params[$name]];
} elseif (!is_array($params[$name])) {
$args[] = $actionParams[$name] = $params[$name];
} else {
throw new HttpException(400, Yii::t('yii', 'Invalid data received for parameter "{param}".', [
'param' => $name,
]));
}
unset($params[$name]); unset($params[$name]);
} elseif ($param->isDefaultValueAvailable()) { } elseif ($param->isDefaultValueAvailable()) {
$args[] = $actionParams[$name] = $param->getDefaultValue(); $args[] = $actionParams[$name] = $param->getDefaultValue();