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

Adjust changelog, correct phpdoc, minor code style fixes

Browse Source
This commit is contained in:
Alexander Makarov
2020-07-07 14:40:16 +03:00
parent d62590807d
commit 38f038175f
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/base/Controller.php
View File

@ -9,6 +9,7 @@ namespace yii\base;
use Yii;
use yii\di\Instance;
use yii\di\NotInstantiableException;
/**
* Controller is the base class for classes containing controller logic.
@ -65,12 +66,12 @@ class Controller extends Component implements ViewContextInterface
*/
public $action;
/**
* @var Request|array|string The request
* @var Request|array|string The request.
* @since 2.0.36
*/
public $request = 'request';
/**
* @var Response|array|string
* @var Response|array|string The response.
* @since 2.0.36
*/
public $response = 'response';
@ -553,8 +554,8 @@ class Controller extends Component implements ViewContextInterface
* @param array &$args The array of arguments for the action, this function may append items to it.
* @param array &$requestedParams The array with requested params, this function may write specific keys to it.
* @throws ErrorException when we cannot load a required service.
* @throws \yii\base\InvalidConfigException Thrown when there is an error in the DI configuration.
* @throws \yii\di\NotInstantiableException Thrown when a definition cannot be resolved to a concrete class
* @throws InvalidConfigException Thrown when there is an error in the DI configuration.
* @throws NotInstantiableException Thrown when a definition cannot be resolved to a concrete class
* (for example an interface type hint) without a proper definition in the container.
* @since 2.0.36
*/

4
framework/base/ErrorHandler.php
View File

@ -42,8 +42,8 @@ abstract class ErrorHandler extends Component
*/
public $exception;
/**
* @var bool if TRUE - `handleException()` will finish script with `ExitCode::OK`.
* FALSE - `ExitCode::UNSPECIFIED_ERROR`.
* @var bool if true - `handleException()` will finish script with `ExitCode::OK`.
* false - `ExitCode::UNSPECIFIED_ERROR`.
* @since 2.0.36
*/
public $silentExitOnException;