Skip to content

Commit 4bfe5e7

Browse files
committed
release version 2.0.14.2
1 parent 4ad04be commit 4bfe5e7

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

framework/BaseYii.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class BaseYii
9393
*/
9494
public static function getVersion()
9595
{
96-
return '2.0.15-dev';
96+
return '2.0.14.2';
9797
}
9898

9999
/**

framework/CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Yii Framework 2 Change Log
22
==========================
33

4-
2.0.14.2 under development
5-
------------------------
4+
2.0.14.2 March 13, 2018
5+
-----------------------
66

77
- Bug #15776: Fixed slow MySQL constraints retrieving (MartijnHols, berosoboy, sergeymakinen)
88
- Bug #15783: Regenerate CSRF token only when logging in directly (samdark)

framework/db/Connection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@
127127
* available and `$fallbackToMaster` is false. This property is read-only.
128128
* @property PDO $slavePdo The PDO instance for the currently active slave connection. `null` is returned if
129129
* no slave connection is available and `$fallbackToMaster` is false. This property is read-only.
130-
* @property Transaction $transaction The currently active transaction. Null if no active transaction. This
131-
* property is read-only.
130+
* @property Transaction|null $transaction The currently active transaction. Null if no active transaction.
131+
* This property is read-only.
132132
*
133133
* @author Qiang Xue <[email protected]>
134134
* @since 2.0

framework/db/QueryBuilder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
*
2323
* For more details and usage information on QueryBuilder, see the [guide article on query builders](guide:db-query-builder).
2424
*
25+
* @property string[] $conditionClasses Map of condition aliases to condition classes. For example: ```php
26+
* ['LIKE' => yii\db\condition\LikeCondition::class] ``` . This property is write-only.
2527
* @property string[] $expressionBuilders Array of builders that should be merged with the pre-defined ones in
2628
* [[expressionBuilders]] property. This property is write-only.
2729
*

0 commit comments

Comments
 (0)