Skip to content

Commit

Permalink
release version 2.0.11
Browse files Browse the repository at this point in the history
  • Loading branch information
cebe committed Feb 1, 2017
1 parent bd59d8f commit c19b2f7
Show file tree
Hide file tree
Showing 45 changed files with 80 additions and 69 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"ezyang/htmlpurifier": "~4.6",
"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.inputmask": "~3.2.2",
"bower-asset/jquery.inputmask": "~3.2.2 | ~3.3.3",
"bower-asset/punycode": "1.3.*",
"bower-asset/yii2-pjax": "~2.0.1"
},
Expand Down
2 changes: 1 addition & 1 deletion framework/BaseYii.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class BaseYii
*/
public static function getVersion()
{
return '2.0.11-dev';
return '2.0.11';
}

/**
Expand Down
2 changes: 1 addition & 1 deletion framework/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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)
Expand Down
1 change: 1 addition & 0 deletions framework/base/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* @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.
* 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\web\ErrorHandler|\yii\console\ErrorHandler $errorHandler The error handler application
* component. This property is read-only.
Expand Down
3 changes: 2 additions & 1 deletion framework/base/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@
* @property string $layoutPath The root directory of layout files. Defaults to "[[viewPath]]/layouts".
* @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 $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|callable $version The version of this module.
*
* @author Qiang Xue <[email protected]>
* @since 2.0
Expand Down
9 changes: 5 additions & 4 deletions framework/base/Widget.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Widget extends Component implements ViewContextInterface
/**
* @event Event an event that is triggered when the widget is initialized via [[init()]].
* @since 2.0.11
*/
*/
const EVENT_INIT = 'init';
/**
* @event WidgetEvent an event raised right before executing a widget.
Expand All @@ -42,7 +42,7 @@ class Widget extends Component implements ViewContextInterface
* @since 2.0.11
*/
const EVENT_AFTER_RUN = 'afterRun';

/**
* @var int a counter used to generate [[id]] for widgets.
* @internal
Expand All @@ -60,11 +60,12 @@ class Widget extends Component implements ViewContextInterface
*/
public static $stack = [];


