diff --git a/framework/BaseYii.php b/framework/BaseYii.php
index 3c23c53c15..a8f70c7086 100644
--- a/framework/BaseYii.php
+++ b/framework/BaseYii.php
@@ -93,7 +93,7 @@ class BaseYii
      */
     public static function getVersion()
     {
-        return '2.0.14-dev';
+        return '2.0.14';
     }
 
     /**
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index a2cd82e4de..6380ad7929 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -1,7 +1,7 @@
 Yii Framework 2 Change Log
 ==========================
 
-2.0.14 under development
+2.0.14 February 18, 2018
 ------------------------
 
 - Bug #8983: Only truncate the original log file for rotation (matthewyang, developeruz)
diff --git a/framework/base/ActionFilter.php b/framework/base/ActionFilter.php
index 26e5a92569..10d745a3b2 100644
--- a/framework/base/ActionFilter.php
+++ b/framework/base/ActionFilter.php
@@ -6,6 +6,7 @@
  */
 
 namespace yii\base;
+
 use yii\helpers\StringHelper;
 
 /**
diff --git a/framework/base/DynamicContentAwareTrait.php b/framework/base/DynamicContentAwareTrait.php
index a330717da7..d175936cc7 100644
--- a/framework/base/DynamicContentAwareTrait.php
+++ b/framework/base/DynamicContentAwareTrait.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\base;
 
diff --git a/framework/base/View.php b/framework/base/View.php
index b17f8e364a..1a501d5b57 100644
--- a/framework/base/View.php
+++ b/framework/base/View.php
@@ -97,7 +97,7 @@ class View extends Component implements DynamicContentAwareInterface
      * @var array a list of placeholders for embedding dynamic contents. This property
      * is used internally to implement the content caching feature. Do not modify it directly.
      * @internal
-     * @deprecated Since 2.0.14. Do not use this property directly. Use methods [[getDynamicPlaceholders()]], 
+     * @deprecated Since 2.0.14. Do not use this property directly. Use methods [[getDynamicPlaceholders()]],
      * [[setDynamicPlaceholders()]], [[addDynamicPlaceholder()]] instead.
      */
     public $dynamicPlaceholders = [];
diff --git a/framework/behaviors/BlameableBehavior.php b/framework/behaviors/BlameableBehavior.php
index cc0ee4e868..94f803d83d 100644
--- a/framework/behaviors/BlameableBehavior.php
+++ b/framework/behaviors/BlameableBehavior.php
@@ -72,13 +72,13 @@ class BlameableBehavior extends AttributeBehavior
      * In case, when the property is `null`, the value of `Yii::$app->user->id` will be used as the value.
      */
     public $value;
-
     /**
      * @var mixed Default value for cases when the user is guest
      * @since 2.0.14
      */
     public $defaultValue;
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/behaviors/CacheableWidgetBehavior.php b/framework/behaviors/CacheableWidgetBehavior.php
index bd7b007398..40f377ca38 100644
--- a/framework/behaviors/CacheableWidgetBehavior.php
+++ b/framework/behaviors/CacheableWidgetBehavior.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\behaviors;
 
@@ -36,10 +41,6 @@ use yii\di\Instance;
  * }
  * ```
  *
- * @property Widget $owner
- * @group behaviors
- * @since 2.0.14
- */
 class CacheableWidgetBehavior extends Behavior
 {
     /**
@@ -48,14 +49,12 @@ class CacheableWidgetBehavior extends Behavior
      * Defaults to the `cache` application component.
      */
     public $cache = 'cache';
-
     /**
      * @var int cache duration in seconds.
      * Set to `0` to indicate that the cached data will never expire.
      * Defaults to 60 seconds or 1 minute.
      */
     public $cacheDuration = 60;
-
     /**
      * @var Dependency|array|null a cache dependency or a configuration array
      * for creating a cache dependency or `null` meaning no cache dependency.
@@ -73,7 +72,6 @@ class CacheableWidgetBehavior extends Behavior
      * If any post has its modification time changed, the cached content would be invalidated.
      */
     public $cacheDependency;
-
     /**
      * @var string[]|string an array of strings or a single string which would cause
      * the variation of the content being cached (e.g. an application language, a GET parameter).
@@ -88,7 +86,6 @@ class CacheableWidgetBehavior extends Behavior
      * ```
      */
     public $cacheKeyVariations = [];
-
     /**
      * @var bool whether to enable caching or not. Allows to turn the widget caching
      * on and off according to specific conditions.
@@ -100,8 +97,9 @@ class CacheableWidgetBehavior extends Behavior
      */
     public $cacheEnabled = true;
 
