release version 2.0.14.2

yiisoft · Mar 13, 2018 · 4bfe5e7 · 4bfe5e7
1 parent 4ad04be
commit 4bfe5e7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git 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.2';
     }
 
     /**

diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -1,8 +1,8 @@
 Yii Framework 2 Change Log
 ==========================
 
-2.0.14.2 under development
-------------------------
+2.0.14.2 March 13, 2018
+-----------------------
 
 - Bug #15776: Fixed slow MySQL constraints retrieving (MartijnHols, berosoboy, sergeymakinen)
 - Bug #15783: Regenerate CSRF token only when logging in directly (samdark)

diff --git a/framework/db/Connection.php b/framework/db/Connection.php
@@ -127,8 +127,8 @@
  * 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.
+ * @property Transaction|null $transaction The currently active transaction. Null if no active transaction.
+ * This property is read-only.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0

diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php
@@ -22,6 +22,8 @@
  *
  * For more details and usage information on QueryBuilder, see the [guide article on query builders](guide:db-query-builder).
  *
+ * @property string[] $conditionClasses Map of condition aliases to condition classes. For example: ```php
+ * ['LIKE' => yii\db\condition\LikeCondition::class] ``` . 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.
  *
-Original file line number
+Diff line change
@@ Expand Up / @@ -93,7 +93,7 @@ class BaseYii @@
          */
         public static function getVersion()
         {
-            return '2.0.15-dev';
+            return '2.0.14.2';
         }
         /**
@@ Expand Down @@