/**
* Initializes the object.
* This method is called at the end of the constructor.
* The default implementation will trigger an [[EVENT_INIT]] event.
*/
*/
public function init()
{
parent::init();
Expand Down Expand Up @@ -278,7 +279,7 @@ public function getViewPath()
* }
* ```
*
* @return boolean whether the widget should continue to be executed.
* @return bool whether the widget should continue to be executed.
* @since 2.0.11
*/
public function beforeRun()
Expand Down
2 changes: 1 addition & 1 deletion framework/caching/Dependency.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the actual dependency data.
*
* For more details and usage information on Cache, see the [guide article on caching](guide:caching-overview).
*
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/caching/ExpressionDependency.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* please refer to the [php manual](http://www.php.net/manual/en/language.expressions.php).
*
* For more details and usage information on Cache, see the [guide article on caching](guide:caching-overview).
*
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/caching/MemCacheServer.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* of each configuration property.
*
* For more details and usage information on Cache, see the [guide article on caching](guide:caching-overview).
*
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/caching/WinCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* See [[Cache]] manual for common cache operations that are supported by WinCache.
*
* For more details and usage information on Cache, see the [guide article on caching](guide:caching-overview).
*
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/caching/XCache.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* See [[Cache]] for common cache operations that XCache supports.
*
* For more details and usage information on Cache, see the [guide article on caching](guide:caching-overview).
*
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
Expand Down
4 changes: 4 additions & 0 deletions framework/classes.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
'yii\base\ViewNotFoundException' => YII2_PATH . '/base/ViewNotFoundException.php',
'yii\base\ViewRenderer' => YII2_PATH . '/base/ViewRenderer.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\AttributeTypecastBehavior' => YII2_PATH . '/behaviors/AttributeTypecastBehavior.php',
'yii\behaviors\BlameableBehavior' => YII2_PATH . '/behaviors/BlameableBehavior.php',
Expand Down Expand Up @@ -142,6 +143,7 @@
'yii\filters\AccessRule' => YII2_PATH . '/filters/AccessRule.php',
'yii\filters\ContentNegotiator' => YII2_PATH . '/filters/ContentNegotiator.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\PageCache' => YII2_PATH . '/filters/PageCache.php',
'yii\filters\RateLimitInterface' => YII2_PATH . '/filters/RateLimitInterface.php',
Expand All @@ -159,6 +161,7 @@
'yii\grid\DataColumn' => YII2_PATH . '/grid/DataColumn.php',
'yii\grid\GridView' => YII2_PATH . '/grid/GridView.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\helpers\ArrayHelper' => YII2_PATH . '/helpers/ArrayHelper.php',
'yii\helpers\BaseArrayHelper' => YII2_PATH . '/helpers/BaseArrayHelper.php',
Expand Down Expand Up @@ -299,6 +302,7 @@
'yii\web\MultipartFormDataParser' => YII2_PATH . '/web/MultipartFormDataParser.php',
'yii\web\NotAcceptableHttpException' => YII2_PATH . '/web/NotAcceptableHttpException.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\RequestParserInterface' => YII2_PATH . '/web/RequestParserInterface.php',
'yii\web\Response' => YII2_PATH . '/web/Response.php',
Expand Down
1 change: 1 addition & 0 deletions framework/console/UnknownCommandException.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class UnknownCommandException extends Exception
* @var string the name of the command that could not be recognized.
*/
public $command;

/**
* @var Application
*/
Expand Down
4 changes: 2 additions & 2 deletions framework/data/BaseDataProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
* @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
* [[setPagination()]] for details.
* @property Sort|bool $sort The sorting object. If this is false, it means the sorting is disabled. Note
* that the type of this property differs in getter and setter. See [[getSort()]] and [[setSort()]] for details.
* @property Sort|bool $sort The sorting object. If this is false, it means the sorting is disabled. Note that
* 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.
*
* @author Qiang Xue <[email protected]>
Expand Down
10 changes: 5 additions & 5 deletions framework/data/Pagination.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@
*
* 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
* for fetching the current page of data. Note that if the page size is infinite, a value -1 will be returned.
* This property is read-only.
* @property int $limit The limit of the data. This may be used to set the LIMIT value for a SQL statement for
* fetching the current page of data. Note that if the page size is infinite, a value -1 will be returned. This
* property is read-only.
* @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.
* @property int $offset The offset of the data. This may be used to set the OFFSET value for a SQL
* statement for fetching the current page of data. 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 statement
* for fetching the current page of data. This property is read-only.
* @property int $page The zero-based current page number.
* @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
Expand Down
2 changes: 1 addition & 1 deletion framework/db/ActiveRelationTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function __clone()
* public function getOrderItems() {
* return $this->hasMany(OrderItem::className(), ['order_id' => 'id']);
* }
*
*
* public function getItems() {
* return $this->hasMany(Item::className(), ['id' => 'item_id'])
* ->via('orderItems');
Expand Down
7 changes: 4 additions & 3 deletions framework/db/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,18 @@
* @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
* 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
* read-only.
* @property QueryBuilder $queryBuilder The query builder for the current DB connection. This property is
* read-only.
* @property Schema $schema The schema information for the database opened by this connection. This property
* 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
* 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
* slave connection is 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 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 is read-only.
*
Expand Down
2 changes: 1 addition & 1 deletion framework/db/QueryInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public function offset($offset);
* 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
* 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.
* @since 2.0.11
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/db/QueryTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ public function offset($offset)
* 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
* 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.
* @since 2.0.11
*/
Expand Down
1 change: 0 additions & 1 deletion framework/db/Schema.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ abstract class Schema extends Object
public $exceptionMap = [
'SQLSTATE[23' => 'yii\db\IntegrityException',
];

/**
* @var string column schema class
* @since 2.0.11
Expand Down
4 changes: 2 additions & 2 deletions framework/db/Transaction.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
* > 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.
*
* @property bool $isActive Whether this transaction is active. Only an active transaction can [[commit()]]
* or [[rollBack()]]. This property is read-only.
* @property bool $isActive Whether this transaction is active. Only an active transaction can [[commit()]] or
* [[rollBack()]]. This property is read-only.
* @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
* containing DBMS specific syntax to be used after `SET TRANSACTION ISOLATION LEVEL`. This property is
Expand Down
10 changes: 5 additions & 5 deletions framework/di/Container.php
Original file line number Diff line number Diff line change
Expand Up @@ -573,10 +573,10 @@ public function resolveCallableDependencies(callable $callback, $params = [])
* @param array $definitions array of definitions. There are two allowed formats of array.
* The first format:
* - 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
* [[set()]] documentation for the `$definition` parameter. Will be passed to the [[set()]] method
* as the second argument `$definition`.
* [[set()]] documentation for the `$definition` parameter. Will be passed to the [[set()]] method
* as the second argument `$definition`.
*
* Example:
* ```php
Expand All @@ -596,9 +596,9 @@ public function resolveCallableDependencies(callable $callback, $params = [])
*
* The second format:
* - 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
* second argument `$definition`, the second one — as `$params`.
* second argument `$definition`, the second one — as `$params`.
*
* Example:
* ```php
Expand Down
2 changes: 1 addition & 1 deletion framework/helpers/BaseHtml.php
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ public static function fileInput($name, $value = null, $options = [])
* The following special options are recognized:
*
* - `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
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/helpers/BaseStringHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ protected static function truncateHtml($string, $count, $suffix, $encoding = fal
*
* @param string $string Input string
* @param string $with Part to search inside the $string
* @param bool $caseSensitive Case sensitive search. Default is true. When case sensitive is enabled, $with must exactly match the starting of the string in order to get a true value.
* @param bool $caseSensitive Case sensitive search. Default is true. When case sensitive is enabled, $with must exactly match the starting of the string in order to get a true value.
* @return bool Returns true if first input starts with second input, false otherwise
*/
public static function startsWith($string, $with, $caseSensitive = true)
Expand Down
3 changes: 2 additions & 1 deletion framework/log/Logger.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
* @property float $elapsedTime The total elapsed time in seconds for current request. This property is
* read-only.
* @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 <[email protected]>
* @since 2.0
Expand Down
1 change: 1 addition & 0 deletions framework/log/SyslogTarget.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class SyslogTarget extends Target
Logger::LEVEL_ERROR => LOG_ERR,
];


