diff --git a/framework/BaseYii.php b/framework/BaseYii.php index f77918b46ec..6f9ffb51892 100644 --- a/framework/BaseYii.php +++ b/framework/BaseYii.php @@ -93,7 +93,7 @@ class BaseYii */ public static function getVersion() { - return '2.0.15-dev'; + return '2.0.14.1'; } /** diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 1b9c4af82ff..51fd0dd4007 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -1,25 +1,25 @@ Yii Framework 2 Change Log ========================== -2.0.14.1 under development +2.0.14.1 February 24, 2018 -------------------------- -- Enh #15716: Added `disableJsonSupport` to MySQL and PgSQL `ColumnSchema`, `disableArraySupport` and `deserializeArrayColumnToArrayExpression` to PgSQL `ColumnSchema` (silverfire) -- Bug #15728, #15731: Fixed BC break in `Query::select()` method (silverfire) -- Bug #15692: Fix ExistValidator with targetRelation ignores filter (developeruz) -- Bug #15693: Fixed `yii\filters\auth\HttpHeaderAuth` to work correctly when pattern is set but was not matched (bboure) -- Bug #15696: Fix magic getter for ActiveRecord (developeruz) - Bug #15318: Fixed `session_name(): Cannot change session name when session is active` errors (bscheshirwork, samdark) -- Bug #15726: Fix ExistValidator is broken for NOSQL (developeruz) -- Enh #15716: Implemented `\Traversable` in `yii\db\ArrayExpression` (silverfire) - Bug #15678: Fixed `resetForm()` method in `yii.activeForm.js` which used an undefined variable (Izumi-kun) -- Bug #15742: Updated `yii\helpers\BaseHtml::setActivePlaceholder()` to be consistent with `activeLabel()` (edwards-sj) +- Bug #15692: Fix ExistValidator with targetRelation ignores filter (developeruz) - Bug #15692: Fix `yii\validators\ExistValidator` to respect filter when `targetRelation` is used (developeruz) +- Bug #15693: Fixed `yii\filters\auth\HttpHeaderAuth` to work correctly when pattern is set but was not matched (bboure) +- Bug #15696: Fix magic getter for ActiveRecord (developeruz) - Bug #15696: Fix magic getter for `yii\db\ActiveRecord` (developeruz) - Bug #15707: Fixed JSON retrieving from MySQL (silverfire) +- Bug #15708: Fixed `yii\db\Command::upsert()` for Cubrid/MSSQL/Oracle (sergeymakinen) - Bug #15724: Changed shortcut in `yii\console\controllers\BaseMigrateController` for `comment` option from `-c` to `-C` due to conflict (Izumi-kun) +- Bug #15726: Fix ExistValidator is broken for NOSQL (developeruz) +- Bug #15728, #15731: Fixed BC break in `Query::select()` method (silverfire) +- Bug #15742: Updated `yii\helpers\BaseHtml::setActivePlaceholder()` to be consistent with `activeLabel()` (edwards-sj) +- Enh #15716: Added `disableJsonSupport` to MySQL and PgSQL `ColumnSchema`, `disableArraySupport` and `deserializeArrayColumnToArrayExpression` to PgSQL `ColumnSchema` (silverfire) +- Enh #15716: Implemented `\Traversable` in `yii\db\ArrayExpression` (silverfire) - Enh #15760: Added `ArrayAccess` support as validated value in `yii\validators\EachValidator` (silverfire) -- Bug #15708: Fixed `yii\db\Command::upsert()` for Cubrid/MSSQL/Oracle (sergeymakinen) 2.0.14 February 18, 2018 diff --git a/framework/behaviors/CacheableWidgetBehavior.php b/framework/behaviors/CacheableWidgetBehavior.php index 17a1050af7e..60db7ec023c 100644 --- a/framework/behaviors/CacheableWidgetBehavior.php +++ b/framework/behaviors/CacheableWidgetBehavior.php @@ -41,8 +41,6 @@ * } * ``` * - * @property Widget $owner - * * @author Nikolay Oleynikov * @since 2.0.14 */ diff --git a/framework/classes.php b/framework/classes.php index 2f8ea33b3be..380b283b0c8 100644 --- a/framework/classes.php +++ b/framework/classes.php @@ -179,6 +179,7 @@ 'yii\db\mssql\TableSchema' => YII2_PATH . '/db/mssql/TableSchema.php', 'yii\db\mssql\conditions\InConditionBuilder' => YII2_PATH . '/db/mssql/conditions/InConditionBuilder.php', 'yii\db\mssql\conditions\LikeConditionBuilder' => YII2_PATH . '/db/mssql/conditions/LikeConditionBuilder.php', + 'yii\db\mysql\ColumnSchema' => YII2_PATH . '/db/mysql/ColumnSchema.php', 'yii\db\mysql\ColumnSchemaBuilder' => YII2_PATH . '/db/mysql/ColumnSchemaBuilder.php', 'yii\db\mysql\JsonExpressionBuilder' => YII2_PATH . '/db/mysql/JsonExpressionBuilder.php', 'yii\db\mysql\QueryBuilder' => YII2_PATH . '/db/mysql/QueryBuilder.php', diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php index a6dbf39ee17..7f88a0e80a9 100644 --- a/framework/db/QueryBuilder.php +++ b/framework/db/QueryBuilder.php @@ -22,8 +22,8 @@ * * For more details and usage information on QueryBuilder, see the [guide article on query builders](guide:db-query-builder). * - * @property string[] $expressionBuilders Array of builders that should be merged with the pre-defined ones - * in [[expressionBuilders]] property. This property is write-only. + * @property string[] $expressionBuilders Array of builders that should be merged with the pre-defined ones in + * [[expressionBuilders]] property. This property is write-only. * * @author Qiang Xue * @since 2.0 diff --git a/framework/db/mysql/ColumnSchema.php b/framework/db/mysql/ColumnSchema.php index 2f40a191b0d..760595d4838 100644 --- a/framework/db/mysql/ColumnSchema.php +++ b/framework/db/mysql/ColumnSchema.php @@ -28,6 +28,7 @@ class ColumnSchema extends \yii\db\ColumnSchema */ public $disableJsonSupport = false; + /** * {@inheritdoc} */ diff --git a/framework/db/mysql/Schema.php b/framework/db/mysql/Schema.php index 897ac7b8867..4e830954d19 100644 --- a/framework/db/mysql/Schema.php +++ b/framework/db/mysql/Schema.php @@ -34,7 +34,6 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface * {@inheritdoc} */ public $columnSchemaClass = 'yii\db\mysql\ColumnSchema'; - /** * @var bool whether MySQL used is older than 5.1. */ diff --git a/framework/db/pgsql/ColumnSchema.php b/framework/db/pgsql/ColumnSchema.php index 4f21d9b09de..da2f40ff837 100644 --- a/framework/db/pgsql/ColumnSchema.php +++ b/framework/db/pgsql/ColumnSchema.php @@ -22,7 +22,6 @@ class ColumnSchema extends \yii\db\ColumnSchema * @var int the dimension of array. Defaults to 0, means this column is not an array. */ public $dimension = 0; - /** * @var bool whether the column schema should OMIT using JSON support feature. * You can use this property to make upgrade to Yii 2.0.14 easier. @@ -32,7 +31,6 @@ class ColumnSchema extends \yii\db\ColumnSchema * @deprecated Since 2.0.14.1 and will be removed in 2.1. */ public $disableJsonSupport = false; - /** * @var bool whether the column schema should OMIT using PgSQL Arrays support feature. * You can use this property to make upgrade to Yii 2.0.14 easier. @@ -42,7 +40,6 @@ class ColumnSchema extends \yii\db\ColumnSchema * @deprecated Since 2.0.14.1 and will be removed in 2.1. */ public $disableArraySupport = false; - /** * @var bool whether the Array column value should be unserialized to an [[ArrayExpression]] object. * You can use this property to make upgrade to Yii 2.0.14 easier. @@ -53,6 +50,7 @@ class ColumnSchema extends \yii\db\ColumnSchema */ public $deserializeArrayColumnToArrayExpression = true; + /** * {@inheritdoc} */ diff --git a/framework/rbac/BaseManager.php b/framework/rbac/BaseManager.php index d525d95f743..4f832e014d6 100644 --- a/framework/rbac/BaseManager.php +++ b/framework/rbac/BaseManager.php @@ -19,7 +19,7 @@ * * @property Role[] $defaultRoleInstances Default roles. The array is indexed by the role names. This property * is read-only. - * @property array $defaultRoles Default roles. Note that the type of this property differs in getter and + * @property string[] $defaultRoles Default roles. Note that the type of this property differs in getter and * setter. See [[getDefaultRoles()]] and [[setDefaultRoles()]] for details. * * @author Qiang Xue