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

fix #9823

Browse Source
This commit is contained in:
mdmunir
2015-10-03 23:00:46 +07:00
parent 3ab36501c2
commit 3accf52ddb
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/console/Controller.php
View File

@ -113,23 +113,23 @@ class Controller extends \yii\base\Controller
$args = [];
$missing = [];
foreach ($method->getParameters() as $i => $param) {
foreach ($method->getParameters() as $param) {
if (($class = $param->getClass()) !== null) {
$name = $param->getName();
$className = $class->getName();
if (Yii::$app->has($name) && ($obj = Yii::$app->get($name)) instanceof $className) {
$args[$i] = $obj;
$args[] = $obj;
} else {
$args[$i] = Yii::$container->get($className);
$args[] = Yii::$container->get($className);
}
continue;
}
$value = array_shift($params);
if (isset($value)) {
$args[$i] = $param->isArray() ? preg_split('/\s*,\s*/', $value) : $value;
$args[] = $param->isArray() ? preg_split('/\s*,\s*/', $value) : $value;
} else {
if ($param->isDefaultValueAvailable()) {
$args[$i] = $param->getDefaultValue();
$args[] = $param->getDefaultValue();
} else {
$missing[] = $param->getName();
}
@ -140,6 +140,10 @@ class Controller extends \yii\base\Controller
throw new Exception(Yii::t('yii', 'Missing required arguments: {params}', ['params' => implode(', ', $missing)]));
}
// #9823
foreach ($params as $value) {
$args[] = $value;
}
return $args;
}

9
tests/framework/console/ControllerTest.php
View File

@ -78,9 +78,18 @@ class ControllerTest extends TestCase
$result = $controller->runAction('aksi6', $params);
$this->assertEquals(['mdmunir', false, true], $result);
$params = ['arg1', 'arg2', 'arg3'];
$result = $controller->runAction('aksi8', $params);
$this->assertEquals($params, $result);
$params = ['arg1', 'arg2', 'arg3'];
$result = $controller->runAction('aksi9', $params);
$this->assertEquals(['arg1', 'arg2', Yii::$app->quxApp, 'arg3'], $result);
$params = ['avaliable'];
$message = Yii::t('yii', 'Missing required arguments: {params}', ['params' => implode(', ', ['missing'])]);
$this->setExpectedException('yii\console\Exception', $message);
$result = $controller->runAction('aksi7', $params);
}
}

10
tests/framework/console/FakeController.php
View File

@ -53,4 +53,14 @@ class FakeController extends Controller
{
}
public function actionAksi8($arg1, $arg2)
{
return func_get_args();
}
public function actionAksi9($arg1, $arg2, QuxInterface $quxApp)
{
return func_get_args();
}
}