/**
* @inheritdoc
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/rbac/CheckAccessInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/**
* For more details and usage information on CheckAccessInterface, see the [guide article on security authorization](guide:security-authorization).
*
*
* @author Sam Mousa <[email protected]>
* @since 2.0.9
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/rest/DeleteAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* DeleteAction implements the API endpoint for deleting a model.
*
* For more details and usage information on DeleteAction, see the [guide article on rest controllers](guide:rest-controllers).
*
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
Expand Down
4 changes: 2 additions & 2 deletions framework/rest/IndexAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

/**
* IndexAction implements the API endpoint for listing multiple models.
*
*
* For more details and usage information on IndexAction, see the [guide article on rest controllers](guide:rest-controllers).
*
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/rest/ViewAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* ViewAction implements the API endpoint for returning the detailed information about a model.
*
* For more details and usage information on ViewAction, see the [guide article on rest controllers](guide:rest-controllers).
*
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/test/FixtureTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* through the syntax `$this->fixtureName('model name')`.
*
* For more details and usage information on FixtureTrait, see the [guide article on fixtures](guide:test-fixtures).
*
*
* @author Qiang Xue <[email protected]>
* @since 2.0
*/
Expand Down
2 changes: 1 addition & 1 deletion framework/validators/ExistValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ class ExistValidator extends Validator
* @var bool whether to allow array type attribute.
*/
public $allowArray = false;

/**
* @var string and|or define how target attributes are related
* @since 2.0.11
*/
public $targetAttributeJunction = 'and';


/**
* @inheritdoc
*/
Expand Down
Loading

0 comments on commit c19b2f7

Please sign in to comment.