Merge branch 'master' of github.com:yiisoft/yii2 into 2.1

framework/CHANGELOG.md

@@ -42,6 +42,10 @@ Yii Framework 2 Change Log
 - Chg #14761: Removed Yii autoloader in favor of Composer's PSR-4 implementation (samdark)
 - Chg #15448: Package "ezyang/htmlpurifier" has been made optional and is not installed by default (klimov-paul)
 - Chg #15481: Removed `yii\BaseYii::powered()` method (Kolyunya, samdark)
+2.0.14.2 under development
+------------------------
+
+- Bug #15792: Added missing `yii\db\QueryBuilder::conditionClasses` setter (silverfire)
 
 
 2.0.14.1 February 24, 2018

framework/db/QueryBuilder.php

@@ -194,6 +194,23 @@ class QueryBuilder extends \yii\base\BaseObject
     }
 
     /**
+     * Setter for [[conditionClasses]] property.
+     *
+     * @param string[] $classes map of condition aliases to condition classes. For example:
+     *
+     * ```php
+     * ['LIKE' => yii\db\condition\LikeCondition::class]
+     * ```
+     *
+     * @since 2.0.14.2
+     * @see conditionClasses
+     */
+    public function setConditionClasses($classes)
+    {
+        $this->conditionClasses = array_merge($this->conditionClasses, $classes);
+    }
+
+    /**
      * Generates a SELECT SQL statement from a [[Query]] object.
      *
      * @param Query $query the [[Query]] object from which the SQL statement will be generated.

framework/db/conditions/BetweenColumnsCondition.php

@@ -32,7 +32,7 @@ use yii\db\Query;
  * );
  *
  * // Will be built to:
- * // NOW() BETWEEN (SELECT time FROM log ORDER BY id ASC LIMIT 1) AND update_time
+ * // NOW() NOT BETWEEN (SELECT time FROM log ORDER BY id ASC LIMIT 1) AND update_time
  * ```
  *
  * @author Dmytro Naumenko <d.naumenko.a@gmail.com>