+
     /**
-     *{@inheritdoc}
+     * {@inheritdoc}
      */
     public function attach($owner)
     {
diff --git a/framework/classes.php b/framework/classes.php
index a7a7c2ef6a..2f8ea33b3b 100644
--- a/framework/classes.php
+++ b/framework/classes.php
@@ -24,6 +24,8 @@ return [
   'yii\base\Component' => YII2_PATH . '/base/Component.php',
   'yii\base\Configurable' => YII2_PATH . '/base/Configurable.php',
   'yii\base\Controller' => YII2_PATH . '/base/Controller.php',
+  'yii\base\DynamicContentAwareInterface' => YII2_PATH . '/base/DynamicContentAwareInterface.php',
+  'yii\base\DynamicContentAwareTrait' => YII2_PATH . '/base/DynamicContentAwareTrait.php',
   'yii\base\DynamicModel' => YII2_PATH . '/base/DynamicModel.php',
   'yii\base\ErrorException' => YII2_PATH . '/base/ErrorException.php',
   'yii\base\ErrorHandler' => YII2_PATH . '/base/ErrorHandler.php',
@@ -63,6 +65,7 @@ return [
   'yii\behaviors\AttributeTypecastBehavior' => YII2_PATH . '/behaviors/AttributeTypecastBehavior.php',
   'yii\behaviors\AttributesBehavior' => YII2_PATH . '/behaviors/AttributesBehavior.php',
   'yii\behaviors\BlameableBehavior' => YII2_PATH . '/behaviors/BlameableBehavior.php',
+  'yii\behaviors\CacheableWidgetBehavior' => YII2_PATH . '/behaviors/CacheableWidgetBehavior.php',
   'yii\behaviors\SluggableBehavior' => YII2_PATH . '/behaviors/SluggableBehavior.php',
   'yii\behaviors\TimestampBehavior' => YII2_PATH . '/behaviors/TimestampBehavior.php',
   'yii\caching\ApcCache' => YII2_PATH . '/caching/ApcCache.php',
@@ -104,6 +107,7 @@ return [
   'yii\db\ActiveRecordInterface' => YII2_PATH . '/db/ActiveRecordInterface.php',
   'yii\db\ActiveRelationTrait' => YII2_PATH . '/db/ActiveRelationTrait.php',
   'yii\db\AfterSaveEvent' => YII2_PATH . '/db/AfterSaveEvent.php',
+  'yii\db\ArrayExpression' => YII2_PATH . '/db/ArrayExpression.php',
   'yii\db\BaseActiveRecord' => YII2_PATH . '/db/BaseActiveRecord.php',
   'yii\db\BatchQueryResult' => YII2_PATH . '/db/BatchQueryResult.php',
   'yii\db\CheckConstraint' => YII2_PATH . '/db/CheckConstraint.php',
@@ -112,18 +116,27 @@ return [
   'yii\db\Command' => YII2_PATH . '/db/Command.php',
   'yii\db\Connection' => YII2_PATH . '/db/Connection.php',
   'yii\db\Constraint' => YII2_PATH . '/db/Constraint.php',
+  'yii\db\ConstraintFinderInterface' => YII2_PATH . '/db/ConstraintFinderInterface.php',
   'yii\db\ConstraintFinderTrait' => YII2_PATH . '/db/ConstraintFinderTrait.php',
   'yii\db\DataReader' => YII2_PATH . '/db/DataReader.php',
   'yii\db\DefaultValueConstraint' => YII2_PATH . '/db/DefaultValueConstraint.php',
   'yii\db\Exception' => YII2_PATH . '/db/Exception.php',
   'yii\db\Expression' => YII2_PATH . '/db/Expression.php',
+  'yii\db\ExpressionBuilder' => YII2_PATH . '/db/ExpressionBuilder.php',
+  'yii\db\ExpressionBuilderInterface' => YII2_PATH . '/db/ExpressionBuilderInterface.php',
+  'yii\db\ExpressionBuilderTrait' => YII2_PATH . '/db/ExpressionBuilderTrait.php',
+  'yii\db\ExpressionInterface' => YII2_PATH . '/db/ExpressionInterface.php',
   'yii\db\ForeignKeyConstraint' => YII2_PATH . '/db/ForeignKeyConstraint.php',
   'yii\db\IndexConstraint' => YII2_PATH . '/db/IndexConstraint.php',
   'yii\db\IntegrityException' => YII2_PATH . '/db/IntegrityException.php',
+  'yii\db\JsonExpression' => YII2_PATH . '/db/JsonExpression.php',
   'yii\db\Migration' => YII2_PATH . '/db/Migration.php',
   'yii\db\MigrationInterface' => YII2_PATH . '/db/MigrationInterface.php',
+  'yii\db\PdoValue' => YII2_PATH . '/db/PdoValue.php',
+  'yii\db\PdoValueBuilder' => YII2_PATH . '/db/PdoValueBuilder.php',
   'yii\db\Query' => YII2_PATH . '/db/Query.php',
   'yii\db\QueryBuilder' => YII2_PATH . '/db/QueryBuilder.php',
+  'yii\db\QueryExpressionBuilder' => YII2_PATH . '/db/QueryExpressionBuilder.php',
   'yii\db\QueryInterface' => YII2_PATH . '/db/QueryInterface.php',
   'yii\db\QueryTrait' => YII2_PATH . '/db/QueryTrait.php',
   'yii\db\Schema' => YII2_PATH . '/db/Schema.php',
@@ -134,26 +147,60 @@ return [
   'yii\db\TableSchema' => YII2_PATH . '/db/TableSchema.php',
   'yii\db\Transaction' => YII2_PATH . '/db/Transaction.php',
   'yii\db\ViewFinderTrait' => YII2_PATH . '/db/ViewFinderTrait.php',
+  'yii\db\conditions\AndCondition' => YII2_PATH . '/db/conditions/AndCondition.php',
+  'yii\db\conditions\BetweenColumnsCondition' => YII2_PATH . '/db/conditions/BetweenColumnsCondition.php',
+  'yii\db\conditions\BetweenColumnsConditionBuilder' => YII2_PATH . '/db/conditions/BetweenColumnsConditionBuilder.php',
+  'yii\db\conditions\BetweenCondition' => YII2_PATH . '/db/conditions/BetweenCondition.php',
+  'yii\db\conditions\BetweenConditionBuilder' => YII2_PATH . '/db/conditions/BetweenConditionBuilder.php',
+  'yii\db\conditions\ConditionInterface' => YII2_PATH . '/db/conditions/ConditionInterface.php',
+  'yii\db\conditions\ConjunctionCondition' => YII2_PATH . '/db/conditions/ConjunctionCondition.php',
+  'yii\db\conditions\ConjunctionConditionBuilder' => YII2_PATH . '/db/conditions/ConjunctionConditionBuilder.php',
+  'yii\db\conditions\ExistsCondition' => YII2_PATH . '/db/conditions/ExistsCondition.php',
+  'yii\db\conditions\ExistsConditionBuilder' => YII2_PATH . '/db/conditions/ExistsConditionBuilder.php',
+  'yii\db\conditions\HashCondition' => YII2_PATH . '/db/conditions/HashCondition.php',
+  'yii\db\conditions\HashConditionBuilder' => YII2_PATH . '/db/conditions/HashConditionBuilder.php',
+  'yii\db\conditions\InCondition' => YII2_PATH . '/db/conditions/InCondition.php',
+  'yii\db\conditions\InConditionBuilder' => YII2_PATH . '/db/conditions/InConditionBuilder.php',
+  'yii\db\conditions\LikeCondition' => YII2_PATH . '/db/conditions/LikeCondition.php',
+  'yii\db\conditions\LikeConditionBuilder' => YII2_PATH . '/db/conditions/LikeConditionBuilder.php',
+  'yii\db\conditions\NotCondition' => YII2_PATH . '/db/conditions/NotCondition.php',
+  'yii\db\conditions\NotConditionBuilder' => YII2_PATH . '/db/conditions/NotConditionBuilder.php',
+  'yii\db\conditions\OrCondition' => YII2_PATH . '/db/conditions/OrCondition.php',
+  'yii\db\conditions\SimpleCondition' => YII2_PATH . '/db/conditions/SimpleCondition.php',
+  'yii\db\conditions\SimpleConditionBuilder' => YII2_PATH . '/db/conditions/SimpleConditionBuilder.php',
   'yii\db\cubrid\ColumnSchemaBuilder' => YII2_PATH . '/db/cubrid/ColumnSchemaBuilder.php',
   'yii\db\cubrid\QueryBuilder' => YII2_PATH . '/db/cubrid/QueryBuilder.php',
   'yii\db\cubrid\Schema' => YII2_PATH . '/db/cubrid/Schema.php',
+  'yii\db\cubrid\conditions\LikeConditionBuilder' => YII2_PATH . '/db/cubrid/conditions/LikeConditionBuilder.php',
   'yii\db\mssql\PDO' => YII2_PATH . '/db/mssql/PDO.php',
   'yii\db\mssql\QueryBuilder' => YII2_PATH . '/db/mssql/QueryBuilder.php',
   'yii\db\mssql\Schema' => YII2_PATH . '/db/mssql/Schema.php',
   'yii\db\mssql\SqlsrvPDO' => YII2_PATH . '/db/mssql/SqlsrvPDO.php',
   '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\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',
   'yii\db\mysql\Schema' => YII2_PATH . '/db/mysql/Schema.php',
   'yii\db\oci\ColumnSchemaBuilder' => YII2_PATH . '/db/oci/ColumnSchemaBuilder.php',
   'yii\db\oci\QueryBuilder' => YII2_PATH . '/db/oci/QueryBuilder.php',
   'yii\db\oci\Schema' => YII2_PATH . '/db/oci/Schema.php',
+  'yii\db\oci\conditions\InConditionBuilder' => YII2_PATH . '/db/oci/conditions/InConditionBuilder.php',
+  'yii\db\oci\conditions\LikeConditionBuilder' => YII2_PATH . '/db/oci/conditions/LikeConditionBuilder.php',
+  'yii\db\pgsql\ArrayExpressionBuilder' => YII2_PATH . '/db/pgsql/ArrayExpressionBuilder.php',
+  'yii\db\pgsql\ArrayParser' => YII2_PATH . '/db/pgsql/ArrayParser.php',
+  'yii\db\pgsql\ColumnSchema' => YII2_PATH . '/db/pgsql/ColumnSchema.php',
+  'yii\db\pgsql\JsonExpressionBuilder' => YII2_PATH . '/db/pgsql/JsonExpressionBuilder.php',
   'yii\db\pgsql\QueryBuilder' => YII2_PATH . '/db/pgsql/QueryBuilder.php',
   'yii\db\pgsql\Schema' => YII2_PATH . '/db/pgsql/Schema.php',
   'yii\db\sqlite\ColumnSchemaBuilder' => YII2_PATH . '/db/sqlite/ColumnSchemaBuilder.php',
+  'yii\db\sqlite\Command' => YII2_PATH . '/db/sqlite/Command.php',
   'yii\db\sqlite\QueryBuilder' => YII2_PATH . '/db/sqlite/QueryBuilder.php',
   'yii\db\sqlite\Schema' => YII2_PATH . '/db/sqlite/Schema.php',
   'yii\db\sqlite\SqlTokenizer' => YII2_PATH . '/db/sqlite/SqlTokenizer.php',
+  'yii\db\sqlite\conditions\InConditionBuilder' => YII2_PATH . '/db/sqlite/conditions/InConditionBuilder.php',
+  'yii\db\sqlite\conditions\LikeConditionBuilder' => YII2_PATH . '/db/sqlite/conditions/LikeConditionBuilder.php',
   'yii\di\Container' => YII2_PATH . '/di/Container.php',
   'yii\di\Instance' => YII2_PATH . '/di/Instance.php',
   'yii\di\NotInstantiableException' => YII2_PATH . '/di/NotInstantiableException.php',
@@ -174,6 +221,7 @@ return [
   'yii\filters\auth\CompositeAuth' => YII2_PATH . '/filters/auth/CompositeAuth.php',
   'yii\filters\auth\HttpBasicAuth' => YII2_PATH . '/filters/auth/HttpBasicAuth.php',
   'yii\filters\auth\HttpBearerAuth' => YII2_PATH . '/filters/auth/HttpBearerAuth.php',
+  'yii\filters\auth\HttpHeaderAuth' => YII2_PATH . '/filters/auth/HttpHeaderAuth.php',
   'yii\filters\auth\QueryParamAuth' => YII2_PATH . '/filters/auth/QueryParamAuth.php',
   'yii\grid\ActionColumn' => YII2_PATH . '/grid/ActionColumn.php',
   'yii\grid\CheckboxColumn' => YII2_PATH . '/grid/CheckboxColumn.php',
@@ -191,6 +239,7 @@ return [
   'yii\helpers\BaseHtml' => YII2_PATH . '/helpers/BaseHtml.php',
   'yii\helpers\BaseHtmlPurifier' => YII2_PATH . '/helpers/BaseHtmlPurifier.php',
   'yii\helpers\BaseInflector' => YII2_PATH . '/helpers/BaseInflector.php',
+  'yii\helpers\BaseIpHelper' => YII2_PATH . '/helpers/BaseIpHelper.php',
   'yii\helpers\BaseJson' => YII2_PATH . '/helpers/BaseJson.php',
   'yii\helpers\BaseMarkdown' => YII2_PATH . '/helpers/BaseMarkdown.php',
   'yii\helpers\BaseStringHelper' => YII2_PATH . '/helpers/BaseStringHelper.php',
@@ -202,6 +251,7 @@ return [
   'yii\helpers\Html' => YII2_PATH . '/helpers/Html.php',
   'yii\helpers\HtmlPurifier' => YII2_PATH . '/helpers/HtmlPurifier.php',
   'yii\helpers\Inflector' => YII2_PATH . '/helpers/Inflector.php',
+  'yii\helpers\IpHelper' => YII2_PATH . '/helpers/IpHelper.php',
   'yii\helpers\Json' => YII2_PATH . '/helpers/Json.php',
   'yii\helpers\Markdown' => YII2_PATH . '/helpers/Markdown.php',
   'yii\helpers\ReplaceArrayValue' => YII2_PATH . '/helpers/ReplaceArrayValue.php',
@@ -216,6 +266,7 @@ return [
   'yii\i18n\GettextMoFile' => YII2_PATH . '/i18n/GettextMoFile.php',
   'yii\i18n\GettextPoFile' => YII2_PATH . '/i18n/GettextPoFile.php',
   'yii\i18n\I18N' => YII2_PATH . '/i18n/I18N.php',
+  'yii\i18n\Locale' => YII2_PATH . '/i18n/Locale.php',
   'yii\i18n\MessageFormatter' => YII2_PATH . '/i18n/MessageFormatter.php',
   'yii\i18n\MessageSource' => YII2_PATH . '/i18n/MessageSource.php',
   'yii\i18n\MissingTranslationEvent' => YII2_PATH . '/i18n/MissingTranslationEvent.php',
@@ -224,6 +275,7 @@ return [
   'yii\log\Dispatcher' => YII2_PATH . '/log/Dispatcher.php',
   'yii\log\EmailTarget' => YII2_PATH . '/log/EmailTarget.php',
   'yii\log\FileTarget' => YII2_PATH . '/log/FileTarget.php',
+  'yii\log\LogRuntimeException' => YII2_PATH . '/log/LogRuntimeException.php',
   'yii\log\Logger' => YII2_PATH . '/log/Logger.php',
   'yii\log\SyslogTarget' => YII2_PATH . '/log/SyslogTarget.php',
   'yii\log\Target' => YII2_PATH . '/log/Target.php',
@@ -263,6 +315,7 @@ return [
   'yii\test\ArrayFixture' => YII2_PATH . '/test/ArrayFixture.php',
   'yii\test\BaseActiveFixture' => YII2_PATH . '/test/BaseActiveFixture.php',
   'yii\test\DbFixture' => YII2_PATH . '/test/DbFixture.php',
+  'yii\test\FileFixtureTrait' => YII2_PATH . '/test/FileFixtureTrait.php',
   'yii\test\Fixture' => YII2_PATH . '/test/Fixture.php',
   'yii\test\FixtureTrait' => YII2_PATH . '/test/FixtureTrait.php',
   'yii\test\InitDbFixture' => YII2_PATH . '/test/InitDbFixture.php',
@@ -308,6 +361,7 @@ return [
   'yii\web\GoneHttpException' => YII2_PATH . '/web/GoneHttpException.php',
   'yii\web\GroupUrlRule' => YII2_PATH . '/web/GroupUrlRule.php',
   'yii\web\HeaderCollection' => YII2_PATH . '/web/HeaderCollection.php',
+  'yii\web\HeadersAlreadySentException' => YII2_PATH . '/web/HeadersAlreadySentException.php',
   'yii\web\HtmlResponseFormatter' => YII2_PATH . '/web/HtmlResponseFormatter.php',
   'yii\web\HttpException' => YII2_PATH . '/web/HttpException.php',
   'yii\web\IdentityInterface' => YII2_PATH . '/web/IdentityInterface.php',
diff --git a/framework/console/widgets/Table.php b/framework/console/widgets/Table.php
index 0a8f2b252f..66cbb090fd 100644
--- a/framework/console/widgets/Table.php
+++ b/framework/console/widgets/Table.php
@@ -50,7 +50,6 @@ class Table extends Widget
 {
     const DEFAULT_CONSOLE_SCREEN_WIDTH = 120;
     const CONSOLE_SCROLLBAR_OFFSET = 3;
-
     const CHAR_TOP = 'top';
     const CHAR_TOP_MID = 'top-mid';
     const CHAR_TOP_LEFT = 'top-left';
diff --git a/framework/data/DataFilter.php b/framework/data/DataFilter.php
index c9637c74bf..a10177fbf3 100644
--- a/framework/data/DataFilter.php
+++ b/framework/data/DataFilter.php
@@ -352,7 +352,7 @@ class DataFilter extends Model
      *
      * @param Validator validator from which to detect attribute type.
      * @return string|null detected attribute type.
-     * @since 2.0.14 
+     * @since 2.0.14
      */
     protected function detectSearchAttributeType(Validator $validator)
     {
diff --git a/framework/db/ArrayExpression.php b/framework/db/ArrayExpression.php
index fc1e1e4958..a4d4d7cc8b 100644
--- a/framework/db/ArrayExpression.php
+++ b/framework/db/ArrayExpression.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db;
 
@@ -37,6 +42,7 @@ class ArrayExpression implements ExpressionInterface, \ArrayAccess, \Countable
      */
     private $dimension;
 
+
     /**
      * ArrayExpression constructor.
      *
@@ -88,7 +94,7 @@ class ArrayExpression implements ExpressionInterface, \ArrayAccess, \Countable
      * @param mixed $offset <p>
      * An offset to check for.
      * </p>
-     * @return boolean true on success or false on failure.
+     * @return bool true on success or false on failure.
      * </p>
      * <p>
      * The return value will be casted to boolean if non-boolean was returned.
diff --git a/framework/db/Command.php b/framework/db/Command.php
index a92d752c6a..050bbd550e 100644
--- a/framework/db/Command.php
+++ b/framework/db/Command.php
@@ -111,6 +111,7 @@ class Command extends Component
      */
     private $_retryHandler;
 
+
     /**
      * Enables query cache for this command.
      * @param int $duration the number of seconds that query result of this command can remain valid in the cache.
diff --git a/framework/db/Connection.php b/framework/db/Connection.php
index 53a8c2d3f0..5bc06d0106 100644
--- a/framework/db/Connection.php
+++ b/framework/db/Connection.php
@@ -118,10 +118,11 @@ use yii\caching\CacheInterface;
  * 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 QueryBuilder $queryBuilder The query builder for the current DB connection. Note that the type of
+ * this property differs in getter and setter. See [[getQueryBuilder()]] and [[setQueryBuilder()]] for details.
  * @property Schema $schema The schema information for the database opened by this connection. This property
  * is read-only.
+ * @property string $serverVersion Server version as a string. This property is read-only.
  * @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
diff --git a/framework/db/Expression.php b/framework/db/Expression.php
index b9cda61fbc..351e5c923c 100644
--- a/framework/db/Expression.php
+++ b/framework/db/Expression.php
@@ -41,6 +41,7 @@ class Expression extends \yii\base\BaseObject implements ExpressionInterface
      */
     public $params = [];
 
+
     /**
      * Constructor.
      * @param string $expression the DB expression
diff --git a/framework/db/ExpressionBuilder.php b/framework/db/ExpressionBuilder.php
index fd25bb8298..32637a77c8 100644
--- a/framework/db/ExpressionBuilder.php
+++ b/framework/db/ExpressionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db;
 
@@ -12,6 +17,7 @@ class ExpressionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * {@inheritdoc}
      * @param Expression|ExpressionInterface $expression the expression to be built
diff --git a/framework/db/ExpressionBuilderInterface.php b/framework/db/ExpressionBuilderInterface.php
index a3b2c10d7a..7e65c67d03 100644
--- a/framework/db/ExpressionBuilderInterface.php
+++ b/framework/db/ExpressionBuilderInterface.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db;
 
diff --git a/framework/db/ExpressionBuilderTrait.php b/framework/db/ExpressionBuilderTrait.php
index dff49b796d..f2a1ce75f3 100644
--- a/framework/db/ExpressionBuilderTrait.php
+++ b/framework/db/ExpressionBuilderTrait.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db;
 
diff --git a/framework/db/ExpressionInterface.php b/framework/db/ExpressionInterface.php
index fcb59f8acd..73f8888000 100644
--- a/framework/db/ExpressionInterface.php
+++ b/framework/db/ExpressionInterface.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db;
 
diff --git a/framework/db/JsonExpression.php b/framework/db/JsonExpression.php
index f4fa18f860..028fd06090 100644
--- a/framework/db/JsonExpression.php
+++ b/framework/db/JsonExpression.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db;
 
@@ -24,7 +29,6 @@ class JsonExpression implements ExpressionInterface
      * The value must be compatible with [\yii\helpers\Json::encode()|Json::encode()]] input requirements.
      */
     protected $value;
-
     /**
      * @var string|null Type of JSON, expression should be casted to. Defaults to `null`, meaning
      * no explicit casting will be performed.
@@ -33,6 +37,7 @@ class JsonExpression implements ExpressionInterface
      */
     protected $type;
 
+
     /**
      * JsonExpression constructor.
      *
diff --git a/framework/db/PdoValue.php b/framework/db/PdoValue.php
index 79421a75af..f350a26b4d 100644
--- a/framework/db/PdoValue.php
+++ b/framework/db/PdoValue.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db;
 
@@ -29,6 +34,7 @@ final class PdoValue implements ExpressionInterface
      */
     private $type;
 
+
     /**
      * PdoValue constructor.
      *
diff --git a/framework/db/PdoValueBuilder.php b/framework/db/PdoValueBuilder.php
index c085021eed..6e9d572022 100644
--- a/framework/db/PdoValueBuilder.php
+++ b/framework/db/PdoValueBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db;
 
@@ -12,6 +17,7 @@ class PdoValueBuilder implements ExpressionBuilderInterface
 {
     const PARAM_PREFIX = ':pv';
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/Query.php b/framework/db/Query.php
index e827a100b6..c709ff3931 100644
--- a/framework/db/Query.php
+++ b/framework/db/Query.php
@@ -131,6 +131,7 @@ class Query extends Component implements QueryInterface, ExpressionInterface
      */
     public $queryCacheDependency;
 
+
     /**
      * Creates a DB command that can be used to execute this query.
      * @param Connection $db the database connection used to generate the SQL statement.
diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php
index a5a6f51fc0..bd9cbfb7e5 100644
--- a/framework/db/QueryBuilder.php
+++ b/framework/db/QueryBuilder.php
@@ -22,6 +22,9 @@ use yii\helpers\StringHelper;
  *
  * 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.
+ *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
@@ -54,7 +57,6 @@ class QueryBuilder extends \yii\base\BaseObject
      * @deprecated since 2.0.14. Is not used, will be dropped in 2.1.0.
      */
     protected $conditionBuilders = [];
-
     /**
      * @var array map of condition aliases to condition classes. For example:
      *
@@ -74,7 +76,6 @@ class QueryBuilder extends \yii\base\BaseObject
      * @since 2.0.14
      */
     protected $conditionClasses = [];
-
     /**
      * @var string[]|ExpressionBuilderInterface[] maps expression class to expression builder class.
      * For example:
@@ -101,6 +102,7 @@ class QueryBuilder extends \yii\base\BaseObject
      */
     protected $expressionBuilders = [];
 
+
     /**
      * Constructor.
      * @param Connection $connection the database connection.
@@ -181,7 +183,8 @@ class QueryBuilder extends \yii\base\BaseObject
     /**
      * Setter for [[expressionBuilders]] property.
      *
-     * @param string[] $builders array of builder that should be merged with [[expressionBuilders]]
+     * @param string[] $builders array of builders that should be merged with the pre-defined ones
+     * in [[expressionBuilders]] property.
      * @since 2.0.14
      * @see expressionBuilders
      */
diff --git a/framework/db/QueryExpressionBuilder.php b/framework/db/QueryExpressionBuilder.php
index 5c42530f0d..3186d2b91c 100644
--- a/framework/db/QueryExpressionBuilder.php
+++ b/framework/db/QueryExpressionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db;
 
@@ -13,6 +18,7 @@ class QueryExpressionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/Schema.php b/framework/db/Schema.php
index 27878f24bf..2282b6eee9 100644
--- a/framework/db/Schema.php
+++ b/framework/db/Schema.php
@@ -27,6 +27,7 @@ use yii\helpers\StringHelper;
  * @property QueryBuilder $queryBuilder The query builder for this connection. This property is read-only.
  * @property string[] $schemaNames All schema names in the database, except system schemas. This property is
  * read-only.
+ * @property string $serverVersion Server version as a string. This property is read-only.
  * @property string[] $tableNames All table names in the database. This property is read-only.
  * @property TableSchema[] $tableSchemas The metadata for all tables in the database. Each array element is an
  * instance of [[TableSchema]] or its child class. This property is read-only.
diff --git a/framework/db/conditions/AndCondition.php b/framework/db/conditions/AndCondition.php
index 1db96d33a4..32382ed31a 100644
--- a/framework/db/conditions/AndCondition.php
+++ b/framework/db/conditions/AndCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
diff --git a/framework/db/conditions/BetweenColumnsCondition.php b/framework/db/conditions/BetweenColumnsCondition.php
index 4bb49eaa32..e5fb731918 100644
--- a/framework/db/conditions/BetweenColumnsCondition.php
+++ b/framework/db/conditions/BetweenColumnsCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -52,6 +57,7 @@ class BetweenColumnsCondition implements ConditionInterface
      */
     private $intervalEndColumn;
 
+
     /**
      * Creates a condition with the `BETWEEN` operator.
      *
diff --git a/framework/db/conditions/BetweenColumnsConditionBuilder.php b/framework/db/conditions/BetweenColumnsConditionBuilder.php
index 1dc17d76cb..8a55bf4a3a 100644
--- a/framework/db/conditions/BetweenColumnsConditionBuilder.php
+++ b/framework/db/conditions/BetweenColumnsConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -17,6 +22,7 @@ class BetweenColumnsConditionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/conditions/BetweenCondition.php b/framework/db/conditions/BetweenCondition.php
index 50473a8bdc..159b1a6e04 100644
--- a/framework/db/conditions/BetweenCondition.php
+++ b/framework/db/conditions/BetweenCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -29,6 +34,7 @@ class BetweenCondition implements ConditionInterface
      */
     private $intervalEnd;
 
+
     /**
      * Creates a condition with the `BETWEEN` operator.
      *
diff --git a/framework/db/conditions/BetweenConditionBuilder.php b/framework/db/conditions/BetweenConditionBuilder.php
index edbe8fdeb4..5247319033 100644
--- a/framework/db/conditions/BetweenConditionBuilder.php
+++ b/framework/db/conditions/BetweenConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -16,6 +21,7 @@ class BetweenConditionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/conditions/ConditionInterface.php b/framework/db/conditions/ConditionInterface.php
index 277193fd56..c3bbc2aed0 100644
--- a/framework/db/conditions/ConditionInterface.php
+++ b/framework/db/conditions/ConditionInterface.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
diff --git a/framework/db/conditions/ConjunctionCondition.php b/framework/db/conditions/ConjunctionCondition.php
index d24a779ffb..985b8fcd7a 100644
--- a/framework/db/conditions/ConjunctionCondition.php
+++ b/framework/db/conditions/ConjunctionCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -15,6 +20,7 @@ abstract class ConjunctionCondition implements ConditionInterface
      */
     protected $expressions;
 
+
     /**
      * @param mixed $expressions
      */
diff --git a/framework/db/conditions/ConjunctionConditionBuilder.php b/framework/db/conditions/ConjunctionConditionBuilder.php
index 5ccd721b02..00a9bcebfc 100644
--- a/framework/db/conditions/ConjunctionConditionBuilder.php
+++ b/framework/db/conditions/ConjunctionConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -16,6 +21,7 @@ class ConjunctionConditionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/conditions/ExistsCondition.php b/framework/db/conditions/ExistsCondition.php
index 8507e1d1d8..607db5fdca 100644
--- a/framework/db/conditions/ExistsCondition.php
+++ b/framework/db/conditions/ExistsCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -22,6 +27,7 @@ class ExistsCondition implements ConditionInterface
      */
     private $query;
 
+
     /**
      * ExistsCondition constructor.
      *
diff --git a/framework/db/conditions/ExistsConditionBuilder.php b/framework/db/conditions/ExistsConditionBuilder.php
index 1846f4cc44..e3ef3ea24d 100644
--- a/framework/db/conditions/ExistsConditionBuilder.php
+++ b/framework/db/conditions/ExistsConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -16,6 +21,7 @@ class ExistsConditionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/conditions/HashCondition.php b/framework/db/conditions/HashCondition.php
index ea8225463a..7c25a5b195 100644
--- a/framework/db/conditions/HashCondition.php
+++ b/framework/db/conditions/HashCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -15,6 +20,7 @@ class HashCondition implements ConditionInterface
      */
     private $hash;
 
+
     /**
      * HashCondition constructor.
      *
diff --git a/framework/db/conditions/HashConditionBuilder.php b/framework/db/conditions/HashConditionBuilder.php
index 3e802c74f7..57928417c5 100644
--- a/framework/db/conditions/HashConditionBuilder.php
+++ b/framework/db/conditions/HashConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -18,6 +23,7 @@ class HashConditionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/conditions/InCondition.php b/framework/db/conditions/InCondition.php
index 9a66554679..de30d372d0 100644
--- a/framework/db/conditions/InCondition.php
+++ b/framework/db/conditions/InCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -17,13 +22,11 @@ class InCondition implements ConditionInterface
      * @var string $operator the operator to use (e.g. `IN` or `NOT IN`)
      */
     private $operator;
-
     /**
      * @var string|string[] the column name. If it is an array, a composite `IN` condition
      * will be generated.
      */
     private $column;
-
     /**
      * @var ExpressionInterface[]|string[]|int[] an array of values that [[column]] value should be among.
      * If it is an empty array the generated expression will be a `false` value if
@@ -31,6 +34,7 @@ class InCondition implements ConditionInterface
      */
     private $values;
 
+
     /**
      * SimpleCondition constructor
      *
diff --git a/framework/db/conditions/InConditionBuilder.php b/framework/db/conditions/InConditionBuilder.php
index 6554cbd333..87e4d8dca2 100644
--- a/framework/db/conditions/InConditionBuilder.php
+++ b/framework/db/conditions/InConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -17,6 +22,7 @@ class InConditionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/conditions/LikeCondition.php b/framework/db/conditions/LikeCondition.php
index 3619da775a..3586adfff2 100644
--- a/framework/db/conditions/LikeCondition.php
+++ b/framework/db/conditions/LikeCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -19,12 +24,13 @@ class LikeCondition extends SimpleCondition
      */
     protected $escapingReplacements;
 
+
     /**
      * @param string $column the column name.
      * @param string $operator the operator to use (e.g. `LIKE`, `NOT LIKE`, `OR LIKE` or `OR NOT LIKE`)
      * @param string[]|string $value single value or an array of values that $column should be compared with.
-     *   If it is an empty array the generated expression will  be a `false` value if operator is `LIKE` or `OR LIKE`
-     *   and empty if operator is `NOT LIKE` or `OR NOT LIKE`.
+     * If it is an empty array the generated expression will  be a `false` value if operator is `LIKE` or `OR LIKE`
+     * and empty if operator is `NOT LIKE` or `OR NOT LIKE`.
      */
     public function __construct($column, $operator, $value)
     {
@@ -35,9 +41,9 @@ class LikeCondition extends SimpleCondition
      * This method allows to specify how to escape special characters in the value(s).
      *
      * @param array an array of mappings from the special characters to their escaped counterparts.
-     *  You may use `false` or an empty array to indicate the values are already escaped and no escape
-     *  should be applied. Note that when using an escape mapping (or the third operand is not provided),
-     *  the values will be automatically enclosed within a pair of percentage characters.
+     * You may use `false` or an empty array to indicate the values are already escaped and no escape
+     * should be applied. Note that when using an escape mapping (or the third operand is not provided),
+     * the values will be automatically enclosed within a pair of percentage characters.
      */
     public function setEscapingReplacements($escapingReplacements)
     {
diff --git a/framework/db/conditions/LikeConditionBuilder.php b/framework/db/conditions/LikeConditionBuilder.php
index d8fbd6b865..62c3751705 100644
--- a/framework/db/conditions/LikeConditionBuilder.php
+++ b/framework/db/conditions/LikeConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -32,6 +37,7 @@ class LikeConditionBuilder implements ExpressionBuilderInterface
      */
     protected $escapeCharacter;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/conditions/NotCondition.php b/framework/db/conditions/NotCondition.php
index 8925f39993..f176620b8d 100644
--- a/framework/db/conditions/NotCondition.php
+++ b/framework/db/conditions/NotCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -17,6 +22,7 @@ class NotCondition implements ConditionInterface
      */
     private $condition;
 
+
     /**
      * NotCondition constructor.
      *
diff --git a/framework/db/conditions/NotConditionBuilder.php b/framework/db/conditions/NotConditionBuilder.php
index 1cac415ff4..1023b7f62d 100644
--- a/framework/db/conditions/NotConditionBuilder.php
+++ b/framework/db/conditions/NotConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -16,6 +21,7 @@ class NotConditionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/conditions/OrCondition.php b/framework/db/conditions/OrCondition.php
index 9cc2cc83c9..f70d2da853 100644
--- a/framework/db/conditions/OrCondition.php
+++ b/framework/db/conditions/OrCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
diff --git a/framework/db/conditions/SimpleCondition.php b/framework/db/conditions/SimpleCondition.php
index fe4632df38..ba27d1555f 100644
--- a/framework/db/conditions/SimpleCondition.php
+++ b/framework/db/conditions/SimpleCondition.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -25,6 +30,7 @@ class SimpleCondition implements ConditionInterface
      */
     private $value;
 
+
     /**
      * SimpleCondition constructor
      *
diff --git a/framework/db/conditions/SimpleConditionBuilder.php b/framework/db/conditions/SimpleConditionBuilder.php
index c916d41d1d..512a164dc7 100644
--- a/framework/db/conditions/SimpleConditionBuilder.php
+++ b/framework/db/conditions/SimpleConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\conditions;
 
@@ -17,6 +22,7 @@ class SimpleConditionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * Method builds the raw SQL from the $expression that will not be additionally
      * escaped or quoted.
diff --git a/framework/db/cubrid/QueryBuilder.php b/framework/db/cubrid/QueryBuilder.php
index 92c14e186f..5281f8e46b 100644
--- a/framework/db/cubrid/QueryBuilder.php
+++ b/framework/db/cubrid/QueryBuilder.php
@@ -48,6 +48,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
         Schema::TYPE_MONEY => 'decimal(19,4)',
     ];
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/cubrid/Schema.php b/framework/db/cubrid/Schema.php
index d67f978281..90752cbbda 100644
--- a/framework/db/cubrid/Schema.php
+++ b/framework/db/cubrid/Schema.php
@@ -85,6 +85,7 @@ class Schema extends \yii\db\Schema implements ConstraintFinderInterface
      */
     protected $tableQuoteCharacter = '"';
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/cubrid/conditions/LikeConditionBuilder.php b/framework/db/cubrid/conditions/LikeConditionBuilder.php
index a83ecc07ae..c6ea75ed77 100644
--- a/framework/db/cubrid/conditions/LikeConditionBuilder.php
+++ b/framework/db/cubrid/conditions/LikeConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\cubrid\conditions;
 
diff --git a/framework/db/mssql/QueryBuilder.php b/framework/db/mssql/QueryBuilder.php
index 45b44104cc..761f4799a0 100644
--- a/framework/db/mssql/QueryBuilder.php
+++ b/framework/db/mssql/QueryBuilder.php
@@ -46,6 +46,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
         Schema::TYPE_MONEY => 'decimal(19,4)',
     ];
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/mssql/conditions/InConditionBuilder.php b/framework/db/mssql/conditions/InConditionBuilder.php
index eba1e1d11d..7892b54556 100644
--- a/framework/db/mssql/conditions/InConditionBuilder.php
+++ b/framework/db/mssql/conditions/InConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\mssql\conditions;
 
diff --git a/framework/db/mssql/conditions/LikeConditionBuilder.php b/framework/db/mssql/conditions/LikeConditionBuilder.php
index 04948402e8..f96cd2aadb 100644
--- a/framework/db/mssql/conditions/LikeConditionBuilder.php
+++ b/framework/db/mssql/conditions/LikeConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\mssql\conditions;
 
@@ -17,5 +22,4 @@ class LikeConditionBuilder extends \yii\db\conditions\LikeConditionBuilder
         ']' => '[]]',
         '\\' => '[\\]',
     ];
-
 }
diff --git a/framework/db/mysql/JsonExpressionBuilder.php b/framework/db/mysql/JsonExpressionBuilder.php
index c41f9ee53a..2f3d11e34d 100644
--- a/framework/db/mysql/JsonExpressionBuilder.php
+++ b/framework/db/mysql/JsonExpressionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\mysql;
 
@@ -21,6 +26,7 @@ class JsonExpressionBuilder implements ExpressionBuilderInterface
 
     const PARAM_PREFIX = ':qp';
 
+
     /**
      * {@inheritdoc}
      * @param JsonExpression|ExpressionInterface $expression the expression to be built
diff --git a/framework/db/mysql/QueryBuilder.php b/framework/db/mysql/QueryBuilder.php
index 37e33c7671..ad5730ed06 100644
--- a/framework/db/mysql/QueryBuilder.php
+++ b/framework/db/mysql/QueryBuilder.php
@@ -49,6 +49,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
         Schema::TYPE_JSON => 'json'
     ];
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/oci/QueryBuilder.php b/framework/db/oci/QueryBuilder.php
index 690cb1bc0e..855032e170 100644
--- a/framework/db/oci/QueryBuilder.php
+++ b/framework/db/oci/QueryBuilder.php
@@ -51,6 +51,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
         Schema::TYPE_MONEY => 'NUMBER(19,4)',
     ];
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/oci/conditions/InConditionBuilder.php b/framework/db/oci/conditions/InConditionBuilder.php
index af1a8c34e4..131bf5bf0d 100644
--- a/framework/db/oci/conditions/InConditionBuilder.php
+++ b/framework/db/oci/conditions/InConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\oci\conditions;
 
diff --git a/framework/db/oci/conditions/LikeConditionBuilder.php b/framework/db/oci/conditions/LikeConditionBuilder.php
index cadfb58f33..a8c0c2ab92 100644
--- a/framework/db/oci/conditions/LikeConditionBuilder.php
+++ b/framework/db/oci/conditions/LikeConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\oci\conditions;
 
@@ -24,6 +29,7 @@ class LikeConditionBuilder extends \yii\db\conditions\LikeConditionBuilder
         '!' => '!!',
     ];
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/pgsql/ArrayExpressionBuilder.php b/framework/db/pgsql/ArrayExpressionBuilder.php
index 455aca7408..855cfb00c1 100644
--- a/framework/db/pgsql/ArrayExpressionBuilder.php
+++ b/framework/db/pgsql/ArrayExpressionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\pgsql;
 
@@ -19,6 +24,7 @@ class ArrayExpressionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * {@inheritdoc}
      * @param ArrayExpression|ExpressionInterface $expression the expression to be built
diff --git a/framework/db/pgsql/ArrayParser.php b/framework/db/pgsql/ArrayParser.php
index bf615d92bd..8ce08b24f5 100644
--- a/framework/db/pgsql/ArrayParser.php
+++ b/framework/db/pgsql/ArrayParser.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\pgsql;
 
@@ -16,6 +21,7 @@ class ArrayParser
      */
     private $delimiter = ',';
 
+
     /**
      * Convert array from PostgreSQL to PHP
      *
diff --git a/framework/db/pgsql/ColumnSchema.php b/framework/db/pgsql/ColumnSchema.php
index ec135dcf7f..1b16242b61 100644
--- a/framework/db/pgsql/ColumnSchema.php
+++ b/framework/db/pgsql/ColumnSchema.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\pgsql;
 
@@ -18,6 +23,7 @@ class ColumnSchema extends \yii\db\ColumnSchema
      */
     public $dimension = 0;
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/pgsql/JsonExpressionBuilder.php b/framework/db/pgsql/JsonExpressionBuilder.php
index 4e72019305..1a5cad0fe5 100644
--- a/framework/db/pgsql/JsonExpressionBuilder.php
+++ b/framework/db/pgsql/JsonExpressionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\pgsql;
 
@@ -19,6 +24,7 @@ class JsonExpressionBuilder implements ExpressionBuilderInterface
 {
     use ExpressionBuilderTrait;
 
+
     /**
      * {@inheritdoc}
      * @param JsonExpression|ExpressionInterface $expression the expression to be built
diff --git a/framework/db/pgsql/QueryBuilder.php b/framework/db/pgsql/QueryBuilder.php
index fbd75aec8a..acf40313b1 100644
--- a/framework/db/pgsql/QueryBuilder.php
+++ b/framework/db/pgsql/QueryBuilder.php
@@ -77,6 +77,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
         Schema::TYPE_JSON => 'jsonb',
     ];
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php
index 973602acda..5f9cb5de41 100644
--- a/framework/db/sqlite/QueryBuilder.php
+++ b/framework/db/sqlite/QueryBuilder.php
@@ -51,6 +51,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
         Schema::TYPE_MONEY => 'decimal(19,4)',
     ];
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/db/sqlite/conditions/InConditionBuilder.php b/framework/db/sqlite/conditions/InConditionBuilder.php
index 04012693cb..9ad84558c5 100644
--- a/framework/db/sqlite/conditions/InConditionBuilder.php
+++ b/framework/db/sqlite/conditions/InConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\sqlite\conditions;
 
diff --git a/framework/db/sqlite/conditions/LikeConditionBuilder.php b/framework/db/sqlite/conditions/LikeConditionBuilder.php
index 25c53465fd..0aa7d919c0 100644
--- a/framework/db/sqlite/conditions/LikeConditionBuilder.php
+++ b/framework/db/sqlite/conditions/LikeConditionBuilder.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\db\sqlite\conditions;
 
diff --git a/framework/filters/auth/HttpBearerAuth.php b/framework/filters/auth/HttpBearerAuth.php
index 4756731033..82b9776274 100644
--- a/framework/filters/auth/HttpBearerAuth.php
+++ b/framework/filters/auth/HttpBearerAuth.php
@@ -37,8 +37,8 @@ class HttpBearerAuth extends HttpHeaderAuth
      */
     public $pattern = '/^Bearer\s+(.*?)$/';
     /**
-    * @var string the HTTP authentication realm
-    */
+     * @var string the HTTP authentication realm
+     */
     public $realm = 'api';
 
 
diff --git a/framework/grid/DataColumn.php b/framework/grid/DataColumn.php
index ada7101914..be1610190e 100644
--- a/framework/grid/DataColumn.php
+++ b/framework/grid/DataColumn.php
@@ -110,7 +110,7 @@ class DataColumn extends Column
      * @var array the HTML attributes for the filter input fields. This property is used in combination with
      * the [[filter]] property. When [[filter]] is not set or is an array, this property will be used to
      * render the HTML attributes for the generated filter input fields.
-     * 
+     *
      * Empty `id` in the default value ensures that id would not be obtained from the model attribute thus
      * providing better performance.
      *
diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php
index b7c3421e43..a4d58d03c9 100644
--- a/framework/helpers/BaseFileHelper.php
+++ b/framework/helpers/BaseFileHelper.php
@@ -33,7 +33,6 @@ class BaseFileHelper
      * @var string the path (or alias) of a PHP file containing MIME type information.
      */
     public static $mimeMagicFile = '@yii/helpers/mimeTypes.php';
-
     /**
      * @var string the path (or alias) of a PHP file containing MIME aliases.
      * @since 2.0.14
diff --git a/framework/helpers/BaseIpHelper.php b/framework/helpers/BaseIpHelper.php
index 74df866c4b..1548336744 100644
--- a/framework/helpers/BaseIpHelper.php
+++ b/framework/helpers/BaseIpHelper.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\helpers;
 
@@ -23,6 +28,7 @@ class BaseIpHelper
      */
     const IPV4_ADDRESS_LENGTH = 32;
 
+
     /**
      * Gets the IP version. Does not perform IP address validation.
      *
diff --git a/framework/helpers/IpHelper.php b/framework/helpers/IpHelper.php
index 8aedef41e2..1831659df7 100644
--- a/framework/helpers/IpHelper.php
+++ b/framework/helpers/IpHelper.php
@@ -1,4 +1,9 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yii\helpers;
 
diff --git a/framework/i18n/Locale.php b/framework/i18n/Locale.php
index c45db6ee41..c2670a3bae 100644
--- a/framework/i18n/Locale.php
+++ b/framework/i18n/Locale.php
@@ -16,6 +16,9 @@ use yii\base\InvalidConfigException;
  *
  * The class requires [PHP intl extension](http://php.net/manual/en/book.intl.php) to be installed.
  * @since 2.0.14
+ *
+ * @property string $currencySymbol This property is read-only.
+ *
  */
 class Locale extends Component
 {
@@ -25,6 +28,7 @@ class Locale extends Component
      */
     public $locale;
 
+
     /**
      * {@inheritdoc}
      */
diff --git a/framework/log/FileTarget.php b/framework/log/FileTarget.php
index ec84441316..4f077e5290 100644
--- a/framework/log/FileTarget.php
+++ b/framework/log/FileTarget.php
@@ -72,6 +72,7 @@ class FileTarget extends Target
      */
     public $rotateByCopy = true;
 
+
     /**
      * Initializes the route.
      * This method is invoked after the route is created by the route manager.
diff --git a/framework/rbac/BaseManager.php b/framework/rbac/BaseManager.php
index 27e4af2f47..d525d95f74 100644
--- a/framework/rbac/BaseManager.php
+++ b/framework/rbac/BaseManager.php
@@ -19,7 +19,8 @@ use yii\base\InvalidValueException;
  *
  * @property Role[] $defaultRoleInstances Default roles. The array is indexed by the role names. This property
  * is read-only.
- * @property string[] $defaultRoles The default roles.
+ * @property array $defaultRoles Default roles. Note that the type of this property differs in getter and
+ * setter. See [[getDefaultRoles()]] and [[setDefaultRoles()]] for details.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
@@ -199,7 +200,7 @@ abstract class BaseManager extends Component implements ManagerInterface
 
     /**
      * Set default roles
-     * @param array|\Closure $roles either array of roles or a callable returning it
+     * @param string[]|\Closure $roles either array of roles or a callable returning it
      * @throws InvalidArgumentException when $roles is neither array nor Closure
      * @throws InvalidValueException when Closure return is not an array
      * @since 2.0.14
@@ -221,7 +222,7 @@ abstract class BaseManager extends Component implements ManagerInterface
 
     /**
      * Get default roles
-     * @return array default roles
+     * @return string[] default roles
      * @since 2.0.14
      */
     public function getDefaultRoles()
diff --git a/framework/test/BaseActiveFixture.php b/framework/test/BaseActiveFixture.php
index ccdc7e145d..100e770cb3 100644
--- a/framework/test/BaseActiveFixture.php
+++ b/framework/test/BaseActiveFixture.php
@@ -31,11 +31,13 @@ abstract class BaseActiveFixture extends DbFixture implements \IteratorAggregate
      * @var array the data rows. Each array element represents one row of data (column name => column value).
      */
     public $data = [];
+
     /**
      * @var \yii\db\ActiveRecord[] the loaded AR models
      */
     private $_models = [];
 
+
     /**
      * Returns the AR model by the specified model name.
      * A model name is the key of the corresponding data row in [[data]].
diff --git a/framework/validators/ExistValidator.php b/framework/validators/ExistValidator.php
index 036c9936c1..e3e9f9ec3c 100644
--- a/framework/validators/ExistValidator.php
+++ b/framework/validators/ExistValidator.php
@@ -79,7 +79,6 @@ class ExistValidator extends Validator
      * @since 2.0.11
      */
     public $targetAttributeJunction = 'and';
-
     /**
      * @var bool whether this validator is forced to always use master DB
      * @since 2.0.14
@@ -241,7 +240,7 @@ class ExistValidator extends Validator
      * @param string $targetClass
      * @param QueryInterface $query
      * @param mixed $value the value want to be checked
-     * @return boolean
+     * @return bool
      */
     private function valueExists($targetClass, $query, $value)
     {
diff --git a/framework/validators/FileValidator.php b/framework/validators/FileValidator.php
index 095cb763ef..51c94235ba 100644
--- a/framework/validators/FileValidator.php
+++ b/framework/validators/FileValidator.php
@@ -80,7 +80,6 @@ class FileValidator extends Validator
      * @see tooMany for the customized message when too many files are uploaded.
      */
     public $maxFiles = 1;
-
     /**
      * @var int the minimum file count the given attribute can hold.
      * Defaults to 0. Higher value means at least that number of files should be uploaded.
@@ -129,7 +128,6 @@ class FileValidator extends Validator
      * - {limit}: the value of [[maxFiles]]
      */
     public $tooMany;
-
     /**
      * @var string the error message used if the count of multiple uploads less that minFiles.
      * You may use the following tokens in the message:
@@ -140,7 +138,6 @@ class FileValidator extends Validator
      * @since 2.0.14
      */
     public $tooFew;
-
     /**
      * @var string the error message used when the uploaded file has an extension name
      * that is not listed in [[extensions]]. You may use the following tokens in the message:
diff --git a/framework/validators/UniqueValidator.php b/framework/validators/UniqueValidator.php
index 03f610963e..3f7a6fa075 100644
--- a/framework/validators/UniqueValidator.php
+++ b/framework/validators/UniqueValidator.php
@@ -89,8 +89,6 @@ class UniqueValidator extends Validator
      * @since 2.0.11
      */
     public $targetAttributeJunction = 'and';
-
-
     /**
      * @var bool whether this validator is forced to always use master DB
      * @since 2.0.14
diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php
index 50b6e23f74..f1bf66c189 100644
--- a/framework/web/ErrorHandler.php
+++ b/framework/web/ErrorHandler.php
@@ -69,7 +69,6 @@ class ErrorHandler extends \yii\base\ErrorHandler
      * @since 2.0.7
      */
     public $displayVars = ['_GET', '_POST', '_FILES', '_COOKIE', '_SESSION'];
-
     /**
      * @var string trace line with placeholders to be be substituted.
      * The placeholders are {file}, {line} and {text} and the string should be as follows.
@@ -82,6 +81,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
      */
     public $traceLine = '{html}';
 
+
     /**
      * Renders the exception.
      * @param \Exception|\Error $exception the exception to be rendered.
diff --git a/framework/web/JsonResponseFormatter.php b/framework/web/JsonResponseFormatter.php
index a87a5693b7..d53a442d53 100644
--- a/framework/web/JsonResponseFormatter.php
+++ b/framework/web/JsonResponseFormatter.php
@@ -42,19 +42,17 @@ class JsonResponseFormatter extends Component implements ResponseFormatterInterf
      * @since 2.0.14
      */
     const CONTENT_TYPE_JSONP = 'application/javascript; charset=UTF-8';
-
     /**
      * JSONP Content Type
      * @since 2.0.14
      */
     const CONTENT_TYPE_JSON = 'application/json; charset=UTF-8';
- 
     /**
      * HAL JSON Content Type
      * @since 2.0.14
      */
     const CONTENT_TYPE_HAL_JSON = 'application/hal+json; charset=UTF-8';
-    
+
     /**
      * @var string|null custom value of the `Content-Type` header of the response.
      * When equals `null` default content type will be used based on the `useJsonp` property.
diff --git a/framework/web/Session.php b/framework/web/Session.php
index a3550b9509..999e7f91a7 100644
--- a/framework/web/Session.php
+++ b/framework/web/Session.php
@@ -47,6 +47,7 @@ use yii\base\InvalidConfigException;
  *
  * @property array $allFlashes Flash messages (key => message or key => [message1, message2]). This property
  * is read-only.
+ * @property string $cacheLimiter Current cache limiter. This property is read-only.
  * @property array $cookieParams The session cookie parameters. This property is read-only.
  * @property int $count The number of session variables. This property is read-only.
  * @property string $flash The key identifying the flash message. Note that flash messages and normal session
@@ -88,7 +89,6 @@ class Session extends Component implements \IteratorAggregate, \ArrayAccess, \Co
      * @see http://www.php.net/manual/en/function.session-set-cookie-params.php
      */
     private $_cookieParams = ['httponly' => true];
-
     /**
      * @var $frozenSessionData array|null is used for saving session between recreations due to session parameters update.
      */
diff --git a/framework/widgets/ActiveForm.php b/framework/widgets/ActiveForm.php
index 2109740882..7da1da90ce 100644
--- a/framework/widgets/ActiveForm.php
+++ b/framework/widgets/ActiveForm.php
@@ -31,7 +31,6 @@ class ActiveForm extends Widget
      * @since 2.0.14
      */
     const VALIDATION_STATE_ON_CONTAINER = 'container';
-
     /**
      * Add validation state class to input tag
      * @since 2.0.14