mirror of
https://github.com/yiisoft/yii2.git
synced 2025-08-26 14:26:54 +08:00
release version 2.0.11
This commit is contained in:
@ -76,7 +76,7 @@
|
|||||||
"ezyang/htmlpurifier": "~4.6",
|
"ezyang/htmlpurifier": "~4.6",
|
||||||
"cebe/markdown": "~1.0.0 | ~1.1.0",
|
"cebe/markdown": "~1.0.0 | ~1.1.0",
|
||||||
"bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
|
"bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
|
||||||
"bower-asset/jquery.inputmask": "~3.2.2",
|
"bower-asset/jquery.inputmask": "~3.2.2 | ~3.3.3",
|
||||||
"bower-asset/punycode": "1.3.*",
|
"bower-asset/punycode": "1.3.*",
|
||||||
"bower-asset/yii2-pjax": "~2.0.1"
|
"bower-asset/yii2-pjax": "~2.0.1"
|
||||||
},
|
},
|
||||||
|
@ -93,7 +93,7 @@ class BaseYii
|
|||||||
*/
|
*/
|
||||||
public static function getVersion()
|
public static function getVersion()
|
||||||
{
|
{
|
||||||
return '2.0.11-dev';
|
return '2.0.11';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Yii Framework 2 Change Log
|
Yii Framework 2 Change Log
|
||||||
==========================
|
==========================
|
||||||
|
|
||||||
2.0.11 under development
|
2.0.11 February 01, 2017
|
||||||
------------------------
|
------------------------
|
||||||
|
|
||||||
- Bug #4113: Error page stacktrace was generating links to private methods which are not part of the API docs (samdark)
|
- Bug #4113: Error page stacktrace was generating links to private methods which are not part of the API docs (samdark)
|
||||||
|
@ -21,6 +21,7 @@ use Yii;
|
|||||||
* @property string $basePath The root directory of the application.
|
* @property string $basePath The root directory of the application.
|
||||||
* @property \yii\caching\Cache $cache The cache application component. Null if the component is not enabled.
|
* @property \yii\caching\Cache $cache The cache application component. Null if the component is not enabled.
|
||||||
* This property is read-only.
|
* This property is read-only.
|
||||||
|
* @property array $container Values given in terms of name-value pairs. This property is write-only.
|
||||||
* @property \yii\db\Connection $db The database connection. This property is read-only.
|
* @property \yii\db\Connection $db The database connection. This property is read-only.
|
||||||
* @property \yii\web\ErrorHandler|\yii\console\ErrorHandler $errorHandler The error handler application
|
* @property \yii\web\ErrorHandler|\yii\console\ErrorHandler $errorHandler The error handler application
|
||||||
* component. This property is read-only.
|
* component. This property is read-only.
|
||||||
|
@ -32,8 +32,9 @@ use yii\di\ServiceLocator;
|
|||||||
* @property string $layoutPath The root directory of layout files. Defaults to "[[viewPath]]/layouts".
|
* @property string $layoutPath The root directory of layout files. Defaults to "[[viewPath]]/layouts".
|
||||||
* @property array $modules The modules (indexed by their IDs).
|
* @property array $modules The modules (indexed by their IDs).
|
||||||
* @property string $uniqueId The unique ID of the module. This property is read-only.
|
* @property string $uniqueId The unique ID of the module. This property is read-only.
|
||||||
|
* @property string $version The version of this module. Note that the type of this property differs in getter
|
||||||
|
* and setter. See [[getVersion()]] and [[setVersion()]] for details.
|
||||||
* @property string $viewPath The root directory of view files. Defaults to "[[basePath]]/views".
|
* @property string $viewPath The root directory of view files. Defaults to "[[basePath]]/views".
|
||||||
* @property string|callable $version The version of this module.
|
|
||||||
*
|
*
|
||||||
* @author Qiang Xue <qiang.xue@gmail.com>
|
* @author Qiang Xue <qiang.xue@gmail.com>
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
|
@ -60,6 +60,7 @@ class Widget extends Component implements ViewContextInterface
|
|||||||
*/
|
*/
|
||||||
public static $stack = [];
|
public static $stack = [];
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes the object.
|
* Initializes the object.
|
||||||
* This method is called at the end of the constructor.
|
* This method is called at the end of the constructor.
|
||||||
@ -278,7 +279,7 @@ class Widget extends Component implements ViewContextInterface
|
|||||||
* }
|
* }
|
||||||
* ```
|
* ```
|
||||||
*
|
*
|
||||||
* @return boolean whether the widget should continue to be executed.
|
* @return bool whether the widget should continue to be executed.
|
||||||
* @since 2.0.11
|
* @since 2.0.11
|
||||||
*/
|
*/
|
||||||
public function beforeRun()
|
public function beforeRun()
|
||||||
|
@ -54,6 +54,7 @@ return [
|
|||||||
'yii\base\ViewNotFoundException' => YII2_PATH . '/base/ViewNotFoundException.php',
|
'yii\base\ViewNotFoundException' => YII2_PATH . '/base/ViewNotFoundException.php',
|
||||||
'yii\base\ViewRenderer' => YII2_PATH . '/base/ViewRenderer.php',
|
'yii\base\ViewRenderer' => YII2_PATH . '/base/ViewRenderer.php',
|
||||||
'yii\base\Widget' => YII2_PATH . '/base/Widget.php',
|
'yii\base\Widget' => YII2_PATH . '/base/Widget.php',
|
||||||
|
'yii\base\WidgetEvent' => YII2_PATH . '/base/WidgetEvent.php',
|
||||||
'yii\behaviors\AttributeBehavior' => YII2_PATH . '/behaviors/AttributeBehavior.php',
|
'yii\behaviors\AttributeBehavior' => YII2_PATH . '/behaviors/AttributeBehavior.php',
|
||||||
'yii\behaviors\AttributeTypecastBehavior' => YII2_PATH . '/behaviors/AttributeTypecastBehavior.php',
|
'yii\behaviors\AttributeTypecastBehavior' => YII2_PATH . '/behaviors/AttributeTypecastBehavior.php',
|
||||||
'yii\behaviors\BlameableBehavior' => YII2_PATH . '/behaviors/BlameableBehavior.php',
|
'yii\behaviors\BlameableBehavior' => YII2_PATH . '/behaviors/BlameableBehavior.php',
|
||||||
@ -142,6 +143,7 @@ return [
|
|||||||
'yii\filters\AccessRule' => YII2_PATH . '/filters/AccessRule.php',
|
'yii\filters\AccessRule' => YII2_PATH . '/filters/AccessRule.php',
|
||||||
'yii\filters\ContentNegotiator' => YII2_PATH . '/filters/ContentNegotiator.php',
|
'yii\filters\ContentNegotiator' => YII2_PATH . '/filters/ContentNegotiator.php',
|
||||||
'yii\filters\Cors' => YII2_PATH . '/filters/Cors.php',
|
'yii\filters\Cors' => YII2_PATH . '/filters/Cors.php',
|
||||||
|
'yii\filters\HostControl' => YII2_PATH . '/filters/HostControl.php',
|
||||||
'yii\filters\HttpCache' => YII2_PATH . '/filters/HttpCache.php',
|
'yii\filters\HttpCache' => YII2_PATH . '/filters/HttpCache.php',
|
||||||
'yii\filters\PageCache' => YII2_PATH . '/filters/PageCache.php',
|
'yii\filters\PageCache' => YII2_PATH . '/filters/PageCache.php',
|
||||||
'yii\filters\RateLimitInterface' => YII2_PATH . '/filters/RateLimitInterface.php',
|
'yii\filters\RateLimitInterface' => YII2_PATH . '/filters/RateLimitInterface.php',
|
||||||
@ -159,6 +161,7 @@ return [
|
|||||||
'yii\grid\DataColumn' => YII2_PATH . '/grid/DataColumn.php',
|
'yii\grid\DataColumn' => YII2_PATH . '/grid/DataColumn.php',
|
||||||
'yii\grid\GridView' => YII2_PATH . '/grid/GridView.php',
|
'yii\grid\GridView' => YII2_PATH . '/grid/GridView.php',
|
||||||
'yii\grid\GridViewAsset' => YII2_PATH . '/grid/GridViewAsset.php',
|
'yii\grid\GridViewAsset' => YII2_PATH . '/grid/GridViewAsset.php',
|
||||||
|
'yii\grid\RadioButtonColumn' => YII2_PATH . '/grid/RadioButtonColumn.php',
|
||||||
'yii\grid\SerialColumn' => YII2_PATH . '/grid/SerialColumn.php',
|
'yii\grid\SerialColumn' => YII2_PATH . '/grid/SerialColumn.php',
|
||||||
'yii\helpers\ArrayHelper' => YII2_PATH . '/helpers/ArrayHelper.php',
|
'yii\helpers\ArrayHelper' => YII2_PATH . '/helpers/ArrayHelper.php',
|
||||||
'yii\helpers\BaseArrayHelper' => YII2_PATH . '/helpers/BaseArrayHelper.php',
|
'yii\helpers\BaseArrayHelper' => YII2_PATH . '/helpers/BaseArrayHelper.php',
|
||||||
@ -299,6 +302,7 @@ return [
|
|||||||
'yii\web\MultipartFormDataParser' => YII2_PATH . '/web/MultipartFormDataParser.php',
|
'yii\web\MultipartFormDataParser' => YII2_PATH . '/web/MultipartFormDataParser.php',
|
||||||
'yii\web\NotAcceptableHttpException' => YII2_PATH . '/web/NotAcceptableHttpException.php',
|
'yii\web\NotAcceptableHttpException' => YII2_PATH . '/web/NotAcceptableHttpException.php',
|
||||||
'yii\web\NotFoundHttpException' => YII2_PATH . '/web/NotFoundHttpException.php',
|
'yii\web\NotFoundHttpException' => YII2_PATH . '/web/NotFoundHttpException.php',
|
||||||
|
'yii\web\RangeNotSatisfiableHttpException' => YII2_PATH . '/web/RangeNotSatisfiableHttpException.php',
|
||||||
'yii\web\Request' => YII2_PATH . '/web/Request.php',
|
'yii\web\Request' => YII2_PATH . '/web/Request.php',
|
||||||
'yii\web\RequestParserInterface' => YII2_PATH . '/web/RequestParserInterface.php',
|
'yii\web\RequestParserInterface' => YII2_PATH . '/web/RequestParserInterface.php',
|
||||||
'yii\web\Response' => YII2_PATH . '/web/Response.php',
|
'yii\web\Response' => YII2_PATH . '/web/Response.php',
|
||||||
|
@ -21,6 +21,7 @@ class UnknownCommandException extends Exception
|
|||||||
* @var string the name of the command that could not be recognized.
|
* @var string the name of the command that could not be recognized.
|
||||||
*/
|
*/
|
||||||
public $command;
|
public $command;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var Application
|
* @var Application
|
||||||
*/
|
*/
|
||||||
|
@ -23,8 +23,8 @@ use yii\base\InvalidParamException;
|
|||||||
* @property Pagination|false $pagination The pagination object. If this is false, it means the pagination is
|
* @property Pagination|false $pagination The pagination object. If this is false, it means the pagination is
|
||||||
* disabled. Note that the type of this property differs in getter and setter. See [[getPagination()]] and
|
* disabled. Note that the type of this property differs in getter and setter. See [[getPagination()]] and
|
||||||
* [[setPagination()]] for details.
|
* [[setPagination()]] for details.
|
||||||
* @property Sort|bool $sort The sorting object. If this is false, it means the sorting is disabled. Note
|
* @property Sort|bool $sort The sorting object. If this is false, it means the sorting is disabled. Note that
|
||||||
* that the type of this property differs in getter and setter. See [[getSort()]] and [[setSort()]] for details.
|
* the type of this property differs in getter and setter. See [[getSort()]] and [[setSort()]] for details.
|
||||||
* @property int $totalCount Total number of possible data models.
|
* @property int $totalCount Total number of possible data models.
|
||||||
*
|
*
|
||||||
* @author Qiang Xue <qiang.xue@gmail.com>
|
* @author Qiang Xue <qiang.xue@gmail.com>
|
||||||
|
@ -58,13 +58,13 @@ use yii\web\Request;
|
|||||||
*
|
*
|
||||||
* For more details and usage information on Pagination, see the [guide article on pagination](guide:output-pagination).
|
* For more details and usage information on Pagination, see the [guide article on pagination](guide:output-pagination).
|
||||||
*
|
*
|
||||||
* @property int $limit The limit of the data. This may be used to set the LIMIT value for a SQL statement
|
* @property int $limit The limit of the data. This may be used to set the LIMIT value for a SQL statement for
|
||||||
* for fetching the current page of data. Note that if the page size is infinite, a value -1 will be returned.
|
* fetching the current page of data. Note that if the page size is infinite, a value -1 will be returned. This
|
||||||
* This property is read-only.
|
* property is read-only.
|
||||||
* @property array $links The links for navigational purpose. The array keys specify the purpose of the links
|
* @property array $links The links for navigational purpose. The array keys specify the purpose of the links
|
||||||
* (e.g. [[LINK_FIRST]]), and the array values are the corresponding URLs. This property is read-only.
|
* (e.g. [[LINK_FIRST]]), and the array values are the corresponding URLs. This property is read-only.
|
||||||
* @property int $offset The offset of the data. This may be used to set the OFFSET value for a SQL
|
* @property int $offset The offset of the data. This may be used to set the OFFSET value for a SQL statement
|
||||||
* statement for fetching the current page of data. This property is read-only.
|
* for fetching the current page of data. This property is read-only.
|
||||||
* @property int $page The zero-based current page number.
|
* @property int $page The zero-based current page number.
|
||||||
* @property int $pageCount Number of pages. This property is read-only.
|
* @property int $pageCount Number of pages. This property is read-only.
|
||||||
* @property int $pageSize The number of items per page. If it is less than 1, it means the page size is
|
* @property int $pageSize The number of items per page. If it is less than 1, it means the page size is
|
||||||
|
@ -114,17 +114,18 @@ use yii\caching\Cache;
|
|||||||
* @property bool $isActive Whether the DB connection is established. This property is read-only.
|
* @property bool $isActive Whether the DB connection is established. This property is read-only.
|
||||||
* @property string $lastInsertID The row ID of the last row inserted, or the last value retrieved from the
|
* @property string $lastInsertID The row ID of the last row inserted, or the last value retrieved from the
|
||||||
* sequence object. This property is read-only.
|
* sequence object. This property is read-only.
|
||||||
|
* @property Connection $master The currently active master connection. `null` is returned if there is no
|
||||||
|
* master available. This property is read-only.
|
||||||
* @property PDO $masterPdo The PDO instance for the currently active master connection. This property is
|
* @property PDO $masterPdo The PDO instance for the currently active master connection. This property is
|
||||||
* read-only.
|
* read-only.
|
||||||
* @property QueryBuilder $queryBuilder The query builder for the current DB connection. This property is
|
* @property QueryBuilder $queryBuilder The query builder for the current DB connection. This property is
|
||||||
* read-only.
|
* read-only.
|
||||||
* @property Schema $schema The schema information for the database opened by this connection. This property
|
* @property Schema $schema The schema information for the database opened by this connection. This property
|
||||||
* is read-only.
|
* is read-only.
|
||||||
* @property Connection $master The currently active master connection. `null` is returned if there is no master
|
|
||||||
* @property Connection $slave The currently active slave connection. `null` is returned if there is no slave
|
* @property Connection $slave The currently active slave connection. `null` is returned if there is no slave
|
||||||
* available and `$fallbackToMaster` is false. This property is read-only.
|
* available and `$fallbackToMaster` is false. This property is read-only.
|
||||||
* @property PDO $slavePdo The PDO instance for the currently active slave connection. `null` is returned if no
|
* @property PDO $slavePdo The PDO instance for the currently active slave connection. `null` is returned if
|
||||||
* slave connection is available and `$fallbackToMaster` is false. This property is read-only.
|
* no slave connection is available and `$fallbackToMaster` is false. This property is read-only.
|
||||||
* @property Transaction $transaction The currently active transaction. Null if no active transaction. This
|
* @property Transaction $transaction The currently active transaction. Null if no active transaction. This
|
||||||
* property is read-only.
|
* property is read-only.
|
||||||
*
|
*
|
||||||
|
@ -259,7 +259,7 @@ interface QueryInterface
|
|||||||
* and so on, will return empty or false values.
|
* and so on, will return empty or false values.
|
||||||
* You should use this method in case your program logic indicates query should not return any results, like
|
* You should use this method in case your program logic indicates query should not return any results, like
|
||||||
* in case you set false where condition like `0=1`.
|
* in case you set false where condition like `0=1`.
|
||||||
* @param boolean $value whether to prevent query execution.
|
* @param bool $value whether to prevent query execution.
|
||||||
* @return $this the query object itself.
|
* @return $this the query object itself.
|
||||||
* @since 2.0.11
|
* @since 2.0.11
|
||||||
*/
|
*/
|
||||||
|
@ -401,7 +401,7 @@ trait QueryTrait
|
|||||||
* and so on, will return empty or false values.
|
* and so on, will return empty or false values.
|
||||||
* You should use this method in case your program logic indicates query should not return any results, like
|
* You should use this method in case your program logic indicates query should not return any results, like
|
||||||
* in case you set false where condition like `0=1`.
|
* in case you set false where condition like `0=1`.
|
||||||
* @param boolean $value whether to prevent query execution.
|
* @param bool $value whether to prevent query execution.
|
||||||
* @return $this the query object itself.
|
* @return $this the query object itself.
|
||||||
* @since 2.0.11
|
* @since 2.0.11
|
||||||
*/
|
*/
|
||||||
|
@ -74,7 +74,6 @@ abstract class Schema extends Object
|
|||||||
public $exceptionMap = [
|
public $exceptionMap = [
|
||||||
'SQLSTATE[23' => 'yii\db\IntegrityException',
|
'SQLSTATE[23' => 'yii\db\IntegrityException',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string column schema class
|
* @var string column schema class
|
||||||
* @since 2.0.11
|
* @since 2.0.11
|
||||||
|
@ -38,8 +38,8 @@ use yii\base\InvalidConfigException;
|
|||||||
* > with PHP 5.x and PHP 7.x. `\Exception` implements the [`\Throwable` interface](http://php.net/manual/en/class.throwable.php)
|
* > with PHP 5.x and PHP 7.x. `\Exception` implements the [`\Throwable` interface](http://php.net/manual/en/class.throwable.php)
|
||||||
* > since PHP 7.0, so you can skip the part with `\Exception` if your app uses only PHP 7.0 and higher.
|
* > since PHP 7.0, so you can skip the part with `\Exception` if your app uses only PHP 7.0 and higher.
|
||||||
*
|
*
|
||||||
* @property bool $isActive Whether this transaction is active. Only an active transaction can [[commit()]]
|
* @property bool $isActive Whether this transaction is active. Only an active transaction can [[commit()]] or
|
||||||
* or [[rollBack()]]. This property is read-only.
|
* [[rollBack()]]. This property is read-only.
|
||||||
* @property string $isolationLevel The transaction isolation level to use for this transaction. This can be
|
* @property string $isolationLevel The transaction isolation level to use for this transaction. This can be
|
||||||
* one of [[READ_UNCOMMITTED]], [[READ_COMMITTED]], [[REPEATABLE_READ]] and [[SERIALIZABLE]] but also a string
|
* one of [[READ_UNCOMMITTED]], [[READ_COMMITTED]], [[REPEATABLE_READ]] and [[SERIALIZABLE]] but also a string
|
||||||
* containing DBMS specific syntax to be used after `SET TRANSACTION ISOLATION LEVEL`. This property is
|
* containing DBMS specific syntax to be used after `SET TRANSACTION ISOLATION LEVEL`. This property is
|
||||||
|
@ -573,10 +573,10 @@ class Container extends Component
|
|||||||
* @param array $definitions array of definitions. There are two allowed formats of array.
|
* @param array $definitions array of definitions. There are two allowed formats of array.
|
||||||
* The first format:
|
* The first format:
|
||||||
* - key: class name, interface name or alias name. The key will be passed to the [[set()]] method
|
* - key: class name, interface name or alias name. The key will be passed to the [[set()]] method
|
||||||
* as a first argument `$class`.
|
* as a first argument `$class`.
|
||||||
* - value: the definition associated with `$class`. Possible values are described in
|
* - value: the definition associated with `$class`. Possible values are described in
|
||||||
* [[set()]] documentation for the `$definition` parameter. Will be passed to the [[set()]] method
|
* [[set()]] documentation for the `$definition` parameter. Will be passed to the [[set()]] method
|
||||||
* as the second argument `$definition`.
|
* as the second argument `$definition`.
|
||||||
*
|
*
|
||||||
* Example:
|
* Example:
|
||||||
* ```php
|
* ```php
|
||||||
@ -596,9 +596,9 @@ class Container extends Component
|
|||||||
*
|
*
|
||||||
* The second format:
|
* The second format:
|
||||||
* - key: class name, interface name or alias name. The key will be passed to the [[set()]] method
|
* - key: class name, interface name or alias name. The key will be passed to the [[set()]] method
|
||||||
* as a first argument `$class`.
|
* as a first argument `$class`.
|
||||||
* - value: array of two elements. The first element will be passed the [[set()]] method as the
|
* - value: array of two elements. The first element will be passed the [[set()]] method as the
|
||||||
* second argument `$definition`, the second one — as `$params`.
|
* second argument `$definition`, the second one — as `$params`.
|
||||||
*
|
*
|
||||||
* Example:
|
* Example:
|
||||||
* ```php
|
* ```php
|
||||||
|
@ -663,7 +663,7 @@ class BaseHtml
|
|||||||
* The following special options are recognized:
|
* The following special options are recognized:
|
||||||
*
|
*
|
||||||
* - `doubleEncode`: whether to double encode HTML entities in `$value`. If `false`, HTML entities in `$value` will not
|
* - `doubleEncode`: whether to double encode HTML entities in `$value`. If `false`, HTML entities in `$value` will not
|
||||||
* be further encoded. This option is available since version 2.0.11.
|
* be further encoded. This option is available since version 2.0.11.
|
||||||
*
|
*
|
||||||
* @return string the generated text area tag
|
* @return string the generated text area tag
|
||||||
*/
|
*/
|
||||||
|
@ -35,7 +35,8 @@ use yii\base\Component;
|
|||||||
* @property float $elapsedTime The total elapsed time in seconds for current request. This property is
|
* @property float $elapsedTime The total elapsed time in seconds for current request. This property is
|
||||||
* read-only.
|
* read-only.
|
||||||
* @property array $profiling The profiling results. Each element is an array consisting of these elements:
|
* @property array $profiling The profiling results. Each element is an array consisting of these elements:
|
||||||
* `info`, `category`, `timestamp`, `trace`, `level`, `duration`, `memory`, `memoryDiff`. This property is read-only.
|
* `info`, `category`, `timestamp`, `trace`, `level`, `duration`, `memory`, `memoryDiff`. The `memory` and
|
||||||
|
* `memoryDiff` values are available since version 2.0.11. This property is read-only.
|
||||||
*
|
*
|
||||||
* @author Qiang Xue <qiang.xue@gmail.com>
|
* @author Qiang Xue <qiang.xue@gmail.com>
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
|
@ -47,6 +47,7 @@ class SyslogTarget extends Target
|
|||||||
Logger::LEVEL_ERROR => LOG_ERR,
|
Logger::LEVEL_ERROR => LOG_ERR,
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritdoc
|
* @inheritdoc
|
||||||
*/
|
*/
|
||||||
|
@ -64,13 +64,13 @@ class ExistValidator extends Validator
|
|||||||
* @var bool whether to allow array type attribute.
|
* @var bool whether to allow array type attribute.
|
||||||
*/
|
*/
|
||||||
public $allowArray = false;
|
public $allowArray = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string and|or define how target attributes are related
|
* @var string and|or define how target attributes are related
|
||||||
* @since 2.0.11
|
* @since 2.0.11
|
||||||
*/
|
*/
|
||||||
public $targetAttributeJunction = 'and';
|
public $targetAttributeJunction = 'and';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritdoc
|
* @inheritdoc
|
||||||
*/
|
*/
|
||||||
|
@ -83,13 +83,13 @@ class UniqueValidator extends Validator
|
|||||||
* to setup custom message for multiple target attributes.
|
* to setup custom message for multiple target attributes.
|
||||||
*/
|
*/
|
||||||
public $comboNotUnique;
|
public $comboNotUnique;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var string and|or define how target attributes are related
|
* @var string and|or define how target attributes are related
|
||||||
* @since 2.0.11
|
* @since 2.0.11
|
||||||
*/
|
*/
|
||||||
public $targetAttributeJunction = 'and';
|
public $targetAttributeJunction = 'and';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @inheritdoc
|
* @inheritdoc
|
||||||
*/
|
*/
|
||||||
@ -218,7 +218,7 @@ class UniqueValidator extends Validator
|
|||||||
* If the key and the value are the same, you can just specify the value.
|
* If the key and the value are the same, you can just specify the value.
|
||||||
* @param Model $model the data model to be validated
|
* @param Model $model the data model to be validated
|
||||||
* @param string $attribute the name of the attribute to be validated in the $model
|
* @param string $attribute the name of the attribute to be validated in the $model
|
||||||
|
*
|
||||||
* @return array conditions, compatible with [[\yii\db\Query::where()|Query::where()]] key-value format.
|
* @return array conditions, compatible with [[\yii\db\Query::where()|Query::where()]] key-value format.
|
||||||
*/
|
*/
|
||||||
private function prepareConditions($targetAttribute, $model, $attribute)
|
private function prepareConditions($targetAttribute, $model, $attribute)
|
||||||
|
@ -66,6 +66,7 @@ class ErrorAction extends Action
|
|||||||
* Defaults to "An internal server error occurred.".
|
* Defaults to "An internal server error occurred.".
|
||||||
*/
|
*/
|
||||||
public $defaultMessage;
|
public $defaultMessage;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var \Exception the exception object, normally is filled on [[init()]] method call.
|
* @var \Exception the exception object, normally is filled on [[init()]] method call.
|
||||||
* @see [[findException()]] to know default way of obtaining exception.
|
* @see [[findException()]] to know default way of obtaining exception.
|
||||||
@ -73,6 +74,7 @@ class ErrorAction extends Action
|
|||||||
*/
|
*/
|
||||||
protected $exception;
|
protected $exception;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@inheritdoc}
|
* {@inheritdoc}
|
||||||
*/
|
*/
|
||||||
|
@ -25,7 +25,7 @@ class RangeNotSatisfiableHttpException extends HttpException
|
|||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
* @param string $message error message
|
* @param string $message error message
|
||||||
* @param integer $code error code
|
* @param int $code error code
|
||||||
* @param \Exception $previous The previous exception used for the exception chaining.
|
* @param \Exception $previous The previous exception used for the exception chaining.
|
||||||
*/
|
*/
|
||||||
public function __construct($message = null, $code = 0, \Exception $previous = null)
|
public function __construct($message = null, $code = 0, \Exception $previous = null)
|
||||||
|
@ -44,13 +44,13 @@ use yii\helpers\StringHelper;
|
|||||||
* @property array $eTags The entity tags. This property is read-only.
|
* @property array $eTags The entity tags. This property is read-only.
|
||||||
* @property HeaderCollection $headers The header collection. This property is read-only.
|
* @property HeaderCollection $headers The header collection. This property is read-only.
|
||||||
* @property string|null $hostInfo Schema and hostname part (with port number if needed) of the request URL
|
* @property string|null $hostInfo Schema and hostname part (with port number if needed) of the request URL
|
||||||
* (e.g. `http://www.yiiframework.com`), null if can't be obtained from `$_SERVER` and wasn't set.
|
* (e.g. `http://www.yiiframework.com`), null if can't be obtained from `$_SERVER` and wasn't set. See
|
||||||
|
* [[getHostInfo()]] for security related notes on this property.
|
||||||
* @property string|null $hostName Hostname part of the request URL (e.g. `www.yiiframework.com`). This
|
* @property string|null $hostName Hostname part of the request URL (e.g. `www.yiiframework.com`). This
|
||||||
* property is read-only.
|
* property is read-only.
|
||||||
* @property bool $isAjax Whether this is an AJAX (XMLHttpRequest) request. This property is read-only.
|
* @property bool $isAjax Whether this is an AJAX (XMLHttpRequest) request. This property is read-only.
|
||||||
* @property bool $isDelete Whether this is a DELETE request. This property is read-only.
|
* @property bool $isDelete Whether this is a DELETE request. This property is read-only.
|
||||||
* @property bool $isFlash Whether this is an Adobe Flash or Adobe Flex request. This property is
|
* @property bool $isFlash Whether this is an Adobe Flash or Adobe Flex request. This property is read-only.
|
||||||
* read-only.
|
|
||||||
* @property bool $isGet Whether this is a GET request. This property is read-only.
|
* @property bool $isGet Whether this is a GET request. This property is read-only.
|
||||||
* @property bool $isHead Whether this is a HEAD request. This property is read-only.
|
* @property bool $isHead Whether this is a HEAD request. This property is read-only.
|
||||||
* @property bool $isOptions Whether this is a OPTIONS request. This property is read-only.
|
* @property bool $isOptions Whether this is a OPTIONS request. This property is read-only.
|
||||||
|
@ -40,19 +40,17 @@ use yii\helpers\StringHelper;
|
|||||||
* @property CookieCollection $cookies The cookie collection. This property is read-only.
|
* @property CookieCollection $cookies The cookie collection. This property is read-only.
|
||||||
* @property string $downloadHeaders The attachment file name. This property is write-only.
|
* @property string $downloadHeaders The attachment file name. This property is write-only.
|
||||||
* @property HeaderCollection $headers The header collection. This property is read-only.
|
* @property HeaderCollection $headers The header collection. This property is read-only.
|
||||||
* @property bool $isClientError Whether this response indicates a client error. This property is
|
* @property bool $isClientError Whether this response indicates a client error. This property is read-only.
|
||||||
* read-only.
|
|
||||||
* @property bool $isEmpty Whether this response is empty. This property is read-only.
|
* @property bool $isEmpty Whether this response is empty. This property is read-only.
|
||||||
* @property bool $isForbidden Whether this response indicates the current request is forbidden. This
|
* @property bool $isForbidden Whether this response indicates the current request is forbidden. This property
|
||||||
* property is read-only.
|
* is read-only.
|
||||||
* @property bool $isInformational Whether this response is informational. This property is read-only.
|
* @property bool $isInformational Whether this response is informational. This property is read-only.
|
||||||
* @property bool $isInvalid Whether this response has a valid [[statusCode]]. This property is read-only.
|
* @property bool $isInvalid Whether this response has a valid [[statusCode]]. This property is read-only.
|
||||||
* @property bool $isNotFound Whether this response indicates the currently requested resource is not
|
* @property bool $isNotFound Whether this response indicates the currently requested resource is not found.
|
||||||
* found. This property is read-only.
|
* This property is read-only.
|
||||||
* @property bool $isOk Whether this response is OK. This property is read-only.
|
* @property bool $isOk Whether this response is OK. This property is read-only.
|
||||||
* @property bool $isRedirection Whether this response is a redirection. This property is read-only.
|
* @property bool $isRedirection Whether this response is a redirection. This property is read-only.
|
||||||
* @property bool $isServerError Whether this response indicates a server error. This property is
|
* @property bool $isServerError Whether this response indicates a server error. This property is read-only.
|
||||||
* read-only.
|
|
||||||
* @property bool $isSuccessful Whether this response is successful. This property is read-only.
|
* @property bool $isSuccessful Whether this response is successful. This property is read-only.
|
||||||
* @property int $statusCode The HTTP status code to send with the response.
|
* @property int $statusCode The HTTP status code to send with the response.
|
||||||
*
|
*
|
||||||
|
@ -61,10 +61,9 @@ use yii\base\InvalidParamException;
|
|||||||
* read-only.
|
* read-only.
|
||||||
* @property string $name The current session name.
|
* @property string $name The current session name.
|
||||||
* @property string $savePath The current session save path, defaults to '/tmp'.
|
* @property string $savePath The current session save path, defaults to '/tmp'.
|
||||||
* @property int $timeout The number of seconds after which data will be seen as 'garbage' and cleaned up.
|
* @property int $timeout The number of seconds after which data will be seen as 'garbage' and cleaned up. The
|
||||||
* The default value is 1440 seconds (or the value of "session.gc_maxlifetime" set in php.ini).
|
* default value is 1440 seconds (or the value of "session.gc_maxlifetime" set in php.ini).
|
||||||
* @property bool|null $useCookies The value indicating whether cookies should be used to store session
|
* @property bool|null $useCookies The value indicating whether cookies should be used to store session IDs.
|
||||||
* IDs.
|
|
||||||
* @property bool $useCustomStorage Whether to use custom storage. This property is read-only.
|
* @property bool $useCustomStorage Whether to use custom storage. This property is read-only.
|
||||||
* @property bool $useTransparentSessionID Whether transparent sid support is enabled or not, defaults to
|
* @property bool $useTransparentSessionID Whether transparent sid support is enabled or not, defaults to
|
||||||
* false.
|
* false.
|
||||||
|
@ -38,7 +38,7 @@ use yii\helpers\Url;
|
|||||||
* For more details and usage information on UrlManager, see the [guide article on routing](guide:runtime-routing).
|
* For more details and usage information on UrlManager, see the [guide article on routing](guide:runtime-routing).
|
||||||
*
|
*
|
||||||
* @property string $baseUrl The base URL that is used by [[createUrl()]] to prepend to created URLs.
|
* @property string $baseUrl The base URL that is used by [[createUrl()]] to prepend to created URLs.
|
||||||
* @property string $hostInfo The host info (e.g. "http://www.example.com") that is used by
|
* @property string $hostInfo The host info (e.g. `http://www.example.com`) that is used by
|
||||||
* [[createAbsoluteUrl()]] to prepend to created URLs.
|
* [[createAbsoluteUrl()]] to prepend to created URLs.
|
||||||
* @property string $scriptUrl The entry script URL that is used by [[createUrl()]] to prepend to created
|
* @property string $scriptUrl The entry script URL that is used by [[createUrl()]] to prepend to created
|
||||||
* URLs.
|
* URLs.
|
||||||
|
@ -126,6 +126,7 @@ class UrlRule extends Object implements UrlRuleInterface
|
|||||||
*/
|
*/
|
||||||
private $_routeParams = [];
|
private $_routeParams = [];
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return string
|
* @return string
|
||||||
* @since 2.0.11
|
* @since 2.0.11
|
||||||
|
@ -46,8 +46,8 @@ use yii\rbac\CheckAccessInterface;
|
|||||||
* ]
|
* ]
|
||||||
* ```
|
* ```
|
||||||
*
|
*
|
||||||
* @property string|int $id The unique identifier for the user. If `null`, it means the user is a guest.
|
* @property string|int $id The unique identifier for the user. If `null`, it means the user is a guest. This
|
||||||
* This property is read-only.
|
* property is read-only.
|
||||||
* @property IdentityInterface|null $identity The identity object associated with the currently logged-in
|
* @property IdentityInterface|null $identity The identity object associated with the currently logged-in
|
||||||
* user. `null` is returned if the user is not logged in (not authenticated).
|
* user. `null` is returned if the user is not logged in (not authenticated).
|
||||||
* @property bool $isGuest Whether the current user is a guest. This property is read-only.
|
* @property bool $isGuest Whether the current user is a guest. This property is read-only.
|
||||||
@ -226,7 +226,7 @@ class User extends Component
|
|||||||
* - the identity information will be stored in session and be available in the next requests
|
* - the identity information will be stored in session and be available in the next requests
|
||||||
* - in case of `$duration == 0`: as long as the session remains active or till the user closes the browser
|
* - in case of `$duration == 0`: as long as the session remains active or till the user closes the browser
|
||||||
* - in case of `$duration > 0`: as long as the session remains active or as long as the cookie
|
* - in case of `$duration > 0`: as long as the session remains active or as long as the cookie
|
||||||
* remains valid by it's `$duration` in seconds when [[enableAutoLogin]] is set `true`.
|
* remains valid by it's `$duration` in seconds when [[enableAutoLogin]] is set `true`.
|
||||||
*
|
*
|
||||||
* If [[enableSession]] is `false`:
|
* If [[enableSession]] is `false`:
|
||||||
* - the `$duration` parameter will be ignored
|
* - the `$duration` parameter will be ignored
|
||||||
|
@ -56,6 +56,7 @@ class XmlResponseFormatter extends Component implements ResponseFormatterInterfa
|
|||||||
*/
|
*/
|
||||||
public $useObjectTags = true;
|
public $useObjectTags = true;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Formats the specified response.
|
* Formats the specified response.
|
||||||
* @param Response $response the response to be formatted.
|
* @param Response $response the response to be formatted.
|
||||||
|
@ -163,6 +163,7 @@ class ActiveField extends Component
|
|||||||
*/
|
*/
|
||||||
private $_skipLabelFor = false;
|
private $_skipLabelFor = false;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* PHP magic method that returns the string representation of this object.
|
* PHP magic method that returns the string representation of this object.
|
||||||
* @return string the string representation of this object.
|
* @return string the string representation of this object.
|
||||||
|
@ -75,7 +75,6 @@ class LinkPager extends Widget
|
|||||||
* @var string the CSS class for the disabled page buttons.
|
* @var string the CSS class for the disabled page buttons.
|
||||||
*/
|
*/
|
||||||
public $disabledPageCssClass = 'disabled';
|
public $disabledPageCssClass = 'disabled';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var array the options for the disabled tag to be generated inside the disabled list element.
|
* @var array the options for the disabled tag to be generated inside the disabled list element.
|
||||||
* In order to customize the html tag, please use the tag key.
|
* In order to customize the html tag, please use the tag key.
|
||||||
@ -86,7 +85,6 @@ class LinkPager extends Widget
|
|||||||
* @since 2.0.11
|
* @since 2.0.11
|
||||||
*/
|
*/
|
||||||
public $disabledListItemSubTagOptions = [];
|
public $disabledListItemSubTagOptions = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @var int maximum number of page buttons that can be displayed. Defaults to 10.
|
* @var int maximum number of page buttons that can be displayed. Defaults to 10.
|
||||||
*/
|
*/
|
||||||
|
@ -105,6 +105,7 @@ class ListView extends BaseListView
|
|||||||
*/
|
*/
|
||||||
public $afterItem;
|
public $afterItem;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Renders all data models.
|
* Renders all data models.
|
||||||
* @return string the rendering result
|
* @return string the rendering result
|
||||||
|
Reference in New Issue
Block a user