"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "framework/console/Controller.php" between
yii2-2.0.36.tar.gz and yii2-2.0.37.tar.gz

About: Yii 2 is a high-performance component-based PHP framework for developing large-scale Web applications (source).

Controller.php  (yii2-2.0.36):Controller.php  (yii2-2.0.37)
skipping to change at line 37 skipping to change at line 37
* *
* where `<route>` is a route to a controller action and the params will be popu lated as properties of a command. * where `<route>` is a route to a controller action and the params will be popu lated as properties of a command.
* See [[options()]] for details. * See [[options()]] for details.
* *
* @property string $help This property is read-only. * @property string $help This property is read-only.
* @property string $helpSummary This property is read-only. * @property string $helpSummary This property is read-only.
* @property array $passedOptionValues The properties corresponding to the passe d options. This property is * @property array $passedOptionValues The properties corresponding to the passe d options. This property is
* read-only. * read-only.
* @property array $passedOptions The names of the options passed during executi on. This property is * @property array $passedOptions The names of the options passed during executi on. This property is
* read-only. * read-only.
* @property Request $request
* @property Response $response
* *
* @author Qiang Xue <qiang.xue@gmail.com> * @author Qiang Xue <qiang.xue@gmail.com>
* @since 2.0 * @since 2.0
*/ */
class Controller extends \yii\base\Controller class Controller extends \yii\base\Controller
{ {
/** /**
* @deprecated since 2.0.13. Use [[ExitCode::OK]] instead. * @deprecated since 2.0.13. Use [[ExitCode::OK]] instead.
*/ */
const EXIT_CODE_NORMAL = 0; const EXIT_CODE_NORMAL = 0;
skipping to change at line 242 skipping to change at line 240
if (!empty($missing)) { if (!empty($missing)) {
throw new Exception(Yii::t('yii', 'Missing required arguments: {para ms}', ['params' => implode(', ', $missing)])); throw new Exception(Yii::t('yii', 'Missing required arguments: {para ms}', ['params' => implode(', ', $missing)]));
} }
// We use a different array here, specifically one that doesn't contain service instances but descriptions instead. // We use a different array here, specifically one that doesn't contain service instances but descriptions instead.
if (\Yii::$app->requestedParams === null) { if (\Yii::$app->requestedParams === null) {
\Yii::$app->requestedParams = array_merge($actionParams, $requestedP arams); \Yii::$app->requestedParams = array_merge($actionParams, $requestedP arams);
} }
return $args; return array_merge($args, $params);
} }
/** /**
* Formats a string with ANSI codes. * Formats a string with ANSI codes.
* *
* You may pass additional parameters using the constants defined in [[\yii\ helpers\Console]]. * You may pass additional parameters using the constants defined in [[\yii\ helpers\Console]].
* *
* Example: * Example:
* *
* ``` * ```
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)