diff --git a/.travis.yml b/.travis.yml
index 5bc7658..839abcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,6 +56,8 @@ matrix:
   fast_finish: true
   include:
     # run tests coverage on PHP 7.1
+    - php: 7.2
+
     - php: 7.1
       env: TASK_TESTS_COVERAGE=1
     - php: nightly
@@ -69,6 +71,7 @@ matrix:
 
   allow_failures:
     - php: nightly
+    - php: 7.2
 
 install:
   - |
diff --git a/build/controllers/DevController.php b/build/controllers/DevController.php
index f5b23dd..796c035 100644
--- a/build/controllers/DevController.php
+++ b/build/controllers/DevController.php
@@ -14,7 +14,7 @@ use yii\helpers\Console;
 use yii\helpers\FileHelper;
 
 /**
- * This command helps to set up a dev environment with all extensions and applications
+ * This command helps to set up a dev environment with all extensions and applications.
  *
  * It will clone an extension or app repo and link the yii2 dev installation to the containted applications/extensions vendor dirs
  * to help working on yii using the application to test it.
@@ -62,7 +62,7 @@ class DevController extends Controller
 
 
     /**
-     * Install all extensions and advanced + basic app
+     * Install all extensions and advanced + basic app.
      */
     public function actionAll()
     {
@@ -88,7 +88,7 @@ class DevController extends Controller
     }
 
     /**
-     * Runs a command in all extension and application directories
+     * Runs a command in all extension and application directories.
      *
      * Can be used to run e.g. `git pull`.
      *
@@ -118,7 +118,7 @@ class DevController extends Controller
     }
 
     /**
-     * This command installs a project template in the `apps` directory and links the framework and extensions
+     * This command installs a project template in the `apps` directory and links the framework and extensions.
      *
      * It basically runs the following commands in the dev repo root:
      *
@@ -178,7 +178,7 @@ class DevController extends Controller
     }
 
     /**
-     * This command installs an extension in the `extensions` directory and links the framework and other extensions
+     * This command installs an extension in the `extensions` directory and links the framework and other extensions.
      *
      * @param string $extension the application name e.g. `basic` or `advanced`.
      * @param string $repo url of the git repo to clone if it does not already exist.
@@ -237,12 +237,13 @@ class DevController extends Controller
         if (in_array($actionID, ['ext', 'app', 'all'], true)) {
             $options[] = 'useHttp';
         }
+
         return $options;
     }
 
 
     /**
-     * Remove all symlinks in the vendor subdirectory of the directory specified
+     * Remove all symlinks in the vendor subdirectory of the directory specified.
      * @param string $dir base directory
      */
     protected function cleanupVendorDir($dir)
@@ -261,7 +262,7 @@ class DevController extends Controller
     }
 
     /**
-     * Creates symlinks to framework and extension sources for the application
+     * Creates symlinks to framework and extension sources for the application.
      * @param string $dir application directory
      * @param string $base Yii sources base directory
      *
@@ -293,7 +294,7 @@ class DevController extends Controller
     }
 
     /**
-     * Properly removes symlinked directory under Windows, MacOS and Linux
+     * Properly removes symlinked directory under Windows, MacOS and Linux.
      *
      * @param string $file path to symlink
      */
@@ -307,7 +308,7 @@ class DevController extends Controller
     }
 
     /**
-     * Get a list of subdirectories for directory specified
+     * Get a list of subdirectories for directory specified.
      * @param string $dir directory to read
      *
      * @return array list of subdirectories
@@ -336,7 +337,7 @@ class DevController extends Controller
     }
 
     /**
-     * Finds linkable applications
+     * Finds linkable applications.
      *
      * @param string $dir directory to search in
      * @return array list of applications command can link
diff --git a/build/controllers/MimeTypeController.php b/build/controllers/MimeTypeController.php
index 768aac5..8faf653 100644
--- a/build/controllers/MimeTypeController.php
+++ b/build/controllers/MimeTypeController.php
@@ -13,7 +13,7 @@ use yii\helpers\Console;
 use yii\helpers\VarDumper;
 
 /**
- * MimeTypeController generates a map of file extensions to MIME types
+ * MimeTypeController generates a map of file extensions to MIME types.
  *
  * It uses `mime.types` file from apache http located under
  * http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?view=markup
diff --git a/build/controllers/PhpDocController.php b/build/controllers/PhpDocController.php
index 0c716dc..9c7a998 100644
--- a/build/controllers/PhpDocController.php
+++ b/build/controllers/PhpDocController.php
@@ -13,7 +13,7 @@ use yii\helpers\Console;
 use yii\helpers\FileHelper;
 
 /**
- * PhpDocController is there to help maintaining PHPDoc annotation in class files
+ * PhpDocController is there to help maintaining PHPDoc annotation in class files.
  *
  * @author Carsten Brandt <mail@cebe.cc>
  * @author Alexander Makarov <sam@rmcreative.ru>
@@ -34,7 +34,7 @@ class PhpDocController extends Controller
 
 
     /**
-     * Generates `@property` annotations in class files from getters and setters
+     * Generates `@property` annotations in class files from getters and setters.
      *
      * Property description will be taken from getter or setter or from an `@property` annotation
      * in the getters docblock if there is one defined.
@@ -70,7 +70,7 @@ class PhpDocController extends Controller
     }
 
     /**
-     * Fix some issues with PHPdoc in files
+     * Fix some issues with PHPDoc in files.
      *
      * @param string $root the directory to parse files from. Defaults to YII2_PATH.
      */
@@ -243,7 +243,7 @@ class PhpDocController extends Controller
     }
 
     /**
-     * Fix file PHPdoc
+     * Fix file PHPDoc.
      */
     protected function fixFileDoc(&$lines)
     {
@@ -284,7 +284,7 @@ class PhpDocController extends Controller
     }
 
     /**
-     * Markdown aware fix of whitespace issues in doc comments
+     * Markdown aware fix of whitespace issues in doc comments.
      */
     protected function fixDocBlockIndentation(&$lines)
     {
@@ -350,12 +350,15 @@ class PhpDocController extends Controller
                     case 'boolean': $types[$i] = 'bool'; break;
                 }
             }
+
             return '@' . $matches[1] . ' ' . implode('|', $types);
         }, $line);
     }
 
     /**
-     * Fixes line spacing code style for properties and constants
+     * Fixes line spacing code style for properties and constants.
+     * @param string[] $lines
+     * @return string[]
      */
     protected function fixLineSpacing($lines)
     {
@@ -551,7 +554,7 @@ class PhpDocController extends Controller
     }
 
     /**
-     * remove multi empty lines and trim trailing whitespace
+     * remove multi empty lines and trim trailing whitespace.
      *
      * @param $doc
      * @return string
@@ -571,7 +574,7 @@ class PhpDocController extends Controller
     }
 
     /**
-     * Replace property annotations in doc comment
+     * Replace property annotations in doc comment.
      * @param $doc
      * @param $properties
      * @return string
@@ -759,6 +762,7 @@ class PhpDocController extends Controller
                 $sets[] = $set;
             }
         }
+
         return $sets;
     }
 
@@ -768,6 +772,7 @@ class PhpDocController extends Controller
         if ($str == '') {
             return '';
         }
+
         return strtoupper(substr($str, 0, 1)) . substr($str, 1) . ($str[strlen($str) - 1] != '.' ? '.' : '');
     }
 
diff --git a/build/controllers/ReleaseController.php b/build/controllers/ReleaseController.php
index 375bc91..bc6857e 100644
--- a/build/controllers/ReleaseController.php
+++ b/build/controllers/ReleaseController.php
@@ -71,6 +71,7 @@ class ReleaseController extends Controller
         } elseif ($actionID === 'info') {
             $options[] = 'update';
         }
+
         return array_merge(parent::options($actionID), $options);
     }
 
@@ -140,6 +141,7 @@ class ReleaseController extends Controller
                 $w = $l;
             }
         }
+
         return $w;
     }
 
@@ -367,6 +369,7 @@ class ReleaseController extends Controller
     /**
      * @param array $what list of items
      * @param array $limit list of things to allow, or empty to allow any, can be `app`, `framework`, `extension`
+     * @param bool $ensureGitClean
      * @throws \yii\base\Exception
      */
     protected function validateWhat(array $what, $limit = [], $ensureGitClean = true)
@@ -434,11 +437,11 @@ class ReleaseController extends Controller
         $this->dryRun || Yii::$app->runAction('mime-type', ["$frameworkPath/helpers/mimeTypes.php"]);
         $this->stdout("done.\n", Console::FG_GREEN, Console::BOLD);
 
-        $this->stdout("fixing various PHPdoc style issues...\n", Console::BOLD);
+        $this->stdout("fixing various PHPDoc style issues...\n", Console::BOLD);
         $this->dryRun || Yii::$app->runAction('php-doc/fix', [$frameworkPath]);
         $this->stdout("done.\n", Console::FG_GREEN, Console::BOLD);
 
-        $this->stdout("updating PHPdoc @property annotations...\n", Console::BOLD);
+        $this->stdout("updating PHPDoc @property annotations...\n", Console::BOLD);
         $this->dryRun || Yii::$app->runAction('php-doc/property', [$frameworkPath]);
         $this->stdout("done.\n", Console::FG_GREEN, Console::BOLD);
 
@@ -558,13 +561,13 @@ class ReleaseController extends Controller
 
         // adjustments
 
-        $this->stdout("fixing various PHPdoc style issues...\n", Console::BOLD);
+        $this->stdout("fixing various PHPDoc style issues...\n", Console::BOLD);
         $this->setAppAliases($name, $path);
         $this->dryRun || Yii::$app->runAction('php-doc/fix', [$path, 'skipFrameworkRequirements' => true]);
         $this->resetAppAliases();
         $this->stdout("done.\n", Console::FG_GREEN, Console::BOLD);
 
-        $this->stdout("updating PHPdoc @property annotations...\n", Console::BOLD);
+        $this->stdout("updating PHPDoc @property annotations...\n", Console::BOLD);
         $this->setAppAliases($name, $path);
         $this->dryRun || Yii::$app->runAction('php-doc/property', [$path, 'skipFrameworkRequirements' => true]);
         $this->resetAppAliases();
@@ -676,11 +679,11 @@ class ReleaseController extends Controller
 
         // adjustments
 
-        $this->stdout("fixing various PHPdoc style issues...\n", Console::BOLD);
+        $this->stdout("fixing various PHPDoc style issues...\n", Console::BOLD);
         $this->dryRun || Yii::$app->runAction('php-doc/fix', [$path]);
         $this->stdout("done.\n", Console::FG_GREEN, Console::BOLD);
 
-        $this->stdout("updating PHPdoc @property annotations...\n", Console::BOLD);
+        $this->stdout("updating PHPDoc @property annotations...\n", Console::BOLD);
         $this->dryRun || Yii::$app->runAction('php-doc/property', [$path]);
         $this->stdout("done.\n", Console::FG_GREEN, Console::BOLD);
 
@@ -846,7 +849,10 @@ class ReleaseController extends Controller
     }
 
     /**
-     * Extract changelog content for a specific version
+     * Extract changelog content for a specific version.
+     * @param string $file
+     * @param string $version
+     * @return array
      */
     protected function splitChangelog($file, $version)
     {
@@ -875,11 +881,14 @@ class ReleaseController extends Controller
                 ${$state}[] = $line;
             }
         }
+
         return [$start, $changelog, $end];
     }
 
     /**
-     * Ensure sorting of the changelog lines
+     * Ensure sorting of the changelog lines.
+     * @param string[] $changelog
+     * @return string[]
      */
     protected function resortChangelog($changelog)
     {
@@ -895,6 +904,7 @@ class ReleaseController extends Controller
                 $o = ['Bug' => 'C', 'Enh' => 'D', 'Chg' => 'E', 'New' => 'F'];
                 return $o[$m[1]] . ' ' . (!empty($m[2]) ? $m[2] : 'AAAA' . $i++);
             }
+
             return 'B' . $i++;
         }, SORT_ASC, SORT_NATURAL);
 
@@ -929,6 +939,7 @@ class ReleaseController extends Controller
                     return true;
                 }
             }
+
             return false;
         });
     }
@@ -1001,6 +1012,7 @@ class ReleaseController extends Controller
             rsort($tags, SORT_NATURAL); // TODO this can not deal with alpha/beta/rc...
             $versions[$ext] = reset($tags);
         }
+
         return $versions;
     }
 
@@ -1034,6 +1046,7 @@ class ReleaseController extends Controller
             }
             $versions[$k] = implode('.', $parts);
         }
+
         return $versions;
     }
 }
diff --git a/build/controllers/TranslationController.php b/build/controllers/TranslationController.php
index 9adc9c9..0200ad9 100644
--- a/build/controllers/TranslationController.php
+++ b/build/controllers/TranslationController.php
@@ -83,7 +83,7 @@ class TranslationController extends Controller
     }
 
     /**
-     * Checks for files existence
+     * Checks for files existence.
      *
      * @param string $translatedFilePath
      * @param string $sourceFilePath
@@ -104,7 +104,7 @@ class TranslationController extends Controller
     }
 
     /**
-     * Getting DIFF from git
+     * Getting DIFF from git.
      *
      * @param string $translatedFilePath path pointing to translated file
      * @param string $sourceFilePath path pointing to original file
@@ -117,7 +117,7 @@ class TranslationController extends Controller
     }
 
     /**
-     * Adds all necessary HTML tags and classes to diff output
+     * Adds all necessary HTML tags and classes to diff output.
      *
      * @param string $diff DIFF
      * @return string highlighted DIFF
diff --git a/build/controllers/Utf8Controller.php b/build/controllers/Utf8Controller.php
index 133928a..64e8c0a 100644
--- a/build/controllers/Utf8Controller.php
+++ b/build/controllers/Utf8Controller.php
@@ -96,7 +96,7 @@ class Utf8Controller extends Controller
     }
 
     /**
-     * Equvalent for ord() just for unicode
+     * Equivalent for ord() just for unicode.
      *
      * http://stackoverflow.com/a/10333324/1106908
      *
diff --git a/composer.json b/composer.json
index 06bd6e4..05f7396 100644
--- a/composer.json
+++ b/composer.json
@@ -78,7 +78,7 @@
         "psr/http-message": "~1.0.0",
         "ezyang/htmlpurifier": "~4.6",
         "cebe/markdown": "~1.0.0 | ~1.1.0",
-        "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
+        "bower-asset/jquery": "3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
         "bower-asset/inputmask": "~3.2.2 | ~3.3.5",
         "bower-asset/punycode": "1.3.*",
         "bower-asset/yii2-pjax": "~2.0.1"
diff --git a/cs/src/YiiConfig.php b/cs/src/YiiConfig.php
index 0ff0ebf..4e2e28f 100644
--- a/cs/src/YiiConfig.php
+++ b/cs/src/YiiConfig.php
@@ -95,7 +95,7 @@ class YiiConfig extends Config
             'no_useless_return' => true,
             'no_whitespace_before_comma_in_array' => true,
             'no_whitespace_in_blank_line' => true,
-//            'non_printable_character' => true, // breaks Formatter::asCurrency() tests
+            'non_printable_character' => true,
             'normalize_index_brace' => true,
             'object_operator_without_whitespace' => true,
 //            'ordered_class_elements' => [ // needs more discussion
@@ -124,9 +124,7 @@ class YiiConfig extends Config
             'php_unit_dedicate_assert' => true,
             'php_unit_fqcn_annotation' => true,
 //            'php_unit_strict' => true, // needs more attention
-//            'phpdoc_add_missing_param_annotation' => [ // needs more attention
-//                'only_untyped' => false,
-//            ],
+            'phpdoc_add_missing_param_annotation' => true,
             'phpdoc_indent' => true,
 //            'phpdoc_inline_tag' => true, // see https://github.com/yiisoft/yii2/issues/11635
             'phpdoc_no_access' => true,
@@ -137,10 +135,10 @@ class YiiConfig extends Config
             'phpdoc_return_self_reference' => true,
             'phpdoc_scalar' => true,
             'phpdoc_single_line_var_spacing' => true,
-//            'phpdoc_summary' => true, // needs more attention (summary should be separated by blank line from description)
+            'phpdoc_summary' => true,
 //            'phpdoc_to_comment' => true, // breaks phpdoc for define('CONSTANT', $value);
             'phpdoc_trim' => true,
-//            'phpdoc_types' => true, // conflicts with yii\base\Object typehits https://github.com/yiisoft/yii2/pull/12699
+            'phpdoc_types' => true,
             'phpdoc_var_without_name' => true,
             'protected_to_private' => true,
             'psr4' => true,
diff --git a/docs/guide-es/caching-data.md b/docs/guide-es/caching-data.md
index b07eaef..b699742 100644
--- a/docs/guide-es/caching-data.md
+++ b/docs/guide-es/caching-data.md
@@ -96,7 +96,7 @@ Todos los componentes de almacenamiento de caché provienen de la misma clase "p
 * [[yii\caching\Cache::madd()|madd()]]: almacena múltiples elementos de datos en la memoria caché. Cada elemento se identifica con una clave. Si una clave ya existe en la caché, el elemento será omitido.
 * [[yii\caching\Cache::exists()|exists()]]: devuelve un valor que indica si la clave especificada se encuentra en la memoria caché.
 * [[yii\caching\Cache::delete()|delete()]]: elimina un elemento de datos identificado por una clave de la caché.
-* [[yii\caching\Cache::flush()|flush()]]: elimina todos los elementos de datos de la cache.
+* [[yii\caching\Cache::clear()|clear()]]: elimina todos los elementos de datos de la cache.
 
 > Note: No Almacenes el valor boolean `false` en caché directamente porque el método [[yii\caching\Cache::get()|get()]] devuelve
 el valor `false` para indicar que el dato no ha sido encontrado en la caché. Puedes poner `false` dentro de un array y cachear
diff --git a/docs/guide-fr/caching-data.md b/docs/guide-fr/caching-data.md
index 6302394..d3cd58d 100644
--- a/docs/guide-fr/caching-data.md
+++ b/docs/guide-fr/caching-data.md
@@ -122,7 +122,7 @@ Tous les composants de mise en cache dérivent de la même classe de base [[yii\
 * [[yii\caching\Cache::multiAdd()|multiAdd()]]: stocke de multiples données dans le cache. Chaque donnée est identifiée par une clé. Si la clé existe déjà dans le cache, la donnée est ignorée.
 * [[yii\caching\Cache::exists()|exists()]]: retourne une valeur indiquant si la clé spécifiée existe dans le cache.
 * [[yii\caching\Cache::delete()|delete()]]: retire du cache une donnée identifiée par une clé.
-* [[yii\caching\Cache::flush()|flush()]]: retire toutes les données du cache.
+* [[yii\caching\Cache::clear()|clear()]]: retire toutes les données du cache.
 
 > Note : ne mettez pas directement en cache une valeur booléenne `false` parce que la méthode [[yii\caching\Cache::get()|get()]] utilise  la valeur `false` pour indiquer que la donnée n'a pas été trouvée dans le cache. Au lieu de cela, vous pouvez placer cette donnée dans un tableau et mettre ce tableau en cache pour éviter le problème.
 
@@ -254,7 +254,7 @@ $result = Customer::getDb()->cache(function ($db) {
 
 ### Vidage du cache <span id="cache-flushing">
 
-Lorsque vous avez besoin d'invalider toutes les données stockées dans le cache, vous pouvez appeler [[yii\caching\Cache::flush()]].
+Lorsque vous avez besoin d'invalider toutes les données stockées dans le cache, vous pouvez appeler [[yii\caching\Cache::clear()]].
 
 Vous pouvez aussi vider le cache depuis la console en appelant `yii cache/flush`.
  - `yii cache`: liste les caches disponibles dans une application
diff --git a/docs/guide-fr/output-data-widgets.md b/docs/guide-fr/output-data-widgets.md
index d41eb1a..b5fa958 100644
--- a/docs/guide-fr/output-data-widgets.md
+++ b/docs/guide-fr/output-data-widgets.md
@@ -586,7 +586,7 @@ class UserView extends ActiveRecord
     /**
      * @inheritdoc
      */
-    public static function attributeLabels()
+    public function attributeLabels()
     {
         return [
             // définissez vos étiquettes d'attribut ici
diff --git a/docs/guide-ja/caching-data.md b/docs/guide-ja/caching-data.md
index 840c0f2..c521424 100644
--- a/docs/guide-ja/caching-data.md
+++ b/docs/guide-ja/caching-data.md
@@ -129,7 +129,7 @@ Yii はさまざまなキャッシュストレージをサポートしていま
 * [[yii\caching\Cache::multiAdd()|multiAdd()]]: キャッシュに複数のデータを格納します。各データはキーによって識別されます。もしキャッシュ内にキーがすでに存在する場合はスキップされます。
 * [[yii\caching\Cache::exists()|exists()]]: 指定されたキーがキャッシュ内で見つかったかどうかを示す値を返します。
 * [[yii\caching\Cache::delete()|delete()]]: キャッシュからキーによって識別されるデータを削除します。
-* [[yii\caching\Cache::flush()|flush()]]: キャッシュからすべてのデータを削除します。
+* [[yii\caching\Cache::clear()|clear()]]: キャッシュからすべてのデータを削除します。
 
 > Note: [[yii\caching\Cache::get()|get()]] メソッドは、データがキャッシュ内に見つからないことを示すために戻り値として false を使用しているので、直接 boolean 型の `false` をキャッシュしないでください。
 代りに配列内に `false` を置いてキャッシュすることによって、この問題を回避できます。
@@ -278,7 +278,7 @@ $result = Customer::getDb()->cache(function ($db) {
 
 ### キャッシュのフラッシュ <span id="cache-flushing">
 
-保存されている全てのキャッシュデータを無効化する必要がある場合は、[[yii\caching\Cache::flush()]] を呼ぶことが出来ます。
+保存されている全てのキャッシュデータを無効化する必要がある場合は、[[yii\caching\Cache::clear()]] を呼ぶことが出来ます。
 
 コンソールから `yii cache/flush` を呼ぶことによっても、キャッシュをフラッシュすることが出来ます。
  - `yii cache`: アプリケーションで利用可能なキャッシュのリストを表示します。
diff --git a/docs/guide-ja/db-active-record.md b/docs/guide-ja/db-active-record.md
index 422bd22..590e0f2 100644
--- a/docs/guide-ja/db-active-record.md
+++ b/docs/guide-ja/db-active-record.md
@@ -1363,7 +1363,7 @@ class Customer extends \yii\db\ActiveRecord
 {
     public function getComments()
     {
-        return $this->hasMany(Comment::className(), ['customer_id' => 'id']);
+        return $this->hasMany(Comment::class, ['customer_id' => 'id']);
     }
 }
 
@@ -1553,7 +1553,7 @@ class Customer extends \yii\db\ActiveRecord
      */
     public function getOrders()
     {
-        return $this->hasMany(Order::className(), ['customer_id' => 'id']);
+        return $this->hasMany(Order::class, ['customer_id' => 'id']);
     }
 
     /**
diff --git a/docs/guide-ja/output-client-scripts.md b/docs/guide-ja/output-client-scripts.md
index aae33b2..c587b71 100644
--- a/docs/guide-ja/output-client-scripts.md
+++ b/docs/guide-ja/output-client-scripts.md
@@ -97,7 +97,7 @@ CSS ファイルは次のようにして登録することが出来ます。
 
 ```php
 $this->registerCssFile("@web/css/themes/black-and-white.css", [
-    'depends' => [\yii\bootstrap\BootstrapAsset::className()],
+    'depends' => [\yii\bootstrap\BootstrapAsset::class],
     'media' => 'print',
 ], 'css-print-theme');
 ```
diff --git a/docs/guide-ja/output-data-widgets.md b/docs/guide-ja/output-data-widgets.md
index 8cedf18..b5367ea 100644
--- a/docs/guide-ja/output-data-widgets.md
+++ b/docs/guide-ja/output-data-widgets.md
@@ -662,7 +662,7 @@ class UserView extends ActiveRecord
     /**
      * @inheritdoc
      */
-    public static function attributeLabels()
+    public function attributeLabels()
     {
         return [
             // ここで属性のラベルを定義
diff --git a/docs/guide-pl/db-active-record.md b/docs/guide-pl/db-active-record.md
index 7cbfbb7..2d2a686 100644
--- a/docs/guide-pl/db-active-record.md
+++ b/docs/guide-pl/db-active-record.md
@@ -1376,7 +1376,7 @@ class Customer extends \yii\db\ActiveRecord
 {
     public function getComments()
     {
-        return $this->hasMany(Comment::className(), ['customer_id' => 'id']);
+        return $this->hasMany(Comment::class, ['customer_id' => 'id']);
     }
 }
 
@@ -1565,7 +1565,7 @@ class Customer extends \yii\db\ActiveRecord
      */
     public function getOrders()
     {
-        return $this->hasMany(Order::className(), ['customer_id' => 'id']);
+        return $this->hasMany(Order::class, ['customer_id' => 'id']);
     }
 
     /**
diff --git a/docs/guide-pt-BR/caching-data.md b/docs/guide-pt-BR/caching-data.md
index 29b022a..19cb533 100644
--- a/docs/guide-pt-BR/caching-data.md
+++ b/docs/guide-pt-BR/caching-data.md
@@ -119,7 +119,7 @@ Todos os componentes de caches estendem a mesma classe base [[yii\caching\Cache]
   Se a chave já existir em cache, o registro é ignorado.
 * [[yii\caching\Cache::exists()|exists()]]: retorna se a chave específica é encontrada no cache.
 * [[yii\caching\Cache::delete()|delete()]]: remove um registro do cache identificado por uma chave.
-* [[yii\caching\Cache::flush()|flush()]]: remove todos os registros do cache.
+* [[yii\caching\Cache::clear()|clear()]]: remove todos os registros do cache.
 
 > Observação: Não armazene o valor boleano `false` diretamente, porque o método [[yii\caching\Cache::get()|get()]] retorna `false`para indicar que o registro não foi encontrado em cache. Você pode armazena `false` em um array e armazenar este em cache para evitar este problema.
 
diff --git a/docs/guide-ru/caching-data.md b/docs/guide-ru/caching-data.md
index f98cf41..8e06102 100644
--- a/docs/guide-ru/caching-data.md
+++ b/docs/guide-ru/caching-data.md
@@ -121,7 +121,7 @@ Yii поддерживает множество хранилищ кэша:
   Если ключ уже существует, то сохранения не происходит;
 * [[yii\caching\Cache::exists()|exists()]]: есть ли указанный ключ в кэше;
 * [[yii\caching\Cache::delete()|delete()]]: удаляет указанный ключ;
-* [[yii\caching\Cache::flush()|flush()]]: удаляет все данные.
+* [[yii\caching\Cache::clear()|clear()]]: удаляет все данные.
 
 > Note: Не кэшируйте непосредственно значение `false`, потому что [[yii\caching\Cache::get()|get()]] использует
 `false` для случая, когда данные не найдены в кэше. Вы можете обернуть `false` в массив и закэшировать его, чтобы
@@ -252,9 +252,9 @@ $result = Customer::getDb()->cache(function ($db) {
 
 ### Очистка кэша <span id="cache-flushing">
 
-Для очистки всего кэша, вы можете вызвать [[yii\caching\Cache::flush()]].
+Для очистки всего кэша, вы можете вызвать [[yii\caching\Cache::clear()]].
 
-Также вы можете очистить кэш из консоли, вызвав `yii cache/flush`.
+Также вы можете очистить кэш из консоли, вызвав `yii cache/clear`.
  - `yii cache`: отображает список доступных кэширующих компонентов приложения
  - `yii cache/flush cache1 cache2`: очищает кэш в компонентах `cache1`, `cache2` (можно передать несколько названий
  компонентов кэширования, разделяя их пробелом)
diff --git a/docs/guide-ru/concept-service-locator.md b/docs/guide-ru/concept-service-locator.md
index 7680d05..1c6ab96 100644
--- a/docs/guide-ru/concept-service-locator.md
+++ b/docs/guide-ru/concept-service-locator.md
@@ -62,7 +62,7 @@ $cache = $locator->cache;
 Поскольку Service Locator часто используется с [конфигурациями](concept-configurations.md), в нём имеется доступное
 для записи свойство [[yii\di\ServiceLocator::setComponents()|components]]. Это позволяет настроить и зарегистрировать
 сразу несколько компонентов. Следующий код демонстрирует конфигурационный массив, который может использоваться
-для регистрации компонентов `db`, `cache` и `search` в Service Locator (то есть в [приложении](structure-applications.md)):
+для регистрации компонентов `db`, `cache`, `tz` и `search` в Service Locator (то есть в [приложении](structure-applications.md)):
 
 ```php
 return [
@@ -75,6 +75,9 @@ return [
             'password' => '',
         ],
         'cache' => 'yii\caching\ApcCache',
+        'tz' => function() {
+            return new \DateTimeZone(Yii::$app->formatter->defaultTimeZone);
+        },
         'search' => function () {
             $solr = new app\components\SolrService('127.0.0.1');
             // ... дополнительная инициализация ...
diff --git a/docs/guide-ru/output-data-widgets.md b/docs/guide-ru/output-data-widgets.md
index 11d7b66..71f173a 100644
--- a/docs/guide-ru/output-data-widgets.md
+++ b/docs/guide-ru/output-data-widgets.md
@@ -644,7 +644,7 @@ class UserView extends ActiveRecord
     /**
      * @inheritdoc
      */
-    public static function attributeLabels()
+    public function attributeLabels()
     {
         return [
             // здесь определяйте ваши метки атрибутов
diff --git a/docs/guide-ru/structure-applications.md b/docs/guide-ru/structure-applications.md
index 47c4e66..0045c19 100644
--- a/docs/guide-ru/structure-applications.md
+++ b/docs/guide-ru/structure-applications.md
@@ -136,12 +136,12 @@ ID в качестве элемента данного свойства.
 > будет использован компонент приложения. Если Вы вместо этого хотите использовать модуль, то можете указать его при
 > помощи анонимной функции похожей на эту:
 > ```php
-[
-    function () {
-        return Yii::$app->getModule('user');
-    },
-]
-```
+> [
+>     function () {
+>         return Yii::$app->getModule('user');
+>     },
+> ]
+> ```
 
 В процессе [начальной загрузки](runtime-bootstrapping.md), каждый компонент будет создан. Если класс компонента имеет
 интерфейс [[yii\base\BootstrapInterface]], то также будет вызван метод [[yii\base\BootstrapInterface::bootstrap()|bootstrap()]].
diff --git a/docs/guide-ru/test-overview.md b/docs/guide-ru/test-overview.md
index 9486dcd..3c7668e 100644
--- a/docs/guide-ru/test-overview.md
+++ b/docs/guide-ru/test-overview.md
@@ -1,21 +1,15 @@
 Тестирование
 ============
 
-Тестирование является важной составляющей разработки программного обеспечения. Мы проводим тестирование непрерывно, осознаем мы это или нет.
-Например, когда мы пишем класс на языке PHP, мы можем отлаживать его шаг за шагом или просто использовать `echo` или `die` для проверки, что
-реализация работает в соответствии с намеченным планом. В случае веб приложения, мы вводим некоторые тестовые данные в форму для того, чтобы
-убедиться, что страница взаимодействует с нами, как ожидается.
-
-Процесс тестирования может быть автоматизирован так, что каждый раз когда нам нужно что-то проверить, мы просто должны 
-вызвать код, который сделает это за нас. Код, который проверяет, что результат совпадает с тем, что мы планировали, называется тестом, а процесс
-создания тестов и их последующего использования - автоматизированным тестированием, что и является главной темой данного раздела.
+Тестирование является важной составляющей разработки программного обеспечения. Мы проводим тестирование непрерывно, осознаем мы это или нет. Например, когда мы пишем класс на языке PHP, мы можем отлаживать его шаг за шагом или просто использовать `echo` или `die` для проверки, что реализация работает в соответствии с намеченным планом. В случае веб приложения, мы вводим некоторые тестовые данные в форму для того, чтобы убедиться, что страница взаимодействует с нами, как ожидается.
 
+Процесс тестирования может быть автоматизирован так, что каждый раз, когда нам нужно что-то проверить, мы просто должны 
+вызвать код, который сделает это за нас. Код, который проверяет, что результат совпадает с тем, что мы планировали, называется тестом, а процесс создания тестов и их последующего использования - автоматизированным тестированием, что и является главной темой данного раздела.
 
 Разработка с тестами
 --------------------
 
-Разработка через тестирование (TDD) и разработка через поведение (BDD) - это подходы разработки программного обеспечения, в рамках которых
-поведение части кода или целая фича описывается в виде набора сценариев или тестов ДО написания фактического кода и только
+Разработка через тестирование (TDD) и разработка через поведение (BDD) - это подходы разработки программного обеспечения, в рамках которых поведение части кода или целая фича описывается в виде набора сценариев или тестов ДО написания фактического кода и только
 затем создается реализация. Тем самым мы можем использовать данные тесты для проверки, что достигается заданное поведение.
 
 Процесс разработки фичи следующий:
@@ -26,8 +20,7 @@
 - Запустить все тесты и убедиться, что они отрабатывают без ошибок
 - Улучшить код и убедиться, что все тесты все еще отрабатывают без ошибок
 
-После того как это завершено процесс повторяется снова для другой фичи или улучшения. Если существующая фича должна быть изменена, то и тесты
-также должны быть изменены.
+После того как это завершено, процесс повторяется снова для другой фичи или улучшения. Если существующая фича должна быть изменена, то и тесты также должны быть изменены.
 
 > Tip: Если вы чувствуете, что вы теряете время выполняя много мелких и простых итераций, попробуйте покрыть это
 > вашим тестовым сценарием перед следующим выполнением тестов. Если вы слишком много отлаживаете, попробуйте сделать обратное.
@@ -35,12 +28,12 @@
 Написание тестов до реализации конкретного функционала позволяет нам сосредоточиться на том, что мы хотим достичь и полностью
 погрузиться в "как это сделать" впоследствии. 
 
-Обычно это приводит к лучшим абстракциям и более легкой поддержке тестов, когда речь идет о корректировки фичи или уменьшении связанности компонентов.
+Обычно это приводит к лучшим абстракциям и более легкой поддержке тестов, когда речь идет о корректировке фичи или уменьшении связанности компонентов.
 
-Таким образом плюсы этого подхода следующие:
+Таким образом, плюсы этого подхода следующие:
 
 - Позволяет вам сосредоточиться на одной вещи, что в свою очередь приводит к улучшению планирования и реализации.
-- Более подробное покрытие тестами функционала, таким образом, если все тесты отрабатывают без ошибок, скорее всего, ничего не сломано.
+- Более подробное покрытие тестами функционала. Таким образом, если все тесты отрабатывают без ошибок, скорее всего, ничего не сломано.
 
 В долгосрочной перспективе это, как правило, дает вам хороший эффект экономии времени.
 
@@ -50,8 +43,7 @@
 Когда и как тестировать
 -----------------------
 
-Принцип разработки описанный выше имеет смысл применять для долгосрочных и относительно сложных проектов, в то время как для простых это может быть
-излишним. Есть несколько показателей того, когда данный подход уместен:
+Принцип разработки, описанный выше, имеет смысл применять для долгосрочных и относительно сложных проектов, в то время как для простых это может быть излишним. Есть несколько показателей того, когда данный подход уместен:
 
 - Проект уже большой и сложный.
 - Требования к проекту начинают усложняться. Проект постоянно растет.
@@ -63,7 +55,7 @@
 - Legacy-проект который постоянно обновляется.
 - Вам поручили работу над проектом, в котором нет ни одного теста.
 
-В некоторых случаях автоматизированно тестирование может быть излишним:
+В некоторых случаях автоматизированное тестирование может быть излишним:
 
 - Проект простой и не станет более сложным.
 - Это одноразовый проект, который больше не будет дорабатываться.
@@ -73,4 +65,4 @@
 Что почитать
 ------------
 
-- Экстремальное программирование. Разработка через тестирование / Кент Бек. ISBN: 0321146530.
\ No newline at end of file
+- Экстремальное программирование. Разработка через тестирование / Кент Бек. ISBN: 0321146530.
diff --git a/docs/guide-zh-CN/caching-data.md b/docs/guide-zh-CN/caching-data.md
index 3ea1b73..e720d61 100644
--- a/docs/guide-zh-CN/caching-data.md
+++ b/docs/guide-zh-CN/caching-data.md
@@ -90,7 +90,7 @@ Yii 支持一系列缓存存储器，概况如下：
 * [[yii\caching\Cache::madd()|madd()]]：将多项数据存储到缓存中，每项数据对应一个键。如果某个键已经存在于缓存中，则该项数据会被跳过。
 * [[yii\caching\Cache::exists()|exists()]]：返回一个值，指明某个键是否存在于缓存中。
 * [[yii\caching\Cache::delete()|delete()]]：通过一个键，删除缓存中对应的值。
-* [[yii\caching\Cache::flush()|flush()]]：删除缓存中的所有数据。
+* [[yii\caching\Cache::clear()|clear()]]：删除缓存中的所有数据。
 
 有些缓存存储器如 MemCache，APC 支持以批量模式取回缓存值，这样可以节省取回缓存数据的开支。 [[yii\caching\Cache::mget()|mget()]] 和 [[yii\caching\Cache::madd()|madd()]] API提供对该特性的支持。如果底层缓存存储器不支持该特性，Yii 也会模拟实现。
 
diff --git a/docs/guide-zh-CN/concept-service-locator.md b/docs/guide-zh-CN/concept-service-locator.md
index c9f278d..b6eb5ab 100644
--- a/docs/guide-zh-CN/concept-service-locator.md
+++ b/docs/guide-zh-CN/concept-service-locator.md
@@ -50,6 +50,7 @@ $cache = $locator->cache;
 你可以通过 [[yii\di\ServiceLocator::has()]] 检查某组件 ID 是否被注册。若你用一个无效的 ID 调用 [[yii\di\ServiceLocator::get()]]，则会抛出一个异常。
 
 因为服务定位器，经常会在创建时附带[配置信息](concept-configurations.md)，因此我们提供了一个可写的属性，名为 [[yii\di\ServiceLocator::setComponents()|components]]，这样就可以配置该属性，或一次性注册多个组件。下面的代码展示了如何用一个配置数组，配置一个应用并注册"db"，"cache" 和 "search" 三个组件：
+
 ```php
 return [
     // ...
diff --git a/docs/guide-zh-CN/db-dao.md b/docs/guide-zh-CN/db-dao.md
index 0aa6036..4fbfad7 100644
--- a/docs/guide-zh-CN/db-dao.md
+++ b/docs/guide-zh-CN/db-dao.md
@@ -1,9 +1,10 @@
 数据库访问 (DAO)
 ========
 
-Yii 包含了一个建立在 PHP PDO 之上的数据访问层 (DAO). DAO为不同的数据库提供了一套统一的API. 其中```ActiveRecord``` 提供了数据库与模型(MVC 中的 M,Model) 的交互,```QueryBuilder``` 用于创建动态的查询语句. DAO提供了简单高效的SQL查询,可以用在与数据库交互的各个地方.
+Yii 包含了一个建立在 PHP PDO 之上的数据访问层 (DAO). DAO为不同的数据库提供了一套统一的API. 其中 `ActiveRecord` 提供了数据库与模型(MVC 中的 M,Model) 的交互, `QueryBuilder` 用于创建动态的查询语句. DAO提供了简单高效的SQL查询,可以用在与数据库交互的各个地方.
 
 Yii 默认支持以下数据库 (DBMS):
+
 - [MySQL](http://www.mysql.com/)
 - [MariaDB](https://mariadb.com/)
 - [SQLite](http://sqlite.org/)
@@ -12,7 +13,7 @@ Yii 默认支持以下数据库 (DBMS):
 - [Oracle](http://www.oracle.com/us/products/database/overview/index.html)
 - [MSSQL](https://www.microsoft.com/en-us/sqlserver/default.aspx): 版本>=2005.
 
-##配置
+## 配置
 
 开始使用数据库首先需要配置数据库连接组件，通过添加 db 组件到应用配置实现（"基础的" Web 应用是 config/web.php），DSN( Data Source Name )是数据源名称，用于指定数据库信息.如下所示：
 
@@ -45,10 +46,10 @@ return [
 
 ```$connection = \Yii::$app->db;```
 
-请参考```[[yii\db\Connection]]```获取可配置的属性列表。
+请参考 `[[yii\db\Connection]]` 获取可配置的属性列表。
 如果你想通过ODBC连接数据库，则需要配置[[yii\db\Connection::driverName]] 属性，例如:
 
-```
+```php
 'db' => [
     'class' => 'yii\db\Connection',
     'driverName' => 'mysql',
@@ -67,29 +68,30 @@ return [
         // ...
         'db' => [
             'class' => 'yii\db\Connection',
-            'dsn' => 'mysql:host=localhost;dbname=mydatabase', 
+            'dsn' => 'mysql:host=localhost;dbname=mydatabase',
             'username' => 'root',
             'password' => '',
             'charset' => 'utf8',
         ],
         'secondDb' => [
             'class' => 'yii\db\Connection',
-            'dsn' => 'sqlite:/path/to/database/file', 
+            'dsn' => 'sqlite:/path/to/database/file',
         ],
     ],
     // ...
 ];
 ```
+
 在代码中通过以下方式使用:
 
-```
+```php
 $primaryConnection = \Yii::$app->db;
 $secondaryConnection = \Yii::$app->secondDb;
 ```
 
 如果不想定义数据库连接为全局[应用](structure-application-components.md)组件，可以在代码中直接初始化使用：
 
-```
+```php
 $connection = new \yii\db\Connection([
     'dsn' => $dsn,
      'username' => $username,
@@ -98,9 +100,9 @@ $connection = new \yii\db\Connection([
 $connection->open();
 ```
 
->小提示：如果在创建了连接后需要执行额外的 SQL 查询，可以添加以下代码到应用配置文件：
+> 小提示：如果在创建了连接后需要执行额外的 SQL 查询，可以添加以下代码到应用配置文件：
 
-```
+```php
 return [
     // ...
     'components' => [
@@ -117,43 +119,48 @@ return [
 ];
 ```
 
-##SQL 基础查询
+## SQL 基础查询
 
 一旦有了连接实例就可以通过[[yii\db\Command]]执行 SQL 查询。
 
-###SELECT 查询
+### SELECT 查询
 查询返回多行：
 
-```
+```php
 $command = $connection->createCommand('SELECT * FROM post');
 $posts = $command->queryAll();
 ```
+
 返回单行：
-```
+
+```php
 $command = $connection->createCommand('SELECT * FROM post WHERE id=1');
 $post = $command->queryOne();
 ```
 
 查询多行单值：
-```
+
+```php
 $command = $connection->createCommand('SELECT title FROM post');
 $titles = $command->queryColumn();
 ```
+
 查询标量值/计算值：
 
-```
+```php
 $command = $connection->createCommand('SELECT COUNT(*) FROM post');
 $postCount = $command->queryScalar();
 ```
 
-###UPDATE, INSERT, DELETE 更新、插入和删除等
+### UPDATE, INSERT, DELETE 更新、插入和删除等
 
 如果执行 SQL 不返回任何数据可使用命令中的 execute 方法：
 
-```
+```php
 $command = $connection->createCommand('UPDATE post SET status=1 WHERE id=1');
 $command->execute();
 ```
+
 你可以使用`insert`,`update`,`delete` 方法，这些方法会根据参数生成合适的SQL并执行.
 
 ```php
@@ -177,7 +184,7 @@ $connection->createCommand()->update('user', ['status' => 1], 'age > 30')->execu
 $connection->createCommand()->delete('user', 'status = 0')->execute();
 ```
 
-###引用的表名和列名 <a name="quoting-table-and-column-names"></a>
+### 引用的表名和列名 <a name="quoting-table-and-column-names"></a>
 
 大多数时间都使用以下语法来安全地引用表名和列名：
 
@@ -185,7 +192,8 @@ $connection->createCommand()->delete('user', 'status = 0')->execute();
 $sql = "SELECT COUNT([[$column]]) FROM {{table}}";
 $rowCount = $connection->createCommand($sql)->queryScalar();
 ```
-以上代码`[[$column]]` 会转变为引用恰当的列名，而`{{table}}` 就转变为引用恰当的表名。
+
+以上代码 `[[$column]]` 会转变为引用恰当的列名，而 `{{table}}` 就转变为引用恰当的表名。
 表名有个特殊的变量 {{%Y}} ，如果设置了表前缀使用该变体可以自动在表名前添加前缀：
 
 ```php
@@ -217,9 +225,9 @@ $sql = "SELECT COUNT($column) FROM $table";
 $rowCount = $connection->createCommand($sql)->queryScalar();
 ```
 
-###预处理语句
+### 预处理语句
 
-为安全传递查询参数可以使用预处理语句,首先应当使用`:placeholder`占位，再将变量绑定到对应占位符：
+为安全传递查询参数可以使用预处理语句,首先应当使用 `:placeholder` 占位，再将变量绑定到对应占位符：
 
 ```php
 $command = $connection->createCommand('SELECT * FROM post WHERE id=:id');
@@ -239,11 +247,12 @@ $command->execute();
 $id = 2;
 $command->execute();
 ```
->提示，在执行前绑定变量，然后在每个执行中改变变量的值（一般用在循环中）比较高效.
 
-##事务
+> 提示: 在执行前绑定变量，然后在每个执行中改变变量的值（一般用在循环中）比较高效.
+
+## 事务
 
-当你需要顺序执行多个相关的的`query`时，你可以把他们封装到一个事务中去保护数据一致性.Yii提供了一个简单的接口来实现事务操作.
+当你需要顺序执行多个相关的的 `query` 时，你可以把他们封装到一个事务中去保护数据一致性.Yii提供了一个简单的接口来实现事务操作.
 如下执行 SQL 事务查询语句：
 
 ```php
@@ -257,7 +266,8 @@ try {
     $transaction->rollBack();
 }
 ```
-我们通过[[yii\db\Connection::beginTransaction()|beginTransaction()]]开始一个事务，通过`try catch` 捕获异常.当执行成功，通过[[yii\db\Transaction::commit()|commit()]]提交事务并结束，当发生异常失败通过[[yii\db\Transaction::rollBack()|rollBack()]]进行事务回滚.
+
+我们通过[[yii\db\Connection::beginTransaction()|beginTransaction()]]开始一个事务，通过 `try catch` 捕获异常.当执行成功，通过[[yii\db\Transaction::commit()|commit()]]提交事务并结束，当发生异常失败通过[[yii\db\Transaction::rollBack()|rollBack()]]进行事务回滚.
 
 如需要也可以嵌套多个事务：
 
@@ -281,9 +291,10 @@ try {
     $transaction1->rollBack();
 }
 ```
->注意你使用的数据库必须支持`Savepoints`才能正确地执行，以上代码在所有关系数据中都可以执行，但是只有支持`Savepoints`才能保证安全性。
 
-Yii 也支持为事务设置隔离级别`isolation levels`，当执行事务时会使用数据库默认的隔离级别，你也可以为事物指定隔离级别.
+> 注意: 你使用的数据库必须支持 `Savepoints` 才能正确地执行，以上代码在所有关系数据中都可以执行，但是只有支持 `Savepoints` 才能保证安全性。
+
+Yii 也支持为事务设置隔离级别 `isolation levels`，当执行事务时会使用数据库默认的隔离级别，你也可以为事务指定隔离级别.
 Yii 提供了以下常量作为常用的隔离级别
 
 - [[\yii\db\Transaction::READ_UNCOMMITTED]] - 允许读取改变了的还未提交的数据,可能导致脏读、不可重复读和幻读
@@ -291,19 +302,19 @@ Yii 提供了以下常量作为常用的隔离级别
 - [[\yii\db\Transaction::REPEATABLE_READ]] - 对相同字段的多次读取结果一致，可导致幻读。
 - [[\yii\db\Transaction::SERIALIZABLE]] - 完全服从ACID的原则，确保不发生脏读、不可重复读和幻读。
 
-你可以使用以上常量或者使用一个string字符串命令，在对应数据库中执行该命令用以设置隔离级别，比如对于`postgres`有效的命令为`SERIALIZABLE READ ONLY DEFERRABLE`.
+你可以使用以上常量或者使用一个string字符串命令，在对应数据库中执行该命令用以设置隔离级别，比如对于 `postgres` 有效的命令为 `SERIALIZABLE READ ONLY DEFERRABLE`.
 
-> Note: 某些数据库只能针对连接来设置事务隔离级别，所以你必须要为连接明确制定隔离级别.目前受影响的数据库:`MSSQL SQLite`
+> Note: 某些数据库只能针对连接来设置事务隔离级别，所以你必须要为连接明确制定隔离级别.目前受影响的数据库: `MSSQL SQLite`
 
-> Note: SQLite 只支持两种事务隔离级别，所以你只能设置`READ UNCOMMITTED` 和 `SERIALIZABLE`.使用其他隔离级别会抛出异常.
+> Note: SQLite 只支持两种事务隔离级别，所以你只能设置 `READ UNCOMMITTED` 和 `SERIALIZABLE`.使用其他隔离级别会抛出异常.
 
 > Note: PostgreSQL 不允许在事务开始前设置隔离级别，所以你不能在事务开始时指定隔离级别.你可以在事务开始之后调用[[yii\db\Transaction::setIsolationLevel()]] 来设置.
 
 关于隔离级别[isolation levels]: http://en.wikipedia.org/wiki/Isolation_%28database_systems%29#Isolation_levels
 
-##数据库复制和读写分离
+## 数据库复制和读写分离
 
-很多数据库支持数据库复制 [database replication](http://en.wikipedia.org/wiki/Replication_(computing)#Database_replication)来提高可用性和响应速度. 在数据库复制中，数据总是从*主服务器* 到 *从服务器*. 所有的插入和更新等写操作在主服务器执行，而读操作在从服务器执行.
+很多数据库支持数据库复制 [database replication](http://en.wikipedia.org/wiki/Replication_(computing)#Database_replication) 来提高可用性和响应速度. 在数据库复制中，数据总是从*主服务器* 到 *从服务器*. 所有的插入和更新等写操作在主服务器执行，而读操作在从服务器执行.
 
 通过配置[[yii\db\Connection]]可以实现数据库复制和读写分离.
 
@@ -335,6 +346,7 @@ Yii 提供了以下常量作为常用的隔离级别
     ],
 ]
 ```
+
 以上的配置实现了一主多从的结构，从服务器用以执行读查询，主服务器执行写入查询，读写分离的功能由后台代码自动完成.调用者无须关心.例如：
 
 ```php
@@ -347,9 +359,10 @@ $rows = $db->createCommand('SELECT * FROM user LIMIT 10')->queryAll();
 // 通过主服务器执行更新操作
 $db->createCommand("UPDATE user SET username='demo' WHERE id=1")->execute();
 ```
+
 > Note: 通过[[yii\db\Command::execute()]] 执行的查询被认为是写操作，所有使用[[yii\db\Command]]来执行的其他查询方法被认为是读操作.你可以通过`$db->slave`得到当前正在使用能够的从服务器.
 
-`Connection`组件支持从服务器的负载均衡和故障转移，当第一次执行读查询时，会随即选择一个从服务器进行连接，如果连接失败则又选择另一个，如果所有从服务器都不可用，则会连接主服务器。你可以配置[[yii\db\Connection::serverStatusCache|server status cache]]来记住那些不能连接的从服务器，使Yii 在一段时间[[yii\db\Connection::serverRetryInterval]].内不会重复尝试连接那些根本不可用的从服务器.
+`Connection` 组件支持从服务器的负载均衡和故障转移，当第一次执行读查询时，会随即选择一个从服务器进行连接，如果连接失败则又选择另一个，如果所有从服务器都不可用，则会连接主服务器。你可以配置[[yii\db\Connection::serverStatusCache|server status cache]]来记住那些不能连接的从服务器，使Yii 在一段时间[[yii\db\Connection::serverRetryInterval]].内不会重复尝试连接那些根本不可用的从服务器.
 
 > Note: 在上述配置中，每个从服务器连接超时时间被指定为10s. 如果在10s内不能连接，则被认为该服务器已经挂掉.你也可以自定义超时参数.
 
@@ -394,7 +407,8 @@ $db->createCommand("UPDATE user SET username='demo' WHERE id=1")->execute();
     ],
 ]
 ```
-上述配置制定了2个主服务器和4个从服务器.`Connection`组件也支持主服务器的负载均衡和故障转移，与从服务器不同的是，如果所有主服务器都不可用，则会抛出异常.
+
+上述配置制定了2个主服务器和4个从服务器.`Connection` 组件也支持主服务器的负载均衡和故障转移，与从服务器不同的是，如果所有主服务器都不可用，则会抛出异常.
 
 > Note: 当你使用[[yii\db\Connection::masters|masters]]来配置一个或多个主服务器时，`Connection`中关于数据库连接的其他属性（例如：`dsn`, `username`, `password`）都会被忽略.
 
@@ -422,18 +436,19 @@ try {
 $transaction = $db->slave->beginTransaction();
 ```
 
-有时你想强制使用主服务器来执行读查询，你可以调用`seMaster()`方法.
+有时你想强制使用主服务器来执行读查询，你可以调用 `seMaster()` 方法.
 
 ```php
 $rows = $db->useMaster(function ($db) {
     return $db->createCommand('SELECT * FROM user LIMIT 10')->queryAll();
 });
 ```
-你也可以设置`$db->enableSlaves` 为`false`来使所有查询都在主服务器上执行.
 
-##操作数据库模式
+你也可以设置 `$db->enableSlaves` 为 `false` 来使所有查询都在主服务器上执行.
+
+## 操作数据库模式
 
-###获得模式信息
+### 获得模式信息
 
 你可以通过 [[yii\db\Schema]]实例来获取Schema信息:
 
@@ -446,9 +461,10 @@ $schema = $connection->getSchema();
 ```php
 $tables = $schema->getTableNames();
 ```
+
 更多信息请参考[[yii\db\Schema]]
 
-###修改模式
+### 修改模式
 
 除了基础的 SQL 查询，[[yii\db\Command]]还包括一系列方法来修改数据库模式：
 
@@ -468,4 +484,5 @@ $connection->createCommand()->createTable('post', [
     'text' => 'text',
 ]);
 ```
+
 完整参考请查看[[yii\db\Command]].
diff --git a/docs/guide-zh-CN/images/start-country-list.png b/docs/guide-zh-CN/images/start-country-list.png
new file mode 100644
index 0000000..3754194
Binary files /dev/null and b/docs/guide-zh-CN/images/start-country-list.png differ
diff --git a/docs/guide-zh-CN/images/start-entry-confirmation.png b/docs/guide-zh-CN/images/start-entry-confirmation.png
new file mode 100644
index 0000000..ed442a4
Binary files /dev/null and b/docs/guide-zh-CN/images/start-entry-confirmation.png differ
diff --git a/docs/guide-zh-CN/images/start-form-validation.png b/docs/guide-zh-CN/images/start-form-validation.png
new file mode 100644
index 0000000..f386528
Binary files /dev/null and b/docs/guide-zh-CN/images/start-form-validation.png differ
diff --git a/docs/guide-zh-CN/images/start-gii-country-grid.png b/docs/guide-zh-CN/images/start-gii-country-grid.png
new file mode 100644
index 0000000..746663c
Binary files /dev/null and b/docs/guide-zh-CN/images/start-gii-country-grid.png differ
diff --git a/docs/guide-zh-CN/images/start-gii-country-update.png b/docs/guide-zh-CN/images/start-gii-country-update.png
new file mode 100644
index 0000000..51f2d38
Binary files /dev/null and b/docs/guide-zh-CN/images/start-gii-country-update.png differ
diff --git a/docs/guide-zh-CN/images/start-gii-crud-preview.png b/docs/guide-zh-CN/images/start-gii-crud-preview.png
new file mode 100644
index 0000000..a8912e2
Binary files /dev/null and b/docs/guide-zh-CN/images/start-gii-crud-preview.png differ
diff --git a/docs/guide-zh-CN/images/start-gii-crud.png b/docs/guide-zh-CN/images/start-gii-crud.png
new file mode 100644
index 0000000..948e6cd
Binary files /dev/null and b/docs/guide-zh-CN/images/start-gii-crud.png differ
diff --git a/docs/guide-zh-CN/images/start-gii-model-preview.png b/docs/guide-zh-CN/images/start-gii-model-preview.png
new file mode 100644
index 0000000..3b6eb9f
Binary files /dev/null and b/docs/guide-zh-CN/images/start-gii-model-preview.png differ
diff --git a/docs/guide-zh-CN/images/start-gii-model.png b/docs/guide-zh-CN/images/start-gii-model.png
new file mode 100644
index 0000000..9c506de
Binary files /dev/null and b/docs/guide-zh-CN/images/start-gii-model.png differ
diff --git a/docs/guide-zh-CN/images/start-hello-world.png b/docs/guide-zh-CN/images/start-hello-world.png
new file mode 100644
index 0000000..30d1aca
Binary files /dev/null and b/docs/guide-zh-CN/images/start-hello-world.png differ
diff --git a/docs/guide-zh-CN/input-forms.md b/docs/guide-zh-CN/input-forms.md
new file mode 100644
index 0000000..da4da1c
--- /dev/null
+++ b/docs/guide-zh-CN/input-forms.md
@@ -0,0 +1,213 @@
+创建表单
+====
+
+基于活动记录(ActiveRecord)的表单：ActiveForm
+-----------------------
+在yii中使用表单的主要方式是通过[[yii\widgets\ActiveForm]]。当某个表单是基于一个模型时，应该首选这种方式。此外，在[[yii\helpers\Html]]中有很多实用的方法为表单添加按钮和帮助文档。
+
+在客户端显示的表单，大多数情况下都有一个相应的[模型](structure-models.md),用来在服务器上验证其输入的数据(可在[输入验证](input-validation.md)一节获取关于验证的细节)。当创建一个基于模型的表单时，第一步是定义模型本身。该模型可以是一个基于[活动记录](db-active-record.md)的类，表示数据库中的数据，也可以是一个基于通用模型的类（继承自[[yii\base\Model]]），来获取任意的输入数据，如登录表单。
+
+> Tip: 如果一个表单的输入域与数据库的字段不匹配，或者它存在只适用于它的特殊的格式或者方法，则最好为它创建一个单独的继承自[[yii\base\Model]]的模型。
+
+在接下来的例子中，我们展示了通用模型如何用于登录表单：
+
+```php
+<?php
+
+class LoginForm extends \yii\base\Model
+{
+    public $username;
+    public $password;
+
+    public function rules()
+    {
+        return [
+            // 在这里定义验证规则
+        ];
+    }
+}
+```
+
+在控制器中，我们将传递一个模型是实例到视图，其中[[yii\widgets\ActiveForm|ActiveForm]]小部件将用来显示表单。
+
+```php
+<?php
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+$form = ActiveForm::begin([
+    'id' => 'login-form',
+    'options' => ['class' => 'form-horizontal'],
+]) ?>
+    <?= $form->field($model, 'username') ?>
+    <?= $form->field($model, 'password')->passwordInput() ?>
+
+    <div class="form-group">
+        <div class="col-lg-offset-1 col-lg-11">
+            <?= Html::submitButton('Login', ['class' => 'btn btn-primary']) ?>
+        </div>
+    </div>
+<?php ActiveForm::end() ?>
+```
+
+### 用 `begin()` 和 `end()` 包裹 <span id="wrapping-with-begin-and-end"></span>
+
+在上面的代码中，[[yii\widgets\ActiveForm::begin()|ActiveForm::begin()]] 不仅创建了一个表单实例，同时也标志的表单的开始。所有在[[yii\widgets\ActiveForm::begin()|ActiveForm::begin()]]与[[yii\widgets\ActiveForm::end()|ActiveForm::end()]]之中的内容都会被HTML中的 `<form>`标签包裹。与其他小部件一样，你可以制定一些选项，通过传递数组到到 `begin` 中来配置小部件。在这种情况下，一个额外的CSS类和ID会在 `<form>` 标签中使用。要查看更多可用的选项，请查看API文档的 [[yii\widgets\ActiveForm]]。
+
+### ActiveField <span id="activefield"></span>
+
+为了在表单中创建表单元素与元素的标签，以及任意适用的Javascript验证，需要使用[[yii\widgets\ActiveForm::field()]|ActiveForm::field()]方法，其返回一个[[yii\widgets\ActiveField]]实例。当直接输出该方法时，结果是一个普通的（文本）输入。要自定义输出，可以附加上[[yii\widgets\ActiveField|ActiveField]]的其他方法来一起调用：
+
+```php
+// 密码输入框
+<?= $form->field($model, 'password')->passwordInput() ?>
+// 增加提示与自定义标签
+<?= $form->field($model, 'username')->textInput()->hint('Please enter your name')->label('Name') ?>
+// 创建一个HTML5邮件输入元素
+<?= $form->field($model, 'email')->input('email') ?>
+```
+
+它会通过[[yii\widgets\ActiveField|ActiveField]]中定义的表单字段来创建`<label>`,`<input>`以及其他标签。input输入框的name属性会自动的根据[[yii\base\Model::formName()| form name]] 以及属性来来创建。例如，对于上面例子中的`username`输入字段的name属性将是`LoginForm[username]`。这种命名方式会使登录表单的所有属性在服务器端的`$_POST['LoginForm']`数组中是可用。
+
+> Tip：如果你在一个表单中只有一个模型，并且想要简化input输入名称，你可以覆盖模型的[[yii\base\Model::formName()|formName()]]方法，使其返回一个空的字符串，以此来跳过数组部分。这在[GridView](output-data-widgets.md#grid-view)的过滤模型创建更好的URLs时是非常有用的。
+
+指定模型是属性时可以以更复杂的方式来完成。比如，当上传多个文件时，或者选择多个多个项目时，可能会需要一个数组值，你可以通过附加`[]`来指定它的属性名称：
+
+```php
+// allow multiple files to be uploaded:
+echo $form->field($model, 'uploadFile[]')->fileInput(['multiple'=>'multiple']);
+
+// allow multiple items to be checked:
+echo $form->field($model, 'items[]')->checkboxList(['a' => 'Item A', 'b' => 'Item B', 'c' => 'Item C']);
+```
+
+命名表单元素，如提交按钮时需要小心。在[JQuery](https://api.jquery.com/submit/)中有一些保留名词，可能会导致冲突：
+
+> 表单和它们的子元素不应该使用与表单的属性冲突的input name或id，例如submit，length，或者 method。 要检查你的标签是否存在这些问题，一个完整的规则列表详见 DOMLint。
+
+将额外的HTML标签添加到表单中可以通过使用纯HTML或者使用[[yii\helpers\Html|Html]]的方法，比如上述例子中的帮助类的做法[[yii\helpers\Html::submitButton()|Html::submitButton()]]。
+
+> Tip：如果你的应用程序正在使用Twitter的Bootstrap CSS样式，你可以选择使用[[yii\bootstrap\ActiveForm]]代替[[yii\widgets\ActiveForm]]，这个表单继承自后者，并且使用Bootstrap特有的样式初始化表单的输入框。
+
+> Tip: 为了使用星号对必填字段进行样式,你可以使用下面的CSS样式：
+>
+> ```css
+> div.required label.control-label:after {
+>     content: " *";
+>     color: red;
+> }
+> ```
+
+创建列表 <span id="creating-activeform-lists"></span>
+-----------------------
+
+这里有3中类型的列表：
+
+- 下拉列表
+- 单选列表
+- 多选列表
+
+为了创建列表，你必须先为它准备选项。这些选项可以手动准备如下：
+
+```php
+$items = [
+    1 => 'item 1', 
+    2 => 'item 2'
+]
+```
+
+或者直接从数据库中检索：
+
+```php
+$items = Category::find()
+        ->select(['label'])
+        ->indexBy('id')
+        ->column();
+```
+
+这些 `$items` 必须能被不同的列表组件处理。列表输入框的值（以及当前选中的选项）将会根据当前`$model`的属性的值而自动的生成。
+
+#### 创建一个下拉选择列表 ：<span id="creating-activeform-dropdownlist"></span>
+
+我们可以使用活动领域的[[yii\widgets\ActiveField::dropDownList()]] 方法来创建一个下拉列表：
+
+```php
+/* @var $form yii\widgets\ActiveForm */
+
+echo $form->field($model, 'category')->dropdownList([
+        1 => 'item 1', 
+        2 => 'item 2'
+    ],
+    ['prompt'=>'Select Category']
+);
+```
+
+#### 创建一个单选列表 ：<span id="creating-activeform-radioList"></span>
+
+我们可以使用活动领域的[[yii\widgets\ActiveField::radioList()]] 方法来创建一个下拉列表：
+
+```php
+/* @var $form yii\widgets\ActiveForm */
+
+echo $form->field($model, 'category')->radioList([
+    1 => 'radio 1', 
+    2 => 'radio 2'
+]);
+```
+
+#### 创建一个多选列表： <span id="creating-activeform-checkboxList"></span>
+
+我们可以使用活动领域的[[yii\widgets\ActiveField::checkboxList()]] 方法来创建一个下拉列表：
+
+```php
+/* @var $form yii\widgets\ActiveForm */
+
+echo $form->field($model, 'category')->checkboxList([
+    1 => 'checkbox 1', 
+    2 => 'checkbox 2'
+]);
+```
+
+使用Pjax <span id="working-with-pjax"></span>
+-----------------------
+
+[[yii\widgets\Pjax|Pjax]]组件允许你更新一个页面的某些部分而不用从新加载整个页面。你可以在提交表单后使用Pjax来更新表单，或者替换表单的某些内容。
+
+你可以配置[[yii\widgets\Pjax::$formSelector|$formSelector]]来指定那些表单的提交会触发pjax。如果你没有设置，所有包含`data-pjax`属性，并且含有封闭的Pjax内容的表单，将会触发pjax请求。
+
+```php
+use yii\widgets\Pjax;
+use yii\widgets\ActiveForm;
+
+Pjax::begin([
+    // Pjax options
+]);
+    $form = ActiveForm::begin([
+        'options' => ['data' => ['pjax' => true]],
+        // more ActiveForm options
+    ]);
+
+        // ActiveForm content
+
+    ActiveForm::end();
+Pjax::end();
+```
+
+> Tip: 注意小心[[yii\widgets\Pjax|Pjax]]内部的链接，因为响应仍可能在组件内部呈现。为了避免这种现象，可以使用`data-pjax="0"`这个HTML属性。
+
+#### 提交按钮和文件上传
+
+由于`JQuery.serializeArray()`在处理[文件内容](https://github.com/jquery/jquery/issues/2321)和[提交按钮的值](https://github.com/jquery/jquery/issues/2321)时存在已知的问题，同时也为了推广`FormData`在HTML5中的使用，它将直接被弃用而不是等待修复。
+
+这意味着官方对`FormData`在文件上传，ajax提交按钮的值以及组件[[yii\widgets\Pjax]]的使用上取决于[浏览器](https://developer.mozilla.org/en-US/docs/Web/API/FormData#Browser_compatibility)的支持。
+
+扩展阅读 <span id="further-reading"></span> 
+---------------
+
+下一节 [输入验证](input-validation.md) 处理提交的表单数据的服务器端验证， 以及 ajax- 和客户端验证。
+
+要学会有关表格的更复杂的用法，你可以查看以下几节：
+
+- [收集列表输入](input-tabular-input.md) 同一种类型的多个模型的采集数据。
+- [多模型同时输入](input-multiple-models.md) 在同一窗口中处理多个不同的模型。
+- [文件上传](input-file-upload.md) 如何使用表格来上传文件。
diff --git a/docs/guide-zh-CN/input-multiple-models.md b/docs/guide-zh-CN/input-multiple-models.md
index 108d162..cefcfe9 100644
--- a/docs/guide-zh-CN/input-multiple-models.md
+++ b/docs/guide-zh-CN/input-multiple-models.md
@@ -1,35 +1,77 @@
 多模型的复合表单
 ==================================
 
-在复杂的用户界面可能会发生，用户在表单中填写数据
-后将其保存在数据库的不同表中。yii形式的表单与单模型表单相比
-可以让你用更加简单的方法来创建。
+当处理负载的数据时，可能会发生需要使用多个模型来收集用户的输入。例如，假设用户登录信息保存在`user`表中，但是用户详细信息却保存在`profile`表中，你也许会使用`User`模型和`Profile`模型来接受用户的输入。在Yii模型与表单的支持下，你可以非常方便用不同于单个模型的方式来解决该问题。
 
-与一个模型一样，你遵循以下模式用于服务端验证：
+接下来，我们会使用一个例子阐述如何创建一个表单，它允许你同时为`User`和`Profile`模型收集数据。
 
-1. 实例化模型类
-2. 用输入数据填充模型属性
-3. 验证所有模型
-4. 如果所有模型验证通过，则保存它们
-5. 如果验证失败或没有提交数据，传递所有模型对象到视图显示表单
+首先，控制user和profile接收数据的控制器如下：
 
-在下文中我们展示了一个在表单中使用多模型的例子... TBD
+```php
+namespace app\controllers;
 
-多模型实例
----------------
+use Yii;
+use yii\base\Model;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use app\models\User;
+use app\models\Profile;
 
-> Note: This section is under development.
->
-> It has no content yet.
+class UserController extends Controller
+{
+    public function actionUpdate($id)
+    {
+        $user = User::findOne($id);
+        if (!$user) {
+            throw new NotFoundHttpException("The user was not found.");
+        }
+        
+        $profile = Profile::findOne($user->profile_id);
+        
+        if (!$profile) {
+            throw new NotFoundHttpException("The user has no profile.");
+        }
+        
+        $user->scenario = 'update';
+        $profile->scenario = 'update';
+        
+        if ($user->load(Yii::$app->request->post()) && $profile->load(Yii::$app->request->post())) {
+            $isValid = $user->validate();
+            $isValid = $profile->validate() && $isValid;
+            if ($isValid) {
+                $user->save(false);
+                $profile->save(false);
+                return $this->redirect(['user/view', 'id' => $id]);
+            }
+        }
+        
+        return $this->render('update', [
+            'user' => $user,
+            'profile' => $profile,
+        ]);
+    }
+}
+```
 
-TBD
+在`update`动作中，我们首先加载`$user`和`$profile`模型并设置他们为更新模式。然后我们使用[[yii\base\Model::load()]]方法将用户输入的数据填充到模型中。如果数据顺利填充了，我们会验证这两个模型之后在保存它们。但是，请注意我们使用了`save(false)`来避免验证通过的数据在模型中被重复验证。如果填充不成功，我们将会显示下面的`update`视图：
 
-Dependend models
-----------------
+```php
+<?php
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
 
+$form = ActiveForm::begin([
+    'id' => 'user-update-form',
+    'options' => ['class' => 'form-horizontal'],
+]) ?>
+    <?= $form->field($user, 'username') ?>
 
-> Note: This section is under development.
->
-> It has no content yet.
+    ...other input fields...
+    
+    <?= $form->field($profile, 'website') ?>
 
-TBD
+    <?= Html::submitButton('Update', ['class' => 'btn btn-primary']) ?>
+<?php ActiveForm::end() ?>
+```
+
+如上，在`update`视图中你需要给予输入框两个模型`$user`和`$profile`。
\ No newline at end of file
diff --git a/docs/guide-zh-CN/input-validation.md b/docs/guide-zh-CN/input-validation.md
index 75c6b0d..efc3738 100644
--- a/docs/guide-zh-CN/input-validation.md
+++ b/docs/guide-zh-CN/input-validation.md
@@ -161,13 +161,16 @@ return [
 如你所见，这些验证规则并不真的对输入数据进行任何验证。而是，对输入数据进行一些处理，然后把它们存回当前被验证的模型特性。
 
 下面的代码示例展示了对用户输入的完整处理，这将确保只将整数值存储在一个属性中：
+
 ```php
 ['age', 'trim'],
 ['age', 'default', 'value' => null],
 ['age', 'integer', 'integerOnly' => true, 'min' => 0],
 ['age', 'filter', 'filter' => 'intval', 'skipOnEmpty' => true],
 ```
+
 以上代码将对输入执行以下操作：
+
 1. 从输入值中去除前后空白。
 2. 确保空输入在数据库中存储为`null`；我们区分 `未设置` 值和实际值为 `0` 之间的区别。如果值不允许为`null`，则可以在此处设置另一个默认值。
 3. 如果该值不为空，则验证该值是否为大于0的整数。大多数验证器的 [[yii\validators\Validator::$skipOnEmpty|$skipOnEmpty]] 属性都被设置为`true`。
@@ -322,12 +325,13 @@ class MyForm extends Model
 ```
 
 > Note: 缺省状态下，行内验证器不会在关联特性的输入值为空或该特性已经在其他验证中失败的情况下起效。若你想要确保该验证器始终启用的话，你可以在定义规则时，酌情将 [[yii\validators\Validator::skipOnEmpty|skipOnEmpty]] 以及 [[yii\validators\Validator::skipOnError|skipOnError]]
-  属性设为 false，比如，
+>   属性设为 false，比如，
+>
 > ```php
-[
-    ['country', 'validateCountry', 'skipOnEmpty' => false, 'skipOnError' => false],
-]
-```
+> [
+>     ['country', 'validateCountry', 'skipOnEmpty' => false, 'skipOnError' => false],
+> ]
+> ```
 
 
 ### 独立验证器（Standalone Validators） <span id="standalone-validators"></span>
@@ -465,8 +469,9 @@ JS;
 ```
 
 > Tip: 上述代码主要是演示了如何支持客户端验证。在具体实践中，你可以使用 [in](tutorial-core-validators.md#in) 核心验证器来达到同样的目的。比如这样的验证规则：
+>
 > ```php
-[
-    ['status', 'in', 'range' => Status::find()->select('id')->asArray()->column()],
-]
+> [
+>     ['status', 'in', 'range' => Status::find()->select('id')->asArray()->column()],
+> ]
 ```
diff --git a/docs/guide-zh-CN/rest-rate-limiting.md b/docs/guide-zh-CN/rest-rate-limiting.md
index 8fa3674..cb7d7bc 100644
--- a/docs/guide-zh-CN/rest-rate-limiting.md
+++ b/docs/guide-zh-CN/rest-rate-limiting.md
@@ -1,16 +1,17 @@
-速率限制
-=============
+限流 (Rate Limiting)
+==================
 
-为防止滥用，你应该考虑增加速率限制到您的 API。
-例如，您可以限制每个用户的 API 的使用是在 10 分钟内最多 100 次的 API 调用。
-如果一个用户在规定的时间内太多的请求被接收，将返回响应状态代码 429 (这意味着过多的请求)。
+为防止滥用，你应该考虑对您的 API 限流。
+例如，您可以限制每个用户 10 分钟内最多调用 API 100 次。
+如果在规定的时间内接收了一个用户大量的请求，将返回响应状态代码 429 (这意味着过多的请求)。
+
+要启用限流, [[yii\web\User::identityClass|user identity class]] 应该实现 [[yii\filters\RateLimitInterface]].
 
-要启用速率限制, [[yii\web\User::identityClass|user identity class]] 应该实现 [[yii\filters\RateLimitInterface]].
 这个接口需要实现以下三个方法：
 
-* `getRateLimit()`: 返回允许的请求的最大数目及时间，例如，`[100, 600]` 表示在 600 秒内最多 100 次的 API 调用。
-* `loadAllowance()`: 返回剩余的允许的请求和最后一次速率限制检查时相应的 UNIX 时间戳数。
-* `saveAllowance()`: 保存剩余的允许请求数和当前的 UNIX 时间戳。
+- `getRateLimit()`: 返回允许的最大请求数及时间，例如，`[100, 600]` 表示在 600 秒内最多 100 次的 API 调用。
+- `loadAllowance()`: 返回剩余的允许的请求和最后一次限流检查时相应的 UNIX 时间戳数。
+- `saveAllowance()`: 保存剩余的允许请求数和当前的 UNIX 时间戳。
 
 你可以在 user 表中使用两列来记录容差和时间戳信息。
 `loadAllowance()` 和 `saveAllowance()` 可以通过实现对符合当前身份验证的用户的这两列值的读和保存。为了提高性能，你也可以
@@ -30,9 +31,9 @@ public function behaviors()
 
 当速率限制被激活，默认情况下每个响应将包含以下 HTTP 头发送目前的速率限制信息：
 
-* `X-Rate-Limit-Limit`: 同一个时间段所允许的请求的最大数目;
-* `X-Rate-Limit-Remaining`: 在当前时间段内剩余的请求的数量;
-* `X-Rate-Limit-Reset`: 为了得到最大请求数所等待的秒数。
+- `X-Rate-Limit-Limit`: 同一个时间段所允许的请求的最大数目;
+- `X-Rate-Limit-Remaining`: 在当前时间段内剩余的请求的数量;
+- `X-Rate-Limit-Reset`: 为了得到最大请求数所等待的秒数。
 
 你可以禁用这些头信息通过配置 [[yii\filters\RateLimiter::enableRateLimitHeaders]] 为 false,
 就像在上面的代码示例所示。
diff --git a/docs/guide-zh-CN/runtime-requests.md b/docs/guide-zh-CN/runtime-requests.md
new file mode 100644
index 0000000..75bf80f
--- /dev/null
+++ b/docs/guide-zh-CN/runtime-requests.md
@@ -0,0 +1,118 @@
+请求
+===
+
+应用的请求使用 [[yii\web\Request]] 对象来表示，它提供了请求参数、HTTP 头、cookie 等信息。
+对于一个给定的请求，你可以通过 `request` [应用组件](structure-application-components.md) 来访问，默认情况下它是 [[yii\web\Request]] 的实例。在本节中，我们将介绍如何在应用中使用此组件。
+
+## 请求参数 <span id="request-parameters"></span>
+
+你可以通过 `request` 组件的 [[yii\web\Request::get()|get()]] 和 [[yii\web\Request::post()|post()]] 方法来获取请求参数。
+它分别返回 `$_GET` 和 `$_POST` 的值。例如:
+
+```php
+$request = Yii::$app->request;
+
+$get = $request->get();
+// equivalent to: $get = $_GET;
+
+$id = $request->get('id');
+// equivalent to: $id = isset($_GET['id']) ? $_GET['id'] : null;
+
+$id = $request->get('id', 1);
+// equivalent to: $id = isset($_GET['id']) ? $_GET['id'] : 1;
+
+$post = $request->post();
+// equivalent to: $post = $_POST;
+
+$name = $request->post('name');
+// equivalent to: $name = isset($_POST['name']) ? $_POST['name'] : null;
+
+$name = $request->post('name', '');
+// equivalent to: $name = isset($_POST['name']) ? $_POST['name'] : '';
+```
+
+> Info: 推荐上面的方式使用 `request` 组件来获取请求参数而不是直接使用 `$_GET` 和 `$_POST`。这将使编写测试变得更容易，因为您可以创建一个带有伪造请求数据的模拟请求组件。
+
+在实现 [RESTful APIs](rest-quick-start.md) 是，你通常会需要获取 PUT、PATCH 或其他 [请求方法](#request-methods) 提交的参数.
+你可以通过调用 [[yii\web\Request::getBodyParam()]] 方法来获取。例如:
+
+```php
+$request = Yii::$app->request;
+
+// returns all parameters
+$params = $request->bodyParams;
+
+// returns the parameter "id"
+$param = $request->getBodyParam('id');
+```
+
+> Info:  和 `GET` 参数不同，通过 `POST`、`PUT`、`PATCH` 等提交的参数实在请求体中发送。
+当使用上述方式访问它们时, `request` 组件将解析这些参数。
+你可以通过配置 [[yii\web\Request::parsers]] 属性来自定义解析这些参数的方式。
+
+## 请求方法 <span id="request-methods"></span>
+
+你可以通过 `Yii::$app->request->method` 来获取当前请求使用的 HTTP 请求方法。
+`request` 还提供了一组布尔属性，用来检查当前请求是否具有某种类型。例如:
+
+```php
+$request = Yii::$app->request;
+
+if ($request->isAjax) { /* the request is an AJAX request */ }
+if ($request->isGet)  { /* the request method is GET */ }
+if ($request->isPost) { /* the request method is POST */ }
+if ($request->isPut)  { /* the request method is PUT */ }
+```
+
+## 请求 URLs <span id="request-urls"></span>
+
+`request` 组件提供了许多检查当前请求地址的方法。
+
+如果被请求的 URL 是 `http://example.com/admin/index.php/product?id=100`，您可以得到以下内容的不同部分:
+
+* [[yii\web\Request::url|url]]: 返回 `/admin/index.php/product?id=100`, 没有 host info 部分的 URL。
+* [[yii\web\Request::absoluteUrl|absoluteUrl]]: 返回 `http://example.com/admin/index.php/product?id=100`，包含 host info 的完整 URL 地址。
+* [[yii\web\Request::hostInfo|hostInfo]]: 返回 `http://example.com`，URL 的 host info 部分。
+* [[yii\web\Request::pathInfo|pathInfo]]: 返回 `/product`，在脚本和问号(查询字符串)之间的部分。
+* [[yii\web\Request::queryString|queryString]]: 返回 `id=100`，问号后面的部分。
+* [[yii\web\Request::baseUrl|baseUrl]]: 返回 `/admin`，在 host info 和脚本名称之间的部分。
+* [[yii\web\Request::scriptUrl|scriptUrl]]: 返回 `/admin/index.php`，不包含 host info 和 查询字符串的部分。
+* [[yii\web\Request::serverName|serverName]]: 返回 `example.com`，URL 中的主机名。
+* [[yii\web\Request::serverPort|serverPort]]: 返回 80，WEB 服务器使用的端口。
+
+
+## HTTP 头信息 <span id="http-headers"></span> 
+
+你可以通过 [[yii\web\Request::headers]] 返回的 [[yii\web\HeaderCollection|header collection]] 属性来获取 HTTP 头信息。例如:
+
+```php
+// $headers is an object of yii\web\HeaderCollection 
+$headers = Yii::$app->request->headers;
+
+// returns the Accept header value
+$accept = $headers->get('Accept');
+
+if ($headers->has('User-Agent')) { /* there is User-Agent header */ }
+```
+
+`请求` 组件还支持快速访问一些常用的头信息，包括:
+
+* [[yii\web\Request::userAgent|userAgent]]: 返回 `User-Agent` 的头信息的值。
+* [[yii\web\Request::contentType|contentType]]: 返回 `Content-Type` 的头信息的值，它表示请求请求主体中数据的 MIME 类型。
+* [[yii\web\Request::acceptableContentTypes|acceptableContentTypes]]: 返回用户可以接受的内容 MIME 类型。返回类型根据它们的评分。高评分的类型首先返回。
+* [[yii\web\Request::acceptableLanguages|acceptableLanguages]]: 返回用户可接受的语言。返回的语言是由它们的优先级排序的。第一个元素表示最优先的语言。
+
+如果您的应用支持多语言，并且你想根据是最终用户语言显示页面的语言。你可以通过语言协商方法 [[yii\web\Request::getPreferredLanguage()]] 来设置。
+
+此方法将你的应用支持的语言列表和 [[yii\web\Request::acceptableLanguages|acceptableLanguages]] 进行对比来返回合适的语言。
+
+> Tip: 同样，你可以使用 [[yii\filters\ContentNegotiator|ContentNegotiator]] 过滤器来动态决定响应中应该使用的内容类型和语言。这个过滤器实现了上述属性和方法中的内容协商。
+
+## 客户端信息 <span id="client-information"></span>
+
+你可以分别通过 [[yii\web\Request::userHost|userHost]] 和 [[yii\web\Request::userIP|userIP]] 来获取客户端机器的机器名和 IP 地址。例如:
+
+```php
+$userHost = Yii::$app->request->userHost;
+$userIP = Yii::$app->request->userIP;
+```
diff --git a/docs/guide-zh-CN/runtime-responses.md b/docs/guide-zh-CN/runtime-responses.md
index b0f83c7..ea0f7eb 100644
--- a/docs/guide-zh-CN/runtime-responses.md
+++ b/docs/guide-zh-CN/runtime-responses.md
@@ -181,9 +181,9 @@ public function actionOld()
 
 和浏览器跳转类似，文件发送是另一个依赖指定HTTP头的功能，Yii提供方法集合来支持各种文件发送需求，它们对HTTP头都有内置的支持。
 
-* [[yii\web\Response::sendFile()]]: 发送一个已存在的文件到客户端
-* [[yii\web\Response::sendContentAsFile()]]: 发送一个文本字符串作为文件到客户端
-* [[yii\web\Response::sendStreamAsFile()]]: 发送一个已存在的文件流作为文件到客户端
+- [[yii\web\Response::sendFile()]]: 发送一个已存在的文件到客户端
+- [[yii\web\Response::sendContentAsFile()]]: 发送一个文本字符串作为文件到客户端
+- [[yii\web\Response::sendStreamAsFile()]]: 发送一个已存在的文件流作为文件到客户端
 
 这些方法都将响应对象作为返回值，如果要发送的文件非常大，应考虑使用
 [[yii\web\Response::sendStreamAsFile()]] 因为它更节约内存，以下示例显示在控制器操作中如何发送文件：
diff --git a/docs/guide-zh-CN/runtime-sessions-cookies.md b/docs/guide-zh-CN/runtime-sessions-cookies.md
index c19a588..f720575 100644
--- a/docs/guide-zh-CN/runtime-sessions-cookies.md
+++ b/docs/guide-zh-CN/runtime-sessions-cookies.md
@@ -125,10 +125,10 @@ $session['captcha.lifetime'] = 3600;
 
 [[yii\web\Session]] 类默认存储session数据为文件到服务器上，Yii提供以下session类实现不同的session存储方式：
 
-* [[yii\web\DbSession]]: 存储session数据在数据表中
-* [[yii\web\CacheSession]]: 存储session数据到缓存中，缓存和配置中的[缓存组件](caching-data.md#cache-components)相关
-* [[yii\redis\Session]]: 存储session数据到以[redis](http://redis.io/) 作为存储媒介中
-* [[yii\mongodb\Session]]: 存储session数据到[MongoDB](http://www.mongodb.org/).
+- [[yii\web\DbSession]]: 存储session数据在数据表中
+- [[yii\web\CacheSession]]: 存储session数据到缓存中，缓存和配置中的[缓存组件](caching-data.md#cache-components)相关
+- [[yii\redis\Session]]: 存储session数据到以[redis](http://redis.io/) 作为存储媒介中
+- [[yii\mongodb\Session]]: 存储session数据到[MongoDB](http://www.mongodb.org/).
 
 所有这些session类支持相同的API方法集，因此，切换到不同的session存储介质不需要修改项目使用session的代码。
 
diff --git a/docs/guide-zh-CN/start-workflow.md b/docs/guide-zh-CN/start-workflow.md
index 36eec23..942c98e 100644
--- a/docs/guide-zh-CN/start-workflow.md
+++ b/docs/guide-zh-CN/start-workflow.md
@@ -51,7 +51,7 @@ Yii 实现了[模型-视图-控制器 (MVC)](http://wikipedia.org/wiki/Model-vie
 
 ![应用静态结构](images/application-structure.png)
 
-每个应用都有一个入口脚本 `web/index.php`，这是整个应用中唯一可以访问的 PHP 脚本。入口脚本接受一个 Web 请求并创建[应用](structure-application.md)实例去处理它。 [应用](structure-applications.md)在它的[组建](concept-components.md)辅助下解析请求，并分派请求至 MVC 元素。[视图](structure-views.md)使用[小部件](structure-widgets.md)去创建复杂和动态的用户界面。
+每个应用都有一个入口脚本 `web/index.php`，这是整个应用中唯一可以访问的 PHP 脚本。入口脚本接受一个 Web 请求并创建[应用](structure-application.md)实例去处理它。 [应用](structure-applications.md)在它的[组件](concept-components.md)辅助下解析请求，并分派请求至 MVC 元素。[视图](structure-views.md)使用[小部件](structure-widgets.md)去创建复杂和动态的用户界面。
 
 
 请求生命周期 <span id="request-lifecycle"></span>
diff --git a/docs/guide-zh-CN/structure-application-components.md b/docs/guide-zh-CN/structure-application-components.md
index 6726e0b..d13ce09 100644
--- a/docs/guide-zh-CN/structure-application-components.md
+++ b/docs/guide-zh-CN/structure-application-components.md
@@ -15,7 +15,7 @@
 
 第一次使用以上表达式时候会创建应用组件实例，后续再访问会返回此实例，无需再次创建。
 
-应用组件可以是任意对象，可以在 [应用主体配置](structure-applications.md#application-configurations)配置 [[yii\base\Application::components]] 属性 .
+应用组件可以是任意对象，可以在 [应用主体配置](structure-applications.md#application-configurations) 配置 [[yii\base\Application::components]] 属性 .
 例如：
 
 ```php
diff --git a/docs/guide-zh-CN/structure-applications.md b/docs/guide-zh-CN/structure-applications.md
index 1bf63b6..125bc45 100644
--- a/docs/guide-zh-CN/structure-applications.md
+++ b/docs/guide-zh-CN/structure-applications.md
@@ -118,13 +118,14 @@ $config = require __DIR__ . '/../config/web.php';
 ```
 
 > Info: 如果模块ID和应用组件ID同名，优先使用应用组件ID，如果你想用模块ID，可以使用如下无名称函数返回模块ID。
+> 
 > ```php
-[
-    function () {
-        return Yii::$app->getModule('user');
-    },
-]
-```
+> [
+>     function () {
+>         return Yii::$app->getModule('user');
+>     },
+> ]
+> ```
 
 
 在启动阶段，每个组件都会实例化。如果组件类实现接口 [[yii\base\BootstrapInterface]],也会调用 [[yii\base\BootstrapInterface::bootstrap()|bootstrap()]] 方法。
diff --git a/docs/guide-zh-CN/structure-assets.md b/docs/guide-zh-CN/structure-assets.md
index 669c731..a9dae31 100644
--- a/docs/guide-zh-CN/structure-assets.md
+++ b/docs/guide-zh-CN/structure-assets.md
@@ -524,13 +524,14 @@ yii asset assets.php config/assets-prod.php
 
 生成的配置文件可以在应用配置中包含，如最后一小节所描述的。
 
-
 > Info: 使用`asset` 命令并不是唯一一种自动合并和压缩过程的方法，可使用优秀的工具[grunt](http://gruntjs.com/)来完成这个过程。
 
 ### 资源包分组 <span id="grouping-asset-bundles"></span>
+
 上一小节，介绍了如何压缩所有的资源包到一个文件，减少对应用中引用资源文件的 http 请求数，但是在实践中很少这样做。比如，应用有一个“前端”和一个“后端”，每一个都用了一个不同js和css文件集合。在这种情况下，把所有的资源包压缩到一个文件毫无意义，“前端”不会用到“后端”的资源文件，当请求“前端”页面时，“后端”的资源文件也会被发送过来，浪费网络带宽。
 
 为了解决这个问题，可以吧资源包分成若干组，每个组里面有若干个资源包。下面的配置展示了如何对资源包分组：
+
 ```php
 return [
     ...
@@ -562,6 +563,7 @@ return [
     ...
 ];
 ```
+
 如上所示，资源包分成了三个组：`allShared`，`allBackEnd` 和 `allFrontEnd`
 
 他们分别依赖其他资源包，例如，`allBackEnd` 依赖（depends） `app\assets\AdminAsset`。当使用这个配置运行 `asset` 命令时，将会根据上面的指定组合资源包。
diff --git a/docs/guide-zh-CN/structure-controllers.md b/docs/guide-zh-CN/structure-controllers.md
index 75a0ec1..cb23a94 100644
--- a/docs/guide-zh-CN/structure-controllers.md
+++ b/docs/guide-zh-CN/structure-controllers.md
@@ -330,7 +330,7 @@ class PostController extends Controller
 操作参数会被不同的参数填入，如下所示：
 
 * `http://hostname/index.php?r=post/view&id=123`: `$id` 会填入`'123'`，`$version` 仍为 null 空因为没有`version`请求参数;
-* `http://hostname/index.php?r=post/view&id=123&version=2`: $id` 和 `$version` 分别填入 `'123'` 和 `'2'`；
+* `http://hostname/index.php?r=post/view&id=123&version=2`: `$id` 和 `$version` 分别填入 `'123'` 和 `'2'`；
 * `http://hostname/index.php?r=post/view`: 会抛出[[yii\web\BadRequestHttpException]] 异常
   因为请求没有提供参数给必须赋值参数`$id`；
 * `http://hostname/index.php?r=post/view&id[]=123`: 会抛出[[yii\web\BadRequestHttpException]] 异常
diff --git a/docs/guide-zh-CN/structure-views.md b/docs/guide-zh-CN/structure-views.md
index 5bf4f1c..c574237 100644
--- a/docs/guide-zh-CN/structure-views.md
+++ b/docs/guide-zh-CN/structure-views.md
@@ -148,10 +148,9 @@ class PostController extends Controller
 ### 小部件中渲染 <span id="rendering-in-widgets"></span>
 
 在 [小部件](structure-widgets.md) 中，可调用以下小部件方法来渲染视图：
-Within [widgets](structure-widgets.md), you may call the following widget methods to render views.
 
-* [[yii\base\Widget::render()|render()]]: 渲染一个 [视图名](#named-views).
-* [[yii\base\Widget::renderFile()|renderFile()]]: 渲染一个视图文件目录或[别名](concept-aliases.md)下的视图文件。
+- [[yii\base\Widget::render()|render()]]: 渲染一个 [视图名](#named-views)。
+- [[yii\base\Widget::renderFile()|renderFile()]]: 渲染一个视图文件目录或[别名](concept-aliases.md)下的视图文件。
 
 例如：
 
@@ -180,10 +179,10 @@ class ListWidget extends Widget
 
 可以在视图中渲染另一个视图，可以调用[[yii\base\View|view component]]视图组件提供的以下方法：
 
-* [[yii\base\View::render()|render()]]: 渲染一个 [视图名](#named-views).
-* [[yii\web\View::renderAjax()|renderAjax()]]: 渲染一个 [视图名](#named-views)
+- [[yii\base\View::render()|render()]]: 渲染一个 [视图名](#named-views).
+- [[yii\web\View::renderAjax()|renderAjax()]]: 渲染一个 [视图名](#named-views)
   并注入所有注册的JS/CSS脚本和文件，通常使用在响应AJAX网页请求的情况下。
-* [[yii\base\View::renderFile()|renderFile()]]: 渲染一个视图文件目录或[别名](concept-aliases.md)下的视图文件。
+- [[yii\base\View::renderFile()|renderFile()]]: 渲染一个视图文件目录或[别名](concept-aliases.md)下的视图文件。
 
 例如，视图中的如下代码会渲染该视图所在目录下的 `_overview.php` 视图文件，
 记住视图中 `$this` 对应 [[yii\base\View|view]] 组件:
@@ -211,19 +210,19 @@ echo \Yii::$app->view->renderFile('@app/views/site/license.php');
 
 视图名可以依据以下规则到对应的视图文件路径：
 
-* 视图名可省略文件扩展名，这种情况下使用 `.php` 作为扩展，
+- 视图名可省略文件扩展名，这种情况下使用 `.php` 作为扩展，
   视图名 `about` 对应到 `about.php` 文件名；
-* 视图名以双斜杠 `//` 开头，对应的视图文件路径为 `@app/views/ViewName`，
+- 视图名以双斜杠 `//` 开头，对应的视图文件路径为 `@app/views/ViewName`，
   也就是说视图文件在 [[yii\base\Application::viewPath|application's view path]] 路径下找，
   例如 `//site/about` 对应到 `@app/views/site/about.php`。
-* 视图名以单斜杠`/`开始，视图文件路径以当前使用[模块](structure-modules.md) 的[[yii\base\Module::viewPath|view path]]开始，
+- 视图名以单斜杠`/`开始，视图文件路径以当前使用[模块](structure-modules.md) 的[[yii\base\Module::viewPath|view path]]开始，
   如果不存在模块，使用`@app/views/ViewName`开始，例如，如果当前模块为`user`， `/user/create` 对应成
   `@app/modules/user/views/user/create.php`, 如果不在模块中，`/user/create`对应`@app/views/user/create.php`。
-* 如果 [[yii\base\View::context|context]] 渲染视图 并且上下文实现了 [[yii\base\ViewContextInterface]],
+- 如果 [[yii\base\View::context|context]] 渲染视图 并且上下文实现了 [[yii\base\ViewContextInterface]],
   视图文件路径由上下文的 [[yii\base\ViewContextInterface::getViewPath()|view path]] 开始，
   这种主要用在控制器和小部件中渲染视图，例如
   如果上下文为控制器`SiteController`，`site/about` 对应到 `@app/views/site/about.php`。
-* 如果视图渲染另一个视图，包含另一个视图文件的目录以当前视图的文件路径开始，
+- 如果视图渲染另一个视图，包含另一个视图文件的目录以当前视图的文件路径开始，
   例如被视图`@app/views/post/index.php` 渲染的 `item` 对应到 `@app/views/post/item`。
 
 根据以上规则，在控制器中 `app\controllers\PostController` 调用 `$this->render('view')`，
@@ -258,7 +257,6 @@ The controller ID is: <?= $this->context->id ?>
 推送方式让视图更少依赖上下文对象，是视图获取数据优先使用方式，
 缺点是需要手动构建数组，有些繁琐，在不同地方渲染时容易出错。
 
-
 ### 视图间共享数据 <span id="sharing-data-among-views"></span>
 
 [[yii\base\View|view component]]视图组件提供[[yii\base\View::params|params]]参数属性来让不同视图共享数据。
@@ -500,11 +498,11 @@ class PostController extends Controller
 
 视图组件提供如下实用的视图相关特性，每项详情会在独立章节中介绍：
 
-* [主题](output-theming.md): 允许为你的Web站点开发和修改主题；
-* [片段缓存](caching-fragment.md): 允许你在Web页面中缓存片段；
-* [客户脚本处理](output-client-scripts.md): 支持CSS 和 JavaScript 注册和渲染；
-* [资源包处理](structure-assets.md): 支持 [资源包](structure-assets.md)的注册和渲染；
-* [模板引擎](tutorial-template-engines.md): 允许你使用其他模板引擎，如
+- [主题](output-theming.md): 允许为你的Web站点开发和修改主题；
+- [片段缓存](caching-fragment.md): 允许你在Web页面中缓存片段；
+- [客户脚本处理](output-client-scripts.md): 支持CSS 和 JavaScript 注册和渲染；
+- [资源包处理](structure-assets.md): 支持 [资源包](structure-assets.md)的注册和渲染；
+- [模板引擎](tutorial-template-engines.md): 允许你使用其他模板引擎，如
   [Twig](http://twig.sensiolabs.org/), [Smarty](http://www.smarty.net/)。
 
 开发Web页面时，也可能频繁使用以下实用的小特性。
@@ -659,15 +657,15 @@ http://localhost/index.php?r=site/page&view=about
 
 视图负责将模型的数据展示用户想要的格式，总之，视图
 
-* 应主要包含展示代码，如HTML, 和简单的PHP代码来控制、格式化和渲染数据；
-* 不应包含执行数据查询代码，这种代码放在模型中；
-* 应避免直接访问请求数据，如 `$_GET`, `$_POST`，这种应在控制器中执行，
+- 应主要包含展示代码，如HTML, 和简单的PHP代码来控制、格式化和渲染数据；
+- 不应包含执行数据查询代码，这种代码放在模型中；
+- 应避免直接访问请求数据，如 `$_GET`, `$_POST`，这种应在控制器中执行，
   如果需要请求数据，应由控制器推送到视图。
-* 可读取模型属性，但不应修改它们。
+- 可读取模型属性，但不应修改它们。
 
 为使模型更易于维护，避免创建太复杂或包含太多冗余代码的视图，可遵循以下方法达到这个目标：
 
-* 使用 [布局](#layouts) 来展示公共代码（如，页面头部、尾部）；
-* 将复杂的视图分成几个小视图，可使用上面描述的渲染方法将这些小视图渲染并组装成大视图；
-* 创建并使用 [小部件](structure-widgets.md) 作为视图的数据块；
-* 创建并使用助手类在视图中转换和格式化数据。
+- 使用 [布局](#layouts) 来展示公共代码（如，页面头部、尾部）；
+- 将复杂的视图分成几个小视图，可使用上面描述的渲染方法将这些小视图渲染并组装成大视图；
+- 创建并使用 [小部件](structure-widgets.md) 作为视图的数据块；
+- 创建并使用助手类在视图中转换和格式化数据。
diff --git a/docs/guide/README.md b/docs/guide/README.md
index b34f635..f306743 100644
--- a/docs/guide/README.md
+++ b/docs/guide/README.md
@@ -92,6 +92,7 @@ Getting Data from Users
 * [Uploading Files](input-file-upload.md)
 * [Collecting Tabular Input](input-tabular-input.md)
 * [Getting Data for Multiple Models](input-multiple-models.md)
+* [Extending ActiveForm on the Client Side](input-form-javascript.md)
 
 
 Displaying Data
@@ -174,6 +175,7 @@ Special Topics
 * [Shared Hosting Environment](tutorial-shared-hosting.md)
 * [Template Engines](tutorial-template-engines.md)
 * [Working with Third-Party Code](tutorial-yii-integration.md)
+* [Using Yii as a micro framework](tutorial-yii-as-micro-framework.md)
 
 
 Widgets
diff --git a/docs/guide/concept-di-container.md b/docs/guide/concept-di-container.md
index afd9005..d260d11 100644
--- a/docs/guide/concept-di-container.md
+++ b/docs/guide/concept-di-container.md
@@ -386,14 +386,14 @@ Say we work on API application and have:
   ```php
   class FileStorage
   {
-      public function __contruct($root) {
+      public function __construct($root) {
           // whatever
       }
   }
   
   class DocumentsReader
   {
-      public function __contruct(FileStorage $fs) {
+      public function __construct(FileStorage $fs) {
           // whatever
       }
   }
diff --git a/docs/guide/concept-service-locator.md b/docs/guide/concept-service-locator.md
index a7f2808..e8fc29b 100644
--- a/docs/guide/concept-service-locator.md
+++ b/docs/guide/concept-service-locator.md
@@ -12,7 +12,7 @@ The most commonly used service locator in Yii is the *application* object, which
 `urlManager` components. You may configure these components, or even replace them with your own implementations, easily
 through functionality provided by the service locator.
 
-Besides the application object, each module object is also a service locator.
+Besides the application object, each module object is also a service locator. Modules implement [tree traversal](#tree-traversal).
 
 To use a service locator, the first step is to register components with it. A component can be registered
 via [[yii\di\ServiceLocator::set()]]. The following code shows different ways of registering components:
@@ -64,7 +64,7 @@ Because service locators are often being created with [configurations](concept-c
 a writable property named [[yii\di\ServiceLocator::setComponents()|components]] is provided. This allows you 
 to configure and register multiple components at once. The following code shows a configuration array
 that can be used to configure a service locator (e.g. an [application](structure-applications.md)) with 
-the `db`, `cache` and `search` components:
+the `db`, `cache`, `tz` and `search` components:
 
 ```php
 return [
@@ -77,6 +77,9 @@ return [
             'password' => '',
         ],
         'cache' => 'yii\caching\ApcCache',
+        'tz' => function() {
+            return new \DateTimeZone(Yii::$app->formatter->defaultTimeZone);
+        },
         'search' => function () {
             $solr = new app\components\SolrService('127.0.0.1');
             // ... other initializations ...
@@ -115,3 +118,13 @@ return [
 This alternative approach is most preferable when you are releasing a Yii component which encapsulates some non-Yii
 3rd-party library. You use the static method like shown above to represent the complex logic of building the
 3rd-party object, and the user of your component only needs to call the static method to configure the component.
+
+## Tree traversal <span id="tree-traversal"></span>
+
+Modules allow arbitrary nesting; a Yii application is essentially a tree of modules.
+Since each of these modules is a service locator it makes sense for children to have access to their parent.
+This allows modules to use `$this->get('db')` instead of referencing the root service locator `Yii::$app->get('db')`.
+Added benefit is the option for a developer to override configuration in a module.
+
+Any request for a service to be retrieved from a Module will be passed on to its parent in case the module is not able to satisfy it.
+ 
diff --git a/docs/guide/db-migrations.md b/docs/guide/db-migrations.md
index e7ae53a..cd21941 100644
--- a/docs/guide/db-migrations.md
+++ b/docs/guide/db-migrations.md
@@ -704,8 +704,17 @@ Below is the list of all these database accessing methods:
 * [[yii\db\Migration::dropCommentFromTable()|dropCommentFromTable()]]: dropping comment from table
 
 > Info: [[yii\db\Migration]] does not provide a database query method. This is because you normally do not need
-  to display extra message about retrieving data from a database. It is also because you can use the powerful
-  [Query Builder](db-query-builder.md) to build and run complex queries.
+> to display extra message about retrieving data from a database. It is also because you can use the powerful
+> [Query Builder](db-query-builder.md) to build and run complex queries.
+> Using Query Builder in a migration may look like this:
+>
+> ```php
+> // update status field for all users
+> foreach((new Query)->from('users')->each() as $user) {
+>     $this->update('users', ['status' => 1], ['id' => $user['id']]);
+> }
+> ```
+
 
 > Note: When manipulating data using a migration you may find that using your [Active Record](db-active-record.md) classes
 > for this might be useful because some of the logic is already implemented there. Keep in mind however, that in contrast
@@ -788,6 +797,13 @@ yii migrate/redo 3      # redo the last 3 applied migrations
 
 > Note: If a migration is not reversible, you will not be able to redo it.
 
+## Refreshing Migrations <span id="refreshing-migrations"></span>
+
+Since Yii 2.0.13 you can reset the whole database and apply all migrations from the beginning.
+
+```
+yii migrate/fresh       # Truncate the database and apply all migrations from the beginning.
+```
 
 ## Listing Migrations <span id="listing-migrations"></span>
 
@@ -909,6 +925,7 @@ return [
     'controllerMap' => [
         'migrate' => [
             'class' => 'yii\console\controllers\MigrateController',
+            'migrationPath' => null, // disable non-namespaced migrations if app\migrations is listed below
             'migrationNamespaces' => [
                 'app\migrations', // Common migrations for the whole application
                 'module\migrations', // Migrations for the specific project's module
diff --git a/docs/guide/input-form-javascript.md b/docs/guide/input-form-javascript.md
new file mode 100644
index 0000000..35676ec
--- /dev/null
+++ b/docs/guide/input-form-javascript.md
@@ -0,0 +1,202 @@
+Extending ActiveForm on the Client Side
+=======================================
+
+The [[yii\widgets\ActiveForm]] widget comes with a set of JavaScript methods that are used for client validation.
+Its implementation is very flexible and allows you to extend it in different ways.
+In the following these are described.
+
+## ActiveForm events
+
+ActiveForm triggers a series of dedicated events. Using the code like the following you can subscribe to these
+events and handle them:
+
+```javascript
+$('#contact-form').on('beforeSubmit', function (e) {
+	if (!confirm("Everything is correct. Submit?")) {
+		return false;
+	}
+	return true;
+});
+```
+
+In the following we'll review events available.
+
+### `beforeValidate`
+
+`beforeValidate` is triggered before validating the whole form.
+
+The signature of the event handler should be:
+
+```javascript
+function (event, messages, deferreds)
+```
+
+where
+
+- `event`: an Event object.
+- `messages`: an associative array with keys being attribute IDs and values being error message arrays
+   for the corresponding attributes.
+- `deferreds`: an array of Deferred objects. You can use `deferreds.add(callback)` to add a new
+   deferred validation.
+
+If the handler returns a boolean `false`, it will stop further form validation after this event. And as
+a result, `afterValidate` event will not be triggered.
+
+### `afterValidate`
+
+`afterValidate` event is triggered after validating the whole form.
+
+The signature of the event handler should be:
+
+```javascript
+function (event, messages, errorAttributes)
+```
+
+where
+
+- `event`: an Event object.
+- `messages`: an associative array with keys being attribute IDs and values being error message arrays
+   for the corresponding attributes.
+- `errorAttributes`: an array of attributes that have validation errors. Please refer to
+  `attributeDefaults` for the structure of this parameter.
+
+### `beforeValidateAttribute`
+
+`beforeValidateAttribute` event is triggered before validating an attribute.
+The signature of the event handler should be:
+
+```javascript
+function (event, attribute, messages, deferreds)
+```
+     
+where
+
+- `event`: an Event object.
+- `attribute`: the attribute to be validated. Please refer to `attributeDefaults` for the structure
+   of this parameter.
+- `messages`: an array to which you can add validation error messages for the specified attribute.
+- `deferreds`: an array of Deferred objects. You can use `deferreds.add(callback)` to add
+   a new deferred validation.
+
+If the handler returns a boolean `false`, it will stop further validation of the specified attribute.
+And as a result, `afterValidateAttribute` event will not be triggered.
+
+### `afterValidateAttribute`
+
+`afterValidateAttribute` event is triggered after validating the whole form and each attribute.
+
+The signature of the event handler should be:
+
+```javascript
+function (event, attribute, messages)
+```
+
+where
+
+- `event`: an Event object.
+- `attribute`: the attribute being validated. Please refer to `attributeDefaults` for the structure
+   of this parameter.
+- `messages`: an array to which you can add additional validation error messages for the specified
+   attribute.
+
+### `beforeSubmit`
+
+`beforeSubmit` event is triggered before submitting the form after all validations have passed.
+
+The signature of the event handler should be:
+
+```javascript
+function (event)
+```
+
+where event is an Event object.
+
+If the handler returns a boolean `false`, it will stop form submission.
+
+### `ajaxBeforeSend`
+         
+`ajaxBeforeSend` event is triggered before sending an AJAX request for AJAX-based validation.
+
+The signature of the event handler should be:
+
+```javascript
+function (event, jqXHR, settings)
+```
+
+where
+
+- `event`: an Event object.
+- `jqXHR`: a jqXHR object
+- `settings`: the settings for the AJAX request
+
+### `ajaxComplete`
+
+`ajaxComplete` event is triggered after completing an AJAX request for AJAX-based validation.
+
+The signature of the event handler should be:
+
+```javascript
+function (event, jqXHR, textStatus)
+```
+
+where
+
+- `event`: an Event object.
+- `jqXHR`: a jqXHR object
+- `textStatus`: the status of the request ("success", "notmodified", "error", "timeout",
+"abort", or "parsererror").
+
+## Submitting the form via AJAX
+
+While validation can be made on client side or via AJAX request, the form submission itself is done
+as a normal request by default. If you want the form to be submitted via AJAX, you can achieve this
+by handling the `beforeSubmit` event of the form in the following way:
+
+```javascript
+var $form = $('#formId');
+$form.on('beforeSubmit', function() {
+    var data = $form.serialize();
+    $.ajax({
+        url: $form.attr('action'),
+        type: 'POST',
+        data: data,
+        success: function (data) {
+            // Implement successful
+        },
+        error: function(jqXHR, errMsg) {
+            alert(errMsg);
+        }
+     });
+     return false; // prevent default submit
+});
+```
+
+To learn more about the jQuery `ajax()` function, please refer to the [jQuery documentation](https://api.jquery.com/jQuery.ajax/).
+
+
+## Adding fields dynamically
+
+In modern web applications you often have the need of changing a form after it has been displayed to the user.
+This can for example be the addition of new fields after click on a "plus"-icon.
+To enable client validation for these fields, they have to be registered with the ActiveForm JavaScript plugin.
+
+You have to add a field itself and then add it to validation list:
+
+```javascript
+$('#contact-form').yiiActiveForm('add', {
+    id: 'address',
+    name: 'address',
+    container: '.field-address',
+    input: '#address',
+    error: '.help-block',
+    validate:  function (attribute, value, messages, deferred, $form) {
+        yii.validation.required(value, messages, {message: "Validation Message Here"});
+    }
+});
+```
+
+To remove a field from validation list so it's not validated you can do the following:
+
+```javascript
+$('#contact-form').yiiActiveForm('remove', 'address');
+```
diff --git a/docs/guide/input-forms.md b/docs/guide/input-forms.md
index f14413a..2160aed 100644
--- a/docs/guide/input-forms.md
+++ b/docs/guide/input-forms.md
@@ -66,7 +66,7 @@ As with any widget, you can specify some options as to how the widget should be
 the `begin` method. In this case, an extra CSS class and identifying ID are passed to be used in the opening `<form>` tag.
 For all available options, please refer to the API documentation of [[yii\widgets\ActiveForm]].
 
-### ActiveField <span id="activefield"></span>.
+### ActiveField <span id="activefield"></span>
 In order to create a form element in the form, along with the element's label, and any applicable JavaScript validation,
 the [[yii\widgets\ActiveForm::field()|ActiveForm::field()]] method is called, which returns an instance of [[yii\widgets\ActiveField]].
 When the result of this method is echoed directly, the result is a regular (text) input.
diff --git a/docs/guide/input-validation.md b/docs/guide/input-validation.md
index 5a9e607..a6a6c2b 100644
--- a/docs/guide/input-validation.md
+++ b/docs/guide/input-validation.md
@@ -564,7 +564,7 @@ $this->addError('childrenCount', $message);
 Or use a loop:
 
 ```php
-$attributes = ['personalSalary, 'wifeSalary', 'childrenCount'];
+$attributes = ['personalSalary', 'wifeSalary', 'childrenCount'];
 foreach ($attributes as $attribute) {
     $this->addError($attribute, 'Your salary is not enough for children.');
 }
@@ -817,7 +817,7 @@ JS;
 ```
 
 
-### AJAX Validation <span id="ajax-validation"></span>
+## AJAX Validation <span id="ajax-validation"></span>
 
 Some validations can only be done on the server-side, because only the server has the necessary information.
 For example, to validate if a username is unique or not, it is necessary to check the user table on the server-side.
diff --git a/docs/guide/output-data-widgets.md b/docs/guide/output-data-widgets.md
index 8408be1..d21a936 100644
--- a/docs/guide/output-data-widgets.md
+++ b/docs/guide/output-data-widgets.md
@@ -668,7 +668,7 @@ class UserView extends ActiveRecord
     /**
      * @inheritdoc
      */
-    public static function attributeLabels()
+    public function attributeLabels()
     {
         return [
             // define here your attribute labels
diff --git a/docs/guide/runtime-logging.md b/docs/guide/runtime-logging.md
index cc56098..54f4fc9 100644
--- a/docs/guide/runtime-logging.md
+++ b/docs/guide/runtime-logging.md
@@ -308,6 +308,9 @@ return [
 ];
 ```
 
+Since version 2.0.13, you may configure [[yii\log\Target::enabled|enabled]] with a callable to
+define a dynamic condition for whether the log target should be enabled or not.
+See the documentation of [[yii\log\Target::setEnabled()]] for an example.
 
 ### Creating New Targets <span id="new-targets"></span>
 
diff --git a/docs/guide/runtime-requests.md b/docs/guide/runtime-requests.md
index 180c10c..c1a137a 100644
--- a/docs/guide/runtime-requests.md
+++ b/docs/guide/runtime-requests.md
@@ -130,10 +130,73 @@ and returns the most appropriate language.
 
 ## Client Information <span id="client-information"></span>
 
-You can get the host name and IP address of the client machine through [[yii\web\Request::userHost|userHost]]
+You can get the host name and IP address
+of the client machine through [[yii\web\Request::userHost|userHost]]
 and [[yii\web\Request::userIP|userIP]], respectively. For example,
 
 ```php
 $userHost = Yii::$app->request->userHost;
 $userIP = Yii::$app->request->userIP;
 ```
+
+## Trusted proxies and headers <span id="trusted-proxies"></span>
+
+In the previous section you have seen how to get user information like host and IP address.
+This will work out of the box in a normal setup where a single webserver is used to serve the website.
+If your Yii application however runs behind a reverse proxy, you need to add additional configuration
+to retrieve this information as the direct client is now the proxy and the user IP address is passed to
+the Yii application by a header set by the proxy.
+
+You should not blindly trust headers provided by proxies unless you explicitly trust the proxy.
+Since 2.0.13 Yii supports configuring trusted proxies via the 
+[[yii\web\Request::trustedHosts|trustedHosts]],
+[[yii\web\Request::secureHeaders|secureHeaders]], 
+[[yii\web\Request::ipHeaders|ipHeaders]] and
+[[yii\web\Request::secureProtocolHeaders|secureProtocolHeaders]]
+properties of the `request` component.
+
+The following is a request config for an application that runs behind an array of reverse proxies,
+which are located in the `10.0.2.0/24` IP network:
+
+```php
+'request' => [
+    // ...
+    'trustedHosts' => [
+        '/^10\.0\.2\.\d+$/',
+    ],
+],
+```
+
+The IP is sent by the proxy in the `X-Forwarded-For` header by default, and the protocol (`http` or `https`) is sent in `X-Forwarded-Proto`.
+
+In case your proxies are using different headers you can use the request configuration to adjust these, e.g.:
+
+```php
+'request' => [
+    // ...
+    'trustedHosts' => [
+        '/^10\.0\.2\.\d+$/' => [
+            'X-ProxyUser-Ip',
+            'Front-End-Https',
+        ],
+    ],
+    'secureHeaders' => [
+             'X-Forwarded-For',
+             'X-Forwarded-Host',
+             'X-Forwarded-Proto',
+             'X-Proxy-User-Ip',
+             'Front-End-Https',
+         ];'
+    'ipHeaders' => [
+        'X-Proxy-User-Ip',
+    ],
+    'secureProtocolHeaders' => [
+        'Front-End-Https' => ['on']
+    ],
+],
+```
+
+With the above configuration, all headers listed in `secureHeaders` are filtered from the request,
+except the `X-ProxyUser-Ip` and `Front-End-Https` headers in case the request is made by the proxy.
+In that case the former is used to retrieve the user IP as configured in `ipHeaders` and the latter
+will be used to determine the result of [[yii\web\Request::getIsSecureConnection()]].
diff --git a/docs/guide/security-overview.md b/docs/guide/security-overview.md
index 7903a10..e6e7f8a 100644
--- a/docs/guide/security-overview.md
+++ b/docs/guide/security-overview.md
@@ -12,3 +12,4 @@ Yii powered application as secure as possible, Yii has included several excellen
 * [Views security](structure-views.md#security)
 * [Auth Clients](https://github.com/yiisoft/yii2-authclient/blob/master/docs/guide/README.md)
 * [Best Practices](security-best-practices.md)
+* [Trusted proxies and headers](runtime-requests.md#trusted-proxies)
diff --git a/docs/guide/start-installation.md b/docs/guide/start-installation.md
index 326dbb4..f80598c 100644
--- a/docs/guide/start-installation.md
+++ b/docs/guide/start-installation.md
@@ -178,6 +178,8 @@ of `basic/web`. Denying access to those other folders is a security improvement.
 to modify its Web server configuration, you may still adjust the structure of your application for better security. Please refer to
 the [Shared Hosting Environment](tutorial-shared-hosting.md) section for more details.
 
+> Info: If you are running your Yii application behind a reverse proxy, you might need to configure
+> [Trusted proxies and headers](runtime-requests.md#trusted-proxies) in the request component.
 
 ### Recommended Apache Configuration <span id="recommended-apache-configuration"></span>
 
diff --git a/docs/guide/structure-modules.md b/docs/guide/structure-modules.md
index d9ac891..255b545 100644
--- a/docs/guide/structure-modules.md
+++ b/docs/guide/structure-modules.md
@@ -269,6 +269,34 @@ in the `admin` module which is a child module of the `forum` module.
 to its parent. The [[yii\base\Application::loadedModules]] property keeps a list of loaded modules, including both
 direct children and nested ones, indexed by their class names.
 
+## Accessing components from within modules
+
+Since version 2.0.13 modules support [tree traversal](concept-service-locator.md#tree-traversal). This allows module 
+developers to reference (application) components via the service locator that is their module.
+This means that it is preferable to use `$module->get('db')` over `Yii::$app->get('db')`.
+The user of a module is able to specify a specific component to be used for the module in case a different component
+(configuration) is required.
+
+For example consider this application configuration:
+
+```php
+'components' => [
+    'db' => [
+        'tablePrefix' => 'main_',
+    ],
+],
+'modules' => [
+    'mymodule' => [
+        'components' => [
+            'db' => [
+                'tablePrefix' => 'module_',
+            ],
+        ],
+    ],
+],
+```
+
+The application database tables will be prefixed with `main_`, while all module tables will be prefixed with `module_`.
 
 ## Best Practices <span id="best-practices"></span>
 
diff --git a/docs/guide/tutorial-yii-as-micro-framework.md b/docs/guide/tutorial-yii-as-micro-framework.md
new file mode 100644
index 0000000..896e593
--- /dev/null
+++ b/docs/guide/tutorial-yii-as-micro-framework.md
@@ -0,0 +1,210 @@
+# Using Yii as a Micro-framework
+
+Yii can be easily used without the features included in basic and advanced templates. In other words, Yii is already a micro-framework. It is not required to have the directory structure provided by templates to work with Yii.
+
+This is especially handy when you do not need all the pre-defined template code like assets or views. One of such cases is building a JSON API. In the following sections will show how to do that.
+
+## Installing Yii
+
+Create a directory for your project files and change working directory to that path. Commands used in examples are Unix-based but similar commands exist in Windows.
+
+```bash
+mkdir micro-app
+cd micro-app
+```
+
+> Note: A little bit of Composer knowledge is required to continue. If you don't know how to use composer yet, please take time to read [Composer Guide](https://getcomposer.org/doc/00-intro.md).
+
+Create file `composer.json` under the `micro-app` directory using your favorite editor and add the following:
+
+```json
+{
+    "require": {
+        "yiisoft/yii2": "~2.0.0"
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org"
+        }
+    ]
+}
+```
+
+Save the file and run the `composer install` command. This will install the framework with all its dependencies.
+
+## Creating the Project Structure
+
+After you have installed the framework, it's time to create an [entry point](structure-entry-scripts.md) for the application. Entry point is the very first file that will be executed when you try to open your application. For the security reasons, it is recommended to put the entrypoint file in a separate directory and make it a web root.
+
+Create a `web` directory and put `index.php` inside with the following content:
+
+```php 
+<?php
+
+// comment out the following two lines when deployed to production
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'dev');
+
+require(__DIR__ . '/../vendor/autoload.php');
+require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+
+$config = require __DIR__ . '/../config.php';
+(new yii\web\Application($config))->run();
+```
+
+Also create a file named `config.php` which will contain all application configuration:
+
+```php
+<?php
+return [
+    'id' => 'micro-app',
+    // the basePath of the application will be the `micro-app` directory
+    'basePath' => __DIR__,
+    // this is where the application will find all controllers
+    'controllerNamespace' => 'micro\controllers',
+    // set an alias to enable autoloading of classes from the 'micro' namespace
+    'aliases' => [
+        '@micro' => __DIR__,
+    ],
+];
+```
+
+> Info: Even though the configuration could be kept in the `index.php` file it is recommended
+> to have it separately. This way it can be used for console application also as it is shown below.
+
+Your project is now ready for coding. Although it's up to you to decide the project directory structure, as long as you observe namespaces.
+
+## Creating the first Controller
+
+Create a `controllers` directory and add a file `SiteController.php`, which is the default
+controller that will handle a request with no path info.
+
+```php
+<?php
+
+namespace micro\controllers;
+
+use yii\web\Controller;
+
+class SiteController extends Controller
+{
+    public function actionIndex()
+    {
+        return 'Hello World!';
+    }
+}
+```
+
+If you want to use a different name for this controller you can change it and configure [[yii\base\Application::$defaultRoute]] accordingly.
+For example, for a `DefaultController` that would be `'defaultRoute' => 'default/index'`.
+
+At this point the project structure should look like this:
+
+```
+micro-app/
+├── composer.json
+├── web/
+    └── index.php
+└── controllers/
+    └── SiteController.php
+```
+
+If you have not set up the web server yet, you may want to take a look at [web server configuration file examples](start-installation.md#configuring-web-servers).
+Another options is to use the `yii serve` command which will use the PHP build-in web server. You can run
+it from the `micro-app/` directory via:
+
+    vendor/bin/yii serve --docroot=./web
+
+Opening the application URL in a browser should now print "Hello World!" which has been returned in the `SiteController::actionIndex()`.
+
+> Info: In our example, we have changed default application namespace `app` to `micro` to demonstrate
+> that you are not tied to that name (in case you thought you were), then adjusted
+> [[yii\base\Application::$controllerNamespace|controllers namespace]] and set the correct alias.
+
+
+## Creating a REST API
+
+In order to demonstrate the usage of our "micro framework", we will create a simple REST API for posts.
+
+For this API to serve some data, we need a database first. Add the database connection configuration
+to the application configuration:
+
+```php
+'components' => [
+    'db' => [
+        'class' => 'yii\db\Connection',
+        'dsn' => 'sqlite:@micro/database.sqlite',
+    ],
+],
+```
+
+> Info: We use an sqlite database here for simplicity. Please refer to the [Database guide](db-dao.md) for more options.
+
+Next we create a [database migration](db-migrations.md) to create a posts table.
+Make sure you have a separate configuration file as explained above, we need it to run the console commands below.
+Running the following commands will
+create a database migration file and apply the migration to the database:
+
+    vendor/bin/yii migrate/create --appconfig=config.php create_post_table --fields="title:string,body:text"
+    vendor/bin/yii migrate/up --appconfig=config.php
+
+Create directory `models` and a `Post.php` file in that directory. This is the code for the model:
+
+```php
+<?php
+
+namespace micro\models;
+
+use yii\db\ActiveRecord;
+
+class Post extends ActiveRecord
+{ 
+    public static function tableName()
+    {
+        return '{{posts}}';
+    }
+}
+```
+
+> Info: The model created here is an ActiveRecord class, which represents the data from the `posts` table.
+> Please refer to the [active record guide](db-active-record.md) for more information.
+
+To serve posts on our API, add the `PostController` in `controllers`:
+
+```php
+<?php
+
+namespace micro\controllers;
+
+use yii\rest\ActiveController;
+
+class PostController extends ActiveController
+{
+    public $modelClass = 'micro\models\Post';
+
+    public function behaviors()
+    {
+        // remove rateLimiter which requires an authenticated user to work
+        $behaviors = parent::behaviors();
+        unset($behaviors['rateLimiter']);
+        return $behaviors;
+    }
+}
+```
+
+At this point our API will provide the following URLs:
+
+- `/index.php?r=post` - list all posts
+- `/index.php?r=post/view&id=1` - show post with ID 1
+- `/index.php?r=post/create` - create a post
+- `/index.php?r=post/update&id=1` - update post with ID 1
+- `/index.php?r=post/delete&id=1` - delete post with ID 1
+
+Starting from Here you may want to look at the following guides to further develop your application:
+
+- The API currently only understands urlencoded form data as input, to make it a real JSON API, you
+  need to configure [[yii\web\JsonParser]].
+- To make the URLs more friendly you need to configure routing.
+  See [guide on REST routing](rest-routing.md) on how to do this.
+- Please also refer to the [Looking Ahead](start-looking-ahead.md) section for further references.
diff --git a/framework/BaseYii.php b/framework/BaseYii.php
index 5411748..2b521d3 100644
--- a/framework/BaseYii.php
+++ b/framework/BaseYii.php
@@ -471,6 +471,7 @@ class BaseYii
 
     /**
      * Marks the beginning of a code block for profiling.
+     *
      * This has to be matched with a call to [[endProfile]] with the same category name.
      * The begin- and end- calls must also be properly nested. For example,
      *
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 8a0225e..6f1f14f 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -37,48 +37,79 @@ Yii Framework 2 Change Log
 
 2.0.13 under development
 ------------------------
-- Bug #14523: Added `yii\web\MultipartFormDataParser::$force` option allowing to enforce parsing even on 'POST' request (klimov-paul)
-- Bug #14449: Fix PHP 7.2 compatibility bugs and add explicit closure support in `yii\base\Application` (dynasource)
+
+- Bug #6526: Fixed `yii\db\Command::batchInsert()` casting of double values correctly independent of the locale (cebe, leammas)
 - Bug #7890: Allow `migrate/mark` to mark history at the point of the base migration (cebe)
-- Bug #14206: `MySqlMutex`, `PgsqlMutex` and `OracleMutex` now use `useMaster()` to ensure lock is aquired on the same DB server (cebe, ryusoft)
-- Chg #14321: `yii\widgets\MaskedInput` is now registering its JavaScript `clientOptions` initialization code in head section (DaveFerger)
+- Bug #11825: User can login by cookie only once when `autoRenewCookie` is set to false (shirase, silverfire)
+- Bug #12860: Fixed possible race conditions in `yii\mutex\FileMutex` (kidol)
 - Bug #13757: Fixed ambiguous column error in `BaseActiveRecord::refresh()` when the query adds a JOIN by default (cebe, ivankff)
+- Bug #13779: Fixed `yii\db\ActiveRecord::joinWith()` unable to use relation defined via attached behavior (ElisDN, klimov-paul)
 - Bug #13859: Fixed ambiguous column error in `Query::column()` when `$indexBy` is used with a JOIN (cebe)
-- Enh #14431: Moved `ActiveQuery::getTablesUsedInFrom()` to `Query` to make the functionality available on the lower layer (cebe)
+- Bug #13969: Fixed a bug in a `yii\console\controllers\CacheController` when caches defined via a closure were not detected (Kolyunya)
+- Bug #14165: Set `_slave` of `Connection` to `false` instead of `null` in `close` method (rossoneri)
+- Bug #14192: Fixed wrong default null value for TIMESTAMP when using PostgreSQL (Tigrov)
+- Bug #14202: Fixed current time in (UTC) `\Yii::$app->formatter` if time not set (bscheshirwork)
+- Bug #14206: `MySqlMutex`, `PgsqlMutex` and `OracleMutex` now use `useMaster()` to ensure lock is aquired on the same DB server (cebe, ryusoft)
 - Bug #14248: `yii\console\controllers\MessageController` no longer outputs colorized filenames when console does not support text colorization (PowerGamer1)
 - Bug #14264: Fixed a bug where `yii\log\Logger::calculateTimings()` was not accepting messages with array tokens (bizley)
 - Bug #14269: Fixed broken error page when calling an undefined method (cebe)
+- Bug #14304: Fixed `yii\validators\UniqueValidator` and `yii\validators\ExistValidator` to skip prefixes in case expressions are used (samdark)
 - Bug #14307: Fixed PHP warning when `yii\console\UnknownCommandException` is thrown for empty command (rob006)
-- Chg #14201: `yii\console\controllers\MessageController::extractMessagesFromTokens()` is now protected (faenir)
+- Bug #14318: Trigger `yiiActiveForm.events.afterValidateAttribute` after updating attribute  (dmirogin)
+- Bug #14334: Fixed `\yii\db\QueryBuilder::buildNotCondition` loses params when operand is `\yii\db\Expression` (Ni-san)
+- Bug #14341: Fixed regression in error handling introduced by fixing #14264 (samdark)
+- Bug #14370: Fixed creating built-in validator in model with same function name (dmirogin)
+- Bug #14406: Fixed caching rules in `yii\web\UrlManager` with different ruleConfig configuration (dmirogin)
+- Bug #14423: Fixed `ArrayHelper::merge` behavior with null values for integer-keyed elements (dmirogin)
+- Bug #14449: Fix PHP 7.2 compatibility bugs and add explicit closure support in `yii\base\Application` (dynasource)
+- Bug #14471: `ContentNegotiator` will always set one of the configured server response formats even if the client does not accept any of them (PowerGamer1)
+- Bug #14492: Fixed error handler not escaping error info debug mode, see CVE-2017-11516 (samdark)
+- Bug #14493: Fixed getting permissions in `yii\rbac\Dbmanger::getPermissionsByUser` by user with id equals 0 (dmirogin)
+- Bug #14523: Added `yii\web\MultipartFormDataParser::$force` option allowing to enforce parsing even on 'POST' request (klimov-paul)
+- Bug #14525: Fixed 2.0.12 regression of loading of global fixtures trough `yii fixture/load` (michaelarnauts)
+- Bug #14533: Fixed `yii\validators\ExistValidator` and `yii\validators\UniqueValidator` throw exception in case they are set for `yii\db\ActiveRecord` with `$targetClass` pointing to NOSQL ActiveRecord (klimov-paul)
+- Bug #14542: Ensured only ASCII characters are in CSRF cookie value since binary data causes issues with ModSecurity and some browsers (samdark)
+- Bug #14596: Fix event call on init in `yii\widgets\BaseListView` (panchenkodv)
+- Bug #14697: Fixed `console\widgets\Table` rendering when there's no data supplied (bscheshirwork)
+- Bug #14723: Fixed serialization of `yii\db\Connection` instance closes database connection (klimov-paul)
+- Bug #14773: Fixed `yii\widgets\ActiveField::$options` does not support 'class' option in array format (klimov-paul)
+- Bug: Fixed `yii\mutex\FileMutex::$autoRelease` having no effect due to missing base class initialization (kidol)
 - Enh #4495:  Added closure support in `yii\i18n\Formatter` (developeruz)
+- Enh #5786: Allowed to use custom constructors in ActiveRecord-based classes (ElisDN, klimov-paul)
+- Enh #6644: Added `yii\helpers\ArrayHelper::setValue()` (LAV45)
+- Enh #7823: Added `yii\filters\AjaxFilter` filter (dmirogin)
+- Enh #11415: Added `yii\console\widgets\Table` to draw tables in console apps (pana1990, rob006, samdark, tonykor)
+- Enh #13254: Made `yii\helpers\StringHelper` and `yii\validators\StringValidator` independent of `Yii::$app` instance (cebe)
+- Enh #13378: Added skipOnEmpty option to SluggableBehaviour (andrewnester)
+- Enh #13586: Added `$preserveNonEmptyValues` property to the `yii\behaviors\AttributeBehavior` (Kolyunya)
+- Enh #13780: Added support for trusted proxies in `yii\web\Request` (sammousa, cebe, silverfire)
 - Enh #13787: Added `yii\db\Migration::$maxSqlOutputLength` that allows limiting number of characters for outputting SQL (thiagotalma)
 - Enh #13824: Support extracting concatenated strings in `yii message` (developeruz)
-- Enh #14089: Added tests for `yii\base\Theme` (vladis84)
-- Enh #13586: Added `$preserveNonEmptyValues` property to the `yii\behaviors\AttributeBehavior` (Kolyunya)
-- Bug #14192: Fixed wrong default null value for TIMESTAMP when using PostgreSQL (Tigrov)
+- Enh #13835: Added `yii\web\Request::getOrigin()` method that returns `HTTP_ORIGIN` of current CORS request (yyxx9988)
+- Enh #13853: Added `yii\db\Migration::$compact` as well as `yii\console\controllers\BaseMigrateController::$compact` to allow making the migration console output more compact (francislavoie)
+- Enh #14022: `yii\web\UrlManager::setBaseUrl()` now supports aliases (dmirogin)
+- Enh #14061: Added request scope assignments cache to `yii\rbac\DbManager::checkAccess()` to avoid duplicate queries for user assignments (leandrogehlen, cebe, nineinchnick, ryusoft)
 - Enh #14081: Added `yii\caching\CacheInterface` to make custom cache extensions adoption easier (silverfire)
-- Enh #11415: Added `yii\console\widgets\Table` to draw tables in console apps (pana1990, rob006, samdark, tonykor)
-- Chg #14286: Used primary inputmask package name instead of an alias (samdark)
+- Enh #14089: Added tests for `yii\base\Theme` (vladis84)
+- Enh #14105: Implemented a solution for retrieving DBMS constraints in `yii\db\Schema` (sergeymakinen)
+- Enh #14151: Added `yii\behaviors\AttributesBehavior` that assigns values specified to one or multiple attributes of an AR object when certain events happen (bscheshirwork)
+- Enh #14184: Module service locator now falls back to its parent module service locator in case component isn't found (SamMousa)
+- Enh #14188: Add constants and function for sysexits(3) to `ConsoleHelper` (tom--, samdark, cebe)
+- Enh #14273: `yii\log\Target::$enabled` now supports callable value (dmirogin)
+- Enh #14294: Added `InputWidget::renderInput()` to move behavior described in `InputWidget` class docs to the class itself (cebe)
 - Enh #14298: The default response formatter configs defined by `yii\web\Response::defaultFormatters()` now use the array syntax (brandonkelly)
-- Bug #14304: Fixed `yii\validators\UniqueValidator` and `yii\validators\ExistValidator` to skip prefixes in case expressions are used (samdark)
-- Bug #14334: Fixed `\yii\db\QueryBuilder::buildNotCondition` loses params when operand is `\yii\db\Expression` (Ni-san)
-- Bug #14341: Fixed regression in error handling introduced by fixing #14264 (samdark)
-- Enh #13378: Added skipOnEmpty option to SluggableBehaviour (andrewnester)
+- Enh #14363: Added `yii\widgets\LinkPager::$linkContainerOptions` and possibility to override tag in `yii\widgets\LinkPager::$options` (dmirogin)
 - Enh #14389: Optimize `Validator::validateAttributes()` by calling `attributeNames()` only once (nicdnep)
-- Enh #6644: Added `yii\helpers\ArrayHelper::setValue()` (LAV45)
-- Enh #14105: Implemented a solution for retrieving DBMS constraints in `yii\db\Schema` (sergeymakinen)
 - Enh #14417: Added configuration for headers in PHP files generated by `message/extract` command (rob006)
-- Enh #13835: Added `yii\web\Request::getOrigin()` method that returns HTTP_ORIGIN of current CORS request (yyxx9988)
-- Enh #14188: Add constants and function for sysexits(3) to `ConsoleHelper` (tom--, samdark, cebe)
-- Bug #14165: Set `_slave` of `Connection` to `false` instead of `null` in `close` method (rossoneri)
-- Bug #14423: Fixed `ArrayHelper::merge` behavior with null values for integer-keyed elements (dmirogin)
-- Bug #14406: Fixed caching rules in `yii\web\UrlManager` with different ruleConfig configuration (dmirogin)
+- Enh #14431: Moved `ActiveQuery::getTablesUsedInFrom()` to `Query` to make the functionality available on the lower layer (cebe)
+- Enh #14620: Updated `yii.activeForm.js` and `yii\web\View` to jQuery 3.0 compatible API (silverfire)
+- Enh #14664: Add migrate/fresh command to truncate database and apply migrations again (thyseus)
 - Chg #7936: Deprecate `yii\base\Object` in favor of `yii\base\BaseObject` for compatibility with PHP 7.2 (rob006, cebe, klimov-paul)
-- Bug #14493: Fixed getting permissions in `yii\rbac\Dbmanger::getPermissionsByUser` by user with id equals 0 (dmirogin)
-- Bug #14370: Fixed creating built-in validator in model with same function name (dmirogin)
-- Bug #14492: Fixed error handler not escaping error info debug mode (samdark)
+- Chg #14201: `yii\console\controllers\MessageController::extractMessagesFromTokens()` is now protected (faenir)
+- Chg #14286: Used primary inputmask package name instead of an alias (samdark)
+- Chg #14321: `yii\widgets\MaskedInput` is now registering its JavaScript `clientOptions` initialization code in head section (DaveFerger)
 - Chg #14487: Changed i18n message error to warning (dmirogin)
-- Enh #7823: Added `yii\filters\AjaxFilter` filter (dmirogin)
+
 
 2.0.12 June 05, 2017
 --------------------
@@ -142,6 +173,8 @@ Yii Framework 2 Change Log
 - Bug #14074: Fixed default value of `yii\console\controllers\FixtureController::$globalFixtures` to contain valid class name (lynicidn)
 - Bug #14094: Fixed bug when single `yii\web\UrlManager::createUrl()` call my result multiple calls of `yii\web\UrlRule::createUrl()` for the same rule (rossoneri)
 - Bug #14133: Fixed bug when calculating timings with mixed nested profile begin and end in `yii\log\Logger::calculateTimings()` (bizley)
+- Bug #14186: Forced validation in `yiiActiveForm` do not trigger `afterValidate` event (arogachev)
+- Bug #14510: The state of a form is always "not validated" when using forced validation in `yiiActiveForm` (arogachev)
 - Enh #4793: `yii\filters\AccessControl` now can be used without `user` component (bizley)
 - Enh #4999: Added support for wildcards at `yii\filters\AccessRule::$controllers` (klimov-paul)
 - Enh #5108: `yii\validators\DateValidator` now resets `$timestampAttribute` value on empty validated attribute value (klimov-paul)
@@ -568,7 +601,7 @@ Yii Framework 2 Change Log
 - Enh #11137: Added weak ETag support to `yii\filters\HttpCache`. It could be turned on via setting `$weakEtag` to `true` (particleflux)
 - Enh #11139: `yii\validators\EachValidator` injects specific attribute value in error message parameters (silverfire)
 - Enh #11166: migrate command new option `useTablePrefix` (Faryshta)
-- Enh #11187: migrate command now generates phpdoc for table migrations (Faryshta)
+- Enh #11187: migrate command now generates PHPDoc for table migrations (Faryshta)
 - Enh #11207: migrate command can create foreign keys. (Faryshta)
 - Enh #11254: Added ability to attach RBAC rule using class name (mdmunir)
 - Enh #11285: `yii\base\Security` enhancements (tom--, samdark)
@@ -705,6 +738,7 @@ Yii Framework 2 Change Log
 - Enh #10783: Added migration and unit-tests for `yii\i18n\DbMessageSource` (silverfire)
 - Enh #10797: Cleaned up requirements checker CSS (muhammadcahya)
 - Enh: Added last resort measure for `yii\helpers\FileHelper::removeDirectory()` fail to unlink symlinks under Windows (samdark)
+- Enh #9707: Added `yii\i18n\Formatter::asWeight()` and `::asLength()` formatters (nineinchnick, silverfire)
 - Enh: `yii\behaviors\AttributeBehavior::getValue()` now respects the callable in array format (silverfire)
 - Chg #6419: Added `yii\web\ErrorHandler::displayVars` make list of displayed vars customizable. `$_ENV` and `$_SERVER` are not displayed by default anymore (silverfire)
 - Chg #9369: `Yii::$app->user->can()` now returns `false` instead of erroring in case `authManager` component is not configured (creocoder)
diff --git a/framework/UPGRADE.md b/framework/UPGRADE.md
index f3851db..6fb140c 100644
--- a/framework/UPGRADE.md
+++ b/framework/UPGRADE.md
@@ -54,11 +54,13 @@ Upgrade from Yii 2.0.x
 ----------------------
 
 * PHP requirements were raised to 7.1. Make sure your code is updated accordingly.
-* memcache PECL extension support was dropped. Use memcached PECL extesion instead.
+* memcache PECL extension support was dropped. Use memcached PECL extension instead.
 * Following new methods have been added to `yii\i18n\MessageInterface` `addHeader()`, `setHeader()`, `getHeader()`, `setHeaders()`
   providing ability to setup custom mail headers. Make sure your provide implementation for those methods, while
   creating your own mailer solution.
-* `::className()` method calls should be replaced with native `::class`.
+* `::className()` method calls should be replaced with [native](http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.class.class) `::class`.
+  When upgrading to Yii 2.1, You should do a global search and replace for `::className()` to `::class`.
+  All calls on objects via `->className()` should be replaced by a call to `get_class()`.
 * XCache and Zend data cache support was removed. Switch to another caching backends.
 * Rename `InvalidParamException` usage to `InvalidArgumentException`.
 * Masked input field widget was moved into separate extension https://github.com/yiisoft/yii2-maskedinput.
@@ -107,7 +109,7 @@ Upgrade from Yii 2.0.x
 * Console command used to clear cache now calls related actions "clear" instead of "flush".
 * Yii autoloader was removed in favor of Composer-generated one. You should remove explicit inclusion of `Yii.php` from
   your entry `index.php` scripts. In case you have relied on class map, use `composer.json` instead of configuring it
-  with PHP. For details please refer to [guide on autoloading](https://github.com/yiisoft/yii2/blob/2.1/docs/guide/concept-autoloading.md),  
+  with PHP. For details please refer to [guide on autoloading](https://github.com/yiisoft/yii2/blob/2.1/docs/guide/concept-autoloading.md),
   [guide on customizing helpers](https://github.com/yiisoft/yii2/blob/2.1/docs/guide/helper-overview.md#customizing-helper-classes-)
   and [guide on Working with Third-Party Code](https://github.com/yiisoft/yii2/blob/2.1/docs/guide/tutorial-yii-integration.md).
 * The signature of `yii\web\RequestParserInterface::parse()` was changed. The method now accepts the `yii\web\Request` instance
@@ -115,11 +117,41 @@ Upgrade from Yii 2.0.x
 * Uploaded file retrieve methods have been moved from `yii\http\UploadedFile` to `yii\web\Request`. You should use `Request::getUploadedFileByName()`
   instead of `UploadedFile::getInstanceByName()` and `Request::getUploadedFilesByName()` instead of `UploadedFile::getInstancesByName()`.
   Instead of `UploadedFile::getInstance()` and `UploadedFile::getInstances()` use construction `$model->load(Yii::$app->request->getUploadedFiles())`.
+* The following method signature have changed. If you override any of them in your code, you have to adjust these places:
+  `yii\db\QueryBuilderBuild::buildGroupBy($columns)` -> `buildGroupBy($columns, &$params)`
+  `yii\db\QueryBuilderbuild::buildOrderByAndLimit($sql, $orderBy, $limit, $offset)` -> `buildOrderByAndLimit($sql, $orderBy, $limit, $offset, &$params)`
+  `yii\widgets\ActiveField::hint($content = null, $options = [])`
+  `yii\base\View::renderDynamic($statements)` -> `yii\base\View::renderDynamic($statements, array $params = [])`
+* `yii\filters\AccessControl` has been optimized by only instantiating rules at the moment of use.
+   This could lead to a potential BC-break if you are depending on $rules to be instantiated in init().
+* `yii\widgets\BaseListView::run()` and `yii\widgets\GridView::run()` now return content, instead of echoing it.
+  Normally we call `BaseListView::widget()` and for this case behavior is NOT changed.
+  In case you call `::run()` method, ensure that its return is processed correctly.
+* `yii\web\UrlNormalizer` is now enabled by default in `yii\web\UrlManager`.
+  If you are using `yii\web\Request::resolve()` or `yii\web\UrlManager::parseRequest()` directly, make sure that
+  all potential exceptions are handled correctly or set `yii\web\UrlNormalizer::$normalizer` to `false` to disable normalizer.
+* `yii\base\InvalidParamException` was renamed to `yii\base\InvalidArgumentException`.
 
 
 Upgrade from Yii 2.0.12
 -----------------------
 
+* The `yii\web\Request` class allowed to determine the value of `getIsSecureConnection()` form the
+  `X-Forwarded-Proto` header if the connection was made via a normal HTTP request. This behavior
+  was insecure as the header could have been set by a malicious client on a non-HTTPS connection.
+  With 2.0.13 Yii adds support for configuring trusted proxies. If your application runs behind a reverse proxy and relies on
+  `getIsSecureConnection()` to return the value form the `X-Forwarded-Proto` header you need to explicitly allow
+  this in the Request configuration. See the [guide](http://www.yiiframework.com/doc-2.0/guide-runtime-requests.html#trusted-proxies) for more information.
+
+  This setting also affects you when Yii is running on IIS webserver, which sets the `X-Rewrite-Url` header.
+  This header is now filtered by default and must be listed in trusted hosts to be detected by Yii:
+
+  ```php
+  [   // accept X-Rewrite-Url from all hosts, as it will be set by IIS
+      '/.*/' => ['X-Rewrite-Url'],
+  ]
+  ```
+
 * For compatibiliy with [PHP 7.2 which does not allow classes to be named `Object` anymore](https://wiki.php.net/rfc/object-typehint),
   we needed to rename `yii\base\Object` to `yii\base\BaseObject`.
   
@@ -159,6 +191,29 @@ Upgrade from Yii 2.0.12
   require `"yiisoft/yii2": "~2.0.13"` in composer.json and change affected classes to extend from `yii\base\BaseObject`
   instead. It is not possible to allow Yii versions `<2.0.13` and be compatible with PHP 7.2 or higher.
 
+* A new method `public static function instance($refresh = false);` has been added to the `yii\db\ActiveRecordInterface` via a new
+  `yii\base\StaticInstanceInterface`. This change may affect your application in the following ways:
+
+  - If you have an `instance()` method defined in an `ActiveRecord` or `Model` class, you need to check whether the behavior is
+    compatible with the method added by Yii.
+  - Otherwise this method is implemented in the `yii\base\Model`, so the change only affects your code if you implement `ActiveRecordInterface`
+    in a class that does not extend `Model`. You may use `yii\base\StaticInstanceTrait` to implement it.
+
+* Fixed built-in validator creating when model has a method with the same name.
+
+  It is documented, that for the validation rules declared in model by `yii\base\Model::rules()`, validator can be either
+  a built-in validator name, a method name of the model class, an anonymous function, or a validator class name.
+  Before this change behavior was inconsistent with the documentation: method in the model had higher priority, than
+  a built-in validator. In case you have relied on this behavior, make sure to fix it.
+
+* Behavior was changed for methods `yii\base\Module::get()` and `yii\base\Module::has()` so in case when the requested
+  component was not found in the current module, the parent ones will be checked for this component hierarchically.
+  Considering that the root parent module is usually an application, this change can reduce calls to global `Yii::$app->get()`,
+  and replace them with module-scope calls to `get()`, making code more reliable and easier to test.
+  However, this change may affect your application if you have code that uses method `yii\base\Module::has()` in order
+  to check existence of the component exactly in this specific module. In this case make sure the logic is not corrupted.
+
+
 Upgrade from Yii 2.0.11
 -----------------------
 
@@ -205,46 +260,6 @@ Upgrade from Yii 2.0.10
   you better fix these cases by specifying an explicit ID.
 
 
-Upgrade to Yii 2.1.0
---------------------
-
-* The minimum required PHP version is 5.5.0 now.
-
-* `yii\base\Object::className()` has been removed in favor of the [native PHP syntax](http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.class.class)
-  `::class`. When upgrading to Yii 2.1, You should do a global search and replace for `::className()` to `::class`.
-  All calls on objects via `->className()` should be replaced by a call to `get_class()`.
-
-  You can make this change even before upgrading to Yii 2.1, Yii 2.0.x does work with it.
-
-  `::class` does not trigger auto loading so you can even use it in config.
-
-* The following method signature have changed. If you override any of them in your code, you have to adjust these places:
-
-  `yii\db\QueryBuilderbuild::buildGroupBy($columns)` -> `buildGroupBy($columns, &$params)`
-  
-  `yii\db\QueryBuilderbuild::buildOrderByAndLimit($sql, $orderBy, $limit, $offset)` -> `buildOrderByAndLimit($sql, $orderBy, $limit, $offset, &$params)`
-  
-  `yii\widgets\ActiveField::hint($content = null, $options = [])`
-  
-  `yii\base\View::renderDynamic($statements)` -> `yii\base\View::renderDynamic($statements, array $params = [])`
-
-* `yii\filters\AccessControl` has been optimized by only instantiating rules at the moment of use.
-   This could lead to a potential BC-break if you are depending on $rules to be instantiated in init().
-
-* `yii\widgets\BaseListView::run()` and `yii\widgets\GridView::run()` now return content, instead of echoing it.
-  Normally we call `BaseListView::widget()` and for this case behavior is NOT changed.
-  In case you call `::run()` method, ensure that its return is processed correctly. 
-
-* Method `yii\web\Request::getBodyParams()` has been changed to pass full value of 'content-type' header to the second
-  argument of `yii\web\RequestParserInterface::parse()`. If you create your own custom parser, which relies on `$contentType`
-  argument, ensure to process it correctly as it may content additional data.
-
-* `yii\web\UrlNormalizer` is now enabled by default in `yii\web\UrlManager`.
-  If you are using `yii\web\Request::resolve()` or `yii\web\UrlManager::parseRequest()` directly, make sure that
-  all potential exceptions are handled correctly or set `yii\web\UrlNormalizer::$normalizer` to `false` to disable normalizer.
-
-* `yii\base\InvalidParamException` was renamed to `yii\base\InvalidArgumentException`.
-
 Upgrade from Yii 2.0.9
 ----------------------
 
diff --git a/framework/assets/yii.activeForm.js b/framework/assets/yii.activeForm.js
index 310d3ab..e9945dc 100644
--- a/framework/assets/yii.activeForm.js
+++ b/framework/assets/yii.activeForm.js
@@ -221,7 +221,7 @@
                  * Clean up error status when the form is reset.
                  * Note that $form.on('reset', ...) does work because the "reset" event does not bubble on IE.
                  */
-                $form.bind('reset.yiiActiveForm', methods.resetForm);
+                $form.on('reset.yiiActiveForm', methods.resetForm);
 
                 if (settings.validateOnSubmit) {
                     $form.on('mouseup.yiiActiveForm keyup.yiiActiveForm', ':submit', function () {
@@ -260,6 +260,7 @@
                 attributes.splice(index, 1);
                 unwatchAttribute($form, attribute);
             }
+
             return attribute;
         },
 
@@ -286,7 +287,7 @@
 
         destroy: function () {
             return this.each(function () {
-                $(this).unbind('.yiiActiveForm');
+                $(this).off('.yiiActiveForm');
                 $(this).removeData('yiiActiveForm');
             });
         },
@@ -306,9 +307,9 @@
                 needAjaxValidation = false,
                 messages = {},
                 deferreds = deferredArray(),
-                submitting = data.submitting && !forceValidate;
+                submitting = data.submitting;
 
-            if (data.submitting) {
+            if (submitting) {
                 var event = $.Event(events.beforeValidate);
                 $form.trigger(event, [messages, deferreds]);
 
@@ -391,7 +392,7 @@
                     });
                 } else if (data.submitting) {
                     // delay callback so that the form can be submitted without problem
-                    setTimeout(function () {
+                    window.setTimeout(function () {
                         updateInputs($form, messages, submitting);
                     }, 200);
                 } else {
@@ -435,7 +436,7 @@
             // Because we bind directly to a form reset event instead of a reset button (that may not exist),
             // when this function is executed form input values have not been reset yet.
             // Therefore we do the actual reset work through setTimeout.
-            setTimeout(function () {
+            window.setTimeout(function () {
                 $.each(data.attributes, function () {
                     // Without setTimeout() we would get the input values that are not reset yet.
                     this.value = getValue($form, this);
@@ -535,7 +536,7 @@
         if (data.settings.timer !== undefined) {
             clearTimeout(data.settings.timer);
         }
-        data.settings.timer = setTimeout(function () {
+        data.settings.timer = window.setTimeout(function () {
             if (data.submitting || $form.is(':hidden')) {
                 return;
             }
@@ -574,6 +575,7 @@
         for (var i = 0; i < buttonOptions.length; i++) {
             attributes[buttonOptions[i]] = $form.attr(buttonOptions[i]);
         }
+
         return attributes;
     };
 
@@ -702,7 +704,6 @@
         if (!$.isArray(messages[attribute.id])) {
             messages[attribute.id] = [];
         }
-        $form.trigger(events.afterValidateAttribute, [attribute, messages[attribute.id]]);
 
         attribute.status = 1;
         if ($input.length) {
@@ -725,6 +726,9 @@
             }
             attribute.value = getValue($form, attribute);
         }
+
+        $form.trigger(events.afterValidateAttribute, [attribute, messages[attribute.id]]);
+
         return hasError;
     };
 
@@ -762,6 +766,7 @@
             if (!$realInput.length) {
                 $realInput = $form.find('input[type=hidden][name="' + $input.attr('name') + '"]');
             }
+
             return $realInput.val();
         } else {
             return $input.val();
diff --git a/framework/assets/yii.gridView.js b/framework/assets/yii.gridView.js
index 2601414..0a3e2e7 100644
--- a/framework/assets/yii.gridView.js
+++ b/framework/assets/yii.gridView.js
@@ -205,6 +205,7 @@
                     keys.push($(this).parent().closest('tr').data('key'));
                 });
             }
+
             return keys;
         },
 
diff --git a/framework/assets/yii.js b/framework/assets/yii.js
index f561663..618e9a5 100644
--- a/framework/assets/yii.js
+++ b/framework/assets/yii.js
@@ -294,6 +294,7 @@ window.yii = (function ($) {
                     params[name].push(value || '');
                 }
             }
+
             return params;
         },
 
diff --git a/framework/assets/yii.validation.js b/framework/assets/yii.validation.js
index 984690d..af7c5a3 100644
--- a/framework/assets/yii.validation.js
+++ b/framework/assets/yii.validation.js
@@ -243,6 +243,7 @@ yii.validation = (function ($) {
                 value = $.trim(value);
                 $input.val(value);
             }
+
             return value;
         },
 
@@ -377,6 +378,7 @@ yii.validation = (function ($) {
             if (!options.skipOnEmpty) {
                 messages.push(options.uploadRequired);
             }
+
             return [];
         }
 
diff --git a/framework/base/ActionFilter.php b/framework/base/ActionFilter.php
index f66dd9f..0b9b974 100644
--- a/framework/base/ActionFilter.php
+++ b/framework/base/ActionFilter.php
@@ -115,7 +115,7 @@ class ActionFilter extends Behavior
     }
 
     /**
-     * Returns an action ID by converting [[Action::$uniqueId]] into an ID relative to the module
+     * Returns an action ID by converting [[Action::$uniqueId]] into an ID relative to the module.
      * @param Action $action
      * @return string
      * @since 2.0.7
diff --git a/framework/base/Application.php b/framework/base/Application.php
index a5423da..161f999 100644
--- a/framework/base/Application.php
+++ b/framework/base/Application.php
@@ -613,7 +613,7 @@ abstract class Application extends Module
     }
 
     /**
-     * Returns the internationalization (i18n) component
+     * Returns the internationalization (i18n) component.
      * @return \yii\i18n\I18N the internationalization application component.
      */
     public function getI18n()
@@ -704,7 +704,7 @@ abstract class Application extends Module
     }
 
     /**
-     * Configures [[Yii::$container]] with the $config
+     * Configures [[Yii::$container]] with the $config.
      *
      * @param array $config values given in terms of name-value pairs
      * @since 2.0.11
diff --git a/framework/base/BaseObject.php b/framework/base/BaseObject.php
index 2405228..6e33069 100644
--- a/framework/base/BaseObject.php
+++ b/framework/base/BaseObject.php
@@ -78,6 +78,7 @@ class BaseObject implements Configurable
 {
     /**
      * Constructor.
+     *
      * The default implementation does two things:
      *
      * - Initializes the object with the given configuration `$config`.
@@ -214,6 +215,7 @@ class BaseObject implements Configurable
 
     /**
      * Returns a value indicating whether a property is defined.
+     *
      * A property is defined if:
      *
      * - the class has a getter or setter method associated with the specified name
@@ -233,6 +235,7 @@ class BaseObject implements Configurable
 
     /**
      * Returns a value indicating whether a property can be read.
+     *
      * A property is readable if:
      *
      * - the class has a getter method associated with the specified name
@@ -251,6 +254,7 @@ class BaseObject implements Configurable
 
     /**
      * Returns a value indicating whether a property can be set.
+     *
      * A property is writable if:
      *
      * - the class has a setter method associated with the specified name
diff --git a/framework/base/Component.php b/framework/base/Component.php
index 015ebc9..49200f0 100644
--- a/framework/base/Component.php
+++ b/framework/base/Component.php
@@ -111,6 +111,7 @@ class Component extends BaseObject
 
     /**
      * Returns the value of a component property.
+     *
      * This method will check in the following order and act accordingly:
      *
      *  - a property defined by a getter: return the getter result
@@ -149,6 +150,7 @@ class Component extends BaseObject
 
     /**
      * Sets the value of a component property.
+     *
      * This method will check in the following order and act accordingly:
      *
      *  - a property defined by a setter: set the property value
@@ -203,6 +205,7 @@ class Component extends BaseObject
 
     /**
      * Checks if a property is set, i.e. defined and not null.
+     *
      * This method will check in the following order and act accordingly:
      *
      *  - a property defined by a setter: return whether the property is set
@@ -235,6 +238,7 @@ class Component extends BaseObject
 
     /**
      * Sets a component property to be null.
+     *
      * This method will check in the following order and act accordingly:
      *
      *  - a property defined by a setter: set the property value to be null
@@ -302,6 +306,7 @@ class Component extends BaseObject
 
     /**
      * Returns a value indicating whether a property is defined for this component.
+     *
      * A property is defined if:
      *
      * - the class has a getter or setter method associated with the specified name
@@ -323,6 +328,7 @@ class Component extends BaseObject
 
     /**
      * Returns a value indicating whether a property can be read.
+     *
      * A property can be read if:
      *
      * - the class has a getter method associated with the specified name
@@ -348,11 +354,13 @@ class Component extends BaseObject
                 }
             }
         }
+
         return false;
     }
 
     /**
      * Returns a value indicating whether a property can be set.
+     *
      * A property can be written if:
      *
      * - the class has a setter method associated with the specified name
@@ -378,11 +386,13 @@ class Component extends BaseObject
                 }
             }
         }
+
         return false;
     }
 
     /**
      * Returns a value indicating whether a method is defined.
+     *
      * A method is defined if:
      *
      * - the class has a method with the specified name
@@ -404,6 +414,7 @@ class Component extends BaseObject
                 }
             }
         }
+
         return false;
     }
 
@@ -518,6 +529,7 @@ class Component extends BaseObject
         if ($removed) {
             $this->_events[$name] = array_values($this->_events[$name]);
         }
+
         return $removed;
     }
 
diff --git a/framework/base/Controller.php b/framework/base/Controller.php
index f848e24..7c9692b 100644
--- a/framework/base/Controller.php
+++ b/framework/base/Controller.php
@@ -88,6 +88,7 @@ class Controller extends Component implements ViewContextInterface
 
     /**
      * Declares external actions for the controller.
+     *
      * This method is meant to be overwritten to declare external actions for the controller.
      * It should return an array, with array keys being action IDs, and array values the corresponding
      * action class names or action configuration arrays. For example,
@@ -189,6 +190,7 @@ class Controller extends Component implements ViewContextInterface
         } elseif ($pos > 0) {
             return $this->module->runAction($route, $params);
         }
+
         return Yii::$app->runAction(ltrim($route, '/'), $params);
     }
 
@@ -316,6 +318,7 @@ class Controller extends Component implements ViewContextInterface
             array_unshift($modules, $module->module);
             $module = $module->module;
         }
+
         return $modules;
     }
 
@@ -395,6 +398,7 @@ class Controller extends Component implements ViewContextInterface
         if ($layoutFile !== false) {
             return $this->getView()->renderFile($layoutFile, ['content' => $content], $this);
         }
+
         return $content;
     }
 
@@ -435,6 +439,7 @@ class Controller extends Component implements ViewContextInterface
         if ($this->_view === null) {
             $this->_view = Yii::$app->getView();
         }
+
         return $this->_view;
     }
 
@@ -458,6 +463,7 @@ class Controller extends Component implements ViewContextInterface
         if ($this->_viewPath === null) {
             $this->_viewPath = $this->module->getViewPath() . DIRECTORY_SEPARATOR . $this->id;
         }
+
         return $this->_viewPath;
     }
 
diff --git a/framework/base/ErrorHandler.php b/framework/base/ErrorHandler.php
index e2ea54c..7032e2c 100644
--- a/framework/base/ErrorHandler.php
+++ b/framework/base/ErrorHandler.php
@@ -49,7 +49,7 @@ abstract class ErrorHandler extends Component
 
 
     /**
-     * Register this error handler
+     * Register this error handler.
      */
     public function register()
     {
@@ -176,11 +176,12 @@ abstract class ErrorHandler extends Component
 
             throw $exception;
         }
+
         return false;
     }
 
     /**
-     * Handles fatal PHP errors
+     * Handles fatal PHP errors.
      */
     public function handleFatalError()
     {
@@ -219,7 +220,7 @@ abstract class ErrorHandler extends Component
     abstract protected function renderException($exception);
 
     /**
-     * Logs the given exception
+     * Logs the given exception.
      * @param \Exception $exception the exception to be logged
      * @since 2.0.3 this method is now public.
      */
@@ -282,6 +283,7 @@ abstract class ErrorHandler extends Component
         } else {
             $message = 'Error: ' . $exception->getMessage();
         }
+
         return $message;
     }
 
diff --git a/framework/base/Event.php b/framework/base/Event.php
index 973cce1..ae3f32e 100644
--- a/framework/base/Event.php
+++ b/framework/base/Event.php
@@ -128,6 +128,7 @@ class Event extends BaseObject
         if ($removed) {
             self::$_events[$name][$class] = array_values(self::$_events[$name][$class]);
         }
+
         return $removed;
     }
 
diff --git a/framework/base/Model.php b/framework/base/Model.php
index af920f4..fe57094 100644
--- a/framework/base/Model.php
+++ b/framework/base/Model.php
@@ -54,9 +54,10 @@ use yii\validators\Validator;
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
-class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayable
+class Model extends Component implements StaticInstanceInterface, IteratorAggregate, ArrayAccess, Arrayable
 {
     use ArrayableTrait;
+    use StaticInstanceTrait;
 
     /**
      * The name of the default scenario.
@@ -159,6 +160,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
 
     /**
      * Returns a list of scenarios and the corresponding active attributes.
+     *
      * An active attribute is one that is subject to validation in the current scenario.
      * The returned array should be in the following format:
      *
@@ -410,6 +412,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
         if ($this->_validators === null) {
             $this->_validators = $this->createValidators();
         }
+
         return $this->_validators;
     }
 
@@ -428,6 +431,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
                 $validators[] = $validator;
             }
         }
+
         return $validators;
     }
 
@@ -450,6 +454,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
                 throw new InvalidConfigException('Invalid validation rule: a rule must specify both attribute names and validator type.');
             }
         }
+
         return $validators;
     }
 
@@ -474,6 +479,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
                 return true;
             }
         }
+
         return false;
     }
 
@@ -563,6 +569,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
         if ($attribute === null) {
             return $this->_errors === null ? [] : $this->_errors;
         }
+
         return isset($this->_errors[$attribute]) ? $this->_errors[$attribute] : [];
     }
 
@@ -585,6 +592,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
                 $errors[$name] = reset($es);
             }
         }
+
         return $errors;
     }
 
@@ -828,6 +836,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
 
             return true;
         }
+
         return false;
     }
 
diff --git a/framework/base/Module.php b/framework/base/Module.php
index 8b5cee8..03e1009 100644
--- a/framework/base/Module.php
+++ b/framework/base/Module.php
@@ -266,6 +266,7 @@ class Module extends ServiceLocator
         if ($this->_viewPath === null) {
             $this->_viewPath = $this->getBasePath() . DIRECTORY_SEPARATOR . 'views';
         }
+
         return $this->_viewPath;
     }
 
@@ -317,6 +318,7 @@ class Module extends ServiceLocator
                 $this->_version = call_user_func($this->_version, $this);
             }
         }
+
         return $this->_version;
     }
 
@@ -350,6 +352,7 @@ class Module extends ServiceLocator
         if ($this->module === null) {
             return '1.0';
         }
+
         return $this->module->getVersion();
     }
 
@@ -393,6 +396,7 @@ class Module extends ServiceLocator
 
             return $module === null ? false : $module->hasModule(substr($id, $pos + 1));
         }
+
         return isset($this->_modules[$id]);
     }
 
@@ -468,6 +472,7 @@ class Module extends ServiceLocator
 
             return $modules;
         }
+
         return $this->_modules;
     }
 
@@ -640,6 +645,7 @@ class Module extends ServiceLocator
         } elseif (YII_DEBUG) {
             throw new InvalidConfigException('Controller class must extend from \\yii\\base\\Controller.');
         }
+
         return null;
     }
 
@@ -705,4 +711,34 @@ class Module extends ServiceLocator
         $this->trigger(self::EVENT_AFTER_ACTION, $event);
         return $event->result;
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * Since version 2.0.13, if a component isn't defined in the module, it will be looked up in the parent module.
+     * The parent module may be the application.
+     */
+    public function get($id, $throwException = true)
+    {
+        if (!isset($this->module)) {
+            return parent::get($id, $throwException);
+        }
+        
+        $component = parent::get($id, false);
+        if ($component === null) {
+            $component = $this->module->get($id, $throwException);
+        }
+        return $component;
+    }
+
+    /**
+     * {@inheritdoc}
+     *
+     * Since version 2.0.13, if a component isn't defined in the module, it will be looked up in the parent module.
+     * The parent module may be the application.
+     */
+    public function has($id, $checkInstance = false)
+    {
+        return parent::has($id, $checkInstance) || (isset($this->module) && $this->module->has($id, $checkInstance));
+    }
 }
diff --git a/framework/base/Request.php b/framework/base/Request.php
index 53af930..1271ae6 100644
--- a/framework/base/Request.php
+++ b/framework/base/Request.php
@@ -33,7 +33,7 @@ abstract class Request extends Component
     abstract public function resolve();
 
     /**
-     * Returns a value indicating whether the current request is made via command line
+     * Returns a value indicating whether the current request is made via command line.
      * @return bool the value indicating whether the current request is made via console
      */
     public function getIsConsoleRequest()
@@ -42,7 +42,7 @@ abstract class Request extends Component
     }
 
     /**
-     * Sets the value indicating whether the current request is made via command line
+     * Sets the value indicating whether the current request is made via command line.
      * @param bool $value the value indicating whether the current request is made via command line
      */
     public function setIsConsoleRequest($value)
diff --git a/framework/base/Security.php b/framework/base/Security.php
index 05752e3..c0b46bf 100644
--- a/framework/base/Security.php
+++ b/framework/base/Security.php
@@ -269,6 +269,7 @@ class Security extends Component
             if ($outputKey === false) {
                 throw new InvalidArgumentException('Invalid parameters to hash_hkdf()');
             }
+
             return $outputKey;
         }
 
@@ -323,6 +324,7 @@ class Security extends Component
         if ($outputKey === false) {
             throw new InvalidArgumentException('Invalid parameters to hash_pbkdf2()');
         }
+
         return $outputKey;
     }
 
@@ -348,6 +350,7 @@ class Security extends Component
         if (!$hash) {
             throw new InvalidConfigException('Failed to generate HMAC with hash algorithm: ' . $this->macHash);
         }
+
         return $hash . $data;
     }
 
@@ -375,7 +378,7 @@ class Security extends Component
         $hashLength = StringHelper::byteLength($test);
         if (StringHelper::byteLength($data) >= $hashLength) {
             $hash = StringHelper::byteSubstr($data, 0, $hashLength);
-            $pureData = StringHelper::byteSubstr($data, $hashLength);
+            $pureData = StringHelper::byteSubstr($data, $hashLength, null);
 
             $calculatedHash = hash_hmac($this->macHash, $pureData, $key, $rawHash);
 
@@ -383,6 +386,7 @@ class Security extends Component
                 return $pureData;
             }
         }
+
         return false;
     }
 
@@ -532,6 +536,7 @@ class Security extends Component
         if (!is_int($length)) {
             return '';
         }
+
         return StringHelper::byteSubstr($decoded, $length, $length) ^ StringHelper::byteSubstr($decoded, 0, $length);
     }
 }
diff --git a/framework/base/StaticInstanceInterface.php b/framework/base/StaticInstanceInterface.php
new file mode 100644
index 0000000..6788347
--- /dev/null
+++ b/framework/base/StaticInstanceInterface.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+/**
+ * StaticInstanceInterface is the interface for providing static instances to classes,
+ * which can be used to obtain class meta information that can not be expressed in static methods.
+ * For example: adjustments made by DI or behaviors reveal only at object level, but might be needed
+ * at class (static) level as well.
+ *
+ * To implement the [[instance()]] method you may use [[StaticInstanceTrait]].
+ *
+ * @author Paul Klimov <klimov.paul@gmail.com>
+ * @since 2.0.13
+ * @see StaticInstanceTrait
+ */
+interface StaticInstanceInterface
+{
+    /**
+     * Returns static class instance, which can be used to obtain meta information.
+     * @param bool $refresh whether to re-create static instance even, if it is already cached.
+     * @return static class instance.
+     */
+    public static function instance($refresh = false);
+}
diff --git a/framework/base/StaticInstanceTrait.php b/framework/base/StaticInstanceTrait.php
new file mode 100644
index 0000000..0969324
--- /dev/null
+++ b/framework/base/StaticInstanceTrait.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\base;
+
+use Yii;
+
+/**
+ * StaticInstanceTrait provides methods to satisfy [[StaticInstanceInterface]] interface.
+ *
+ * @see StaticInstanceInterface
+ *
+ * @author Paul Klimov <klimov.paul@gmail.com>
+ * @since 2.0.13
+ */
+trait StaticInstanceTrait
+{
+    /**
+     * @var static[] static instances in format: `[className => object]`
+     */
+    private static $_instances = [];
+
+
+    /**
+     * Returns static class instance, which can be used to obtain meta information.
+     * @param bool $refresh whether to re-create static instance even, if it is already cached.
+     * @return static class instance.
+     */
+    public static function instance($refresh = false)
+    {
+        $className = get_called_class();
+        if ($refresh || !isset(self::$_instances[$className])) {
+            self::$_instances[$className] = Yii::createObject($className);
+        }
+        return self::$_instances[$className];
+    }
+}
\ No newline at end of file
diff --git a/framework/base/Theme.php b/framework/base/Theme.php
index 514e8fe..b503344 100644
--- a/framework/base/Theme.php
+++ b/framework/base/Theme.php
@@ -153,6 +153,7 @@ class Theme extends Component
                 }
             }
         }
+
         return $path;
     }
 
diff --git a/framework/base/View.php b/framework/base/View.php
index e7607d6..7f4d753 100644
--- a/framework/base/View.php
+++ b/framework/base/View.php
@@ -319,6 +319,8 @@ class View extends Component
      * @param string $_file_ the view file.
      * @param array $_params_ the parameters (name-value pairs) that will be extracted and made available in the view file.
      * @return string the rendering result
+     * @throws \Exception
+     * @throws \Throwable
      */
     public function renderPhpFile($_file_, $_params_ = [])
     {
@@ -371,6 +373,7 @@ class View extends Component
 
             return $placeholder;
         }
+
         return $this->evaluateDynamicContent($statements);
     }
 
@@ -401,7 +404,8 @@ class View extends Component
 
     /**
      * Begins recording a block.
-     * This method is a shortcut to beginning [[Block]]
+     *
+     * This method is a shortcut to beginning [[Block]].
      * @param string $id the block ID.
      * @param bool $renderInPlace whether to render the block content in place.
      * Defaults to false, meaning the captured block will not be displayed.
@@ -426,6 +430,7 @@ class View extends Component
 
     /**
      * Begins the rendering of content that is to be decorated by the specified view.
+     *
      * This method can be used to implement nested layout. For example, a layout can be embedded
      * in another layout file specified as '@app/views/layouts/base.php' like the following:
      *
@@ -460,6 +465,7 @@ class View extends Component
 
     /**
      * Begins fragment caching.
+     *
      * This method will display cached content if it is available.
      * If not, it will start caching and would expect an [[endCache()]]
      * call to end the cache and save the content into cache.
@@ -488,6 +494,7 @@ class View extends Component
 
             return false;
         }
+
         return true;
     }
 
diff --git a/framework/base/Widget.php b/framework/base/Widget.php
index 498e382..b9d8187 100644
--- a/framework/base/Widget.php
+++ b/framework/base/Widget.php
@@ -110,6 +110,7 @@ class Widget extends Component implements ViewContextInterface
                     $result = $widget->afterRun($result);
                     echo $result;
                 }
+
                 return $widget;
             }
 
@@ -212,6 +213,7 @@ class Widget extends Component implements ViewContextInterface
 
     /**
      * Renders a view.
+     *
      * The view to be rendered can be specified in one of the following formats:
      *
      * - [path alias](guide:concept-aliases) (e.g. "@app/views/site/index");
diff --git a/framework/behaviors/AttributeTypecastBehavior.php b/framework/behaviors/AttributeTypecastBehavior.php
index e31ba80..859275e 100644
--- a/framework/behaviors/AttributeTypecastBehavior.php
+++ b/framework/behaviors/AttributeTypecastBehavior.php
@@ -285,6 +285,7 @@ class AttributeTypecastBehavior extends Behavior
                 }
             }
         }
+
         return $attributeTypes;
     }
 
diff --git a/framework/behaviors/AttributesBehavior.php b/framework/behaviors/AttributesBehavior.php
new file mode 100644
index 0000000..fe0806e
--- /dev/null
+++ b/framework/behaviors/AttributesBehavior.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\behaviors;
+
+use Closure;
+use yii\base\Behavior;
+use yii\base\Event;
+use yii\db\ActiveRecord;
+
+/**
+ * AttributesBehavior automatically assigns values specified to one or multiple attributes of an ActiveRecord
+ * object when certain events happen.
+ *
+ * To use AttributesBehavior, configure the [[attributes]] property which should specify the list of attributes
+ * that need to be updated and the corresponding events that should trigger the update. Then configure the
+ * value of enclosed arrays with a PHP callable whose return value will be used to assign to the current attribute.
+ * For example,
+ *
+ * ```php
+ * use yii\behaviors\AttributesBehavior;
+ *
+ * public function behaviors()
+ * {
+ *     return [
+ *         [
+ *             'class' => AttributesBehavior::class,
+ *             'attributes' => [
+ *                 'attribute1' => [
+ *                     ActiveRecord::EVENT_BEFORE_INSERT => new Expression('NOW()'),
+ *                     ActiveRecord::EVENT_BEFORE_UPDATE => \Yii::$app->formatter->asDatetime('2017-07-13'),
+ *                 ],
+ *                 'attribute2' => [
+ *                     ActiveRecord::EVENT_BEFORE_VALIDATE => [$this, 'storeAttributes'],
+ *                     ActiveRecord::EVENT_AFTER_VALIDATE => [$this, 'restoreAttributes'],
+ *                 ],
+ *                 'attribute3' => [
+ *                     ActiveRecord::EVENT_BEFORE_VALIDATE => $fn2 = [$this, 'getAttribute2'],
+ *                     ActiveRecord::EVENT_AFTER_VALIDATE => $fn2,
+ *                 ],
+ *                 'attribute4' => [
+ *                     ActiveRecord::EVENT_BEFORE_DELETE => function ($event, $attribute) {
+ *                         static::disabled() || $event->isValid = false;
+ *                     },
+ *                 ],
+ *             ],
+ *         ],
+ *     ];
+ * }
+ * ```
+ *
+ * Because attribute values will be set automatically by this behavior, they are usually not user input and should therefore
+ * not be validated, i.e. they should not appear in the [[\yii\base\Model::rules()|rules()]] method of the model.
+ *
+ * @author Luciano Baraglia <luciano.baraglia@gmail.com>
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @author Bogdan Stepanenko <bscheshirwork@gmail.com>
+ * @since 2.0.13
+ */
+class AttributesBehavior extends Behavior
+{
+    /**
+     * @var array list of attributes that are to be automatically filled with the values specified via enclosed arrays.
+     * The array keys are the ActiveRecord attributes upon which the events are to be updated,
+     * and the array values are the array of corresponding events(s). For this enclosed array:
+     * the array keys are the ActiveRecord events upon which the attributes are to be updated,
+     * and the array values are the value that will be assigned to the current attributes. This can be an anonymous function,
+     * callable in array format (e.g. `[$this, 'methodName']`), an [[\yii\db\Expression|Expression]] object representing a DB expression
+     * (e.g. `new Expression('NOW()')`), scalar, string or an arbitrary value. If the former, the return value of the
+     * function will be assigned to the attributes.
+     *
+     * ```php
+     * [
+     *   'attribute1' => [
+     *       ActiveRecord::EVENT_BEFORE_INSERT => new Expression('NOW()'),
+     *       ActiveRecord::EVENT_BEFORE_UPDATE => \Yii::$app->formatter->asDatetime('2017-07-13'),
+     *   ],
+     *   'attribute2' => [
+     *       ActiveRecord::EVENT_BEFORE_VALIDATE => [$this, 'storeAttributes'],
+     *       ActiveRecord::EVENT_AFTER_VALIDATE => [$this, 'restoreAttributes'],
+     *   ],
+     *   'attribute3' => [
+     *       ActiveRecord::EVENT_BEFORE_VALIDATE => $fn2 = [$this, 'getAttribute2'],
+     *       ActiveRecord::EVENT_AFTER_VALIDATE => $fn2,
+     *   ],
+     *   'attribute4' => [
+     *       ActiveRecord::EVENT_BEFORE_DELETE => function ($event, $attribute) {
+     *           static::disabled() || $event->isValid = false;
+     *       },
+     *   ],
+     * ]
+     * ```
+     */
+    public $attributes = [];
+    /**
+     * @var array list of order of attributes that are to be automatically filled with the event.
+     * The array keys are the ActiveRecord events upon which the attributes are to be updated,
+     * and the array values are represent the order corresponding attributes.
+     * The rest of the attributes are processed at the end.
+     * If the [[attributes]] for this attribute do not specify this event, it is ignored
+     *
+     * ```php
+     * [
+     *     ActiveRecord::EVENT_BEFORE_VALIDATE => ['attribute1', 'attribute2'],
+     *     ActiveRecord::EVENT_AFTER_VALIDATE => ['attribute2', 'attribute1'],
+     * ]
+     * ```
+     */
+    public $order = [];
+    /**
+     * @var bool whether to skip this behavior when the `$owner` has not been modified
+     */
+    public $skipUpdateOnClean = true;
+    /**
+     * @var bool whether to preserve non-empty attribute values.
+     */
+    public $preserveNonEmptyValues = false;
+
+
+    /**
+     * @inheritdoc
+     */
+    public function events()
+    {
+        return array_fill_keys(
+            array_reduce($this->attributes, function ($carry, $item) {
+                return array_merge($carry, array_keys($item));
+            }, []),
+            'evaluateAttributes'
+        );
+    }
+
+    /**
+     * Evaluates the attributes values and assigns it to the current attributes.
+     * @param Event $event
+     */
+    public function evaluateAttributes($event)
+    {
+        if ($this->skipUpdateOnClean
+            && $event->name === ActiveRecord::EVENT_BEFORE_UPDATE
+            && empty($this->owner->dirtyAttributes)
+        ) {
+            return;
+        }
+        $attributes = array_keys(array_filter($this->attributes, function ($carry) use ($event) {
+            return array_key_exists($event->name, $carry);
+        }));
+        if (!empty($this->order[$event->name])) {
+            $attributes = array_merge(
+                array_intersect((array) $this->order[$event->name], $attributes),
+                array_diff($attributes, (array) $this->order[$event->name]));
+        }
+        foreach ($attributes as $attribute) {
+            if ($this->preserveNonEmptyValues && !empty($this->owner->$attribute)) {
+                continue;
+            }
+            $this->owner->$attribute = $this->getValue($attribute, $event);
+        }
+    }
+
+    /**
+     * Returns the value for the current attributes.
+     * This method is called by [[evaluateAttributes()]]. Its return value will be assigned
+     * to the target attribute corresponding to the triggering event.
+     * @param string $attribute target attribute name
+     * @param Event $event the event that triggers the current attribute updating.
+     * @return mixed the attribute value
+     */
+    protected function getValue($attribute, $event)
+    {
+        if (!isset($this->attributes[$attribute][$event->name])) {
+            return null;
+        }
+        $value = $this->attributes[$attribute][$event->name];
+        if ($value instanceof Closure || (is_array($value) && is_callable($value))) {
+            return $value($event, $attribute);
+        }
+
+        return $value;
+    }
+}
diff --git a/framework/behaviors/SluggableBehavior.php b/framework/behaviors/SluggableBehavior.php
index c62ae9e..174d22d 100644
--- a/framework/behaviors/SluggableBehavior.php
+++ b/framework/behaviors/SluggableBehavior.php
@@ -225,6 +225,7 @@ class SluggableBehavior extends AttributeBehavior
             $iteration++;
             $uniqueSlug = $this->generateUniqueSlug($slug, $iteration);
         }
+
         return $uniqueSlug;
     }
 
@@ -264,6 +265,7 @@ class SluggableBehavior extends AttributeBehavior
         if (is_callable($this->uniqueSlugGenerator)) {
             return call_user_func($this->uniqueSlugGenerator, $baseSlug, $iteration, $this->owner);
         }
+
         return $baseSlug . '-' . ($iteration + 1);
     }
 
diff --git a/framework/behaviors/TimestampBehavior.php b/framework/behaviors/TimestampBehavior.php
index 5075aea..6bb0d63 100644
--- a/framework/behaviors/TimestampBehavior.php
+++ b/framework/behaviors/TimestampBehavior.php
@@ -116,6 +116,7 @@ class TimestampBehavior extends AttributeBehavior
         if ($this->value === null) {
             return time();
         }
+
         return parent::getValue($event);
     }
 
diff --git a/framework/caching/ArrayCache.php b/framework/caching/ArrayCache.php
index 439dd9f..6130801 100644
--- a/framework/caching/ArrayCache.php
+++ b/framework/caching/ArrayCache.php
@@ -64,6 +64,7 @@ class ArrayCache extends SimpleCache
         if (isset($this->_cache[$key]) && ($this->_cache[$key][1] === 0 || $this->_cache[$key][1] > microtime(true))) {
             return $this->_cache[$key][0];
         }
+
         return false;
     }
 
diff --git a/framework/caching/Cache.php b/framework/caching/Cache.php
index 282d1f6..6a03a20 100644
--- a/framework/caching/Cache.php
+++ b/framework/caching/Cache.php
@@ -306,7 +306,7 @@ class Cache extends Component implements CacheInterface
     }
 
     /**
-     * Deletes a value with the specified key from cache
+     * Deletes a value with the specified key from cache.
      * @param mixed $key a key identifying the value to be deleted from cache. This can be a simple string or
      * a complex data structure consisting of factors representing the key.
      * @return bool if no error happens during deletion
diff --git a/framework/caching/ChainedDependency.php b/framework/caching/ChainedDependency.php
index ee233bf..c9a751b 100644
--- a/framework/caching/ChainedDependency.php
+++ b/framework/caching/ChainedDependency.php
@@ -69,6 +69,7 @@ class ChainedDependency extends Dependency
                 return false;
             }
         }
+
         return !$this->dependOnAll;
     }
 }
diff --git a/framework/caching/DbCache.php b/framework/caching/DbCache.php
index 20c1a60..d22529d 100644
--- a/framework/caching/DbCache.php
+++ b/framework/caching/DbCache.php
@@ -188,6 +188,7 @@ class DbCache extends SimpleCache
             $this->gc();
             return true;
         }
+        
         return $this->addValue($key, $value, $ttl);
     }
 
diff --git a/framework/caching/DbQueryDependency.php b/framework/caching/DbQueryDependency.php
index 1865fb5..3aafd0f 100644
--- a/framework/caching/DbQueryDependency.php
+++ b/framework/caching/DbQueryDependency.php
@@ -61,7 +61,8 @@ class DbQueryDependency extends Dependency
 
     /**
      * Generates the data needed to determine if dependency is changed.
-     * This method returns the query result
+     *
+     * This method returns the query result.
      * @param CacheInterface $cache the cache component that is currently evaluating this dependency
      * @return mixed the data needed to determine if dependency has been changed.
      * @throws InvalidConfigException on invalid configuration.
@@ -104,6 +105,7 @@ class DbQueryDependency extends Dependency
         if (is_string($this->method)) {
             return call_user_func([$query, $this->method], $db);
         }
+
         return call_user_func($this->method, $query, $db);
     }
 }
diff --git a/framework/caching/Dependency.php b/framework/caching/Dependency.php
index 4495b79..9093e8e 100644
--- a/framework/caching/Dependency.php
+++ b/framework/caching/Dependency.php
@@ -60,6 +60,8 @@ abstract class Dependency extends \yii\base\BaseObject
     /**
      * Returns a value indicating whether the dependency has changed.
      * @deprecated since version 2.0.11. Will be removed in version 2.1. Use [[isChanged()]] instead.
+     * @param CacheInterface $cache the cache component that is currently evaluating this dependency
+     * @return bool whether the dependency has changed.
      */
     public function getHasChanged($cache)
     {
@@ -67,7 +69,7 @@ abstract class Dependency extends \yii\base\BaseObject
     }
 
     /**
-     * Checks whether the dependency is changed
+     * Checks whether the dependency is changed.
      * @param CacheInterface $cache the cache component that is currently evaluating this dependency
      * @return bool whether the dependency has changed.
      * @since 2.0.11
@@ -83,6 +85,7 @@ abstract class Dependency extends \yii\base\BaseObject
         } else {
             $data = $this->generateDependencyData($cache);
         }
+
         return $data !== $this->data;
     }
 
diff --git a/framework/caching/migrations/m150909_153426_cache_init.php b/framework/caching/migrations/m150909_153426_cache_init.php
index 359390f..4b55cd9 100644
--- a/framework/caching/migrations/m150909_153426_cache_init.php
+++ b/framework/caching/migrations/m150909_153426_cache_init.php
@@ -10,7 +10,7 @@ use yii\caching\DbCache;
 use yii\db\Migration;
 
 /**
- * Initializes Cache tables
+ * Initializes Cache tables.
  *
  * @author Misbahul D Munir <misbahuldmunir@gmail.com>
  * @since 2.0.7
@@ -27,6 +27,7 @@ class m150909_153426_cache_init extends Migration
         if (!$cache instanceof DbCache) {
             throw new InvalidConfigException('You should configure "cache" component to use database before executing this migration.');
         }
+
         return $cache;
     }
 
diff --git a/framework/captcha/Captcha.php b/framework/captcha/Captcha.php
index c636c0b..516e522 100644
--- a/framework/captcha/Captcha.php
+++ b/framework/captcha/Captcha.php
@@ -102,11 +102,7 @@ class Captcha extends InputWidget
     public function run()
     {
         $this->registerClientScript();
-        if ($this->hasModel()) {
-            $input = Html::activeTextInput($this->model, $this->attribute, $this->options);
-        } else {
-            $input = Html::textInput($this->name, $this->value, $this->options);
-        }
+        $input = $this->renderInputHtml('text');
         $route = $this->captchaAction;
         if (is_array($route)) {
             $route['v'] = uniqid();
diff --git a/framework/composer.json b/framework/composer.json
index e628c52..d690317 100644
--- a/framework/composer.json
+++ b/framework/composer.json
@@ -73,7 +73,7 @@
         "psr/http-message": "~1.0.0",
         "ezyang/htmlpurifier": "~4.6",
         "cebe/markdown": "~1.0.0 | ~1.1.0",
-        "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
+        "bower-asset/jquery": "3.2.*@stable | 3.1.*@stable | 2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
         "bower-asset/punycode": "1.3.*",
         "bower-asset/yii2-pjax": "~2.0.1"
     },
diff --git a/framework/console/Controller.php b/framework/console/Controller.php
index ba6bf78..ad0d7db 100644
--- a/framework/console/Controller.php
+++ b/framework/console/Controller.php
@@ -131,6 +131,7 @@ class Controller extends \yii\base\Controller
             $route = $this->getUniqueId() . '/' . $id;
             return Yii::$app->runAction('help', [$route]);
         }
+
         return parent::runAction($id, $params);
     }
 
@@ -176,7 +177,7 @@ class Controller extends \yii\base\Controller
     }
 
     /**
-     * Formats a string with ANSI codes
+     * Formats a string with ANSI codes.
      *
      * You may pass additional parameters using the constants defined in [[\yii\helpers\Console]].
      *
@@ -196,11 +197,12 @@ class Controller extends \yii\base\Controller
             array_shift($args);
             $string = Console::ansiFormat($string, $args);
         }
+
         return $string;
     }
 
     /**
-     * Prints a string to STDOUT
+     * Prints a string to STDOUT.
      *
      * You may optionally format the string with ANSI codes by
      * passing additional parameters using the constants defined in [[\yii\helpers\Console]].
@@ -221,11 +223,12 @@ class Controller extends \yii\base\Controller
             array_shift($args);
             $string = Console::ansiFormat($string, $args);
         }
+
         return Console::stdout($string);
     }
 
     /**
-     * Prints a string to STDERR
+     * Prints a string to STDERR.
      *
      * You may optionally format the string with ANSI codes by
      * passing additional parameters using the constants defined in [[\yii\helpers\Console]].
@@ -246,11 +249,12 @@ class Controller extends \yii\base\Controller
             array_shift($args);
             $string = Console::ansiFormat($string, $args);
         }
+
         return fwrite(\STDERR, $string);
     }
 
     /**
-     * Prompts the user for input and validates it
+     * Prompts the user for input and validates it.
      *
      * @param string $text prompt string
      * @param array $options the options to validate the input:
@@ -375,6 +379,7 @@ class Controller extends \yii\base\Controller
         foreach ($this->options($this->action->id) as $property) {
             $properties[$property] = $this->$property;
         }
+
         return $properties;
     }
 
@@ -389,7 +394,7 @@ class Controller extends \yii\base\Controller
     }
 
     /**
-     * Returns the properties corresponding to the passed options
+     * Returns the properties corresponding to the passed options.
      *
      * @return array the properties corresponding to the passed options
      */
@@ -399,6 +404,7 @@ class Controller extends \yii\base\Controller
         foreach ($this->_passedOptions as $property) {
             $properties[$property] = $this->$property;
         }
+
         return $properties;
     }
 
@@ -449,6 +455,7 @@ class Controller extends \yii\base\Controller
 
     /**
      * Returns the help information for the anonymous arguments for the action.
+     *
      * The returned value should be an array. The keys are the argument names, and the values are
      * the corresponding help information. Each value must be an array of the following structure:
      *
@@ -501,11 +508,13 @@ class Controller extends \yii\base\Controller
                 ];
             }
         }
+
         return $args;
     }
 
     /**
      * Returns the help information for the options for the action.
+     *
      * The returned value should be an array. The keys are the option names, and the values are
      * the corresponding help information. Each value must be an array of the following structure:
      *
@@ -560,6 +569,7 @@ class Controller extends \yii\base\Controller
                 ];
             }
         }
+
         return $options;
     }
 
@@ -578,6 +588,7 @@ class Controller extends \yii\base\Controller
                 $this->_reflections[$action->id] = new \ReflectionMethod($action, 'run');
             }
         }
+
         return $this->_reflections[$action->id];
     }
 
@@ -604,6 +615,7 @@ class Controller extends \yii\base\Controller
                 }
             }
         }
+
         return $tags;
     }
 
@@ -619,6 +631,7 @@ class Controller extends \yii\base\Controller
         if (isset($docLines[1])) {
             return trim($docLines[1], "\t *");
         }
+
         return '';
     }
 
@@ -637,6 +650,7 @@ class Controller extends \yii\base\Controller
         if ($comment !== '') {
             return rtrim(Console::renderColoredString(Console::markdownToAnsi($comment)));
         }
+
         return '';
     }
 }
diff --git a/framework/console/ErrorHandler.php b/framework/console/ErrorHandler.php
index c73c5a9..f40e879 100644
--- a/framework/console/ErrorHandler.php
+++ b/framework/console/ErrorHandler.php
@@ -82,6 +82,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
             || Yii::$app instanceof \yii\console\Application && Console::streamSupportsAnsiColors($stream)) {
             $message = Console::ansiFormat($message, $format);
         }
+
         return $message;
     }
 }
diff --git a/framework/console/Markdown.php b/framework/console/Markdown.php
index 0cdc067..0e62a81 100644
--- a/framework/console/Markdown.php
+++ b/framework/console/Markdown.php
@@ -43,7 +43,7 @@ class Markdown extends \cebe\markdown\Parser
 
 
     /**
-     * Renders a code block
+     * Renders a code block.
      *
      * @param array $block
      * @return string
@@ -54,7 +54,7 @@ class Markdown extends \cebe\markdown\Parser
     }
 
     /**
-     * Render a paragraph block
+     * Render a paragraph block.
      *
      * @param string $block
      * @return string
diff --git a/framework/console/UnknownCommandException.php b/framework/console/UnknownCommandException.php
index 1be4abd..02c61e7 100644
--- a/framework/console/UnknownCommandException.php
+++ b/framework/console/UnknownCommandException.php
@@ -94,6 +94,7 @@ class UnknownCommandException extends Exception
                 }
             }
         }
+
         return $this->filterBySimilarity($availableActions, $this->command);
     }
 
diff --git a/framework/console/controllers/AssetController.php b/framework/console/controllers/AssetController.php
index 316656b..b27a27a 100644
--- a/framework/console/controllers/AssetController.php
+++ b/framework/console/controllers/AssetController.php
@@ -760,6 +760,7 @@ EOD;
                 $realPathParts[] = $pathPart;
             }
         }
+
         return implode(DIRECTORY_SEPARATOR, $realPathParts);
     }
 
diff --git a/framework/console/controllers/BaseMigrateController.php b/framework/console/controllers/BaseMigrateController.php
index 18170b8..51a37fc 100644
--- a/framework/console/controllers/BaseMigrateController.php
+++ b/framework/console/controllers/BaseMigrateController.php
@@ -8,7 +8,9 @@
 namespace yii\console\controllers;
 
 use Yii;
+use yii\base\BaseObject;
 use yii\base\InvalidConfigException;
+use yii\base\NotSupportedException;
 use yii\console\Controller;
 use yii\console\Exception;
 use yii\console\ExitCode;
@@ -81,6 +83,13 @@ abstract class BaseMigrateController extends Controller
      */
     public $templateFile;
 
+    /**
+     * @var bool indicates whether the console output should be compacted.
+     * If this is set to true, the individual commands ran within the migration will not be output to the console.
+     * Default is false, in other words the output is fully verbose by default.
+     * @since 2.0.13
+     */
+    public $compact = false;
 
     /**
      * @inheritdoc
@@ -89,7 +98,7 @@ abstract class BaseMigrateController extends Controller
     {
         return array_merge(
             parent::options($actionID),
-            ['migrationPath', 'migrationNamespaces'], // global for all actions
+            ['migrationPath', 'migrationNamespaces', 'compact'], // global for all actions
             $actionID === 'create' ? ['templateFile'] : [] // action create
         );
     }
@@ -138,6 +147,7 @@ abstract class BaseMigrateController extends Controller
 
     /**
      * Upgrades the application by applying new migrations.
+     *
      * For example,
      *
      * ```
@@ -196,6 +206,7 @@ abstract class BaseMigrateController extends Controller
 
     /**
      * Downgrades the application by reverting old migrations.
+     *
      * For example,
      *
      * ```
@@ -428,6 +439,31 @@ abstract class BaseMigrateController extends Controller
     }
 
     /**
+     * Truncates the whole database and starts the migration from the beginning.
+     *
+     * ```
+     * yii migrate/fresh
+     * ```
+     *
+     * @since 2.0.13
+     */
+    public function actionFresh()
+    {
+        if (YII_ENV_PROD) {
+            $this->stdout("YII_ENV is set to 'prod'.\nRefreshing migrations is not possible on production systems.\n");
+            return ExitCode::OK;
+        }
+
+        if ($this->confirm(
+            "Are you sure you want to reset the database and start the migration from the beginning?\nAll data will be lost irreversibly!")) {
+            $this->truncateDatabase();
+            $this->actionUp();
+        } else {
+            $this->stdout('Action was cancelled by user. Nothing has been performed.');
+        }
+    }
+
+    /**
      * Checks if given migration version specification matches namespaced migration name.
      * @param string $rawVersion raw version specification received from user input.
      * @return string|false actual migration version, `false` - if not match.
@@ -438,6 +474,7 @@ abstract class BaseMigrateController extends Controller
         if (preg_match('/^\\\\?([\w_]+\\\\)+m(\d{6}_?\d{6})(\D.*)?$/is', $rawVersion, $matches)) {
             return trim($rawVersion, '\\');
         }
+
         return false;
     }
 
@@ -452,6 +489,7 @@ abstract class BaseMigrateController extends Controller
         if (preg_match('/^m?(\d{6}_?\d{6})(\D.*)?$/is', $rawVersion, $matches)) {
             return 'm' . $matches[1];
         }
+
         return false;
     }
 
@@ -722,7 +760,11 @@ abstract class BaseMigrateController extends Controller
     protected function createMigration($class)
     {
         $this->includeMigrationFile($class);
-        return new $class();
+        $migration = new $class();
+        if ($migration instanceof BaseObject && $migration->canSetProperty('compact')) {
+            $migration->compact = $this->compact;
+        }
+        return $migration;
     }
 
     /**
@@ -878,6 +920,17 @@ abstract class BaseMigrateController extends Controller
     }
 
     /**
+     * Truncates the database.
+     * This method should be overwritten in subclasses to implement the task of clearing the database.
+     * @throws NotSupportedException if not overridden
+     * @since 2.0.13
+     */
+    protected function truncateDatabase()
+    {
+        throw new NotSupportedException('This command is not implemented in ' . get_class($this));
+    }
+
+    /**
      * Returns the migration history.
      * @param int $limit the maximum number of records in the history to be returned. `null` for "no limit".
      * @return array the migration history
diff --git a/framework/console/controllers/CacheController.php b/framework/console/controllers/CacheController.php
index 1e24050..817fc90 100644
--- a/framework/console/controllers/CacheController.php
+++ b/framework/console/controllers/CacheController.php
@@ -101,7 +101,7 @@ class CacheController extends Controller
             $cachesInfo[] = [
                 'name' => $name,
                 'class' => $class,
-                'is_cleared' => $this->canBeCleared($class) ? Yii::$app->get($name)->clear() : false,
+                'is_flushed' => $this->canBeCleared($class) ? Yii::$app->get($name)->clear() : false,
             ];
         }
 
@@ -109,7 +109,7 @@ class CacheController extends Controller
     }
 
     /**
-     * Clears all caches registered in the system.
+     * Flushes all caches registered in the system.
      */
     public function actionClearAll()
     {
@@ -125,7 +125,7 @@ class CacheController extends Controller
             $cachesInfo[] = [
                 'name' => $name,
                 'class' => $class,
-                'is_cleared' => $this->canBeCleared($class) ? Yii::$app->get($name)->clear() : false,
+                'is_flushed' => $this->canBeCleared($class) ? Yii::$app->get($name)->clear() : false,
             ];
         }
 
@@ -158,21 +158,21 @@ class CacheController extends Controller
         if (!$connection instanceof \yii\db\Connection) {
             $this->stdout("\"$db\" component doesn't inherit \\yii\\db\\Connection.\n", Console::FG_RED);
             return ExitCode::UNSPECIFIED_ERROR;
-        } elseif (!$this->confirm("Clear cache schema for \"$db\" connection?")) {
+        } elseif (!$this->confirm("Flush cache schema for \"$db\" connection?")) {
             return ExitCode::OK;
         }
 
         try {
             $schema = $connection->getSchema();
             $schema->refresh();
-            $this->stdout("Schema cache for component \"$db\", was cleared.\n\n", Console::FG_GREEN);
+            $this->stdout("Schema cache for component \"$db\", was flushed.\n\n", Console::FG_GREEN);
         } catch (\Exception $e) {
             $this->stdout($e->getMessage() . "\n\n", Console::FG_RED);
         }
     }
 
     /**
-     * Notifies user that given caches are found and can be cleared.
+     * Notifies user that given caches are found and can be flushed.
      * @param array $caches array of cache component classes
      */
     private function notifyCachesCanBeCleared($caches)
@@ -183,7 +183,7 @@ class CacheController extends Controller
             if ($this->canBeCleared($class)) {
                 $this->stdout("\t* $name ($class)\n", Console::FG_GREEN);
             } else {
-                $this->stdout("\t* $name ($class) - can not be cleared via console\n", Console::FG_YELLOW);
+                $this->stdout("\t* $name ($class) - can not be flushed via console\n", Console::FG_YELLOW);
             }
         }
 
@@ -223,8 +223,8 @@ class CacheController extends Controller
         foreach ($caches as $cache) {
             $this->stdout("\t* " . $cache['name'] . ' (' . $cache['class'] . ')', Console::FG_GREEN);
 
-            if (!$cache['is_cleared']) {
-                $this->stdout(" - not cleared\n", Console::FG_RED);
+            if (!$cache['is_flushed']) {
+                $this->stdout(" - not flushed\n", Console::FG_RED);
             } else {
                 $this->stdout("\n");
             }
@@ -240,13 +240,13 @@ class CacheController extends Controller
      */
     private function confirmClear($cachesNames)
     {
-        $this->stdout("The following cache components will be cleared:\n\n", Console::FG_YELLOW);
+        $this->stdout("The following cache components will be flushed:\n\n", Console::FG_YELLOW);
 
         foreach ($cachesNames as $name) {
             $this->stdout("\t* $name \n", Console::FG_GREEN);
         }
 
-        return $this->confirm("\nClear above cache components?");
+        return $this->confirm("\nFlush above cache components?");
     }
 
     /**
@@ -271,6 +271,12 @@ class CacheController extends Controller
                 $caches[$name] = $component['class'];
             } elseif (is_string($component) && $this->isCacheClass($component)) {
                 $caches[$name] = $component;
+            } elseif ($component instanceof \Closure) {
+                $cache = Yii::$app->get($name);
+                if ($this->isCacheClass($cache)) {
+                    $cacheClass = get_class($cache);
+                    $caches[$name] = $cacheClass;
+                }
             }
         }
 
@@ -288,7 +294,7 @@ class CacheController extends Controller
     }
 
     /**
-     * Checks if cache of a certain class can be cleared
+     * Checks if cache of a certain class can be cleared.
      * @param string $className class name.
      * @return bool
      */
diff --git a/framework/console/controllers/FixtureController.php b/framework/console/controllers/FixtureController.php
index 2434830..b0be9d0 100644
--- a/framework/console/controllers/FixtureController.php
+++ b/framework/console/controllers/FixtureController.php
@@ -88,6 +88,7 @@ class FixtureController extends Controller
 
     /**
      * Loads the specified fixture data.
+     *
      * For example,
      *
      * ```
@@ -168,6 +169,7 @@ class FixtureController extends Controller
 
     /**
      * Unloads the specified fixtures.
+     *
      * For example,
      *
      * ```
@@ -243,7 +245,7 @@ class FixtureController extends Controller
     }
 
     /**
-     * Notifies user that there are no fixtures to load according input conditions
+     * Notifies user that there are no fixtures to load according input conditions.
      * @param array $foundFixtures array of found fixtures
      * @param array $except array of names of fixtures that should not be loaded
      */
@@ -265,7 +267,7 @@ class FixtureController extends Controller
     }
 
     /**
-     * Notifies user that there are no fixtures to unload according input conditions
+     * Notifies user that there are no fixtures to unload according input conditions.
      * @param array $foundFixtures array of found fixtures
      * @param array $except array of names of fixtures that should not be loaded
      */
@@ -425,7 +427,7 @@ class FixtureController extends Controller
 
     /**
      * Calculates fixture's name
-     * Basically, strips [[getFixturePath()]] and `Fixture.php' suffix from fixture's full path
+     * Basically, strips [[getFixturePath()]] and `Fixture.php' suffix from fixture's full path.
      * @see getFixturePath()
      * @param string $fullFixturePath Full fixture path
      * @return string Relative fixture name
@@ -454,10 +456,12 @@ class FixtureController extends Controller
             $isNamespaced = (strpos($fixture, '\\') !== false);
             // replace linux' path slashes to namespace backslashes, in case if $fixture is non-namespaced relative path
             $fixture = str_replace('/', '\\', $fixture);
-            $fullClassName = $isNamespaced ? $fixture . 'Fixture' : $this->namespace . '\\' . $fixture . 'Fixture';
+            $fullClassName = $isNamespaced ? $fixture : $this->namespace . '\\' . $fixture;
 
             if (class_exists($fullClassName)) {
                 $config[] = $fullClassName;
+            } elseif (class_exists($fullClassName . 'Fixture')) {
+                $config[] = $fullClassName . 'Fixture';
             }
         }
 
@@ -466,6 +470,7 @@ class FixtureController extends Controller
 
     /**
      * Filters fixtures by splitting them in two categories: one that should be applied and not.
+     *
      * If fixture is prefixed with "-", for example "-User", that means that fixture should not be loaded,
      * if it is not prefixed it is considered as one to be loaded. Returns array:
      *
diff --git a/framework/console/controllers/HelpController.php b/framework/console/controllers/HelpController.php
index 1ca5d1f..7b27177 100644
--- a/framework/console/controllers/HelpController.php
+++ b/framework/console/controllers/HelpController.php
@@ -131,7 +131,7 @@ class HelpController extends Controller
     }
 
     /**
-     * Displays usage information for $action
+     * Displays usage information for $action.
      *
      * @param string $action route to action
      * @since 2.0.11
@@ -529,6 +529,7 @@ class HelpController extends Controller
                 return ', -' . $name;
             }
         }
+
         return '';
     }
 
diff --git a/framework/console/controllers/MessageController.php b/framework/console/controllers/MessageController.php
index b564b48..17c1dcb 100644
--- a/framework/console/controllers/MessageController.php
+++ b/framework/console/controllers/MessageController.php
@@ -205,7 +205,7 @@ class MessageController extends \yii\console\Controller
     }
 
     /**
-     * Creates a configuration file for the "extract" command using command line options specified
+     * Creates a configuration file for the "extract" command using command line options specified.
      *
      * The generated configuration file contains parameters required
      * for source code messages extraction.
@@ -336,7 +336,7 @@ EOD;
     }
 
     /**
-     * Saves messages to database
+     * Saves messages to database.
      *
      * @param array $messages
      * @param Connection $db
@@ -458,7 +458,7 @@ EOD;
     }
 
     /**
-     * Extracts messages from a file
+     * Extracts messages from a file.
      *
      * @param string $fileName name of the file to extract messages from
      * @param string $translator name of the function used to translate messages
@@ -572,6 +572,7 @@ EOD;
 
     /**
      * The method checks, whether the $category is ignored according to $ignoreCategories array.
+     *
      * Examples:
      *
      * - `myapp` - will be ignored only `myapp` category;
@@ -599,7 +600,7 @@ EOD;
     }
 
     /**
-     * Finds out if two PHP tokens are equal
+     * Finds out if two PHP tokens are equal.
      *
      * @param array|string $a
      * @param array|string $b
@@ -614,11 +615,12 @@ EOD;
         if (isset($a[0], $a[1], $b[0], $b[1])) {
             return $a[0] === $b[0] && $a[1] == $b[1];
         }
+
         return false;
     }
 
     /**
-     * Finds out a line of the first non-char PHP token found
+     * Finds out a line of the first non-char PHP token found.
      *
      * @param array $tokens
      * @return int|string
@@ -631,11 +633,12 @@ EOD;
                 return $token[2];
             }
         }
+
         return 'unknown';
     }
 
     /**
-     * Writes messages into PHP files
+     * Writes messages into PHP files.
      *
      * @param array $messages
      * @param string $dirName name of the directory to write to
@@ -658,7 +661,7 @@ EOD;
     }
 
     /**
-     * Writes category messages into PHP file
+     * Writes category messages into PHP file.
      *
      * @param array $messages
      * @param string $fileName name of the file to write to
@@ -740,7 +743,7 @@ EOD;
     }
 
     /**
-     * Writes messages into PO file
+     * Writes messages into PO file.
      *
      * @param array $messages
      * @param string $dirName name of the directory to write to
@@ -836,7 +839,7 @@ EOD;
     }
 
     /**
-     * Writes messages into POT file
+     * Writes messages into POT file.
      *
      * @param array $messages
      * @param string $dirName name of the directory to write to
diff --git a/framework/console/controllers/MigrateController.php b/framework/console/controllers/MigrateController.php
index acc74cb..cadf5f1 100644
--- a/framework/console/controllers/MigrateController.php
+++ b/framework/console/controllers/MigrateController.php
@@ -154,6 +154,7 @@ class MigrateController extends BaseMigrateController
             't' => 'migrationTable',
             'F' => 'templateFile',
             'P' => 'useTablePrefix',
+            'c' => 'compact',
         ]);
     }
 
@@ -169,6 +170,7 @@ class MigrateController extends BaseMigrateController
             if ($action->id !== 'create') {
                 $this->db = Instance::ensure($this->db, Connection::class);
             }
+
             return true;
         }
 
@@ -183,7 +185,7 @@ class MigrateController extends BaseMigrateController
     protected function createMigration($class)
     {
         $this->includeMigrationFile($class);
-        return new $class(['db' => $this->db]);
+        return new $class(['db' => $this->db, 'compact' => $this->compact]);
     }
 
     /**
@@ -229,8 +231,10 @@ class MigrateController extends BaseMigrateController
                 if (($compareResult = strcasecmp($b['canonicalVersion'], $a['canonicalVersion'])) !== 0) {
                     return $compareResult;
                 }
+
                 return strcasecmp($b['version'], $a['version']);
             }
+
             return ($a['apply_time'] > $b['apply_time']) ? -1 : +1;
         });
 
@@ -273,6 +277,32 @@ class MigrateController extends BaseMigrateController
 
     /**
      * @inheritdoc
+     * @since 2.0.13
+     */
+    protected function truncateDatabase()
+    {
+        $db = $this->db;
+        $schemas = $db->schema->getTableSchemas();
+
+        // First drop all foreign keys,
+        foreach ($schemas as $schema) {
+            if ($schema->foreignKeys) {
+                foreach ($schema->foreignKeys as $name => $foreignKey) {
+                    $db->createCommand()->dropForeignKey($name, $schema->name)->execute();
+                    $this->stdout("Foreign key $name dropped.\n");
+                }
+            }
+        }
+
+        // Then drop the tables:
+        foreach ($schemas as $schema) {
+            $db->createCommand()->dropTable($schema->name)->execute();
+            $this->stdout("Table {$schema->name} dropped.\n");
+        }
+    }
+
+    /**
+     * @inheritdoc
      */
     protected function removeMigrationHistory($version)
     {
@@ -396,11 +426,12 @@ class MigrateController extends BaseMigrateController
         if (!$this->useTablePrefix) {
             return $tableName;
         }
+
         return '{{%' . $tableName . '}}';
     }
 
     /**
-     * Parse the command line migration fields
+     * Parse the command line migration fields.
      * @return array parse result with following fields:
      *
      * - fields: array, parsed fields
@@ -450,7 +481,7 @@ class MigrateController extends BaseMigrateController
     }
 
     /**
-     * Adds default primary key to fields list if there's no primary key specified
+     * Adds default primary key to fields list if there's no primary key specified.
      * @param array $fields parsed fields
      * @since 2.0.7
      */
diff --git a/framework/console/controllers/ServeController.php b/framework/console/controllers/ServeController.php
index 5609ad9..a8a271d 100644
--- a/framework/console/controllers/ServeController.php
+++ b/framework/console/controllers/ServeController.php
@@ -12,7 +12,7 @@ use yii\console\Controller;
 use yii\helpers\Console;
 
 /**
- * Runs PHP built-in web server
+ * Runs PHP built-in web server.
  *
  * In order to access server from remote machines use 0.0.0.0:8000. That is especially useful when running server in
  * a virtual machine.
@@ -43,7 +43,7 @@ class ServeController extends Controller
 
 
     /**
-     * Runs PHP built-in web server
+     * Runs PHP built-in web server.
      *
      * @param string $address address to serve on. Either "host" or "host:port".
      *
diff --git a/framework/console/runtime/.gitignore b/framework/console/runtime/.gitignore
index f59ec20..d6b7ef3 100644
--- a/framework/console/runtime/.gitignore
+++ b/framework/console/runtime/.gitignore
@@ -1 +1,2 @@
-*
\ No newline at end of file
+*
+!.gitignore
diff --git a/framework/console/widgets/Table.php b/framework/console/widgets/Table.php
index 6d32857..c73ccef 100644
--- a/framework/console/widgets/Table.php
+++ b/framework/console/widgets/Table.php
@@ -103,7 +103,7 @@ class Table extends Widget
     private $_listPrefix = '• ';
 
     /**
-     * Set table headers
+     * Set table headers.
      *
      * @param array $headers table headers
      * @return $this
@@ -115,7 +115,7 @@ class Table extends Widget
     }
 
     /**
-     * Set table rows
+     * Set table rows.
      *
      * @param array $rows table rows
      * @return $this
@@ -127,7 +127,7 @@ class Table extends Widget
     }
 
     /**
-     * Set table chars
+     * Set table chars.
      *
      * @param array $chars table chars
      * @return $this
@@ -139,7 +139,7 @@ class Table extends Widget
     }
 
     /**
-     * Set screen width
+     * Set screen width.
      *
      * @param int $width screen width
      * @return $this
@@ -151,7 +151,7 @@ class Table extends Widget
     }
 
     /**
-     * Set list prefix
+     * Set list prefix.
      *
      * @param string $listPrefix list prefix
      * @return $this
@@ -206,7 +206,7 @@ class Table extends Widget
     }
 
     /**
-     * Renders a row of data into a string
+     * Renders a row of data into a string.
      *
      * @param array $row row of data
      * @param string $spanLeft character for left border
@@ -221,9 +221,10 @@ class Table extends Widget
 
         $buffer = '';
         $arrayPointer = [];
-        for ($i = 0, $max = $this->calculateRowHeight($row); $i < $max; $i++) {
+        for ($i = 0, ($max = $this->calculateRowHeight($row)) ?: $max = 1; $i < $max; $i++) {
             $buffer .= $spanLeft . ' ';
-            foreach ($row as $index => $cell) {
+            foreach ($size as $index => $cellSize) {
+                $cell = isset($row[$index]) ? $row[$index] : null;
                 $prefix = '';
                 if ($index !== 0) {
                     $buffer .= $spanMiddle . ' ';
@@ -239,17 +240,17 @@ class Table extends Widget
                     } else {
                         $start = mb_strwidth($finalChunk[$index], Yii::$app->charset);
                     }
-                    $chunk = mb_substr($cell[$arrayPointer[$index]], $start, $size[$index] - 4, Yii::$app->charset);
+                    $chunk = mb_substr($cell[$arrayPointer[$index]], $start, $cellSize - 4, Yii::$app->charset);
                     $finalChunk[$index] .= $chunk;
                     if (isset($cell[$arrayPointer[$index] + 1]) && $finalChunk[$index] === $cell[$arrayPointer[$index]]) {
                         $arrayPointer[$index]++;
                         $finalChunk[$index] = '';
                     }
                 } else {
-                    $chunk = mb_substr($cell, ($size[$index] * $i) - ($i * 2), $size[$index] - 2, Yii::$app->charset);
+                    $chunk = mb_substr($cell, ($cellSize * $i) - ($i * 2), $cellSize - 2, Yii::$app->charset);
                 }
                 $chunk = $prefix . $chunk;
-                $repeat = $size[$index] - mb_strwidth($chunk, Yii::$app->charset) - 1;
+                $repeat = $cellSize - mb_strwidth($chunk, Yii::$app->charset) - 1;
                 $buffer .= $chunk;
                 if ($repeat >= 0) {
                     $buffer .= str_repeat(' ', $repeat);
@@ -262,7 +263,7 @@ class Table extends Widget
     }
 
     /**
-     * Renders separator
+     * Renders separator.
      *
      * @param string $spanLeft character for left border
      * @param string $spanMid character for middle border
@@ -285,7 +286,7 @@ class Table extends Widget
     }
 
     /**
-     * Calculate the size of rows to draw anchor of columns in console
+     * Calculate the size of rows to draw anchor of columns in console.
      *
      * @see \yii\console\widgets\Table::render()
      */
@@ -306,6 +307,7 @@ class Table extends Widget
                     $encodings = array_fill(0, count($val), Yii::$app->charset);
                     return max(array_map('mb_strwidth', $val, $encodings)) + mb_strwidth($this->_listPrefix, Yii::$app->charset);
                 }
+
                 return mb_strwidth($val, Yii::$app->charset);
             }, $column)) + 2;
             $this->_columnWidths[] = $columnWidth;
@@ -326,7 +328,7 @@ class Table extends Widget
     }
 
     /**
-     * Calculate the height of a row
+     * Calculate the height of a row.
      *
      * @param array $row
      * @return int maximum row per cell
@@ -340,14 +342,17 @@ class Table extends Widget
                 foreach ($columnWidth as $width) {
                     $rows += ceil($width / ($size - 2));
                 }
+
                 return $rows;
             }
+
             return ceil($columnWidth / ($size - 2));
         }, $this->_columnWidths, array_map(function ($val) {
             if (is_array($val)) {
                 $encodings = array_fill(0, count($val), Yii::$app->charset);
                 return array_map('mb_strwidth', $val, $encodings);
             }
+
             return mb_strwidth($val, Yii::$app->charset);
         }, $row)
         );
@@ -356,7 +361,7 @@ class Table extends Widget
     }
 
     /**
-     * Getting screen width
+     * Getting screen width.
      *
      * @return int screen width
      */
@@ -368,6 +373,7 @@ class Table extends Widget
                 $this->_screenWidth = $size[0];
             }
         }
+
         return $this->_screenWidth;
     }
 }
diff --git a/framework/data/ActiveDataProvider.php b/framework/data/ActiveDataProvider.php
index e3b53ff..afd2a51 100644
--- a/framework/data/ActiveDataProvider.php
+++ b/framework/data/ActiveDataProvider.php
@@ -176,8 +176,9 @@ class ActiveDataProvider extends BaseDataProvider
     {
         parent::setSort($value);
         if (($sort = $this->getSort()) !== false && $this->query instanceof ActiveQueryInterface) {
-            /* @var $model Model */
-            $model = new $this->query->modelClass();
+            /* @var $modelClass Model */
+            $modelClass = $this->query->modelClass;
+            $model = $modelClass::instance();
             if (empty($sort->attributes)) {
                 foreach ($model->attributes() as $attribute) {
                     $sort->attributes[$attribute] = [
diff --git a/framework/data/ArrayDataProvider.php b/framework/data/ArrayDataProvider.php
index c6f621a..516fb2d 100644
--- a/framework/data/ArrayDataProvider.php
+++ b/framework/data/ArrayDataProvider.php
@@ -127,7 +127,7 @@ class ArrayDataProvider extends BaseDataProvider
     }
 
     /**
-     * Sorts the data models according to the given sort definition
+     * Sorts the data models according to the given sort definition.
      * @param array $models the models to be sorted
      * @param Sort $sort the sort definition
      * @return array the sorted data models
diff --git a/framework/db/ActiveQuery.php b/framework/db/ActiveQuery.php
index 3612ea3..816dc7a 100644
--- a/framework/db/ActiveQuery.php
+++ b/framework/db/ActiveQuery.php
@@ -154,7 +154,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
         }
 
         if (empty($this->select) && !empty($this->join)) {
-            $alias = $this->getTableNameAndAlias()[1];
+            [, $alias] = $this->getTableNameAndAlias();
             $this->select = ["$alias.*"];
         }
 
@@ -435,7 +435,9 @@ class ActiveQuery extends Query implements ActiveQueryInterface
         $join = $this->join;
         $this->join = [];
 
-        $model = new $this->modelClass();
+        /* @var $modelClass ActiveRecordInterface */
+        $modelClass = $this->modelClass;
+        $model = $modelClass::instance();
         foreach ($this->joinWith as [$with, $eagerLoading, $joinType]) {
             $this->joinWithRelations($model, $with, $joinType);
 
@@ -514,7 +516,9 @@ class ActiveQuery extends Query implements ActiveQueryInterface
                 } else {
                     $relation = $relations[$fullName];
                 }
-                $primaryModel = new $relation->modelClass();
+                /* @var $relationModelClass ActiveRecordInterface */
+                $relationModelClass = $relation->modelClass;
+                $primaryModel = $relationModelClass::instance();
                 $parent = $relation;
                 $prefix = $fullName;
                 $name = $childName;
@@ -600,8 +604,8 @@ class ActiveQuery extends Query implements ActiveQueryInterface
             return;
         }
 
-        [$parentTable, $parentAlias] = $parent->getTableNameAndAlias();
-        [$childTable, $childAlias] = $child->getTableNameAndAlias();
+        list($parentTable, $parentAlias) = $parent->getTableNameAndAlias();
+        list($childTable, $childAlias) = $child->getTableNameAndAlias();
 
         if (!empty($child->link)) {
             if (strpos($parentAlias, '{{') === false) {
@@ -774,7 +778,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
     public function alias($alias)
     {
         if (empty($this->from) || count($this->from) < 2) {
-            $tableName = $this->getTableNameAndAlias()[0];
+            list($tableName) = $this->getTableNameAndAlias();
             $this->from = [$alias => $tableName];
         } else {
             $tableName = $this->getPrimaryTableName();
@@ -786,6 +790,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
                 }
             }
         }
+
         return $this;
     }
 
@@ -798,6 +803,7 @@ class ActiveQuery extends Query implements ActiveQueryInterface
         if (empty($this->from)) {
             $this->from = [$this->getPrimaryTableName()];
         }
+
         return parent::getTablesUsedInFrom();
     }
 
diff --git a/framework/db/ActiveQueryTrait.php b/framework/db/ActiveQueryTrait.php
index 5e96594..ef092a6 100644
--- a/framework/db/ActiveQueryTrait.php
+++ b/framework/db/ActiveQueryTrait.php
@@ -104,7 +104,7 @@ trait ActiveQueryTrait
     }
 
     /**
-     * Converts found rows into model instances
+     * Converts found rows into model instances.
      * @param array $rows
      * @return array|ActiveRecord[]
      * @since 2.0.11
diff --git a/framework/db/ActiveRecord.php b/framework/db/ActiveRecord.php
index 609efa5..b37938e 100644
--- a/framework/db/ActiveRecord.php
+++ b/framework/db/ActiveRecord.php
@@ -98,7 +98,7 @@ class ActiveRecord extends BaseActiveRecord
 
 
     /**
-     * Loads default values from database table schema
+     * Loads default values from database table schema.
      *
      * You may call this method to load default values after creating a new instance:
      *
@@ -119,6 +119,7 @@ class ActiveRecord extends BaseActiveRecord
                 $this->{$column->name} = $column->defaultValue;
             }
         }
+
         return $this;
     }
 
@@ -484,6 +485,7 @@ class ActiveRecord extends BaseActiveRecord
             } else {
                 $transaction->commit();
             }
+
             return $result;
         } catch (\Throwable $e) {
             $transaction->rollBack();
@@ -590,6 +592,7 @@ class ActiveRecord extends BaseActiveRecord
             } else {
                 $transaction->commit();
             }
+
             return $result;
         } catch (\Throwable $e) {
             $transaction->rollBack();
@@ -630,6 +633,7 @@ class ActiveRecord extends BaseActiveRecord
             } else {
                 $transaction->commit();
             }
+
             return $result;
         } catch (\Throwable $e) {
             $transaction->rollBack();
diff --git a/framework/db/ActiveRecordInterface.php b/framework/db/ActiveRecordInterface.php
index 0400f6e..dbe1828 100644
--- a/framework/db/ActiveRecordInterface.php
+++ b/framework/db/ActiveRecordInterface.php
@@ -7,14 +7,16 @@
 
 namespace yii\db;
 
+use yii\base\StaticInstanceInterface;
+
 /**
- * ActiveRecordInterface
+ * ActiveRecordInterface.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
-interface ActiveRecordInterface
+interface ActiveRecordInterface extends StaticInstanceInterface
 {
     /**
      * Returns the primary key **name(s)** for this AR class.
@@ -87,7 +89,7 @@ interface ActiveRecordInterface
     public function getOldPrimaryKey($asArray = false);
 
     /**
-     * Returns a value indicating whether the given set of attributes represents the primary key for this model
+     * Returns a value indicating whether the given set of attributes represents the primary key for this model.
      * @param array $keys the set of attributes to check
      * @return bool whether the given set of attributes represents the primary key for this model
      */
@@ -245,6 +247,7 @@ interface ActiveRecordInterface
 
     /**
      * Updates records using the provided attribute values and conditions.
+     *
      * For example, to change the status to be 1 for all customers whose status is 2:
      *
      * ```php
diff --git a/framework/db/ActiveRelationTrait.php b/framework/db/ActiveRelationTrait.php
index 7304473..61cfd0d 100644
--- a/framework/db/ActiveRelationTrait.php
+++ b/framework/db/ActiveRelationTrait.php
@@ -108,6 +108,7 @@ trait ActiveRelationTrait
         if ($callable !== null) {
             call_user_func($callable, $relation);
         }
+
         return $this;
     }
 
@@ -160,7 +161,7 @@ trait ActiveRelationTrait
     }
 
     /**
-     * If applicable, populate the query's primary model into the related records' inverse relationship
+     * If applicable, populate the query's primary model into the related records' inverse relationship.
      * @param array $result the array of related records as generated by [[populate()]]
      * @since 2.0.9
      */
@@ -178,7 +179,9 @@ trait ActiveRelationTrait
                 $relatedModel->populateRelation($this->inverseOf, $inverseRelation->multiple ? [$this->primaryModel] : $this->primaryModel);
             } else {
                 if (!isset($inverseRelation)) {
-                    $inverseRelation = (new $this->modelClass())->getRelation($this->inverseOf);
+                    /* @var $modelClass ActiveRecordInterface */
+                    $modelClass = $this->modelClass;
+                    $inverseRelation = $modelClass::instance()->getRelation($this->inverseOf);
                 }
                 $result[$i][$this->inverseOf] = $inverseRelation->multiple ? [$this->primaryModel] : $this->primaryModel;
             }
@@ -221,15 +224,14 @@ trait ActiveRelationTrait
 
         if (!$this->multiple && count($primaryModels) === 1) {
             $model = $this->one();
-            foreach ($primaryModels as $i => $primaryModel) {
-                if ($primaryModel instanceof ActiveRecordInterface) {
-                    $primaryModel->populateRelation($name, $model);
-                } else {
-                    $primaryModels[$i][$name] = $model;
-                }
-                if ($this->inverseOf !== null) {
-                    $this->populateInverseRelation($primaryModels, [$model], $name, $this->inverseOf);
-                }
+            $primaryModel = reset($primaryModels);
+            if ($primaryModel instanceof ActiveRecordInterface) {
+                $primaryModel->populateRelation($name, $model);
+            } else {
+                $primaryModels[key($primaryModels)][$name] = $model;
+            }
+            if ($this->inverseOf !== null) {
+                $this->populateInverseRelation($primaryModels, [$model], $name, $this->inverseOf);
             }
 
             return [$model];
@@ -299,7 +301,13 @@ trait ActiveRelationTrait
         }
         $model = reset($models);
         /* @var $relation ActiveQueryInterface|ActiveQuery */
-        $relation = $model instanceof ActiveRecordInterface ? $model->getRelation($name) : (new $this->modelClass())->getRelation($name);
+        if ($model instanceof ActiveRecordInterface) {
+            $relation = $model->getRelation($name);
+        } else {
+            /* @var $modelClass ActiveRecordInterface */
+            $modelClass = $this->modelClass;
+            $relation = $modelClass::instance()->getRelation($name);
+        }
 
         if ($relation->multiple) {
             $buckets = $this->buildBuckets($primaryModels, $relation->link, null, null, false);
@@ -412,6 +420,7 @@ trait ActiveRelationTrait
                 $result[$key][$index] = $model;
             }
         }
+
         return $result;
     }
 
@@ -440,6 +449,7 @@ trait ActiveRelationTrait
                 }
             }
         }
+
         return $attributes;
     }
 
@@ -518,6 +528,7 @@ trait ActiveRelationTrait
             // ensure matching to special objects, which are convertable to string, for cross-DBMS relations, for example: `|MongoId`
             $value = $value->__toString();
         }
+
         return $value;
     }
 
diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php
index 4bdc7d8..705f6d9 100644
--- a/framework/db/BaseActiveRecord.php
+++ b/framework/db/BaseActiveRecord.php
@@ -7,7 +7,7 @@
 
 namespace yii\db;
 
-use yii\base\Event;
+use Yii;
 use yii\base\InvalidCallException;
 use yii\base\InvalidConfigException;
 use yii\base\InvalidArgumentException;
@@ -100,7 +100,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
 
     /**
      * @inheritdoc
-     * @return static ActiveRecord instance matching the condition, or `null` if nothing matches.
+     * @return static|null ActiveRecord instance matching the condition, or `null` if nothing matches.
      */
     public static function findOne($condition)
     {
@@ -143,6 +143,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
 
     /**
      * Updates the whole table using the provided attribute values and conditions.
+     *
      * For example, to change the status to be 1 for all customers whose status is 2:
      *
      * ```php
@@ -162,6 +163,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
 
     /**
      * Updates the whole table using the provided counter changes and conditions.
+     *
      * For example, to increment all customers' age by 1,
      *
      * ```php
@@ -612,6 +614,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
                 }
             }
         }
+
         return $attributes;
     }
 
@@ -703,6 +706,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
         if ($runValidation && !$this->validate($attributeNames)) {
             return false;
         }
+
         return $this->updateInternal($attributeNames);
     }
 
@@ -912,6 +916,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
 
     /**
      * This method is called at the beginning of inserting or updating a record.
+     *
      * The default implementation will trigger an [[EVENT_BEFORE_INSERT]] event when `$insert` is `true`,
      * or an [[EVENT_BEFORE_UPDATE]] event if `$insert` is `false`.
      * When overriding this method, make sure you call the parent implementation like the following:
@@ -968,6 +973,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
 
     /**
      * This method is invoked before deleting a record.
+     *
      * The default implementation raises the [[EVENT_BEFORE_DELETE]] event.
      * When overriding this method, make sure you call the parent implementation like the following:
      *
@@ -1284,7 +1290,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
             if (is_array($relation->via)) {
                 /* @var $viaClass ActiveRecordInterface */
                 /* @var $record ActiveRecordInterface */
-                $record = new $viaClass();
+                $record = Yii::createObject($viaClass);
                 foreach ($columns as $column => $value) {
                     $record->$column = $value;
                 }
@@ -1542,7 +1548,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
     }
 
     /**
-     * Returns a value indicating whether the given set of attributes represents the primary key for this model
+     * Returns a value indicating whether the given set of attributes represents the primary key for this model.
      * @param array $keys the set of attributes to check
      * @return bool whether the given set of attributes represents the primary key for this model
      */
@@ -1583,7 +1589,9 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
                     } catch (InvalidArgumentException $e) {
                         return $this->generateAttributeLabel($attribute);
                     }
-                    $relatedModel = new $relation->modelClass();
+                    /* @var $modelClass ActiveRecordInterface */
+                    $modelClass = $relation->modelClass;
+                    $relatedModel = $modelClass::instance();
                 }
             }
 
@@ -1623,7 +1631,9 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
                     } catch (InvalidArgumentException $e) {
                         return '';
                     }
-                    $relatedModel = new $relation->modelClass();
+                    /* @var $modelClass ActiveRecordInterface */
+                    $modelClass = $relation->modelClass;
+                    $relatedModel = $modelClass::instance();
                 }
             }
 
@@ -1632,6 +1642,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
                 return $hints[$neededAttribute];
             }
         }
+
         return '';
     }
 
diff --git a/framework/db/ColumnSchema.php b/framework/db/ColumnSchema.php
index 3b5c9b6..6cd75e1 100644
--- a/framework/db/ColumnSchema.php
+++ b/framework/db/ColumnSchema.php
@@ -129,6 +129,7 @@ class ColumnSchema extends BaseObject
                     // ensure type cast always has . as decimal separator in all locales
                     return str_replace(',', '.', (string) $value);
                 }
+
                 return (string) $value;
             case 'integer':
                 return (int) $value;
diff --git a/framework/db/ColumnSchemaBuilder.php b/framework/db/ColumnSchemaBuilder.php
index cba7d5b..ba9ea59 100644
--- a/framework/db/ColumnSchemaBuilder.php
+++ b/framework/db/ColumnSchemaBuilder.php
@@ -143,7 +143,7 @@ class ColumnSchemaBuilder extends BaseObject
     }
 
     /**
-     * Adds a `NULL` constraint to the column
+     * Adds a `NULL` constraint to the column.
      * @return $this
      * @since 2.0.9
      */
@@ -271,7 +271,7 @@ class ColumnSchemaBuilder extends BaseObject
     }
 
     /**
-     * Builds the full string for the column's schema
+     * Builds the full string for the column's schema.
      * @return string
      */
     public function __toString()
@@ -283,6 +283,7 @@ class ColumnSchemaBuilder extends BaseObject
             default:
                 $format = '{type}{length}{notnull}{unique}{default}{check}{comment}{append}';
         }
+
         return $this->buildCompleteString($format);
     }
 
@@ -298,6 +299,7 @@ class ColumnSchemaBuilder extends BaseObject
         if (is_array($this->length)) {
             $this->length = implode(',', $this->length);
         }
+
         return "({$this->length})";
     }
 
@@ -428,7 +430,7 @@ class ColumnSchemaBuilder extends BaseObject
     }
 
     /**
-     * Returns the complete column definition from input format
+     * Returns the complete column definition from input format.
      * @param string $format the format of the definition.
      * @return string a string containing the complete column definition.
      * @since 2.0.8
diff --git a/framework/db/Command.php b/framework/db/Command.php
index 84b118e..f807a05 100644
--- a/framework/db/Command.php
+++ b/framework/db/Command.php
@@ -407,6 +407,7 @@ class Command extends Component
 
     /**
      * Creates an INSERT command.
+     *
      * For example,
      *
      * ```php
@@ -436,6 +437,7 @@ class Command extends Component
 
     /**
      * Creates a batch INSERT command.
+     *
      * For example,
      *
      * ```php
@@ -466,6 +468,7 @@ class Command extends Component
 
     /**
      * Creates an UPDATE command.
+     *
      * For example,
      *
      * ```php
@@ -499,6 +502,7 @@ class Command extends Component
 
     /**
      * Creates a DELETE command.
+     *
      * For example,
      *
      * ```php
@@ -876,7 +880,7 @@ class Command extends Component
     }
 
     /**
-     * Builds a SQL command for adding comment to column
+     * Builds a SQL command for adding comment to column.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @param string $column the name of the column to be commented. The column name will be properly quoted by the method.
@@ -892,7 +896,7 @@ class Command extends Component
     }
 
     /**
-     * Builds a SQL command for adding comment to table
+     * Builds a SQL command for adding comment to table.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @param string $comment the text of the comment to be added. The comment will be properly quoted by the method.
@@ -907,7 +911,7 @@ class Command extends Component
     }
 
     /**
-     * Builds a SQL command for dropping comment from column
+     * Builds a SQL command for dropping comment from column.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @param string $column the name of the column to be commented. The column name will be properly quoted by the method.
@@ -922,7 +926,7 @@ class Command extends Component
     }
 
     /**
-     * Builds a SQL command for dropping comment from table
+     * Builds a SQL command for dropping comment from table.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @return $this the command object itself
@@ -1068,7 +1072,7 @@ class Command extends Component
     }
 
     /**
-     * Refreshes table schema, which was marked by [[requireTableSchemaRefresh()]]
+     * Refreshes table schema, which was marked by [[requireTableSchemaRefresh()]].
      * @since 2.0.6
      */
     protected function refreshTableSchema()
diff --git a/framework/db/Connection.php b/framework/db/Connection.php
index 550e5bf..8777aa0 100644
--- a/framework/db/Connection.php
+++ b/framework/db/Connection.php
@@ -427,6 +427,7 @@ class Connection extends Component
 
     /**
      * Uses query cache for the queries performed with the callable.
+     *
      * When query caching is enabled ([[enableQueryCache]] is true and [[queryCache]] refers to a valid cache),
      * queries performed within the callable will be cached and their results will be fetched from cache if available.
      * For example,
@@ -469,6 +470,7 @@ class Connection extends Component
 
     /**
      * Disables query cache temporarily.
+     *
      * Queries performed within the callable will not use query cache at all. For example,
      *
      * ```php
@@ -637,6 +639,7 @@ class Connection extends Component
         if (strncmp('sqlite:@', $dsn, 8) === 0) {
             $dsn = 'sqlite:' . Yii::getAlias(substr($dsn, 7));
         }
+
         return new $pdoClass($dsn, $this->username, $this->password, $this->attributes);
     }
 
@@ -879,6 +882,7 @@ class Connection extends Component
                 $this->_driverName = strtolower($this->getSlavePdo()->getAttribute(PDO::ATTR_DRIVER_NAME));
             }
         }
+
         return $this->_driverName;
     }
 
@@ -1066,8 +1070,15 @@ class Connection extends Component
      */
     public function __sleep()
     {
-        $this->close();
-        return array_keys((array) $this);
+        $fields = (array) $this;
+
+        unset($fields['pdo']);
+        unset($fields["\000" . __CLASS__ . "\000" . '_master']);
+        unset($fields["\000" . __CLASS__ . "\000" . '_slave']);
+        unset($fields["\000" . __CLASS__ . "\000" . '_transaction']);
+        unset($fields["\000" . __CLASS__ . "\000" . '_schema']);
+
+        return array_keys($fields);
     }
 
     /**
diff --git a/framework/db/DataReader.php b/framework/db/DataReader.php
index b12bef9..ea84336 100644
--- a/framework/db/DataReader.php
+++ b/framework/db/DataReader.php
@@ -92,7 +92,8 @@ class DataReader extends \yii\base\BaseObject implements \Iterator, \Countable
     }
 
     /**
-     * Set the default fetch mode for this statement
+     * Set the default fetch mode for this statement.
+     *
      * @param int $mode fetch mode
      * @see http://www.php.net/manual/en/function.PDOStatement-setFetchMode.php
      */
diff --git a/framework/db/Expression.php b/framework/db/Expression.php
index 6515b52..28e79b2 100644
--- a/framework/db/Expression.php
+++ b/framework/db/Expression.php
@@ -56,7 +56,7 @@ class Expression extends \yii\base\BaseObject
     }
 
     /**
-     * String magic method
+     * String magic method.
      * @return string the DB expression
      */
     public function __toString()
diff --git a/framework/db/Migration.php b/framework/db/Migration.php
index 05dadca..1acb1d9 100644
--- a/framework/db/Migration.php
+++ b/framework/db/Migration.php
@@ -74,6 +74,14 @@ class Migration extends Component implements MigrationInterface
     public $maxSqlOutputLength;
 
     /**
+     * @var bool indicates whether the console output should be compacted.
+     * If this is set to true, the individual commands ran within the migration will not be output to the console.
+     * Default is false, in other words the output is fully verbose by default.
+     * @since 2.0.13
+     */
+    public $compact = false;
+
+    /**
      * Initializes the migration.
      * This method will set [[db]] to be the 'db' application component, if it is `null`.
      */
@@ -202,10 +210,9 @@ class Migration extends Component implements MigrationInterface
             $sqlOutput = StringHelper::truncate($sql, $this->maxSqlOutputLength, '[... hidden]');
         }
 
-        echo "    > execute SQL: $sqlOutput ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("execute SQL: $sqlOutput");
         $this->db->createCommand($sql)->bindValues($params)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -216,10 +223,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function insert($table, $columns)
     {
-        echo "    > insert into $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("insert into $table");
         $this->db->createCommand()->insert($table, $columns)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -231,10 +237,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function batchInsert($table, $columns, $rows)
     {
-        echo "    > insert into $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("insert into $table");
         $this->db->createCommand()->batchInsert($table, $columns, $rows)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -248,10 +253,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function update($table, $columns, $condition = '', $params = [])
     {
-        echo "    > update $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("update $table");
         $this->db->createCommand()->update($table, $columns, $condition, $params)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -263,10 +267,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function delete($table, $condition = '', $params = [])
     {
-        echo "    > delete from $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("delete from $table");
         $this->db->createCommand()->delete($table, $condition, $params)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -287,15 +290,14 @@ class Migration extends Component implements MigrationInterface
      */
     public function createTable($table, $columns, $options = null)
     {
-        echo "    > create table $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("create table $table");
         $this->db->createCommand()->createTable($table, $columns, $options)->execute();
         foreach ($columns as $column => $type) {
             if ($type instanceof ColumnSchemaBuilder && $type->comment !== null) {
                 $this->db->createCommand()->addCommentOnColumn($table, $column, $type->comment)->execute();
             }
         }
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -305,10 +307,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function renameTable($table, $newName)
     {
-        echo "    > rename table $table to $newName ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("rename table $table to $newName");
         $this->db->createCommand()->renameTable($table, $newName)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -317,10 +318,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function dropTable($table)
     {
-        echo "    > drop table $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("drop table $table");
         $this->db->createCommand()->dropTable($table)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -329,10 +329,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function truncateTable($table)
     {
-        echo "    > truncate table $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("truncate table $table");
         $this->db->createCommand()->truncateTable($table)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -345,13 +344,12 @@ class Migration extends Component implements MigrationInterface
      */
     public function addColumn($table, $column, $type)
     {
-        echo "    > add column $column $type to table $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("add column $column $type to table $table");
         $this->db->createCommand()->addColumn($table, $column, $type)->execute();
         if ($type instanceof ColumnSchemaBuilder && $type->comment !== null) {
             $this->db->createCommand()->addCommentOnColumn($table, $column, $type->comment)->execute();
         }
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -361,10 +359,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function dropColumn($table, $column)
     {
-        echo "    > drop column $column from table $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("drop column $column from table $table");
         $this->db->createCommand()->dropColumn($table, $column)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -375,10 +372,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function renameColumn($table, $name, $newName)
     {
-        echo "    > rename column $name in table $table to $newName ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("rename column $name in table $table to $newName");
         $this->db->createCommand()->renameColumn($table, $name, $newName)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -391,13 +387,12 @@ class Migration extends Component implements MigrationInterface
      */
     public function alterColumn($table, $column, $type)
     {
-        echo "    > alter column $column in table $table to $type ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("alter column $column in table $table to $type");
         $this->db->createCommand()->alterColumn($table, $column, $type)->execute();
         if ($type instanceof ColumnSchemaBuilder && $type->comment !== null) {
             $this->db->createCommand()->addCommentOnColumn($table, $column, $type->comment)->execute();
         }
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -409,10 +404,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function addPrimaryKey($name, $table, $columns)
     {
-        echo "    > add primary key $name on $table (" . (is_array($columns) ? implode(',', $columns) : $columns) . ') ...';
-        $time = microtime(true);
+        $time = $this->beginCommand("add primary key $name on $table (" . (is_array($columns) ? implode(',', $columns) : $columns) . ')');
         $this->db->createCommand()->addPrimaryKey($name, $table, $columns)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -422,10 +416,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function dropPrimaryKey($name, $table)
     {
-        echo "    > drop primary key $name ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("drop primary key $name");
         $this->db->createCommand()->dropPrimaryKey($name, $table)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -441,10 +434,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete = null, $update = null)
     {
-        echo "    > add foreign key $name: $table (" . implode(',', (array) $columns) . ") references $refTable (" . implode(',', (array) $refColumns) . ') ...';
-        $time = microtime(true);
+        $time = $this->beginCommand("add foreign key $name: $table (" . implode(',', (array) $columns) . ") references $refTable (" . implode(',', (array) $refColumns) . ')');
         $this->db->createCommand()->addForeignKey($name, $table, $columns, $refTable, $refColumns, $delete, $update)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -454,10 +446,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function dropForeignKey($name, $table)
     {
-        echo "    > drop foreign key $name from table $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("drop foreign key $name from table $table");
         $this->db->createCommand()->dropForeignKey($name, $table)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -471,10 +462,9 @@ class Migration extends Component implements MigrationInterface
      */
     public function createIndex($name, $table, $columns, $unique = false)
     {
-        echo '    > create' . ($unique ? ' unique' : '') . " index $name on $table (" . implode(',', (array) $columns) . ') ...';
-        $time = microtime(true);
+        $time = $this->beginCommand('create' . ($unique ? ' unique' : '') . " index $name on $table (" . implode(',', (array) $columns) . ')');
         $this->db->createCommand()->createIndex($name, $table, $columns, $unique)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
@@ -484,14 +474,13 @@ class Migration extends Component implements MigrationInterface
      */
     public function dropIndex($name, $table)
     {
-        echo "    > drop index $name on $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("drop index $name on $table");
         $this->db->createCommand()->dropIndex($name, $table)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
-     * Builds and execute a SQL statement for adding comment to column
+     * Builds and execute a SQL statement for adding comment to column.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @param string $column the name of the column to be commented. The column name will be properly quoted by the method.
@@ -500,14 +489,13 @@ class Migration extends Component implements MigrationInterface
      */
     public function addCommentOnColumn($table, $column, $comment)
     {
-        echo "    > add comment on column $column ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("add comment on column $column");
         $this->db->createCommand()->addCommentOnColumn($table, $column, $comment)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
-     * Builds a SQL statement for adding comment to table
+     * Builds a SQL statement for adding comment to table.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @param string $comment the text of the comment to be added. The comment will be properly quoted by the method.
@@ -515,14 +503,13 @@ class Migration extends Component implements MigrationInterface
      */
     public function addCommentOnTable($table, $comment)
     {
-        echo "    > add comment on table $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("add comment on table $table");
         $this->db->createCommand()->addCommentOnTable($table, $comment)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
-     * Builds and execute a SQL statement for dropping comment from column
+     * Builds and execute a SQL statement for dropping comment from column.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @param string $column the name of the column to be commented. The column name will be properly quoted by the method.
@@ -530,23 +517,49 @@ class Migration extends Component implements MigrationInterface
      */
     public function dropCommentFromColumn($table, $column)
     {
-        echo "    > drop comment from column $column ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("drop comment from column $column");
         $this->db->createCommand()->dropCommentFromColumn($table, $column)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
     }
 
     /**
-     * Builds a SQL statement for dropping comment from table
+     * Builds a SQL statement for dropping comment from table.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @since 2.0.8
      */
     public function dropCommentFromTable($table)
     {
-        echo "    > drop comment from table $table ...";
-        $time = microtime(true);
+        $time = $this->beginCommand("drop comment from table $table");
         $this->db->createCommand()->dropCommentFromTable($table)->execute();
-        echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        $this->endCommand($time);
+    }
+
+    /**
+     * Prepares for a command to be executed, and outputs to the console
+     * 
+     * @param string $description the description for the command, to be output to the console.
+     * @return float the time before the command is executed, for the time elapsed to be calculated.
+     * @since 2.0.13
+     */
+    protected function beginCommand($description)
+    {
+        if (!$this->compact) {
+            echo "    > $description ...";
+        }
+        return microtime(true);
+    }
+
+    /**
+     * Finalizes after the command has been executed, and outputs to the console the time elapsed
+     * 
+     * @param float $time the time before the command was executed.
+     * @since 2.0.13
+     */
+    protected function endCommand($time)
+    {
+        if (!$this->compact) {
+            echo ' done (time: ' . sprintf('%.3f', microtime(true) - $time) . "s)\n";
+        }
     }
 }
diff --git a/framework/db/Query.php b/framework/db/Query.php
index 634c4ff..640a58b 100644
--- a/framework/db/Query.php
+++ b/framework/db/Query.php
@@ -175,6 +175,7 @@ class Query extends Component implements QueryInterface
 
     /**
      * Starts a batch query and retrieves data row by row.
+     *
      * This method is similar to [[batch()]] except that in each iteration of the result,
      * only one row of data is returned. For example,
      *
@@ -236,6 +237,7 @@ class Query extends Component implements QueryInterface
             }
             $result[$key] = $row;
         }
+
         return $result;
     }
 
@@ -251,6 +253,7 @@ class Query extends Component implements QueryInterface
         if ($this->emulateExecution) {
             return false;
         }
+
         return $this->createCommand($db)->queryOne();
     }
 
@@ -267,6 +270,7 @@ class Query extends Component implements QueryInterface
         if ($this->emulateExecution) {
             return null;
         }
+
         return $this->createCommand($db)->queryScalar();
     }
 
@@ -304,6 +308,7 @@ class Query extends Component implements QueryInterface
                 $results[$row[$this->indexBy]] = $value;
             }
         }
+
         return $results;
     }
 
@@ -321,6 +326,7 @@ class Query extends Component implements QueryInterface
         if ($this->emulateExecution) {
             return 0;
         }
+
         return $this->queryScalar("COUNT($q)", $db);
     }
 
@@ -337,6 +343,7 @@ class Query extends Component implements QueryInterface
         if ($this->emulateExecution) {
             return 0;
         }
+
         return $this->queryScalar("SUM($q)", $db);
     }
 
@@ -353,6 +360,7 @@ class Query extends Component implements QueryInterface
         if ($this->emulateExecution) {
             return 0;
         }
+
         return $this->queryScalar("AVG($q)", $db);
     }
 
@@ -584,6 +592,7 @@ PATTERN;
         } else {
             $this->select = array_merge($this->select, $columns);
         }
+
         return $this;
     }
 
@@ -743,6 +752,7 @@ PATTERN;
         } else {
             $operator = $defaultOperator;
         }
+
         return $this->andFilterWhere([$operator, $name, $value]);
     }
 
@@ -907,6 +917,7 @@ PATTERN;
         } else {
             $this->groupBy = array_merge($this->groupBy, $columns);
         }
+
         return $this;
     }
 
@@ -1002,6 +1013,7 @@ PATTERN;
         if ($condition !== []) {
             $this->having($condition);
         }
+
         return $this;
     }
 
@@ -1026,6 +1038,7 @@ PATTERN;
         if ($condition !== []) {
             $this->andHaving($condition);
         }
+
         return $this;
     }
 
@@ -1050,6 +1063,7 @@ PATTERN;
         if ($condition !== []) {
             $this->orHaving($condition);
         }
+
         return $this;
     }
 
@@ -1100,6 +1114,7 @@ PATTERN;
                 }
             }
         }
+
         return $this;
     }
 
diff --git a/framework/db/QueryBuilder.php b/framework/db/QueryBuilder.php
index f58f43d..0aabc89 100644
--- a/framework/db/QueryBuilder.php
+++ b/framework/db/QueryBuilder.php
@@ -131,6 +131,7 @@ class QueryBuilder extends \yii\base\BaseObject
 
     /**
      * Creates an INSERT SQL statement.
+     *
      * For example,
      *
      * ```php
@@ -222,6 +223,7 @@ class QueryBuilder extends \yii\base\BaseObject
 
     /**
      * Generates a batch INSERT SQL statement.
+     *
      * For example,
      *
      * ```php
@@ -263,6 +265,9 @@ class QueryBuilder extends \yii\base\BaseObject
                 }
                 if (is_string($value)) {
                     $value = $schema->quoteValue($value);
+                } elseif (is_float($value)) {
+                    // ensure type cast always has . as decimal separator in all locales
+                    $value = str_replace(',', '.', (string) $value);
                 } elseif ($value === false) {
                     $value = 0;
                 } elseif ($value === null) {
@@ -286,6 +291,7 @@ class QueryBuilder extends \yii\base\BaseObject
 
     /**
      * Creates an UPDATE SQL statement.
+     *
      * For example,
      *
      * ```php
@@ -333,6 +339,7 @@ class QueryBuilder extends \yii\base\BaseObject
 
     /**
      * Creates a DELETE SQL statement.
+     *
      * For example,
      *
      * ```php
@@ -614,6 +621,7 @@ class QueryBuilder extends \yii\base\BaseObject
         foreach ($columns as $i => $col) {
             $columns[$i] = $this->db->quoteColumnName($col);
         }
+
         return 'ALTER TABLE ' . $this->db->quoteTableName($table) . ' ADD CONSTRAINT '
             . $this->db->quoteColumnName($name) . ' UNIQUE ('
             . implode(', ', $columns) . ')';
@@ -727,7 +735,7 @@ class QueryBuilder extends \yii\base\BaseObject
     }
 
     /**
-     * Builds a SQL command for adding comment to column
+     * Builds a SQL command for adding comment to column.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @param string $column the name of the column to be commented. The column name will be properly quoted by the method.
@@ -741,7 +749,7 @@ class QueryBuilder extends \yii\base\BaseObject
     }
 
     /**
-     * Builds a SQL command for adding comment to table
+     * Builds a SQL command for adding comment to table.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @param string $comment the text of the comment to be added. The comment will be properly quoted by the method.
@@ -754,7 +762,7 @@ class QueryBuilder extends \yii\base\BaseObject
     }
 
     /**
-     * Builds a SQL command for adding comment to column
+     * Builds a SQL command for adding comment to column.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @param string $column the name of the column to be commented. The column name will be properly quoted by the method.
@@ -767,7 +775,7 @@ class QueryBuilder extends \yii\base\BaseObject
     }
 
     /**
-     * Builds a SQL command for adding comment to table
+     * Builds a SQL command for adding comment to table.
      *
      * @param string $table the table whose column is to be commented. The table name will be properly quoted by the method.
      * @return string the SQL statement for adding comment on column
@@ -780,13 +788,14 @@ class QueryBuilder extends \yii\base\BaseObject
 
     /**
      * Converts an abstract column type into a physical column type.
+     *
      * The conversion is done using the type map specified in [[typeMap]].
      * The following abstract column types are supported (using MySQL as an example to explain the corresponding
      * physical types):
      *
      * - `pk`: an auto-incremental primary key type, will be converted into "int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY"
      * - `bigpk`: an auto-incremental primary key type, will be converted into "bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY"
-     * - `unsignedpk`: an unsigned auto-incremental primary key type, will be converted into "int(11) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY"
+     * - `upk`: an unsigned auto-incremental primary key type, will be converted into "int(10) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY"
      * - `char`: char type, will be converted into "char(1)"
      * - `string`: string type, will be converted into "varchar(255)"
      * - `text`: a long string type, will be converted into "text"
@@ -933,7 +942,7 @@ class QueryBuilder extends \yii\base\BaseObject
     }
 
     /**
-     * Quotes table names passed
+     * Quotes table names passed.
      *
      * @param array $tables
      * @param array $params
@@ -958,6 +967,7 @@ class QueryBuilder extends \yii\base\BaseObject
                 }
             }
         }
+
         return $tables;
     }
 
@@ -991,6 +1001,7 @@ class QueryBuilder extends \yii\base\BaseObject
                 $columns[$i] = $this->db->quoteColumnName($column);
             }
         }
+
         return 'GROUP BY ' . implode(', ', $columns);
     }
 
@@ -1025,6 +1036,7 @@ class QueryBuilder extends \yii\base\BaseObject
         if ($limit !== '') {
             $sql .= $this->separator . $limit;
         }
+
         return $sql;
     }
 
@@ -1153,6 +1165,7 @@ class QueryBuilder extends \yii\base\BaseObject
             foreach ($condition->params as $n => $v) {
                 $params[$n] = $v;
             }
+
             return $condition->expression;
         } elseif (!is_array($condition)) {
             return (string) $condition;
@@ -1206,6 +1219,7 @@ class QueryBuilder extends \yii\base\BaseObject
                 }
             }
         }
+
         return count($parts) === 1 ? $parts[0] : '(' . implode(') AND (', $parts) . ')';
     }
 
@@ -1382,7 +1396,7 @@ class QueryBuilder extends \yii\base\BaseObject
     }
 
     /**
-     * Builds SQL for IN condition
+     * Builds SQL for IN condition.
      *
      * @param string $operator
      * @param array $columns
@@ -1399,6 +1413,7 @@ class QueryBuilder extends \yii\base\BaseObject
                     $columns[$i] = $this->db->quoteColumnName($col);
                 }
             }
+
             return '(' . implode(', ', $columns) . ") $operator ($sql)";
         }
 
@@ -1410,7 +1425,7 @@ class QueryBuilder extends \yii\base\BaseObject
     }
 
     /**
-     * Builds SQL for IN condition
+     * Builds SQL for IN condition.
      *
      * @param string $operator
      * @param array|\Traversable $columns
@@ -1562,6 +1577,7 @@ class QueryBuilder extends \yii\base\BaseObject
             foreach ($value->params as $n => $v) {
                 $params[$n] = $v;
             }
+
             return "$column $operator {$value->expression}";
         } elseif ($value instanceof Query) {
             [$sql, $params] = $this->build($value, $params);
diff --git a/framework/db/QueryInterface.php b/framework/db/QueryInterface.php
index 2f52eac..0192543 100644
--- a/framework/db/QueryInterface.php
+++ b/framework/db/QueryInterface.php
@@ -153,7 +153,7 @@ interface QueryInterface
      * - Additionally you can specify arbitrary operators as follows: A condition of `['>=', 'id', 10]` will result in the
      *   following SQL expression: `id >= 10`.
      *
-     * @param string|array $condition the conditions that should be put in the WHERE part.
+     * @param array $condition the conditions that should be put in the WHERE part.
      * @return $this the query object itself
      * @see andWhere()
      * @see orWhere()
@@ -163,7 +163,7 @@ interface QueryInterface
     /**
      * Adds an additional WHERE condition to the existing one.
      * The new condition and the existing one will be joined using the 'AND' operator.
-     * @param string|array $condition the new WHERE condition. Please refer to [[where()]]
+     * @param array $condition the new WHERE condition. Please refer to [[where()]]
      * on how to specify this parameter.
      * @return $this the query object itself
      * @see where()
@@ -174,7 +174,7 @@ interface QueryInterface
     /**
      * Adds an additional WHERE condition to the existing one.
      * The new condition and the existing one will be joined using the 'OR' operator.
-     * @param string|array $condition the new WHERE condition. Please refer to [[where()]]
+     * @param array $condition the new WHERE condition. Please refer to [[where()]]
      * on how to specify this parameter.
      * @return $this the query object itself
      * @see where()
diff --git a/framework/db/QueryTrait.php b/framework/db/QueryTrait.php
index f62e097..5b9a123 100644
--- a/framework/db/QueryTrait.php
+++ b/framework/db/QueryTrait.php
@@ -85,7 +85,7 @@ trait QueryTrait
      *
      * See [[QueryInterface::where()]] for detailed documentation.
      *
-     * @param string|array $condition the conditions that should be put in the WHERE part.
+     * @param array $condition the conditions that should be put in the WHERE part.
      * @return $this the query object itself
      * @see andWhere()
      * @see orWhere()
@@ -99,7 +99,7 @@ trait QueryTrait
     /**
      * Adds an additional WHERE condition to the existing one.
      * The new condition and the existing one will be joined using the 'AND' operator.
-     * @param string|array $condition the new WHERE condition. Please refer to [[where()]]
+     * @param array $condition the new WHERE condition. Please refer to [[where()]]
      * on how to specify this parameter.
      * @return $this the query object itself
      * @see where()
@@ -112,13 +112,14 @@ trait QueryTrait
         } else {
             $this->where = ['and', $this->where, $condition];
         }
+
         return $this;
     }
 
     /**
      * Adds an additional WHERE condition to the existing one.
      * The new condition and the existing one will be joined using the 'OR' operator.
-     * @param string|array $condition the new WHERE condition. Please refer to [[where()]]
+     * @param array $condition the new WHERE condition. Please refer to [[where()]]
      * on how to specify this parameter.
      * @return $this the query object itself
      * @see where()
@@ -131,6 +132,7 @@ trait QueryTrait
         } else {
             $this->where = ['or', $this->where, $condition];
         }
+
         return $this;
     }
 
@@ -167,6 +169,7 @@ trait QueryTrait
         if ($condition !== []) {
             $this->where($condition);
         }
+
         return $this;
     }
 
@@ -190,6 +193,7 @@ trait QueryTrait
         if ($condition !== []) {
             $this->andWhere($condition);
         }
+
         return $this;
     }
 
@@ -213,6 +217,7 @@ trait QueryTrait
         if ($condition !== []) {
             $this->orWhere($condition);
         }
+
         return $this;
     }
 
@@ -236,6 +241,7 @@ trait QueryTrait
                     unset($condition[$name]);
                 }
             }
+
             return $condition;
         }
 
@@ -345,11 +351,12 @@ trait QueryTrait
         } else {
             $this->orderBy = array_merge($this->orderBy, $columns);
         }
+
         return $this;
     }
 
     /**
-     * Normalizes format of ORDER BY data
+     * Normalizes format of ORDER BY data.
      *
      * @param array|string|Expression $columns the columns value to normalize. See [[orderBy]] and [[addOrderBy]].
      * @return array
diff --git a/framework/db/Schema.php b/framework/db/Schema.php
index b7d2b02..ce4a2e7 100644
--- a/framework/db/Schema.php
+++ b/framework/db/Schema.php
@@ -314,6 +314,7 @@ abstract class Schema extends BaseObject
 
     /**
      * Returns all unique indexes for the given table.
+     *
      * Each array element is of the following structure:
      *
      * ```php
@@ -421,6 +422,7 @@ abstract class Schema extends BaseObject
 
             $result[$name] = isset($columns[$name]) ? $columns[$name] : $tableSchema->columns[$name]->defaultValue;
         }
+
         return $result;
     }
 
@@ -493,6 +495,7 @@ abstract class Schema extends BaseObject
         if (strpos($name, '{{') !== false) {
             return $name;
         }
+
         return $prefix . $this->quoteSimpleColumnName($name);
     }
 
@@ -658,6 +661,7 @@ abstract class Schema extends BaseObject
             $this->_tableMetadata[$name][$type] = $this->{'loadTable' . ucfirst($type)}($this->getRawTableName($name));
             $this->saveTableMetadataToCache($cache, $name);
         }
+
         return $this->_tableMetadata[$name][$type];
     }
 
@@ -685,6 +689,7 @@ abstract class Schema extends BaseObject
                 $metadata[] = $tableMetadata;
             }
         }
+
         return $metadata;
     }
 
diff --git a/framework/db/SchemaBuilderTrait.php b/framework/db/SchemaBuilderTrait.php
index e7ff966..562f648 100644
--- a/framework/db/SchemaBuilderTrait.php
+++ b/framework/db/SchemaBuilderTrait.php
@@ -177,6 +177,7 @@ trait SchemaBuilderTrait
         if ($scale !== null) {
             $length[] = $scale;
         }
+
         return $this->getDb()->getSchema()->createColumnSchemaBuilder(Schema::TYPE_DECIMAL, $length);
     }
 
@@ -268,6 +269,7 @@ trait SchemaBuilderTrait
         if ($scale !== null) {
             $length[] = $scale;
         }
+
         return $this->getDb()->getSchema()->createColumnSchemaBuilder(Schema::TYPE_MONEY, $length);
     }
 }
diff --git a/framework/db/SqlToken.php b/framework/db/SqlToken.php
index 66e56ac..77497ee 100644
--- a/framework/db/SqlToken.php
+++ b/framework/db/SqlToken.php
@@ -190,6 +190,7 @@ class SqlToken extends BaseObject implements \ArrayAccess
         while ($code->parent !== null) {
             $code = $code->parent;
         }
+
         return mb_substr($code->content, $this->startOffset, $this->endOffset - $this->startOffset, 'UTF-8');
     }
 
@@ -274,8 +275,10 @@ class SqlToken extends BaseObject implements \ArrayAccess
                 $offset++;
                 continue 2;
             }
+
             return false;
         }
+
         return true;
     }
 
diff --git a/framework/db/SqlTokenizer.php b/framework/db/SqlTokenizer.php
index b2fa624..d17f0ca 100644
--- a/framework/db/SqlTokenizer.php
+++ b/framework/db/SqlTokenizer.php
@@ -115,6 +115,7 @@ abstract class SqlTokenizer extends Component
         if ($this->_token->getHasChildren() && !$this->_token[-1]->getHasChildren()) {
             unset($this->_token[-1]);
         }
+
         return $this->_token;
     }
 
@@ -205,6 +206,7 @@ abstract class SqlTokenizer extends Component
                 return true;
             }
         }
+
         return false;
     }
 
@@ -231,6 +233,7 @@ abstract class SqlTokenizer extends Component
         if (!$caseSensitive && !isset($this->_substrings[$cacheKey . ',0'])) {
             $this->_substrings[$cacheKey . ',0'] = mb_strtoupper($this->_substrings[$cacheKey . ',1'], 'UTF-8');
         }
+
         return $this->_substrings[$cacheKey . ',' . (int) $caseSensitive];
     }
 
@@ -255,6 +258,7 @@ abstract class SqlTokenizer extends Component
         } else {
             $afterIndexOf += mb_strlen($string, 'UTF-8');
         }
+
         return $afterIndexOf;
     }
 
@@ -341,6 +345,7 @@ abstract class SqlTokenizer extends Component
                 ]);
                 break;
         }
+
         return true;
     }
 
diff --git a/framework/db/cubrid/ColumnSchemaBuilder.php b/framework/db/cubrid/ColumnSchemaBuilder.php
index 39502ca..93feb70 100644
--- a/framework/db/cubrid/ColumnSchemaBuilder.php
+++ b/framework/db/cubrid/ColumnSchemaBuilder.php
@@ -66,6 +66,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
             default:
                 $format = '{type}{length}{notnull}{unique}{default}{check}{comment}{append}{pos}';
         }
+
         return $this->buildCompleteString($format);
     }
 }
diff --git a/framework/db/cubrid/QueryBuilder.php b/framework/db/cubrid/QueryBuilder.php
index 059d1e2..5158d55 100644
--- a/framework/db/cubrid/QueryBuilder.php
+++ b/framework/db/cubrid/QueryBuilder.php
@@ -228,6 +228,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
                 }
             }
         }
+
         return null;
     }
 }
diff --git a/framework/db/cubrid/Schema.php b/framework/db/cubrid/Schema.php
index c71cb87..7208a0f 100644
--- a/framework/db/cubrid/Schema.php
+++ b/framework/db/cubrid/Schema.php
@@ -190,6 +190,7 @@ class Schema extends \yii\db\Schema
                 'onUpdate' => isset($actionTypes[$foreignKey[0]['UPDATE_RULE']]) ? $actionTypes[$foreignKey[0]['UPDATE_RULE']] : null,
             ]);
         }
+
         return $result;
     }
 
@@ -427,6 +428,7 @@ class Schema extends \yii\db\Schema
         foreach ($result as $type => $data) {
             $this->setTableMetadata($tableName, $type, $data);
         }
+
         return $result[$returnType];
     }
 }
diff --git a/framework/db/mssql/PDO.php b/framework/db/mssql/PDO.php
index 196eaf5..005774c 100644
--- a/framework/db/mssql/PDO.php
+++ b/framework/db/mssql/PDO.php
@@ -64,8 +64,9 @@ class PDO extends \PDO
 
     /**
      * Retrieve a database connection attribute.
+     *
      * It is necessary to override PDO's method as some MSSQL PDO driver (e.g. dblib) does not
-     * support getting attributes
+     * support getting attributes.
      * @param int $attribute One of the PDO::ATTR_* constants.
      * @return mixed A successful call returns the value of the requested PDO attribute.
      * An unsuccessful call returns null.
diff --git a/framework/db/mssql/QueryBuilder.php b/framework/db/mssql/QueryBuilder.php
index ae38722..d030905 100644
--- a/framework/db/mssql/QueryBuilder.php
+++ b/framework/db/mssql/QueryBuilder.php
@@ -288,7 +288,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
     }
 
     /**
-     * Returns an array of column names given model name
+     * Returns an array of column names given model name.
      *
      * @param string $modelClass name of the model class
      * @return array|null array of column names
@@ -320,6 +320,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
             $version = explode('.', $pdo->getAttribute(\PDO::ATTR_SERVER_VERSION));
             $this->_oldMssql = $version[0] < 11;
         }
+
         return $this->_oldMssql;
     }
 
@@ -332,11 +333,12 @@ class QueryBuilder extends \yii\db\QueryBuilder
         if (is_array($columns)) {
             throw new NotSupportedException(__METHOD__ . ' is not supported by MSSQL.');
         }
+
         return parent::buildSubqueryInCondition($operator, $columns, $values, $params);
     }
 
     /**
-     * Builds SQL for IN condition
+     * Builds SQL for IN condition.
      *
      * @param string $operator
      * @param array $columns
@@ -395,6 +397,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
                 }
             }
         }
+
         return $columns;
     }
 
diff --git a/framework/db/mssql/Schema.php b/framework/db/mssql/Schema.php
index a0ad1c2..d89292e 100644
--- a/framework/db/mssql/Schema.php
+++ b/framework/db/mssql/Schema.php
@@ -112,6 +112,7 @@ class Schema extends \yii\db\Schema
             $resolvedName->schemaName = $this->defaultSchema;
             $resolvedName->fullName = $resolvedName->name = $parts[0];
         }
+
         return $resolvedName;
     }
 
@@ -215,6 +216,7 @@ SQL;
                 'columnNames' => ArrayHelper::getColumn($index, 'column_name'),
             ]);
         }
+
         return $result;
     }
 
@@ -570,6 +572,7 @@ SQL;
 
     /**
      * Returns all unique indexes for the given table.
+     *
      * Each array element is of the following structure:
      *
      * ```php
@@ -589,6 +592,7 @@ SQL;
         foreach ($this->findTableConstraints($table, 'UNIQUE') as $row) {
             $result[$row['index_name']][] = $row['field_name'];
         }
+
         return $result;
     }
 
@@ -704,6 +708,7 @@ SQL;
         foreach ($result as $type => $data) {
             $this->setTableMetadata($tableName, $type, $data);
         }
+
         return $result[$returnType];
     }
 }
diff --git a/framework/db/mysql/ColumnSchemaBuilder.php b/framework/db/mysql/ColumnSchemaBuilder.php
index eca93e0..ad79ee6 100644
--- a/framework/db/mysql/ColumnSchemaBuilder.php
+++ b/framework/db/mysql/ColumnSchemaBuilder.php
@@ -66,6 +66,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
             default:
                 $format = '{type}{length}{notnull}{unique}{default}{check}{comment}{append}{pos}';
         }
+
         return $this->buildCompleteString($format);
     }
 }
diff --git a/framework/db/mysql/QueryBuilder.php b/framework/db/mysql/QueryBuilder.php
index aa7b432..90a5a09 100644
--- a/framework/db/mysql/QueryBuilder.php
+++ b/framework/db/mysql/QueryBuilder.php
@@ -347,6 +347,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
                 }
             }
         }
+
         return null;
     }
 }
diff --git a/framework/db/mysql/Schema.php b/framework/db/mysql/Schema.php
index 8fd1761..a8956a9 100644
--- a/framework/db/mysql/Schema.php
+++ b/framework/db/mysql/Schema.php
@@ -164,6 +164,7 @@ SQL;
                 'columnNames' => ArrayHelper::getColumn($index, 'column_name'),
             ]);
         }
+
         return $result;
     }
 
@@ -428,6 +429,7 @@ SQL;
 
     /**
      * Returns all unique indexes for the given table.
+     *
      * Each array element is of the following structure:
      *
      * ```php
@@ -477,6 +479,7 @@ SQL;
             $version = $this->db->getSlavePdo()->getAttribute(\PDO::ATTR_SERVER_VERSION);
             $this->_oldMysql = version_compare($version, '5.1', '<=');
         }
+
         return $this->_oldMysql;
     }
 
@@ -503,7 +506,8 @@ SELECT DISTINCT
     `kcu`.`REFERENCED_TABLE_NAME` AS `foreign_table_name`,
     `kcu`.`REFERENCED_COLUMN_NAME` AS `foreign_column_name`,
     `rc`.`UPDATE_RULE` AS `on_update`,
-    `rc`.`DELETE_RULE` AS `on_delete`
+    `rc`.`DELETE_RULE` AS `on_delete`,
+    `kcu`.`ORDINAL_POSITION` as `position`
 FROM (SELECT DATABASE() AS `name`) AS `sch`
 INNER JOIN `information_schema`.`KEY_COLUMN_USAGE` AS `kcu`
     ON `kcu`.`TABLE_SCHEMA` = COALESCE(:schemaName, `sch`.`name`) AND `kcu`.`CONSTRAINT_SCHEMA` = `kcu`.`TABLE_SCHEMA` AND `kcu`.`TABLE_NAME` = :tableName
@@ -557,6 +561,7 @@ SQL;
         foreach ($result as $type => $data) {
             $this->setTableMetadata($tableName, $type, $data);
         }
+
         return $result[$returnType];
     }
 }
diff --git a/framework/db/oci/ColumnSchemaBuilder.php b/framework/db/oci/ColumnSchemaBuilder.php
index 8629de8..ec68a99 100644
--- a/framework/db/oci/ColumnSchemaBuilder.php
+++ b/framework/db/oci/ColumnSchemaBuilder.php
@@ -41,6 +41,7 @@ class ColumnSchemaBuilder extends AbstractColumnSchemaBuilder
             default:
                 $format = '{type}{length}{default}{notnull}{check}{append}';
         }
+
         return $this->buildCompleteString($format);
     }
 }
diff --git a/framework/db/oci/QueryBuilder.php b/framework/db/oci/QueryBuilder.php
index 29c5be0..e2231c4 100644
--- a/framework/db/oci/QueryBuilder.php
+++ b/framework/db/oci/QueryBuilder.php
@@ -229,6 +229,7 @@ EOD;
 
     /**
      * Generates a batch INSERT SQL statement.
+     *
      * For example,
      *
      * ```php
@@ -268,6 +269,9 @@ EOD;
                 }
                 if (is_string($value)) {
                     $value = $schema->quoteValue($value);
+                } elseif (is_float($value)) {
+                    // ensure type cast always has . as decimal separator in all locales
+                    $value = str_replace(',', '.', (string) $value);
                 } elseif ($value === false) {
                     $value = 0;
                 } elseif ($value === null) {
@@ -330,6 +334,7 @@ EOD;
              */
             $this->likeEscapingReplacements['\\'] = substr($this->db->quoteValue('\\'), 1, -1);
         }
+
         return parent::buildLikeCondition($operator, $operands, $params);
     }
 
diff --git a/framework/db/oci/Schema.php b/framework/db/oci/Schema.php
index 23adbd9..0f4c11a 100644
--- a/framework/db/oci/Schema.php
+++ b/framework/db/oci/Schema.php
@@ -22,7 +22,7 @@ use yii\helpers\ArrayHelper;
 use yii\db\IntegrityException;
 
 /**
- * Schema is the class for retrieving metadata from an Oracle database
+ * Schema is the class for retrieving metadata from an Oracle database.
  *
  * @property string $lastInsertID The row ID of the last row inserted, or the last value retrieved from the
  * sequence object. This property is read-only.
@@ -130,6 +130,7 @@ SQL;
             }
             $names[] = $row['TABLE_NAME'];
         }
+
         return $names;
     }
 
@@ -201,6 +202,7 @@ SQL;
                 'columnNames' => ArrayHelper::getColumn($index, 'column_name'),
             ]);
         }
+
         return $result;
     }
 
@@ -328,11 +330,12 @@ SQL;
             $c = $this->createColumn($column);
             $table->columns[$c->name] = $c;
         }
+
         return true;
     }
 
     /**
-     * Sequence name of table
+     * Sequence name of table.
      *
      * @param string $tableName
      * @internal param \yii\db\TableSchema $table->name the table schema
@@ -377,7 +380,7 @@ SQL;
     }
 
     /**
-     * Creates ColumnSchema instance
+     * Creates ColumnSchema instance.
      *
      * @param array $column
      * @return ColumnSchema
@@ -420,7 +423,7 @@ SQL;
     }
 
     /**
-     * Finds constraints and fills them into TableSchema object passed
+     * Finds constraints and fills them into TableSchema object passed.
      * @param TableSchema $table
      */
     protected function findConstraints($table)
@@ -489,7 +492,7 @@ SQL;
 
     /**
      * Returns all unique indexes for the given table.
-     * Each array element is of the following structure:
+     * Each array element is of the following structure:.
      *
      * ```php
      * [
@@ -524,11 +527,12 @@ SQL;
         foreach ($command->queryAll() as $row) {
             $result[$row['INDEX_NAME']][] = $row['COLUMN_NAME'];
         }
+
         return $result;
     }
 
     /**
-     * Extracts the data types for the given column
+     * Extracts the data types for the given column.
      * @param ColumnSchema $column
      * @param string $dbType DB type
      * @param string $precision total number of digits.
@@ -716,6 +720,7 @@ SQL;
         foreach ($result as $type => $data) {
             $this->setTableMetadata($tableName, $type, $data);
         }
+
         return $result[$returnType];
     }
 }
diff --git a/framework/db/pgsql/QueryBuilder.php b/framework/db/pgsql/QueryBuilder.php
index a41808b..304e85b 100644
--- a/framework/db/pgsql/QueryBuilder.php
+++ b/framework/db/pgsql/QueryBuilder.php
@@ -233,6 +233,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
         if (!preg_match('/^(DROP|SET|RESET)\s+/i', $type)) {
             $type = 'TYPE ' . $this->getColumnType($type);
         }
+
         return 'ALTER TABLE ' . $this->db->quoteTableName($table) . ' ALTER COLUMN '
             . $this->db->quoteColumnName($column) . ' ' . $type;
     }
@@ -305,6 +306,9 @@ class QueryBuilder extends \yii\db\QueryBuilder
                 }
                 if (is_string($value)) {
                     $value = $schema->quoteValue($value);
+                } elseif (is_float($value)) {
+                    // ensure type cast always has . as decimal separator in all locales
+                    $value = str_replace(',', '.', (string) $value);
                 } elseif ($value === true) {
                     $value = 'TRUE';
                 } elseif ($value === false) {
diff --git a/framework/db/pgsql/Schema.php b/framework/db/pgsql/Schema.php
index dfe49df..0670ae5 100644
--- a/framework/db/pgsql/Schema.php
+++ b/framework/db/pgsql/Schema.php
@@ -240,6 +240,7 @@ SQL;
                 'columnNames' => ArrayHelper::getColumn($index, 'column_name'),
             ]);
         }
+
         return $result;
     }
 
@@ -418,6 +419,7 @@ SQL;
 
     /**
      * Returns all unique indexes for the given table.
+     *
      * Each array element is of the following structure:
      *
      * ```php
@@ -707,6 +709,7 @@ SQL;
         foreach ($result as $type => $data) {
             $this->setTableMetadata($tableName, $type, $data);
         }
+
         return $result[$returnType];
     }
 }
diff --git a/framework/db/sqlite/QueryBuilder.php b/framework/db/sqlite/QueryBuilder.php
index ec29900..287a5b0 100644
--- a/framework/db/sqlite/QueryBuilder.php
+++ b/framework/db/sqlite/QueryBuilder.php
@@ -56,6 +56,7 @@ class QueryBuilder extends \yii\db\QueryBuilder
 
     /**
      * Generates a batch INSERT SQL statement.
+     *
      * For example,
      *
      * ```php
@@ -102,6 +103,9 @@ class QueryBuilder extends \yii\db\QueryBuilder
                 }
                 if (is_string($value)) {
                     $value = $schema->quoteValue($value);
+                } elseif (is_float($value)) {
+                    // ensure type cast always has . as decimal separator in all locales
+                    $value = str_replace(',', '.', (string) $value);
                 } elseif ($value === false) {
                     $value = 0;
                 } elseif ($value === null) {
@@ -423,11 +427,12 @@ class QueryBuilder extends \yii\db\QueryBuilder
         if (is_array($columns)) {
             throw new NotSupportedException(__METHOD__ . ' is not supported by SQLite.');
         }
+
         return parent::buildSubqueryInCondition($operator, $columns, $values, $params);
     }
 
     /**
-     * Builds SQL for IN condition
+     * Builds SQL for IN condition.
      *
      * @param string $operator
      * @param array $columns
diff --git a/framework/db/sqlite/Schema.php b/framework/db/sqlite/Schema.php
index b3ffcb9..21aa309 100644
--- a/framework/db/sqlite/Schema.php
+++ b/framework/db/sqlite/Schema.php
@@ -120,6 +120,7 @@ class Schema extends \yii\db\Schema
                 'onUpdate' => isset($foreignKey[0]['on_update']) ? $foreignKey[0]['on_update'] : null,
             ]);
         }
+
         return $result;
     }
 
@@ -174,6 +175,7 @@ class Schema extends \yii\db\Schema
                 'expression' => $checkSql,
             ]);
         }
+
         return $result;
     }
 
@@ -276,6 +278,7 @@ class Schema extends \yii\db\Schema
 
     /**
      * Returns all unique indexes for the given table.
+     *
      * Each array element is of the following structure:
      *
      * ```php
@@ -447,6 +450,7 @@ class Schema extends \yii\db\Schema
         foreach ($result as $type => $data) {
             $this->setTableMetadata($tableName, $type, $data);
         }
+
         return $result[$returnType];
     }
 
diff --git a/framework/db/sqlite/SqlTokenizer.php b/framework/db/sqlite/SqlTokenizer.php
index 29b3225..e153820 100644
--- a/framework/db/sqlite/SqlTokenizer.php
+++ b/framework/db/sqlite/SqlTokenizer.php
@@ -55,6 +55,7 @@ class SqlTokenizer extends \yii\db\SqlTokenizer
         } else {
             $length = $this->indexAfter('*/') - $this->offset;
         }
+
         return true;
     }
 
@@ -121,6 +122,7 @@ class SqlTokenizer extends \yii\db\SqlTokenizer
         if ($delimiter !== ']') {
             $content = strtr($content, ["$delimiter$delimiter" => $delimiter]);
         }
+
         return true;
     }
 
diff --git a/framework/di/Container.php b/framework/di/Container.php
index 75b793c..37c94bf 100644
--- a/framework/di/Container.php
+++ b/framework/di/Container.php
@@ -334,6 +334,7 @@ class Container extends Component
                     throw new InvalidConfigException('A class definition requires a "class" member.');
                 }
             }
+
             return $definition;
         }
 
@@ -464,6 +465,7 @@ class Container extends Component
                 }
             }
         }
+
         return $dependencies;
     }
 
@@ -566,6 +568,7 @@ class Container extends Component
         foreach ($params as $value) {
             $args[] = $value;
         }
+
         return $args;
     }
 
@@ -628,7 +631,7 @@ class Container extends Component
     }
 
     /**
-     * Registers class definitions as singletons within this container by calling [[setSingleton()]]
+     * Registers class definitions as singletons within this container by calling [[setSingleton()]].
      *
      * @param array $singletons array of singleton definitions. See [[setDefinitions()]]
      * for allowed formats of array.
diff --git a/framework/di/Instance.php b/framework/di/Instance.php
index 68bd35b..8e065fc 100644
--- a/framework/di/Instance.php
+++ b/framework/di/Instance.php
@@ -168,7 +168,7 @@ class Instance
     }
 
     /**
-     * Restores class state after using `var_export()`
+     * Restores class state after using `var_export()`.
      *
      * @param array $state
      * @return Instance
diff --git a/framework/di/ServiceLocator.php b/framework/di/ServiceLocator.php
index 14ea99e..567fd9c 100644
--- a/framework/di/ServiceLocator.php
+++ b/framework/di/ServiceLocator.php
@@ -40,6 +40,7 @@ use yii\base\InvalidConfigException;
  * ```
  *
  * Because [[\yii\base\Module]] extends from ServiceLocator, modules and the application are all service locators.
+ * Modules add [tree traversal](guide:concept-service-locator#tree-traversal) for service resolution.
  *
  * For more details and usage information on ServiceLocator, see the [guide article on service locators](guide:concept-service-locator).
  *
diff --git a/framework/filters/AccessControl.php b/framework/filters/AccessControl.php
index 378f80f..a4672f2 100644
--- a/framework/filters/AccessControl.php
+++ b/framework/filters/AccessControl.php
@@ -128,6 +128,7 @@ class AccessControl extends ActionFilter
                 } else {
                     $this->denyAccess($user);
                 }
+
                 return false;
             }
         }
@@ -136,6 +137,7 @@ class AccessControl extends ActionFilter
         } else {
             $this->denyAccess($user);
         }
+
         return false;
     }
 
diff --git a/framework/filters/AccessRule.php b/framework/filters/AccessRule.php
index 78b585e..ba88135 100644
--- a/framework/filters/AccessRule.php
+++ b/framework/filters/AccessRule.php
@@ -16,7 +16,7 @@ use yii\web\Request;
 use yii\web\User;
 
 /**
- * This class represents an access rule defined by the [[AccessControl]] action filter
+ * This class represents an access rule defined by the [[AccessControl]] action filter.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
diff --git a/framework/filters/AjaxFilter.php b/framework/filters/AjaxFilter.php
index c6c71b8..f974023 100644
--- a/framework/filters/AjaxFilter.php
+++ b/framework/filters/AjaxFilter.php
@@ -62,4 +62,4 @@ class AjaxFilter extends ActionFilter
 
         throw new BadRequestHttpException($this->errorMessage);
     }
-}
\ No newline at end of file
+}
diff --git a/framework/filters/ContentNegotiator.php b/framework/filters/ContentNegotiator.php
index 8acb7ac..46f65a4 100644
--- a/framework/filters/ContentNegotiator.php
+++ b/framework/filters/ContentNegotiator.php
@@ -195,14 +195,15 @@ class ContentNegotiator extends ActionFilter implements BootstrapInterface
             }
         }
 
+        foreach ($this->formats as $type => $format) {
+            $response->format = $format;
+            $response->acceptMimeType = $type;
+            $response->acceptParams = [];
+            break;
+        }
+
         if (isset($types['*/*'])) {
-            // return the first format
-            foreach ($this->formats as $type => $format) {
-                $response->format = $this->formats[$type];
-                $response->acceptMimeType = $type;
-                $response->acceptParams = [];
-                return;
-            }
+            return;
         }
 
         throw new NotAcceptableHttpException('None of your requested media types is supported.');
@@ -224,6 +225,7 @@ class ContentNegotiator extends ActionFilter implements BootstrapInterface
                     return $supported;
                 }
             }
+
             return reset($this->languages);
         }
 
diff --git a/framework/filters/Cors.php b/framework/filters/Cors.php
index aa205e5..42f71df 100644
--- a/framework/filters/Cors.php
+++ b/framework/filters/Cors.php
@@ -127,7 +127,7 @@ class Cors extends ActionFilter
     }
 
     /**
-     * Extract CORS headers from the request
+     * Extract CORS headers from the request.
      * @return array CORS headers to handle
      */
     public function extractHeaders()
@@ -140,11 +140,12 @@ class Cors extends ActionFilter
                 $headers[$headerField] = $headerData;
             }
         }
+
         return $headers;
     }
 
     /**
-     * For each CORS headers create the specific response
+     * For each CORS headers create the specific response.
      * @param array $requestHeaders CORS headers we have detected
      * @return array CORS headers ready to be sent
      */
@@ -168,7 +169,7 @@ class Cors extends ActionFilter
             $responseHeaders['Access-Control-Allow-Credentials'] = $this->cors['Access-Control-Allow-Credentials'] ? 'true' : 'false';
         }
 
-        if (isset($this->cors['Access-Control-Max-Age']) && Yii::$app->getRequest()->getIsOptions()) {
+        if (isset($this->cors['Access-Control-Max-Age']) && $this->request->getIsOptions()) {
             $responseHeaders['Access-Control-Max-Age'] = $this->cors['Access-Control-Max-Age'];
         }
 
@@ -180,7 +181,7 @@ class Cors extends ActionFilter
     }
 
     /**
-     * Handle classic CORS request to avoid duplicate code
+     * Handle classic CORS request to avoid duplicate code.
      * @param string $type the kind of headers we would handle
      * @param array $requestHeaders CORS headers request by client
      * @param array $responseHeaders CORS response headers sent to the client
@@ -204,7 +205,7 @@ class Cors extends ActionFilter
     }
 
     /**
-     * Adds the CORS headers to the response
+     * Adds the CORS headers to the response.
      * @param Response $response
      * @param array $headers CORS headers which have been computed
      */
@@ -218,9 +219,11 @@ class Cors extends ActionFilter
     }
 
     /**
-     * Convert any string (including php headers with HTTP prefix) to header format like :
-     *  * X-PINGOTHER -> X-Pingother
-     *  * X_PINGOTHER -> X-Pingother
+     * Convert any string (including php headers with HTTP prefix) to header format.
+     *
+     * Example:
+     *  - X-PINGOTHER -> X-Pingother
+     *  - X_PINGOTHER -> X-Pingother
      * @param string $string string to convert
      * @return string the result in "header" format
      */
diff --git a/framework/filters/HttpCache.php b/framework/filters/HttpCache.php
index fe22a37..5fc3c8e 100644
--- a/framework/filters/HttpCache.php
+++ b/framework/filters/HttpCache.php
@@ -178,7 +178,7 @@ class HttpCache extends ActionFilter
     }
 
     /**
-     * Sends the cache control header to the client
+     * Sends the cache control header to the client.
      * @see cacheControlHeader
      */
     protected function sendCacheControlHeader()
diff --git a/framework/filters/PageCache.php b/framework/filters/PageCache.php
index 5d756a3..ee8a6e0 100644
--- a/framework/filters/PageCache.php
+++ b/framework/filters/PageCache.php
@@ -338,6 +338,7 @@ class PageCache extends ActionFilter
                 $key[] = $value;
             }
         }
+
         return $key;
     }
 }
diff --git a/framework/filters/RateLimiter.php b/framework/filters/RateLimiter.php
index 481d611..96305b8 100644
--- a/framework/filters/RateLimiter.php
+++ b/framework/filters/RateLimiter.php
@@ -127,7 +127,7 @@ class RateLimiter extends ActionFilter
     }
 
     /**
-     * Adds the rate limit headers to the response
+     * Adds the rate limit headers to the response.
      * @param Response $response
      * @param int $limit the maximum number of allowed requests during a period
      * @param int $remaining the remaining number of allowed requests within the current period
diff --git a/framework/filters/auth/AuthMethod.php b/framework/filters/auth/AuthMethod.php
index 043c648..453f851 100644
--- a/framework/filters/auth/AuthMethod.php
+++ b/framework/filters/auth/AuthMethod.php
@@ -108,6 +108,7 @@ abstract class AuthMethod extends ActionFilter implements AuthInterface
                 return true;
             }
         }
+
         return false;
     }
 }
diff --git a/framework/filters/auth/HttpBasicAuth.php b/framework/filters/auth/HttpBasicAuth.php
index f5f2ef9..c97ea8f 100644
--- a/framework/filters/auth/HttpBasicAuth.php
+++ b/framework/filters/auth/HttpBasicAuth.php
@@ -95,6 +95,7 @@ class HttpBasicAuth extends AuthMethod
                 } else {
                     $this->handleFailure($response);
                 }
+
                 return $identity;
             }
         } elseif ($username !== null) {
@@ -102,6 +103,7 @@ class HttpBasicAuth extends AuthMethod
             if ($identity === null) {
                 $this->handleFailure($response);
             }
+
             return $identity;
         }
 
diff --git a/framework/filters/auth/HttpBearerAuth.php b/framework/filters/auth/HttpBearerAuth.php
index 42335d2..a768437 100644
--- a/framework/filters/auth/HttpBearerAuth.php
+++ b/framework/filters/auth/HttpBearerAuth.php
@@ -45,6 +45,7 @@ class HttpBearerAuth extends AuthMethod
             if ($identity === null) {
                 $this->handleFailure($response);
             }
+
             return $identity;
         }
 
diff --git a/framework/grid/ActionColumn.php b/framework/grid/ActionColumn.php
index 97207a2..b7dc149 100644
--- a/framework/grid/ActionColumn.php
+++ b/framework/grid/ActionColumn.php
@@ -151,7 +151,7 @@ class ActionColumn extends Column
     }
 
     /**
-     * Initializes the default button rendering callback for single button
+     * Initializes the default button rendering callback for single button.
      * @param string $name Button name as it's written in template
      * @param string $iconName The part of Bootstrap glyphicon class that makes it unique
      * @param array $additionalOptions Array of additional options
diff --git a/framework/grid/CheckboxColumn.php b/framework/grid/CheckboxColumn.php
index abfd0db..a26a366 100644
--- a/framework/grid/CheckboxColumn.php
+++ b/framework/grid/CheckboxColumn.php
@@ -131,7 +131,7 @@ class CheckboxColumn extends Column
     }
 
     /**
-     * Returns header checkbox name
+     * Returns header checkbox name.
      * @return string header checkbox name
      * @since 2.0.8
      */
@@ -151,7 +151,7 @@ class CheckboxColumn extends Column
     }
 
     /**
-     * Registers the needed JavaScript
+     * Registers the needed JavaScript.
      * @since 2.0.8
      */
     public function registerClientScript()
diff --git a/framework/grid/Column.php b/framework/grid/Column.php
index 68abb8f..465a855 100644
--- a/framework/grid/Column.php
+++ b/framework/grid/Column.php
@@ -107,6 +107,7 @@ class Column extends BaseObject
         } else {
             $options = $this->contentOptions;
         }
+
         return Html::tag('td', $this->renderDataCellContent($model, $key, $index), $options);
     }
 
diff --git a/framework/grid/DataColumn.php b/framework/grid/DataColumn.php
index 8d21cda..b231ac2 100644
--- a/framework/grid/DataColumn.php
+++ b/framework/grid/DataColumn.php
@@ -147,12 +147,14 @@ class DataColumn extends Column
 
         if ($this->label === null) {
             if ($provider instanceof ActiveDataProvider && $provider->query instanceof ActiveQueryInterface) {
-                /* @var $model Model */
-                $model = new $provider->query->modelClass();
+                /* @var $modelClass Model */
+                $modelClass = $provider->query->modelClass;
+                $model = $modelClass::instance();
                 $label = $model->getAttributeLabel($this->attribute);
             } elseif ($provider instanceof ArrayDataProvider && $provider->modelClass !== null) {
-                /* @var $model Model */
-                $model = new $provider->modelClass();
+                /* @var $modelClass Model */
+                $modelClass = $provider->modelClass;
+                $model = $modelClass::instance();
                 $label = $model->getAttributeLabel($this->attribute);
             } elseif ($this->grid->filterModel !== null && $this->grid->filterModel instanceof Model) {
                 $label = $this->grid->filterModel->getAttributeLabel($this->attribute);
@@ -229,6 +231,7 @@ class DataColumn extends Column
         if ($this->attribute !== null) {
             return ArrayHelper::getValue($model, $this->attribute);
         }
+
         return null;
     }
 
diff --git a/framework/grid/GridView.php b/framework/grid/GridView.php
index fc72983..fc7f07d 100644
--- a/framework/grid/GridView.php
+++ b/framework/grid/GridView.php
@@ -244,7 +244,7 @@ class GridView extends BaseListView
      */
     public $filterErrorOptions = ['class' => 'help-block'];
     /**
-     * @var string the layout that determines how different sections of the list view should be organized.
+     * @var string the layout that determines how different sections of the grid view should be organized.
      * The following tokens will be replaced with the corresponding section contents:
      *
      * - `{summary}`: the summary section. See [[renderSummary()]].
diff --git a/framework/helpers/BaseArrayHelper.php b/framework/helpers/BaseArrayHelper.php
index 2839454..d090cbb 100644
--- a/framework/helpers/BaseArrayHelper.php
+++ b/framework/helpers/BaseArrayHelper.php
@@ -350,6 +350,7 @@ class BaseArrayHelper
                 }
             }
         }
+
         return $result;
     }
 
@@ -754,6 +755,7 @@ class BaseArrayHelper
                     return false;
                 }
             }
+
             return true;
         }
 
diff --git a/framework/helpers/BaseConsole.php b/framework/helpers/BaseConsole.php
index b6d9ae8..7ed17b7 100644
--- a/framework/helpers/BaseConsole.php
+++ b/framework/helpers/BaseConsole.php
@@ -264,7 +264,7 @@ class BaseConsole
     /**
      * Resets any ANSI format set by previous method [[beginAnsiFormat()]]
      * Any output after this will have default text format.
-     * This is equal to calling
+     * This is equal to calling.
      *
      * ```php
      * echo Console::ansiFormatCode([Console::RESET])
@@ -276,7 +276,7 @@ class BaseConsole
     }
 
     /**
-     * Will return a string formatted with the given ANSI style
+     * Will return a string formatted with the given ANSI style.
      *
      * @param string $string the string to be formatted
      * @param array $format An array containing formatting values.
@@ -293,8 +293,9 @@ class BaseConsole
 
     /**
      * Returns the ansi format code for xterm foreground color.
+     *
      * You can pass the return value of this to one of the formatting methods:
-     * [[ansiFormat]], [[ansiFormatCode]], [[beginAnsiFormat]]
+     * [[ansiFormat]], [[ansiFormatCode]], [[beginAnsiFormat]].
      *
      * @param int $colorCode xterm color code
      * @return string
@@ -307,8 +308,9 @@ class BaseConsole
 
     /**
      * Returns the ansi format code for xterm background color.
+     *
      * You can pass the return value of this to one of the formatting methods:
-     * [[ansiFormat]], [[ansiFormatCode]], [[beginAnsiFormat]]
+     * [[ansiFormat]], [[ansiFormatCode]], [[beginAnsiFormat]].
      *
      * @param int $colorCode xterm color code
      * @return string
@@ -320,7 +322,7 @@ class BaseConsole
     }
 
     /**
-     * Strips ANSI control codes from a string
+     * Strips ANSI control codes from a string.
      *
      * @param string $string String to strip
      * @return string
@@ -341,7 +343,7 @@ class BaseConsole
     }
 
     /**
-     * Converts an ANSI formatted string to HTML
+     * Converts an ANSI formatted string to HTML.
      *
      * Note: xTerm 256 bit colors are currently not supported.
      *
@@ -450,11 +452,12 @@ class BaseConsole
             $result .= '</span>';
             $tags--;
         }
+
         return $result;
     }
 
     /**
-     * Converts Markdown to be better readable in console environments by applying some ANSI format
+     * Converts Markdown to be better readable in console environments by applying some ANSI format.
      * @param string $markdown the markdown string.
      * @return string the parsed result as ANSI formatted string.
      */
@@ -465,7 +468,7 @@ class BaseConsole
     }
 
     /**
-     * Converts a string to ansi formatted by replacing patterns like %y (for yellow) with ansi control codes
+     * Converts a string to ansi formatted by replacing patterns like %y (for yellow) with ansi control codes.
      *
      * Uses almost the same syntax as https://github.com/pear/Console_Color2/blob/master/Console/Color2.php
      * The conversion table is: ('bold' meaning 'light' on some
@@ -557,7 +560,7 @@ class BaseConsole
 
     /**
      * Escapes % so they don't get interpreted as color codes when
-     * the string is parsed by [[renderColoredString]]
+     * the string is parsed by [[renderColoredString]].
      *
      * @param string $string String to escape
      *
@@ -586,7 +589,7 @@ class BaseConsole
     }
 
     /**
-     * Returns true if the console is running on windows
+     * Returns true if the console is running on windows.
      * @return bool
      */
     public static function isRunningOnWindows()
@@ -595,7 +598,13 @@ class BaseConsole
     }
 
     /**
-     * Usage: [$width, $height] = ConsoleHelper::getScreenSize();
+     * Returns terminal screen size.
+     *
+     * Usage:
+     *
+     * ```php
+     * [$width, $height] = ConsoleHelper::getScreenSize();
+     * ```
      *
      * @param bool $refresh whether to force checking and not re-use cached size value.
      * This is useful to detect changing window size while the application is running but may
diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php
index 4165336..139364b 100644
--- a/framework/helpers/BaseFileHelper.php
+++ b/framework/helpers/BaseFileHelper.php
@@ -37,6 +37,7 @@ class BaseFileHelper
 
     /**
      * Normalizes a file/directory path.
+     *
      * The normalization does the following work:
      *
      * - Convert all directory separators into `DIRECTORY_SEPARATOR` (e.g. "\a/b\c" becomes "/a/b/c")
@@ -209,6 +210,7 @@ class BaseFileHelper
         if (!isset(self::$_mimeTypes[$magicFile])) {
             self::$_mimeTypes[$magicFile] = require $magicFile;
         }
+
         return self::$_mimeTypes[$magicFile];
     }
 
@@ -729,6 +731,7 @@ class BaseFileHelper
                 }
             }
         }
+
         return $options;
     }
 }
diff --git a/framework/helpers/BaseFormatConverter.php b/framework/helpers/BaseFormatConverter.php
index 01d85aa..de1b6be 100644
--- a/framework/helpers/BaseFormatConverter.php
+++ b/framework/helpers/BaseFormatConverter.php
@@ -128,6 +128,7 @@ class BaseFormatConverter
                 $escaped[$match[0]] = '\\' . implode('\\', preg_split('//u', $match[1], -1, PREG_SPLIT_NO_EMPTY));
             }
         }
+
         return strtr($pattern, array_merge($escaped, [
             '\'\'' => '\\\'', // two single quotes produce one
             'G' => '',      // era designator like (Anno Domini)
@@ -339,6 +340,7 @@ class BaseFormatConverter
                 $escaped[$match] = $match;
             }
         }
+
         return strtr($pattern, array_merge($escaped, [
             'G' => '',      // era designator like (Anno Domini)
             'Y' => '',      // 4digit year of "Week of Year"
diff --git a/framework/helpers/BaseHtml.php b/framework/helpers/BaseHtml.php
index ad835ab..d439da7 100644
--- a/framework/helpers/BaseHtml.php
+++ b/framework/helpers/BaseHtml.php
@@ -167,6 +167,7 @@ class BaseHtml
         if ($name === null || $name === false) {
             return '';
         }
+
         return "<$name" . static::renderTagAttributes($options) . '>';
     }
 
@@ -182,6 +183,7 @@ class BaseHtml
         if ($name === null || $name === false) {
             return '';
         }
+
         return "</$name>";
     }
 
@@ -286,6 +288,7 @@ class BaseHtml
         if (strpos($condition, '!IE') !== false) {
             return "<!--[if $condition]><!-->\n" . $content . "\n<!--<![endif]-->";
         }
+
         return "<!--[if $condition]>\n" . $content . "\n<![endif]-->";
     }
 
@@ -408,6 +411,7 @@ class BaseHtml
         if ($url !== null) {
             $options['href'] = Url::to($url);
         }
+
         return static::tag('a', $text, $options);
     }
 
@@ -457,6 +461,7 @@ class BaseHtml
         if (!isset($options['alt'])) {
             $options['alt'] = '';
         }
+
         return static::tag('img', '', $options);
     }
 
@@ -495,6 +500,7 @@ class BaseHtml
         if (!isset($options['type'])) {
             $options['type'] = 'button';
         }
+
         return static::tag('button', $content, $options);
     }
 
@@ -1237,6 +1243,7 @@ class BaseHtml
         } else {
             $content = '<ul><li>' . implode("</li>\n<li>", $lines) . '</li></ul>';
         }
+
         return Html::tag('div', $header . $content . $footer, $options);
     }
 
@@ -1288,6 +1295,7 @@ class BaseHtml
         if (!array_key_exists('id', $options)) {
             $options['id'] = static::getInputId($model, $attribute);
         }
+
         return static::input($type, $name, $value, $options);
     }
 
@@ -1397,6 +1405,7 @@ class BaseHtml
         if (isset($options['name'])) {
             $hiddenOptions['name'] = $options['name'];
         }
+
         return static::activeHiddenInput($model, $attribute, $hiddenOptions)
             . static::activeInput('file', $model, $attribute, $options);
     }
@@ -1724,6 +1733,7 @@ class BaseHtml
         if (!array_key_exists('id', $options)) {
             $options['id'] = static::getInputId($model, $attribute);
         }
+
         return static::$type($name, $selection, $items, $options);
     }
 
@@ -1870,6 +1880,7 @@ class BaseHtml
 
     /**
      * Adds a CSS class (or several classes) to the specified options.
+     *
      * If the CSS class is already in the options, it will not be added again.
      * If class specification at given options is an array, and some class placed there with the named (string) key,
      * overriding of such key will have no effect. For example:
@@ -1913,6 +1924,7 @@ class BaseHtml
                 $existingClasses[$key] = $class;
             }
         }
+
         return array_unique($existingClasses);
     }
 
@@ -2056,6 +2068,7 @@ class BaseHtml
                 $result[trim($property[0])] = trim($property[1]);
             }
         }
+
         return $result;
     }
 
@@ -2183,7 +2196,7 @@ class BaseHtml
     }
 
     /**
-     * Escapes regular expression to use in JavaScript
+     * Escapes regular expression to use in JavaScript.
      * @param string $regexp the regular expression to be escaped.
      * @return string the escaped result.
      * @since 2.0.6
diff --git a/framework/helpers/BaseHtmlPurifier.php b/framework/helpers/BaseHtmlPurifier.php
index bc6d5af..3c748a0 100644
--- a/framework/helpers/BaseHtmlPurifier.php
+++ b/framework/helpers/BaseHtmlPurifier.php
@@ -18,7 +18,7 @@ namespace yii\helpers;
 class BaseHtmlPurifier
 {
     /**
-     * Passes markup through HTMLPurifier making it safe to output to end user
+     * Passes markup through HTMLPurifier making it safe to output to end user.
      *
      * @param string $content The HTML content to purify
      * @param array|\Closure|null $config The config to use for HtmlPurifier.
diff --git a/framework/helpers/BaseInflector.php b/framework/helpers/BaseInflector.php
index ae6e06b..d3ddfaa 100644
--- a/framework/helpers/BaseInflector.php
+++ b/framework/helpers/BaseInflector.php
@@ -236,10 +236,12 @@ class BaseInflector
         'ÿ' => 'y',
     ];
     /**
-     * Shortcut for `Any-Latin; NFKD` transliteration rule. The rule is strict, letters will be transliterated with
+     * Shortcut for `Any-Latin; NFKD` transliteration rule.
+     *
+     * The rule is strict, letters will be transliterated with
      * the closest sound-representation chars. The result may contain any UTF-8 chars. For example:
      * `获取到 どちら Українська: ґ,є, Српска: ђ, њ, џ! ¿Español?` will be transliterated to
-     * `huò qǔ dào dochira Ukraí̈nsʹka: g̀,ê, Srpska: đ, n̂, d̂! ¿Español?`
+     * `huò qǔ dào dochira Ukraí̈nsʹka: g̀,ê, Srpska: đ, n̂, d̂! ¿Español?`.
      *
      * Used in [[transliterate()]].
      * For detailed information see [unicode normalization forms](http://unicode.org/reports/tr15/#Normalization_Forms_Table)
@@ -249,10 +251,12 @@ class BaseInflector
      */
     const TRANSLITERATE_STRICT = 'Any-Latin; NFKD';
     /**
-     * Shortcut for `Any-Latin; Latin-ASCII` transliteration rule. The rule is medium, letters will be
+     * Shortcut for `Any-Latin; Latin-ASCII` transliteration rule.
+     *
+     * The rule is medium, letters will be
      * transliterated to characters of Latin-1 (ISO 8859-1) ASCII table. For example:
      * `获取到 どちら Українська: ґ,є, Српска: ђ, њ, џ! ¿Español?` will be transliterated to
-     * `huo qu dao dochira Ukrainsʹka: g,e, Srpska: d, n, d! ¿Espanol?`
+     * `huo qu dao dochira Ukrainsʹka: g,e, Srpska: d, n, d! ¿Espanol?`.
      *
      * Used in [[transliterate()]].
      * For detailed information see [unicode normalization forms](http://unicode.org/reports/tr15/#Normalization_Forms_Table)
@@ -262,11 +266,13 @@ class BaseInflector
      */
     const TRANSLITERATE_MEDIUM = 'Any-Latin; Latin-ASCII';
     /**
-     * Shortcut for `Any-Latin; Latin-ASCII; [\u0080-\uffff] remove` transliteration rule. The rule is loose,
+     * Shortcut for `Any-Latin; Latin-ASCII; [\u0080-\uffff] remove` transliteration rule.
+     *
+     * The rule is loose,
      * letters will be transliterated with the characters of Basic Latin Unicode Block.
      * For example:
      * `获取到 どちら Українська: ґ,є, Српска: ђ, њ, џ! ¿Español?` will be transliterated to
-     * `huo qu dao dochira Ukrainska: g,e, Srpska: d, n, d! Espanol?`
+     * `huo qu dao dochira Ukrainska: g,e, Srpska: d, n, d! Espanol?`.
      *
      * Used in [[transliterate()]].
      * For detailed information see [unicode normalization forms](http://unicode.org/reports/tr15/#Normalization_Forms_Table)
@@ -306,7 +312,7 @@ class BaseInflector
     }
 
     /**
-     * Returns the singular of the $word
+     * Returns the singular of the $word.
      * @param string $word the english word to singularize
      * @return string Singular noun.
      */
@@ -340,10 +346,11 @@ class BaseInflector
     }
 
     /**
-     * Returns given word as CamelCased
+     * Returns given word as CamelCased.
+     *
      * Converts a word like "send_email" to "SendEmail". It
      * will remove non alphanumeric character from the word, so
-     * "who's online" will be converted to "WhoSOnline"
+     * "who's online" will be converted to "WhoSOnline".
      * @see variablize()
      * @param string $word the word to CamelCase
      * @return string
@@ -414,7 +421,7 @@ class BaseInflector
     }
 
     /**
-     * Returns a human-readable string from $word
+     * Returns a human-readable string from $word.
      * @param string $word the string to humanize
      * @param bool $ucAll whether to set all words to uppercase or not
      * @return string
@@ -428,9 +435,10 @@ class BaseInflector
 
     /**
      * Same as camelize but first char is in lowercase.
+     *
      * Converts a word like "send_email" to "sendEmail". It
      * will remove non alphanumeric character from the word, so
-     * "who's online" will be converted to "whoSOnline"
+     * "who's online" will be converted to "whoSOnline".
      * @param string $word to lowerCamelCase
      * @return string
      */
@@ -442,8 +450,9 @@ class BaseInflector
     }
 
     /**
-     * Converts a class name to its table name (pluralized)
-     * naming conventions. For example, converts "Person" to "people"
+     * Converts a class name to its table name (pluralized) naming conventions.
+     *
+     * For example, converts "Person" to "people".
      * @param string $className the class name for getting related table_name
      * @return string
      */
@@ -510,7 +519,9 @@ class BaseInflector
     }
 
     /**
-     * Converts a table name to its class name. For example, converts "people" to "Person"
+     * Converts a table name to its class name.
+     *
+     * For example, converts "people" to "Person".
      * @param string $tableName
      * @return string
      */
diff --git a/framework/helpers/BaseJson.php b/framework/helpers/BaseJson.php
index 491cfc4..a17525f 100644
--- a/framework/helpers/BaseJson.php
+++ b/framework/helpers/BaseJson.php
@@ -22,7 +22,7 @@ use yii\web\JsExpression;
 class BaseJson
 {
     /**
-     * List of JSON Error messages assigned to constant names for better handling of version differences
+     * List of JSON Error messages assigned to constant names for better handling of version differences.
      * @var array
      * @since 2.0.7
      */
diff --git a/framework/helpers/BaseStringHelper.php b/framework/helpers/BaseStringHelper.php
index 15b2eb3..52b8a9b 100644
--- a/framework/helpers/BaseStringHelper.php
+++ b/framework/helpers/BaseStringHelper.php
@@ -104,12 +104,15 @@ class BaseStringHelper
      */
     public static function truncate($string, $length, $suffix = '...', $encoding = null, $asHtml = false)
     {
+        if ($encoding === null) {
+            $encoding = Yii::$app ? Yii::$app->charset : 'UTF-8';
+        }
         if ($asHtml) {
-            return static::truncateHtml($string, $length, $suffix, $encoding ?: Yii::$app->charset);
+            return static::truncateHtml($string, $length, $suffix, $encoding);
         }
 
-        if (mb_strlen($string, $encoding ?: Yii::$app->charset) > $length) {
-            return rtrim(mb_substr($string, 0, $length, $encoding ?: Yii::$app->charset)) . $suffix;
+        if (mb_strlen($string, $encoding) > $length) {
+            return rtrim(mb_substr($string, 0, $length, $encoding)) . $suffix;
         }
 
         return $string;
@@ -152,7 +155,9 @@ class BaseStringHelper
     protected static function truncateHtml($string, $count, $suffix, $encoding = false)
     {
         $config = \HTMLPurifier_Config::create(null);
-        $config->set('Cache.SerializerPath', \Yii::$app->getRuntimePath());
+        if (Yii::$app !== null) {
+            $config->set('Cache.SerializerPath', Yii::$app->getRuntimePath());
+        }
         $lexer = \HTMLPurifier_Lexer::create($config);
         $tokens = $lexer->tokenizeHTML($string, $config, new \HTMLPurifier_Context());
         $openTokens = [];
@@ -215,9 +220,10 @@ class BaseStringHelper
         }
         if ($caseSensitive) {
             return strncmp($string, $with, $bytes) === 0;
-        }
 
-        return mb_strtolower(mb_substr($string, 0, $bytes, '8bit'), Yii::$app->charset) === mb_strtolower($with, Yii::$app->charset);
+        }
+        $encoding = Yii::$app ? Yii::$app->charset : 'UTF-8';
+        return mb_strtolower(mb_substr($string, 0, $bytes, '8bit'), $encoding) === mb_strtolower($with, $encoding);
     }
 
     /**
@@ -239,14 +245,16 @@ class BaseStringHelper
             if (static::byteLength($string) < $bytes) {
                 return false;
             }
+
             return substr_compare($string, $with, -$bytes, $bytes) === 0;
         }
 
-        return mb_strtolower(mb_substr($string, -$bytes, mb_strlen($string, '8bit'), '8bit'), Yii::$app->charset) === mb_strtolower($with, Yii::$app->charset);
+        $encoding = Yii::$app ? Yii::$app->charset : 'UTF-8';
+        return mb_strtolower(mb_substr($string, -$bytes, mb_strlen($string, '8bit'), '8bit'), $encoding) === mb_strtolower($with, $encoding);
     }
 
     /**
-     * Explodes string into array, optionally trims values and skips empty ones
+     * Explodes string into array, optionally trims values and skips empty ones.
      *
      * @param string $string String to be exploded.
      * @param string $delimiter Delimiter. Default is ','.
@@ -277,11 +285,12 @@ class BaseStringHelper
                 return $value !== '';
             }));
         }
+
         return $result;
     }
 
     /**
-     * Counts words in a string
+     * Counts words in a string.
      * @since 2.0.8
      *
      * @param string $string
@@ -293,8 +302,8 @@ class BaseStringHelper
     }
 
     /**
-     * Returns string represenation of number value with replaced commas to dots, if decimal point
-     * of current locale is comma
+     * Returns string representation of number value with replaced commas to dots, if decimal point
+     * of current locale is comma.
      * @param int|float|string $value
      * @return string
      * @since 2.0.11
@@ -314,7 +323,7 @@ class BaseStringHelper
     }
 
     /**
-     * Encodes string into "Base 64 Encoding with URL and Filename Safe Alphabet" (RFC 4648)
+     * Encodes string into "Base 64 Encoding with URL and Filename Safe Alphabet" (RFC 4648).
      *
      * > Note: Base 64 padding `=` may be at the end of the returned string.
      * > `=` is not transparent to URL encoding.
@@ -330,7 +339,7 @@ class BaseStringHelper
     }
 
     /**
-     * Decodes "Base 64 Encoding with URL and Filename Safe Alphabet" (RFC 4648)
+     * Decodes "Base 64 Encoding with URL and Filename Safe Alphabet" (RFC 4648).
      *
      * @see https://tools.ietf.org/html/rfc4648#page-7
      * @param string $input encoded string.
diff --git a/framework/helpers/BaseUrl.php b/framework/helpers/BaseUrl.php
index e7de37bf..1738c16 100644
--- a/framework/helpers/BaseUrl.php
+++ b/framework/helpers/BaseUrl.php
@@ -328,6 +328,7 @@ class BaseUrl
 
     /**
      * Returns the canonical URL of the currently requested page.
+     *
      * The canonical URL is constructed using the current controller's [[\yii\web\Controller::route]] and
      * [[\yii\web\Controller::actionParams]]. You may use the following code in the layout view to add a link tag
      * about canonical URL:
diff --git a/framework/helpers/FileHelper.php b/framework/helpers/FileHelper.php
index f1f14d9..9322661 100644
--- a/framework/helpers/FileHelper.php
+++ b/framework/helpers/FileHelper.php
@@ -8,7 +8,7 @@
 namespace yii\helpers;
 
 /**
- * File system helper
+ * File system helper.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alex Makarov <sam@rmcreative.ru>
diff --git a/framework/helpers/Markdown.php b/framework/helpers/Markdown.php
index 9562155..b3ec838 100644
--- a/framework/helpers/Markdown.php
+++ b/framework/helpers/Markdown.php
@@ -22,6 +22,9 @@ namespace yii\helpers;
  *
  * For more details please refer to the [Markdown library documentation](https://github.com/cebe/markdown#readme).
  *
+ * > Note: The Markdown library works with PHPDoc annotations so if you use it together with
+ * > PHP `opcache` make sure [it does not strip comments](http://php.net/manual/en/opcache.configuration.php#ini.opcache.save-comments).
+ *
  * @author Carsten Brandt <mail@cebe.cc>
  * @since 2.0
  */
diff --git a/framework/helpers/StringHelper.php b/framework/helpers/StringHelper.php
index 5ecd390..73960a3 100644
--- a/framework/helpers/StringHelper.php
+++ b/framework/helpers/StringHelper.php
@@ -8,7 +8,7 @@
 namespace yii\helpers;
 
 /**
- * StringHelper
+ * StringHelper.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Alex Makarov <sam@rmcreative.ru>
diff --git a/framework/i18n/Formatter.php b/framework/i18n/Formatter.php
index c0d7321..41871f7 100644
--- a/framework/i18n/Formatter.php
+++ b/framework/i18n/Formatter.php
@@ -48,6 +48,31 @@ use yii\helpers\HtmlPurifier;
 class Formatter extends Component
 {
     /**
+     * @since 2.0.13
+     */
+    const UNIT_SYSTEM_METRIC = 'metric';
+    /**
+     * @since 2.0.13
+     */
+    const UNIT_SYSTEM_IMPERIAL = 'imperial';
+    /**
+     * @since 2.0.13
+     */
+    const FORMAT_WIDTH_LONG = 'long';
+    /**
+     * @since 2.0.13
+     */
+    const FORMAT_WIDTH_SHORT = 'short';
+    /**
+     * @since 2.0.13
+     */
+    const UNIT_LENGTH = 'length';
+    /**
+     * @since 2.0.13
+     */
+    const UNIT_WEIGHT = 'mass';
+
+    /**
      * @var string the text to be displayed when formatting a `null` value.
      * Defaults to `'<span class="not-set">(not set)</span>'`, where `(not set)`
      * will be translated according to [[locale]].
@@ -254,11 +279,95 @@ class Formatter extends Component
      * Defaults to 1024.
      */
     public $sizeFormatBase = 1024;
+    /**
+     * @var string default system of measure units. Defaults to [[UNIT_SYSTEM_METRIC]].
+     * Possible values:
+     *  - [[UNIT_SYSTEM_METRIC]]
+     *  - [[UNIT_SYSTEM_IMPERIAL]]
+     *
+     * @see asLength
+     * @see asWeight
+     * @since 2.0.13
+     */
+    public $systemOfUnits = self::UNIT_SYSTEM_METRIC;
+    /**
+     * @var array configuration of weight and length measurement units.
+     * This array contains the most usable measurement units, but you can change it
+     * in case you have some special requirements.
+     *
+     * For example, you can add smaller measure unit:
+     *
+     * ```php
+     * $this->measureUnits[self::UNIT_LENGTH][self::UNIT_SYSTEM_METRIC] = [
+     *     'nanometer' => 0.000001
+     * ]
+     * ```
+     * @see asLength
+     * @see asWeight
+     * @since 2.0.13
+     */
+    public $measureUnits = [
+        self::UNIT_LENGTH => [
+            self::UNIT_SYSTEM_IMPERIAL => [
+                'inch' => 1,
+                'foot' => 12,
+                'yard' => 36,
+                'chain' => 792,
+                'furlong' => 7920,
+                'mile' => 63360,
+            ],
+            self::UNIT_SYSTEM_METRIC => [
+                'millimeter' => 1,
+                'centimeter' => 10,
+                'meter' => 1000,
+                'kilometer' => 1000000,
+            ],
+        ],
+        self::UNIT_WEIGHT => [
+            self::UNIT_SYSTEM_IMPERIAL => [
+                'grain' => 1,
+                'drachm' => 27.34375,
+                'ounce' => 437.5,
+                'pound' => 7000,
+                'stone' => 98000,
+                'quarter' => 196000,
+                'hundredweight' => 784000,
+                'ton' => 15680000,
+            ],
+            self::UNIT_SYSTEM_METRIC => [
+                'gram' => 1,
+                'kilogram' => 1000,
+                'ton' => 1000000,
+            ],
+        ],
+    ];
+    /**
+     * @var array The base units that are used as multipliers for smallest possible unit from [[measureUnits]].
+     * @since 2.0.13
+     */
+    public $baseUnits = [
+        self::UNIT_LENGTH => [
+            self::UNIT_SYSTEM_IMPERIAL => 12, // 1 feet = 12 inches
+            self::UNIT_SYSTEM_METRIC => 1000, // 1 meter = 1000 millimeters
+        ],
+        self::UNIT_WEIGHT => [
+            self::UNIT_SYSTEM_IMPERIAL => 7000, // 1 pound = 7000 grains
+            self::UNIT_SYSTEM_METRIC => 1000, // 1 kilogram = 1000 grams
+        ],
+    ];
 
     /**
      * @var bool whether the [PHP intl extension](http://php.net/manual/en/book.intl.php) is loaded.
      */
     private $_intlLoaded = false;
+    /**
+     * @var \ResourceBundle cached ResourceBundle object used to read unit translations
+     */
+    private $_resourceBundle;
+    /**
+     * @var array cached unit translation patterns
+     */
+    private $_unitMessages = [];
 
 
     /**
@@ -509,6 +618,7 @@ class Formatter extends Component
         if ($format === null) {
             $format = $this->dateFormat;
         }
+
         return $this->formatDateTimeValue($value, $format, 'date');
     }
 
@@ -536,7 +646,7 @@ class Formatter extends Component
      * PHP [date()](http://php.net/manual/en/function.date.php)-function.
      *
      * @return string the formatted result.
-     * @throws InvalidArgumentException if the input value can not be evaluated as a date value.
+     * @throws InvalidParamException if the input value can not be evaluated as a date value.
      * @throws InvalidConfigException if the date format is invalid.
      * @see timeFormat
      */
@@ -545,6 +655,7 @@ class Formatter extends Component
         if ($format === null) {
             $format = $this->timeFormat;
         }
+
         return $this->formatDateTimeValue($value, $format, 'time');
     }
 
@@ -563,7 +674,7 @@ class Formatter extends Component
      * If no timezone conversion should be performed, you need to set [[defaultTimeZone]] and [[timeZone]] to the same value.
      *
      * @param string $format the format used to convert the value into a date string.
-     * If null, [[dateFormat]] will be used.
+     * If null, [[datetimeFormat]] will be used.
      *
      * This can be "short", "medium", "long", or "full", which represents a preset format of different lengths.
      * It can also be a custom format as specified in the [ICU manual](http://userguide.icu-project.org/formatparse/datetime).
@@ -581,6 +692,7 @@ class Formatter extends Component
         if ($format === null) {
             $format = $this->datetimeFormat;
         }
+
         return $this->formatDateTimeValue($value, $format, 'datetime');
     }
 
@@ -613,7 +725,7 @@ class Formatter extends Component
         $timeZone = $this->timeZone;
         // avoid time zone conversion for date-only and time-only values
         if ($type === 'date' || $type === 'time') {
-            [$timestamp, $hasTimeInfo, $hasDateInfo] = $this->normalizeDatetimeValue($value, true);
+            list($timestamp, $hasTimeInfo, $hasDateInfo) = $this->normalizeDatetimeValue($value, true);
             if ($type === 'date' && !$hasTimeInfo || $type === 'time' && !$hasDateInfo) {
                 $timeZone = $this->defaultTimeZone;
             }
@@ -648,6 +760,7 @@ class Formatter extends Component
             if ($timestamp instanceof \DateTimeImmutable) {
                 $timestamp = new DateTime($timestamp->format(DateTime::ISO8601), $timestamp->getTimezone());
             }
+
             return $formatter->format($timestamp);
         }
 
@@ -689,7 +802,7 @@ class Formatter extends Component
      * the timestamp has time information or it is just a date value.
      * Since version 2.0.12 the array has third boolean element indicating whether the timestamp has date information
      * or it is just a time value.
-     * @throws InvalidArgumentException if the input value can not be evaluated as a date value.
+     * @throws InvalidParamException if the input value can not be evaluated as a date value.
      */
     protected function normalizeDatetimeValue($value, $checkDateTimeInfo = false)
     {
@@ -705,7 +818,7 @@ class Formatter extends Component
             if (is_numeric($value)) { // process as unix timestamp, which is always in UTC
                 $timestamp = new DateTime('@' . (int) $value, new DateTimeZone('UTC'));
                 return $checkDateTimeInfo ? [$timestamp, true, true] : $timestamp;
-            } elseif (($timestamp = DateTime::createFromFormat('Y-m-d', $value, new DateTimeZone($this->defaultTimeZone))) !== false) { // try Y-m-d format (support invalid dates like 2012-13-01)
+            } elseif (($timestamp = DateTime::createFromFormat('Y-m-d|', $value, new DateTimeZone($this->defaultTimeZone))) !== false) { // try Y-m-d format (support invalid dates like 2012-13-01)
                 return $checkDateTimeInfo ? [$timestamp, false, true] : $timestamp;
             } elseif (($timestamp = DateTime::createFromFormat('Y-m-d H:i:s', $value, new DateTimeZone($this->defaultTimeZone))) !== false) { // try Y-m-d H:i:s format (support invalid dates like 2012-13-01 12:63:12)
                 return $checkDateTimeInfo ? [$timestamp, true, true] : $timestamp;
@@ -1027,6 +1140,7 @@ class Formatter extends Component
                 throw new InvalidArgumentException('Formatting percent value failed: ' . $f->getErrorCode() . ' '
                     . $f->getErrorMessage());
             }
+
             return $result;
         }
 
@@ -1052,7 +1166,7 @@ class Formatter extends Component
      * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
      * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
      * @return string the formatted result.
-     * @throws InvalidArgumentException if the input value is not numeric or the formatting failed.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
      */
     public function asScientific($value, $decimals = null, $options = [], $textOptions = [])
     {
@@ -1064,8 +1178,7 @@ class Formatter extends Component
         if ($this->_intlLoaded) {
             $f = $this->createNumberFormatter(NumberFormatter::SCIENTIFIC, $decimals, $options, $textOptions);
             if (($result = $f->format($value)) === false) {
-                throw new InvalidArgumentException('Formatting scientific number value failed: ' . $f->getErrorCode()
-                    . ' ' . $f->getErrorMessage());
+                throw new InvalidParamException('Formatting scientific number value failed: ' . $f->getErrorCode() . ' ' . $f->getErrorMessage());
             }
 
             return $result;
@@ -1090,7 +1203,7 @@ class Formatter extends Component
      * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
      * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
      * @return string the formatted result.
-     * @throws InvalidArgumentException if the input value is not numeric or the formatting failed.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
      * @throws InvalidConfigException if no currency is given and [[currencyCode]] is not defined.
      */
     public function asCurrency($value, $currency = null, $options = [], $textOptions = [])
@@ -1114,7 +1227,7 @@ class Formatter extends Component
                 $result = $formatter->formatCurrency($value, $currency);
             }
             if ($result === false) {
-                throw new InvalidArgumentException('Formatting currency value failed: ' . $formatter->getErrorCode() . ' ' . $formatter->getErrorMessage());
+                throw new InvalidParamException('Formatting currency value failed: ' . $formatter->getErrorCode() . ' ' . $formatter->getErrorMessage());
             }
 
             return $result;
@@ -1137,7 +1250,7 @@ class Formatter extends Component
      *
      * @param mixed $value the value to be formatted
      * @return string the formatted result.
-     * @throws InvalidArgumentException if the input value is not numeric or the formatting failed.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
      * @throws InvalidConfigException when the [PHP intl extension](http://php.net/manual/en/book.intl.php) is not available.
      */
     public function asSpellout($value)
@@ -1149,8 +1262,7 @@ class Formatter extends Component
         if ($this->_intlLoaded) {
             $f = $this->createNumberFormatter(NumberFormatter::SPELLOUT);
             if (($result = $f->format($value)) === false) {
-                throw new InvalidArgumentException('Formatting number as spellout failed: ' . $f->getErrorCode() . ' '
-                    . $f->getErrorMessage());
+                throw new InvalidParamException('Formatting number as spellout failed: ' . $f->getErrorCode() . ' ' . $f->getErrorMessage());
             }
 
             return $result;
@@ -1166,7 +1278,7 @@ class Formatter extends Component
      *
      * @param mixed $value the value to be formatted
      * @return string the formatted result.
-     * @throws InvalidArgumentException if the input value is not numeric or the formatting failed.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
      * @throws InvalidConfigException when the [PHP intl extension](http://php.net/manual/en/book.intl.php) is not available.
      */
     public function asOrdinal($value)
@@ -1178,8 +1290,7 @@ class Formatter extends Component
         if ($this->_intlLoaded) {
             $f = $this->createNumberFormatter(NumberFormatter::ORDINAL);
             if (($result = $f->format($value)) === false) {
-                throw new InvalidArgumentException('Formatting number as ordinal failed: ' . $f->getErrorCode() . ' '
-                    . $f->getErrorMessage());
+                throw new InvalidParamException('Formatting number as ordinal failed: ' . $f->getErrorCode() . ' ' . $f->getErrorMessage());
             }
 
             return $result;
@@ -1201,7 +1312,7 @@ class Formatter extends Component
      * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
      * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
      * @return string the formatted result.
-     * @throws InvalidArgumentException if the input value is not numeric or the formatting failed.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
      * @see sizeFormatBase
      * @see asSize
      */
@@ -1211,7 +1322,7 @@ class Formatter extends Component
             return $this->nullDisplay;
         }
 
-        [$params, $position] = $this->formatSizeNumber($value, $decimals, $options, $textOptions);
+        [$params, $position] = $this->formatNumber($value, $decimals, 4, $this->sizeFormatBase, $options, $textOptions);
 
         if ($this->sizeFormatBase == 1024) {
             switch ($position) {
@@ -1267,7 +1378,7 @@ class Formatter extends Component
             return $this->nullDisplay;
         }
 
-        [$params, $position] = $this->formatSizeNumber($value, $decimals, $options, $textOptions);
+        [$params, $position] = $this->formatNumber($value, $decimals, 4, $this->sizeFormatBase, $options, $textOptions);
 
         if ($this->sizeFormatBase == 1024) {
             switch ($position) {
@@ -1302,31 +1413,215 @@ class Formatter extends Component
         }
     }
 
+    /**
+     * Formats the value as a length in human readable form for example `12 meters`.
+     * Check properties [[baseUnits]] if you need to change unit of value as the multiplier
+     * of the smallest unit and [[systemOfUnits]] to switch between [[UNIT_SYSTEM_METRIC]] or [[UNIT_SYSTEM_IMPERIAL]].
+     *
+     * @param float|int $value value to be formatted.
+     * @param int $decimals the number of digits after the decimal point.
+     * @param array $numberOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
+     * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
+     * @return string the formatted result.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
+     * @throws InvalidConfigException when INTL is not installed or does not contain required information.
+     * @see asLength
+     * @since 2.0.13
+     * @author John Was <janek.jan@gmail.com>
+     */
+    public function asLength($value, $decimals = null, $numberOptions = [], $textOptions = [])
+    {
+        return $this->formatUnit(self::UNIT_LENGTH, self::FORMAT_WIDTH_LONG, $value, null, null, $decimals, $numberOptions, $textOptions);
+    }
+
+    /**
+     * Formats the value as a length in human readable form for example `12 m`.
+     * This is the short form of [[asLength]].
+     *
+     * Check properties [[baseUnits]] if you need to change unit of value as the multiplier
+     * of the smallest unit and [[systemOfUnits]] to switch between [[UNIT_SYSTEM_METRIC]] or [[UNIT_SYSTEM_IMPERIAL]].
+     *
+     * @param float|int $value value to be formatted.
+     * @param int $decimals the number of digits after the decimal point.
+     * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
+     * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
+     * @return string the formatted result.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
+     * @throws InvalidConfigException when INTL is not installed or does not contain required information.
+     * @see asLength
+     * @since 2.0.13
+     * @author John Was <janek.jan@gmail.com>
+     */
+    public function asShortLength($value, $decimals = null, $options = [], $textOptions = [])
+    {
+        return $this->formatUnit(self::UNIT_LENGTH, self::FORMAT_WIDTH_SHORT, $value, null, null, $decimals, $options, $textOptions);
+    }
+
+    /**
+     * Formats the value as a weight in human readable form for example `12 kilograms`.
+     * Check properties [[baseUnits]] if you need to change unit of value as the multiplier
+     * of the smallest unit and [[systemOfUnits]] to switch between [[UNIT_SYSTEM_METRIC]] or [[UNIT_SYSTEM_IMPERIAL]].
+     *
+     * @param float|int $value value to be formatted.
+     * @param int $decimals the number of digits after the decimal point.
+     * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
+     * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
+     * @return string the formatted result.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
+     * @throws InvalidConfigException when INTL is not installed or does not contain required information.
+     * @since 2.0.13
+     * @author John Was <janek.jan@gmail.com>
+     */
+    public function asWeight($value, $decimals = null, $options = [], $textOptions = [])
+    {
+        return $this->formatUnit(self::UNIT_WEIGHT, self::FORMAT_WIDTH_LONG, $value, null, null, $decimals, $options, $textOptions);
+    }
+
+    /**
+     * Formats the value as a weight in human readable form for example `12 kg`.
+     * This is the short form of [[asWeight]].
+     *
+     * Check properties [[baseUnits]] if you need to change unit of value as the multiplier
+     * of the smallest unit and [[systemOfUnits]] to switch between [[UNIT_SYSTEM_METRIC]] or [[UNIT_SYSTEM_IMPERIAL]].
+     *
+     * @param float|int $value value to be formatted.
+     * @param int $decimals the number of digits after the decimal point.
+     * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
+     * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
+     * @return string the formatted result.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
+     * @throws InvalidConfigException when INTL is not installed or does not contain required information.
+     * @since 2.0.13
+     * @author John Was <janek.jan@gmail.com>
+     */
+    public function asShortWeight($value, $decimals = null, $options = [], $textOptions = [])
+    {
+        return $this->formatUnit(self::UNIT_WEIGHT, self::FORMAT_WIDTH_SHORT, $value, null, null, $decimals, $options, $textOptions);
+    }
+
+    /**
+     * @param string $unitType one of [[UNIT_WEIGHT]], [[UNIT_LENGTH]]
+     * @param string $unitFormat one of [[FORMAT_WIDTH_SHORT]], [[FORMAT_WIDTH_LONG]]
+     * @param float|int $value to be formatted
+     * @param float $baseUnit unit of value as the multiplier of the smallest unit. When `null`, property [[baseUnits]]
+     * will be used to determine base unit using $unitType and $unitSystem.
+     * @param string $unitSystem either [[UNIT_SYSTEM_METRIC]] or [[UNIT_SYSTEM_IMPERIAL]]. When `null`, property [[systemOfUnits]] will be used.
+     * @param int $decimals the number of digits after the decimal point.
+     * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
+     * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
+     * @return string
+     * @throws InvalidConfigException when INTL is not installed or does not contain required information
+     */
+    private function formatUnit($unitType, $unitFormat, $value, $baseUnit, $unitSystem, $decimals, $options, $textOptions)
+    {
+        if ($value === null) {
+            return $this->nullDisplay;
+        }
+        if ($unitSystem === null) {
+            $unitSystem = $this->systemOfUnits;
+        }
+        if ($baseUnit === null) {
+            $baseUnit = $this->baseUnits[$unitType][$unitSystem];
+        }
+
+        $multipliers = array_values($this->measureUnits[$unitType][$unitSystem]);
+
+        list($params, $position) = $this->formatNumber($value * $baseUnit, $decimals, null, $multipliers, $options, $textOptions);
+
+        $message = $this->getUnitMessage($unitType, $unitFormat, $unitSystem, $position);
+
+        return (new \MessageFormatter($this->locale, $message))->format([
+            '0' => $params['nFormatted'],
+            'n' => $params['n'],
+        ]);
+    }
+
+    /**
+     * @param string $unitType one of [[UNIT_WEIGHT]], [[UNIT_LENGTH]]
+     * @param string $unitFormat one of [[FORMAT_WIDTH_SHORT]], [[FORMAT_WIDTH_LONG]]
+     * @param string $system either [[UNIT_SYSTEM_METRIC]] or [[UNIT_SYSTEM_IMPERIAL]]. When `null`, property [[systemOfUnits]] will be used.
+     * @param int $position internal position of size unit
+     * @return string
+     * @throws InvalidConfigException when INTL is not installed or does not contain required information
+     */
+    private function getUnitMessage($unitType, $unitFormat, $system, $position)
+    {
+        if (isset($this->_unitMessages[$unitType][$system][$position])) {
+            return $this->_unitMessages[$unitType][$system][$position];
+        }
+        if (!$this->_intlLoaded) {
+            throw new InvalidConfigException('Format of ' . $unitType . ' is only supported when PHP intl extension is installed.');
+        }
+
+        if ($this->_resourceBundle === null) {
+            try {
+                $this->_resourceBundle = new \ResourceBundle($this->locale, 'ICUDATA-unit');
+            } catch (\IntlException $e) {
+                throw new InvalidConfigException('Current ICU data does not contain information about measure units. Check system requirements.');
+            }
+        }
+        $unitNames = array_keys($this->measureUnits[$unitType][$system]);
+        $bundleKey = 'units' . ($unitFormat === self::FORMAT_WIDTH_SHORT ? 'Short' : '');
+
+        $unitBundle = $this->_resourceBundle[$bundleKey][$unitType][$unitNames[$position]];
+        if ($unitBundle === null) {
+            throw new InvalidConfigException('Current ICU data version does not contain information about unit type "' . $unitType . '" and unit measure "' . $unitNames[$position] . '". Check system requirements.');
+        }
+
+        $message = [];
+        foreach ($unitBundle as $key => $value) {
+            if ($key === 'dnam') {
+                continue;
+            }
+            $message[] = "$key{{$value}}";
+        }
+
+        return $this->_unitMessages[$unitType][$system][$position] = '{n, plural, ' . implode(' ', $message) . '}';
+    }
 
     /**
      * Given the value in bytes formats number part of the human readable form.
      *
      * @param string|int|float $value value in bytes to be formatted.
      * @param int $decimals the number of digits after the decimal point
+     * @param int $maxPosition maximum internal position of size unit, ignored if $formatBase is an array
+     * @param array|int $formatBase the base at which each next unit is calculated, either 1000 or 1024, or an array
      * @param array $options optional configuration for the number formatter. This parameter will be merged with [[numberFormatterOptions]].
      * @param array $textOptions optional configuration for the number formatter. This parameter will be merged with [[numberFormatterTextOptions]].
      * @return array [parameters for Yii::t containing formatted number, internal position of size unit]
-     * @throws InvalidArgumentException if the input value is not numeric or the formatting failed.
+     * @throws InvalidParamException if the input value is not numeric or the formatting failed.
      */
-    private function formatSizeNumber($value, $decimals, $options, $textOptions)
+    private function formatNumber($value, $decimals, $maxPosition, $formatBase, $options, $textOptions)
     {
         $value = $this->normalizeNumericValue($value);
 
         $position = 0;
+        if (is_array($formatBase)) {
+            $maxPosition = count($formatBase) - 1;
+        }
         do {
-            if (abs($value) < $this->sizeFormatBase) {
-                break;
+            if (is_array($formatBase)) {
+                if (!isset($formatBase[$position + 1])) {
+                    break;
+                }
+
+                if (abs($value) < $formatBase[$position + 1]) {
+                    break;
+                }
+            } else {
+                if (abs($value) < $formatBase) {
+                    break;
+                }
+                $value = $value / $formatBase;
             }
-            $value /= $this->sizeFormatBase;
             $position++;
-        } while ($position < 5);
+        } while ($position < $maxPosition + 1);
 
-        // no decimals for bytes
+        if (is_array($formatBase) && $position !== 0) {
+            $value /= $formatBase[$position];
+        }
+
+        // no decimals for smallest unit
         if ($position === 0) {
             $decimals = 0;
         } elseif ($decimals !== null) {
@@ -1335,7 +1630,7 @@ class Formatter extends Component
         // disable grouping for edge cases like 1023 to get 1023 B instead of 1,023 B
         $oldThousandSeparator = $this->thousandSeparator;
         $this->thousandSeparator = '';
-        if ($this->_intlLoaded) {
+        if ($this->_intlLoaded && !isset($options[NumberFormatter::GROUPING_USED])) {
             $options[NumberFormatter::GROUPING_USED] = false;
         }
         // format the size value
@@ -1353,7 +1648,7 @@ class Formatter extends Component
     }
 
     /**
-     * Normalizes a numeric input value
+     * Normalizes a numeric input value.
      *
      * - everything [empty](http://php.net/manual/en/function.empty.php) will result in `0`
      * - a [numeric](http://php.net/manual/en/function.is-numeric.php) string will be casted to float
@@ -1375,6 +1670,7 @@ class Formatter extends Component
         if (!is_numeric($value)) {
             throw new InvalidArgumentException("'$value' is not a numeric value.");
         }
+
         return $value;
     }
 
diff --git a/framework/i18n/MessageFormatter.php b/framework/i18n/MessageFormatter.php
index 3484466..60fe60a 100644
--- a/framework/i18n/MessageFormatter.php
+++ b/framework/i18n/MessageFormatter.php
@@ -12,7 +12,7 @@ use yii\base\Component;
 use yii\base\NotSupportedException;
 
 /**
- * MessageFormatter allows formatting messages via [ICU message format](http://userguide.icu-project.org/formatparse/messages)
+ * MessageFormatter allows formatting messages via [ICU message format](http://userguide.icu-project.org/formatparse/messages).
  *
  * This class enhances the message formatter class provided by the PHP intl extension.
  *
@@ -50,7 +50,7 @@ class MessageFormatter extends Component
 
 
     /**
-     * Get the error code from the last operation
+     * Get the error code from the last operation.
      * @link http://php.net/manual/en/messageformatter.geterrorcode.php
      * @return string Code of the last error.
      */
@@ -60,7 +60,7 @@ class MessageFormatter extends Component
     }
 
     /**
-     * Get the error text from the last operation
+     * Get the error text from the last operation.
      * @link http://php.net/manual/en/messageformatter.geterrormessage.php
      * @return string Description of the last error.
      */
@@ -70,7 +70,7 @@ class MessageFormatter extends Component
     }
 
     /**
-     * Formats a message via [ICU message format](http://userguide.icu-project.org/formatparse/messages)
+     * Formats a message via [ICU message format](http://userguide.icu-project.org/formatparse/messages).
      *
      * It uses the PHP intl extension's [MessageFormatter](http://www.php.net/manual/en/class.messageformatter.php)
      * and works around some issues.
@@ -250,7 +250,7 @@ class MessageFormatter extends Component
     }
 
     /**
-     * Fallback implementation for MessageFormatter::formatMessage
+     * Fallback implementation for MessageFormatter::formatMessage.
      * @param string $pattern The pattern string to insert things into.
      * @param array $args The array of values to insert into the format string
      * @param string $locale The locale to use for formatting locale-dependent parts
@@ -279,7 +279,7 @@ class MessageFormatter extends Component
     }
 
     /**
-     * Tokenizes a pattern by separating normal text from replaceable patterns
+     * Tokenizes a pattern by separating normal text from replaceable patterns.
      * @param string $pattern patter to tokenize
      * @return array|bool array of tokens or false on failure
      */
@@ -322,7 +322,7 @@ class MessageFormatter extends Component
     }
 
     /**
-     * Parses a token
+     * Parses a token.
      * @param array $token the token to parse
      * @param array $args arguments to replace
      * @param string $locale the locale
@@ -358,6 +358,7 @@ class MessageFormatter extends Component
                         // add decimals with unknown length
                         $number .= '.' . substr($arg, $pos + 1);
                     }
+
                     return $number;
                 }
                 throw new NotSupportedException("Message format 'number' is only supported for integer values. You have to install PHP intl extension to use this feature.");
diff --git a/framework/log/SyslogTarget.php b/framework/log/SyslogTarget.php
index 20a72db..f820708 100644
--- a/framework/log/SyslogTarget.php
+++ b/framework/log/SyslogTarget.php
@@ -61,7 +61,7 @@ class SyslogTarget extends Target
     }
 
     /**
-     * Writes log messages to syslog
+     * Writes log messages to syslog.
      */
     public function export()
     {
diff --git a/framework/log/Target.php b/framework/log/Target.php
index 09bfc4a..d417dcf 100644
--- a/framework/log/Target.php
+++ b/framework/log/Target.php
@@ -27,16 +27,14 @@ use yii\web\Request;
  *
  * For more details and usage information on Target, see the [guide article on logging & targets](guide:runtime-logging).
  *
+ * @property bool $enabled Whether to enable this log target. Defaults to true.
+ * 
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
 abstract class Target extends Component
 {
     /**
-     * @var bool whether to enable this log target. Defaults to true.
-     */
-    public $enabled = true;
-    /**
      * @var array list of message categories that this target is interested in. Defaults to empty, meaning all categories.
      * You can use an asterisk at the end of a category so that the category may be used to
      * match those categories sharing the same common prefix. For example, 'yii\db\*' will match
@@ -105,6 +103,11 @@ abstract class Target extends Component
      */
     public $messages = [];
 
+    /**
+     * @var bool
+     */
+    private $_enabled = true;
+
 
     /**
      * Exports log [[messages]] to a specific destination.
@@ -150,6 +153,7 @@ abstract class Target extends Component
         foreach ($context as $key => $value) {
             $result[] = "\${$key} = " . VarDumper::dumpAsString($value);
         }
+
         return implode("\n\n", $result);
     }
 
@@ -192,6 +196,7 @@ abstract class Target extends Component
                 unset($messages[$i]);
             }
         }
+
         return $messages;
     }
 
@@ -254,4 +259,38 @@ abstract class Target extends Component
 
         return "[$ip][$userID][$sessionID]";
     }
+
+    /**
+     * Sets a value indicating whether this log target is enabled.
+     * @param bool|callable $value a boolean value or a callable to obtain the value from.
+     * The callable value is available since version 2.0.13.
+     *
+     * A callable may be used to determine whether the log target should be enabled in a dynamic way.
+     * For example, to only enable a log if the current user is logged in you can configure the target
+     * as follows:
+     *
+     * ```php
+     * 'enabled' => function() {
+     *     return !Yii::$app->user->isGuest;
+     * }
+     * ```
+     */
+    public function setEnabled($value)
+    {
+        $this->_enabled = $value;
+    }
+
+    /**
+     * Check whether the log target is enabled.
+     * @property Indicates whether this log target is enabled. Defaults to true.
+     * @return bool A value indicating whether this log target is enabled.
+     */
+    public function getEnabled()
+    {
+        if (is_callable($this->_enabled)) {
+            return call_user_func($this->_enabled, $this);
+        }
+
+        return $this->_enabled;
+    }
 }
diff --git a/framework/log/migrations/m141106_185632_log_init.php b/framework/log/migrations/m141106_185632_log_init.php
index b5eaee5..7cda022 100644
--- a/framework/log/migrations/m141106_185632_log_init.php
+++ b/framework/log/migrations/m141106_185632_log_init.php
@@ -57,6 +57,7 @@ class m141106_185632_log_init extends Migration
                 throw new InvalidConfigException('You should configure "log" component to use one or more database targets before executing this migration.');
             }
         }
+
         return $this->dbTargets;
     }
 
diff --git a/framework/mail/BaseMailer.php b/framework/mail/BaseMailer.php
index 754dae8..f267934 100644
--- a/framework/mail/BaseMailer.php
+++ b/framework/mail/BaseMailer.php
@@ -214,6 +214,24 @@ abstract class BaseMailer extends Component implements MailerInterface
     }
 
     /**
+     * Renders the specified view with optional parameters and layout.
+     * The view will be rendered using the [[view]] component.
+     * @param string $view the view name or the [path alias](guide:concept-aliases) of the view file.
+     * @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file.
+     * @param string|bool $layout layout view name or [path alias](guide:concept-aliases). If false, no layout will be applied.
+     * @return string the rendering result.
+     */
+    public function render($view, $params = [], $layout = false)
+    {
+        $output = $this->getView()->render($view, $params, $this);
+        if ($layout !== false) {
+            return $this->getView()->render($layout, ['content' => $output, 'message' => $this->_message], $this);
+        }
+
+        return $output;
+    }
+
+    /**
      * Sends the specified message.
      * This method should be implemented by child classes with the actual email sending logic.
      * @param MessageInterface $message the message to be sent
diff --git a/framework/mail/BaseMessage.php b/framework/mail/BaseMessage.php
index b0500c1..9e47eb4 100644
--- a/framework/mail/BaseMessage.php
+++ b/framework/mail/BaseMessage.php
@@ -45,6 +45,7 @@ abstract class BaseMessage extends BaseObject implements MessageInterface
         } elseif ($mailer === null) {
             $mailer = $this->mailer;
         }
+
         return $mailer->send($this);
     }
 
diff --git a/framework/messages/bg/yii.php b/framework/messages/bg/yii.php
index 1ccb2df..b4b0e23 100644
--- a/framework/messages/bg/yii.php
+++ b/framework/messages/bg/yii.php
@@ -80,6 +80,7 @@ return [
   '{attribute} must be a string.' => 'Полето "{attribute}" трябва да съдържа текст.',
   '{attribute} must be an integer.' => 'Полето "{attribute}" трябва да съдържа цяло число.',
   '{attribute} must be either "{true}" or "{false}".' => 'Полето "{attribute}"  трябва да бъде "{true}" или "{false}".',
+  '{attribute} must be equal to "{compareValueOrAttribute}".' => '"{attribute}" трябва да е равно на "{compareValueOrAttribute}".',
   '{attribute} must be greater than "{compareValue}".' => 'Полето "{attribute}" трябва да е по-голямо от "{compareValue}".',
   '{attribute} must be greater than or equal to "{compareValue}".' => 'Полето "{attribute}" трябва да е по-големо или равно на «{compareValue}».',
   '{attribute} must be less than "{compareValue}".' => 'Полето "{attribute}" трябва да е по-малко от "{compareValue}".',
diff --git a/framework/messages/cs/yii.php b/framework/messages/cs/yii.php
index 352eb43..0906491 100644
--- a/framework/messages/cs/yii.php
+++ b/framework/messages/cs/yii.php
@@ -23,6 +23,41 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
+    ' and ' => ' a ',
+    'Powered by {yii}' => 'Běží na {yii}',
+    'The combination {values} of {attributes} has already been taken.' => 'Kombinace {values} pro {attributes} je již použitá.',
+    'Unknown alias: -{name}' => 'Neznámý alias: -{name}',
+    'Yii Framework' => 'Yii Framework',
+    '{attribute} contains wrong subnet mask.' => '{attribute} obsahuje neplatnou masku podsítě.',
+    '{attribute} is not in the allowed range.' => '{attribute} není v povoleném rozsahu.',
+    '{attribute} must be a valid IP address.' => '{attribute} musí být platná IP adresa.',
+    '{attribute} must be an IP address with specified subnet.' => '{attribute} musí být IP adresa se zadanou podsítí.',
+    '{attribute} must be equal to "{compareValueOrAttribute}".' => '{attribute} se musí rovnat "{compareValueOrAttribute}".',
+    '{attribute} must be greater than "{compareValueOrAttribute}".' => '{attribute} musí být větší než "{compareValueOrAttribute}".',
+    '{attribute} must be greater than or equal to "{compareValueOrAttribute}".' => '{attribute} musí být větší nebo roven "{compareValueOrAttribute}".',
+    '{attribute} must be less than "{compareValueOrAttribute}".' => '{attribute} musí být menší než "{compareValueOrAttribute}".',
+    '{attribute} must be less than or equal to "{compareValueOrAttribute}".' => '{attribute} musí být menší nebo roven "{compareValueOrAttribute}".',
+    '{attribute} must not be a subnet.' => '{attribute} nesmí být podsíť.',
+    '{attribute} must not be an IPv4 address.' => '{attribute} nesmí být IPv4 adresa.',
+    '{attribute} must not be an IPv6 address.' => '{attribute} nesmí být IPv6 adresa.',
+    '{attribute} must not be equal to "{compareValueOrAttribute}".' => '{attribute} se nesmí rovnat "{compareValueOrAttribute}".',
+    '{delta, plural, =1{1 day} other{# days}}' => '{delta, plural, =1{1 den} few{# dny} other{# dní}}',
+    '{delta, plural, =1{1 hour} other{# hours}}' => '{delta, plural, =1{1 hodina} few{# hodiny} other{# hodin}}',
+    '{delta, plural, =1{1 minute} other{# minutes}}' => '{delta, plural, =1{1 minuta} few{# minuty} other{# minut}}',
+    '{delta, plural, =1{1 month} other{# months}}' => '{delta, plural, =1{1 měsíc} few{# měsíce} other{# měsíců}}',
+    '{delta, plural, =1{1 second} other{# seconds}}' => '{delta, plural, =1{1 sekunda} few{# sekundy} other{# sekund}}',
+    '{delta, plural, =1{1 year} other{# years}}' => '{delta, plural, =1{1 rok} few{# roky} other{# let}}',
+    '{nFormatted} B' => '{nFormatted} B',
+    '{nFormatted} GB' => '{nFormatted} GB',
+    '{nFormatted} GiB' => '{nFormatted} GiB',
+    '{nFormatted} KB' => '{nFormatted} KB',
+    '{nFormatted} KiB' => '{nFormatted} KiB',
+    '{nFormatted} MB' => '{nFormatted} MB',
+    '{nFormatted} MiB' => '{nFormatted} MiB',
+    '{nFormatted} PB' => '{nFormatted} PB',
+    '{nFormatted} PiB' => '{nFormatted} PiB',
+    '{nFormatted} TB' => '{nFormatted} TB',
+    '{nFormatted} TiB' => '{nFormatted} TiB',
     '(not set)' => '(není zadáno)',
     'An internal server error occurred.' => 'Vyskytla se vnitřní chyba serveru.',
     'Are you sure you want to delete this item?' => 'Opravdu chcete smazat tuto položku?',
@@ -35,8 +70,6 @@ return [
     'Missing required arguments: {params}' => 'Chybí povinné argumenty: {params}',
     'Missing required parameters: {params}' => 'Chybí povinné parametry: {params}',
     'No' => 'Ne',
-    'No help for unknown command "{command}".' => 'K neznámému příkazu "{command}" neexistuje nápověda.',
-    'No help for unknown sub-command "{command}".' => 'K neznámému pod-příkazu "{command}" neexistuje nápověda.',
     'No results found.' => 'Nenalezeny žádné záznamy.',
     'Only files with these MIME types are allowed: {mimeTypes}.' => 'Povolené jsou pouze soubory následujících MIME typů: {mimeTypes}.',
     'Only files with these extensions are allowed: {extensions}.' => 'Povolené jsou pouze soubory s následujícími příponami: {extensions}.',
@@ -56,7 +89,6 @@ return [
     'The verification code is incorrect.' => 'Nesprávný ověřovací kód.',
     'Total <b>{count, number}</b> {count, plural, one{item} other{items}}.' => 'Celkem <b>{count, number}</b> {count, plural, one{záznam} few{záznamy} other{záznamů}}.',
     'Unable to verify your data submission.' => 'Nebylo možné ověřit odeslané údaje.',
-    'Unknown command "{command}".' => 'Neznámý příkaz "{command}".',
     'Unknown option: --{name}' => 'Neznámá volba: --{name}',
     'Update' => 'Upravit',
     'View' => 'Náhled',
@@ -81,14 +113,8 @@ return [
     '{attribute} must be a string.' => '{attribute} musí být řetězec.',
     '{attribute} must be an integer.' => '{attribute} musí být celé číslo.',
     '{attribute} must be either "{true}" or "{false}".' => '{attribute} musí být buď "{true}" nebo "{false}".',
-    '{attribute} must be greater than "{compareValue}".' => '{attribute} musí být větší než "{compareValue}".',
-    '{attribute} must be greater than or equal to "{compareValue}".' => '{attribute} musí být větší nebo roven "{compareValue}".',
-    '{attribute} must be less than "{compareValue}".' => '{attribute} musí být menší než "{compareValue}".',
-    '{attribute} must be less than or equal to "{compareValue}".' => '{attribute} musí být menší nebo roven "{compareValue}".',
     '{attribute} must be no greater than {max}.' => '{attribute} nesmí být větší než {max}.',
     '{attribute} must be no less than {min}.' => '{attribute} nesmí být menší než {min}.',
-    '{attribute} must be repeated exactly.' => 'Údaj {attribute} je třeba zopakovat přesně.',
-    '{attribute} must not be equal to "{compareValue}".' => '{attribute} se nesmí rovnat "{compareValue}".',
     '{attribute} should contain at least {min, number} {min, plural, one{character} other{characters}}.' => '{attribute} musí obsahovat alespoň {min, number} {min, plural, one{znak} few{znaky} other{znaků}}.',
     '{attribute} should contain at most {max, number} {max, plural, one{character} other{characters}}.' => '{attribute} může obsahovat nanejvýš {max, number} {max, plural, one{znak} few{znaky} other{znaků}}.',
     '{attribute} should contain {length, number} {length, plural, one{character} other{characters}}.' => '{attribute}  musí obsahovat {length, number} {length, plural, one{znak} few{znaky} other{znaků}}.',
diff --git a/framework/messages/es/yii.php b/framework/messages/es/yii.php
index c008806..7840553 100644
--- a/framework/messages/es/yii.php
+++ b/framework/messages/es/yii.php
@@ -23,51 +23,8 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'Powered by {yii}' => 'Desarrollado con {yii}',
-    'The requested view "{name}" was not found.' => 'La vista solicitada "{name}" no fue encontrada',
-    'Yii Framework' => 'Yii Framework',
-    'just now' => 'justo ahora',
-    '{attribute} contains wrong subnet mask.' => '{attribute} contiene la máscara de subred incorrecta',
-    '{attribute} is not in the allowed range.' => '{attribute} no está en el rango permitido.',
-    '{attribute} must be a valid IP address.' => '{attribute} debe ser una dirección IP válida ',
-    '{attribute} must be an IP address with specified subnet.' => '{attribute} debe ser una dirección IP con subred especificada.',
-    '{attribute} must be equal to "{compareValueOrAttribute}".' => '{attribute} debe ser igual a "{compareValueOrAttribute}".',
-    '{attribute} must be greater than "{compareValueOrAttribute}".' => '{attribute} debe ser mayor a "{compareValueOrAttribute}".',
-    '{attribute} must be greater than or equal to "{compareValueOrAttribute}".' => '{attribute} debe ser mayor o igual a "{compareValueOrAttribute}".',
-    '{attribute} must be less than "{compareValueOrAttribute}".' => '{attribute} debe ser menor a "{compareValueOrAttribute}".',
-    '{attribute} must be less than or equal to "{compareValueOrAttribute}".' => '{attribute} debe ser menor  o igual a "{compareValueOrAttribute}".',
-    '{attribute} must not be a subnet.' => '{attribute} no debe ser una subnet.',
-    '{attribute} must not be an IPv4 address.' => '{attribute} no debe ser una dirección IPv4.',
-    '{attribute} must not be an IPv6 address.' => '{attribute} no debe ser una dirección IPv6.',
-    '{attribute} must not be equal to "{compareValueOrAttribute}".' => '{attribute} no debe ser igual a "{compareValueOrAttribute}".',
-    '{delta, plural, =1{1 day} other{# days}}' => '{delta, plural, =1{1 día} other{# días}}',
-    '{delta, plural, =1{1 hour} other{# hours}}' => '{delta, plural, =1{1 hora} other{# horas}}',
-    '{delta, plural, =1{1 minute} other{# minutes}}' => '{delta, plural, =1{1 minuto} other{# minutos}}',
-    '{delta, plural, =1{1 month} other{# months}}' => '{delta, plural, =1{1 mes} other{# meses}}',
-    '{delta, plural, =1{1 second} other{# seconds}}' => '{delta, plural, =1{1 segundo} other{# segundos}}',
-    '{delta, plural, =1{1 year} other{# years}}' => '{delta, plural, =1{1 año} other{# años}}',
-    '{nFormatted} B' => '{nFormatted} B',
-    '{nFormatted} GB' => '{nFormatted} GB',
-    '{nFormatted} GiB' => '{nFormatted} GiB',
-    '{nFormatted} KB' => '{nFormatted} KB',
-    '{nFormatted} KiB' => '{nFormatted} KiB',
-    '{nFormatted} MB' => '{nFormatted} MB',
-    '{nFormatted} MiB' => '{nFormatted} MiB',
-    '{nFormatted} PB' => '{nFormatted} PB',
-    '{nFormatted} PiB' => '{nFormatted} PiB',
-    '{nFormatted} TB' => '{nFormatted} TB',
-    '{nFormatted} TiB' => '{nFormatted} TiB',
-    '{nFormatted} {n, plural, =1{byte} other{bytes}}' => '{nFormatted} {n, plural, =1{byte} other{bytes}}',
-    '{nFormatted} {n, plural, =1{gibibyte} other{gibibytes}}' => '{nFormatted} {n, plural, =1{gibibyte} other{gibibytes}}',
-    '{nFormatted} {n, plural, =1{gigabyte} other{gigabytes}}' => '{nFormatted} {n, plural, =1{gigabyte} other{gigabytes}}',
-    '{nFormatted} {n, plural, =1{kibibyte} other{kibibytes}}' => '{nFormatted} {n, plural, =1{kibibyte} other{kibibytes}}',
-    '{nFormatted} {n, plural, =1{kilobyte} other{kilobytes}}' => '{nFormatted} {n, plural, =1{kilobyte} other{kilobytes}}',
-    '{nFormatted} {n, plural, =1{mebibyte} other{mebibytes}}' => '{nFormatted} {n, plural, =1{mebibyte} other{mebibytes}}',
-    '{nFormatted} {n, plural, =1{megabyte} other{megabytes}}' => '{nFormatted} {n, plural, =1{megabyte} other{megabytes}}',
-    '{nFormatted} {n, plural, =1{pebibyte} other{pebibytes}}' => '{nFormatted} {n, plural, =1{pebibyte} other{pebibytes}}',
-    '{nFormatted} {n, plural, =1{petabyte} other{petabytes}}' => '{nFormatted} {n, plural, =1{petabyte} other{petabytes}}',
-    '{nFormatted} {n, plural, =1{tebibyte} other{tebibytes}}' => '{nFormatted} {n, plural, =1{tebibyte} other{tebibytes}}',
-    '{nFormatted} {n, plural, =1{terabyte} other{terabytes}}' => '{nFormatted} {n, plural, =1{terabyte} other{terabytes}}',
+    ' and ' => ' y ',
+    'The combination {values} of {attributes} has already been taken.' => 'La combinación de {values} de {attributes} ya ha sido utilizada.',
     '(not set)' => '(no definido)',
     'An internal server error occurred.' => 'Hubo un error interno del servidor.',
     'Are you sure you want to delete this item?' => '¿Está seguro de eliminar este elemento?',
@@ -86,6 +43,7 @@ return [
     'Page not found.' => 'Página no encontrada.',
     'Please fix the following errors:' => 'Por favor corrija los siguientes errores:',
     'Please upload a file.' => 'Por favor suba un archivo.',
+    'Powered by {yii}' => 'Desarrollado con {yii}',
     'Showing <b>{begin, number}-{end, number}</b> of <b>{totalCount, number}</b> {totalCount, plural, one{item} other{items}}.' => 'Mostrando <b>{begin, number}-{end, number}</b> de <b>{totalCount, number}</b> {totalCount, plural, one{elemento} other{elementos}}.',
     'The file "{file}" is not an image.' => 'El archivo "{file}" no es una imagen.',
     'The file "{file}" is too big. Its size cannot exceed {formattedLimit}.' => 'El archivo "{file}" es demasiado grande. Su tamaño no puede exceder {formattedLimit}.',
@@ -95,6 +53,7 @@ return [
     'The image "{file}" is too large. The width cannot be larger than {limit, number} {limit, plural, one{pixel} other{pixels}}.' => 'La imagen "{file}" es demasiado grande. La anchura no puede ser mayor a {limit, number} {limit, plural, one{píxel} other{píxeles}}.',
     'The image "{file}" is too small. The height cannot be smaller than {limit, number} {limit, plural, one{pixel} other{pixels}}.' => 'La imagen "{file}" es demasiado pequeña. La altura no puede ser menor a {limit, number} {limit, plural, one{píxel} other{píxeles}}.',
     'The image "{file}" is too small. The width cannot be smaller than {limit, number} {limit, plural, one{pixel} other{pixels}}.' => 'La imagen "{file}" es demasiado pequeña. La anchura no puede ser menor a {limit, number} {limit, plural, one{píxel} other{píxeles}}.',
+    'The requested view "{name}" was not found.' => 'La vista solicitada "{name}" no fue encontrada',
     'The verification code is incorrect.' => 'El código de verificación es incorrecto.',
     'Total <b>{count, number}</b> {count, plural, one{item} other{items}}.' => 'Total <b>{count, number}</b> {count, plural, one{elemento} other{elementos}}.',
     'Unable to verify your data submission.' => 'Incapaz de verificar los datos enviados.',
@@ -103,6 +62,7 @@ return [
     'Update' => 'Actualizar',
     'View' => 'Ver',
     'Yes' => 'Sí',
+    'Yii Framework' => 'Yii Framework',
     'You are not allowed to perform this action.' => 'No tiene permitido ejecutar esta acción.',
     'You can upload at most {limit, number} {limit, plural, one{file} other{files}}.' => 'Puedes subir como máximo {limit, number} {limit, plural, one{archivo} other{archivos}}.',
     'in {delta, plural, =1{a day} other{# days}}' => 'en {delta, plural, =1{un día} other{# días}}',
@@ -111,26 +71,68 @@ return [
     'in {delta, plural, =1{a second} other{# seconds}}' => 'en {delta, plural, =1{un segundo} other{# segundos}}',
     'in {delta, plural, =1{a year} other{# years}}' => 'en {delta, plural, =1{un año} other{# años}}',
     'in {delta, plural, =1{an hour} other{# hours}}' => 'en {delta, plural, =1{una hora} other{# horas}}',
+    'just now' => 'justo ahora',
     'the input value' => 'el valor de entrada',
     '{attribute} "{value}" has already been taken.' => '{attribute} "{value}" ya ha sido utilizado.',
     '{attribute} cannot be blank.' => '{attribute} no puede estar vacío.',
+    '{attribute} contains wrong subnet mask.' => '{attribute} contiene la máscara de subred incorrecta',
     '{attribute} is invalid.' => '{attribute} es inválido.',
     '{attribute} is not a valid URL.' => '{attribute} no es una URL válida.',
     '{attribute} is not a valid email address.' => '{attribute} no es una dirección de correo válida.',
+    '{attribute} is not in the allowed range.' => '{attribute} no está en el rango permitido.',
     '{attribute} must be "{requiredValue}".' => '{attribute} debe ser "{requiredValue}".',
     '{attribute} must be a number.' => '{attribute} debe ser un número.',
     '{attribute} must be a string.' => '{attribute} debe ser una cadena de caracteres.',
+    '{attribute} must be a valid IP address.' => '{attribute} debe ser una dirección IP válida ',
+    '{attribute} must be an IP address with specified subnet.' => '{attribute} debe ser una dirección IP con subred especificada.',
     '{attribute} must be an integer.' => '{attribute} debe ser un número entero.',
     '{attribute} must be either "{true}" or "{false}".' => '{attribute} debe ser "{true}" o "{false}".',
+    '{attribute} must be equal to "{compareValueOrAttribute}".' => '{attribute} debe ser igual a "{compareValueOrAttribute}".',
+    '{attribute} must be greater than "{compareValueOrAttribute}".' => '{attribute} debe ser mayor a "{compareValueOrAttribute}".',
+    '{attribute} must be greater than or equal to "{compareValueOrAttribute}".' => '{attribute} debe ser mayor o igual a "{compareValueOrAttribute}".',
+    '{attribute} must be less than "{compareValueOrAttribute}".' => '{attribute} debe ser menor a "{compareValueOrAttribute}".',
+    '{attribute} must be less than or equal to "{compareValueOrAttribute}".' => '{attribute} debe ser menor  o igual a "{compareValueOrAttribute}".',
     '{attribute} must be no greater than {max}.' => '{attribute} no debe ser mayor a {max}.',
     '{attribute} must be no less than {min}.' => '{attribute} no debe ser menor a {min}.',
+    '{attribute} must not be a subnet.' => '{attribute} no debe ser una subnet.',
+    '{attribute} must not be an IPv4 address.' => '{attribute} no debe ser una dirección IPv4.',
+    '{attribute} must not be an IPv6 address.' => '{attribute} no debe ser una dirección IPv6.',
+    '{attribute} must not be equal to "{compareValueOrAttribute}".' => '{attribute} no debe ser igual a "{compareValueOrAttribute}".',
     '{attribute} should contain at least {min, number} {min, plural, one{character} other{characters}}.' => '{attribute} debería contener al menos {min, number} {min, plural, one{letra} other{letras}}.',
     '{attribute} should contain at most {max, number} {max, plural, one{character} other{characters}}.' => '{attribute} debería contener como máximo {max, number} {max, plural, one{letra} other{letras}}.',
     '{attribute} should contain {length, number} {length, plural, one{character} other{characters}}.' => '{attribute} debería contener {length, number} {length, plural, one{letra} other{letras}}.',
+    '{delta, plural, =1{1 day} other{# days}}' => '{delta, plural, =1{1 día} other{# días}}',
+    '{delta, plural, =1{1 hour} other{# hours}}' => '{delta, plural, =1{1 hora} other{# horas}}',
+    '{delta, plural, =1{1 minute} other{# minutes}}' => '{delta, plural, =1{1 minuto} other{# minutos}}',
+    '{delta, plural, =1{1 month} other{# months}}' => '{delta, plural, =1{1 mes} other{# meses}}',
+    '{delta, plural, =1{1 second} other{# seconds}}' => '{delta, plural, =1{1 segundo} other{# segundos}}',
+    '{delta, plural, =1{1 year} other{# years}}' => '{delta, plural, =1{1 año} other{# años}}',
     '{delta, plural, =1{a day} other{# days}} ago' => 'hace {delta, plural, =1{un día} other{# días}}',
     '{delta, plural, =1{a minute} other{# minutes}} ago' => 'hace {delta, plural, =1{un minuto} other{# minutos}}',
     '{delta, plural, =1{a month} other{# months}} ago' => 'hace {delta, plural, =1{un mes} other{# meses}}',
     '{delta, plural, =1{a second} other{# seconds}} ago' => 'hace {delta, plural, =1{un segundo} other{# segundos}}',
     '{delta, plural, =1{a year} other{# years}} ago' => 'hace {delta, plural, =1{un año} other{# años}}',
     '{delta, plural, =1{an hour} other{# hours}} ago' => 'hace {delta, plural, =1{una hora} other{# horas}}',
+    '{nFormatted} B' => '{nFormatted} B',
+    '{nFormatted} GB' => '{nFormatted} GB',
+    '{nFormatted} GiB' => '{nFormatted} GiB',
+    '{nFormatted} KB' => '{nFormatted} KB',
+    '{nFormatted} KiB' => '{nFormatted} KiB',
+    '{nFormatted} MB' => '{nFormatted} MB',
+    '{nFormatted} MiB' => '{nFormatted} MiB',
+    '{nFormatted} PB' => '{nFormatted} PB',
+    '{nFormatted} PiB' => '{nFormatted} PiB',
+    '{nFormatted} TB' => '{nFormatted} TB',
+    '{nFormatted} TiB' => '{nFormatted} TiB',
+    '{nFormatted} {n, plural, =1{byte} other{bytes}}' => '{nFormatted} {n, plural, =1{byte} other{bytes}}',
+    '{nFormatted} {n, plural, =1{gibibyte} other{gibibytes}}' => '{nFormatted} {n, plural, =1{gibibyte} other{gibibytes}}',
+    '{nFormatted} {n, plural, =1{gigabyte} other{gigabytes}}' => '{nFormatted} {n, plural, =1{gigabyte} other{gigabytes}}',
+    '{nFormatted} {n, plural, =1{kibibyte} other{kibibytes}}' => '{nFormatted} {n, plural, =1{kibibyte} other{kibibytes}}',
+    '{nFormatted} {n, plural, =1{kilobyte} other{kilobytes}}' => '{nFormatted} {n, plural, =1{kilobyte} other{kilobytes}}',
+    '{nFormatted} {n, plural, =1{mebibyte} other{mebibytes}}' => '{nFormatted} {n, plural, =1{mebibyte} other{mebibytes}}',
+    '{nFormatted} {n, plural, =1{megabyte} other{megabytes}}' => '{nFormatted} {n, plural, =1{megabyte} other{megabytes}}',
+    '{nFormatted} {n, plural, =1{pebibyte} other{pebibytes}}' => '{nFormatted} {n, plural, =1{pebibyte} other{pebibytes}}',
+    '{nFormatted} {n, plural, =1{petabyte} other{petabytes}}' => '{nFormatted} {n, plural, =1{petabyte} other{petabytes}}',
+    '{nFormatted} {n, plural, =1{tebibyte} other{tebibytes}}' => '{nFormatted} {n, plural, =1{tebibyte} other{tebibytes}}',
+    '{nFormatted} {n, plural, =1{terabyte} other{terabytes}}' => '{nFormatted} {n, plural, =1{terabyte} other{terabytes}}',
 ];
diff --git a/framework/messages/fr/yii.php b/framework/messages/fr/yii.php
index 602ad22..1f85c1d 100644
--- a/framework/messages/fr/yii.php
+++ b/framework/messages/fr/yii.php
@@ -24,12 +24,6 @@
  */
 return [
     ' and ' => ' et ',
-    '{delta, plural, =1{1 day} other{# days}}' => '{delta, plural, =1{1 jour} other{# jours}}',
-    '{delta, plural, =1{1 hour} other{# hours}}' => '{delta, plural, =1{1 heure} other{# heures}}',
-    '{delta, plural, =1{1 minute} other{# minutes}}' => '{delta, plural, =1{1 minute} other{# minutes}}',
-    '{delta, plural, =1{1 month} other{# months}}' => 'mois',
-    '{delta, plural, =1{1 second} other{# seconds}}' => '{delta, plural, =1{1 seconde} other{# secondes}}',
-    '{delta, plural, =1{1 year} other{# years}}' => '{delta, plural, =1{1 année} other{# années}}',
     '(not set)' => '(non défini)',
     'An internal server error occurred.' => 'Une erreur de serveur interne s\'est produite.',
     'Are you sure you want to delete this item?' => 'Êtes-vous sûr de vouloir supprimer cet élément ?',
@@ -48,6 +42,7 @@ return [
     'Page not found.' => 'Page non trouvée.',
     'Please fix the following errors:' => 'Veuillez vérifier les erreurs suivantes :',
     'Please upload a file.' => 'Veuillez télécharger un fichier.',
+    'Powered by {yii}' => 'Propulsé par {yii}',
     'Showing <b>{begin, number}-{end, number}</b> of <b>{totalCount, number}</b> {totalCount, plural, one{item} other{items}}.' => 'Affichage de <b>{begin, number}-{end, number}</b> sur <b>{totalCount, number}</b> {totalCount, plural, one{élément} other{éléments}}.',
     'The combination {values} of {attributes} has already been taken.' => 'La combinaison {values} de {attributes} est déjà utilisée.',
     'The file "{file}" is not an image.' => 'Le fichier « {file} » n\'est pas une image.',
@@ -62,10 +57,12 @@ return [
     'The verification code is incorrect.' => 'Le code de vérification est incorrect.',
     'Total <b>{count, number}</b> {count, plural, one{item} other{items}}.' => 'Total <b>{count, number}</b> {count, plural, one{élément} other{éléments}}.',
     'Unable to verify your data submission.' => 'Impossible de vérifier votre envoi de données.',
+    'Unknown alias: -{name}' => 'Alias inconnu : -{name}',
     'Unknown option: --{name}' => 'Option inconnue : --{name}',
     'Update' => 'Modifier',
     'View' => 'Voir',
     'Yes' => 'Oui',
+    'Yii Framework' => 'Yii Framework',
     'You are not allowed to perform this action.' => 'Vous n\'êtes pas autorisé à effectuer cette action.',
     'You can upload at most {limit, number} {limit, plural, one{file} other{files}}.' => 'Vous pouvez télécharger au maximum {limit, number} {limit, plural, one{fichier} other{fichiers}}.',
     'in {delta, plural, =1{a day} other{# days}}' => 'dans {delta, plural, =1{un jour} other{# jours}}',
@@ -97,7 +94,6 @@ return [
     '{attribute} must be less than or equal to "{compareValueOrAttribute}".' => '{attribute} doit être inférieur ou égal à « {compareValueOrAttribute} ».',
     '{attribute} must be no greater than {max}.' => '{attribute} ne doit pas être supérieur à {max}.',
     '{attribute} must be no less than {min}.' => '{attribute} ne doit pas être inférieur à {min}.',
-    '{attribute} must be repeated exactly.' => '{attribute} doit être identique.',
     '{attribute} must not be a subnet.' => '{attribute} ne doit pas être un sous-réseau.',
     '{attribute} must not be an IPv4 address.' => '{attribute} ne doit pas être une adresse IPv4.',
     '{attribute} must not be an IPv6 address.' => '{attribute} ne doit pas être une adresse IPv6.',
@@ -105,6 +101,12 @@ return [
     '{attribute} should contain at least {min, number} {min, plural, one{character} other{characters}}.' => '{attribute} doit comporter au moins {min, number} {min, plural, one{caractère} other{caractères}}.',
     '{attribute} should contain at most {max, number} {max, plural, one{character} other{characters}}.' => '{attribute} doit comporter au plus {max, number} {max, plural, one{caractère} other{caractères}}.',
     '{attribute} should contain {length, number} {length, plural, one{character} other{characters}}.' => '{attribute} doit comporter {length, number} {length, plural, one{caractère} other{caractères}}.',
+    '{delta, plural, =1{1 day} other{# days}}' => '{delta, plural, =1{1 jour} other{# jours}}',
+    '{delta, plural, =1{1 hour} other{# hours}}' => '{delta, plural, =1{1 heure} other{# heures}}',
+    '{delta, plural, =1{1 minute} other{# minutes}}' => '{delta, plural, =1{1 minute} other{# minutes}}',
+    '{delta, plural, =1{1 month} other{# months}}' => 'mois',
+    '{delta, plural, =1{1 second} other{# seconds}}' => '{delta, plural, =1{1 seconde} other{# secondes}}',
+    '{delta, plural, =1{1 year} other{# years}}' => '{delta, plural, =1{1 année} other{# années}}',
     '{delta, plural, =1{a day} other{# days}} ago' => 'il y a {delta, plural, =1{un jour} other{# jours}}',
     '{delta, plural, =1{a minute} other{# minutes}} ago' => 'il y a {delta, plural, =1{une minute} other{# minutes}}',
     '{delta, plural, =1{a month} other{# months}} ago' => 'il y a {delta, plural, =1{un mois} other{# mois}}',
diff --git a/framework/messages/pt-BR/yii.php b/framework/messages/pt-BR/yii.php
index 35d99eb..78f56ab 100644
--- a/framework/messages/pt-BR/yii.php
+++ b/framework/messages/pt-BR/yii.php
@@ -23,29 +23,48 @@
  * NOTE: this file must be saved in UTF-8 encoding.
  */
 return [
-    'in {delta, plural, =1{a day} other{# days}}' => 'em {delta, plural, =1{1 dia} other{# dias}}',
-    'in {delta, plural, =1{a minute} other{# minutes}}' => 'em {delta, plural, =1{1 minuto} other{# minutos}}',
-    'in {delta, plural, =1{a month} other{# months}}' => 'em {delta, plural, =1{1 mês} other{# meses}}',
-    'in {delta, plural, =1{a second} other{# seconds}}' => 'em {delta, plural, =1{1 segundo} other{# segundos}}',
-    'in {delta, plural, =1{a year} other{# years}}' => 'em {delta, plural, =1{1 ano} other{# anos}}',
-    'in {delta, plural, =1{an hour} other{# hours}}' => 'em {delta, plural, =1{1 hora} other{# horas}}',
+    ' and ' => ' e ',
+    '(not set)' => '(não definido)',
+    '{attribute} "{value}" has already been taken.' => '{attribute} "{value}" já foi utilizado.',
+    '{attribute} cannot be blank.' => '"{attribute}" não pode ficar em branco.',
+    '{attribute} contains wrong subnet mask.' => '{attribute} contém a máscara de sub-rede errado.',
+    '{attribute} is invalid.' => '"{attribute}" é inválido.',
+    '{attribute} is not a valid email address.' => '"{attribute}" não é um endereço de e-mail válido.',
+    '{attribute} is not a valid URL.' => '"{attribute}" não é uma URL válida.',
+    '{attribute} is not in the allowed range.' => '{attribute} intervalo não permitido.',
+    '{attribute} must be "{requiredValue}".' => '"{attribute}" deve ser "{requiredValue}".',
+    '{attribute} must be a number.' => '"{attribute}" deve ser um número.',
+    '{attribute} must be a string.' => '"{attribute}" deve ser um texto.',
+    '{attribute} must be a valid IP address.' => '{attribute} deve ser um endereço IP válido.',
+    '{attribute} must be an integer.' => '"{attribute}" deve ser um número inteiro.',
+    '{attribute} must be an IP address with specified subnet.' => '{attribute} deve ser um endereço IP com sub-rede especificada.',
+    '{attribute} must be either "{true}" or "{false}".' => '"{attribute}" deve ser "{true}" ou "{false}".',
+    '{attribute} must be equal to "{compareValueOrAttribute}".' => '{attribute} deve ser igual a "{compareValueOrAttribute}".',
+    '{attribute} must be greater than "{compareValueOrAttribute}".' => '"{attribute}" deve ser maior que "{compareValueOrAttribute}".',
+    '{attribute} must be greater than or equal to "{compareValueOrAttribute}".' => '"{attribute}" deve ser maior ou igual a "{compareValueOrAttribute}".',
+    '{attribute} must be less than "{compareValueOrAttribute}".' => '"{attribute}" deve ser menor que "{compareValueOrAttribute}".',
+    '{attribute} must be less than or equal to "{compareValueOrAttribute}".' => '"{attribute}" deve ser menor ou igual a "{compareValueOrAttribute}".',
+    '{attribute} must be no greater than {max}.' => '"{attribute}" não pode ser maior que {max}.',
+    '{attribute} must be no less than {min}.' => '"{attribute}" não pode ser menor que {min}.',
+    '{attribute} must not be a subnet.' => '{attribute} não deve ser uma sub-rede.',
+    '{attribute} must not be an IPv4 address.' => '{attribute} não deve ser um endereço IPv4.',
+    '{attribute} must not be an IPv6 address.' => '{attribute} não deve ser um endereço IPv6.',
+    '{attribute} must not be equal to "{compareValueOrAttribute}".' => '"{attribute}" não deve ser igual a "{compareValueOrAttribute}".',
+    '{attribute} should contain {length, number} {length, plural, one{character} other{characters}}.' => '"{attribute}" deve conter {length, number} {length, plural, one{caractere} other{caracteres}}.',
+    '{attribute} should contain at least {min, number} {min, plural, one{character} other{characters}}.' => '"{attribute}" deve conter pelo menos {min, number} {min, plural, one{caractere} other{caracteres}}.',
+    '{attribute} should contain at most {max, number} {max, plural, one{character} other{characters}}.' => '"{attribute}" deve conter no máximo {max, number} {max, plural, one{caractere} other{caracteres}}.',
+    '{delta, plural, =1{1 day} other{# days}}' => '{delta, plural, =1{1 dia} other{# dias}}',
+    '{delta, plural, =1{1 hour} other{# hours}}' => '{delta, plural, =1{1 hora} other{# horas}}',
+    '{delta, plural, =1{1 minute} other{# minutes}}' => '{delta, plural, =1{1 minuto} other{# minutos}}',
+    '{delta, plural, =1{1 month} other{# months}}' => '{delta, plural, =1{1 mês} other{# meses}}',
+    '{delta, plural, =1{1 second} other{# seconds}}' => '{delta, plural, =1{1 segundo} other{# segundos}}',
+    '{delta, plural, =1{1 year} other{# years}}' => '{delta, plural, =1{1 ano} other{# anos}}',
     '{delta, plural, =1{a day} other{# days}} ago' => '{delta, plural, =1{há 1 dia} other{há # dias}}',
     '{delta, plural, =1{a minute} other{# minutes}} ago' => '{delta, plural, =1{há 1 minuto} other{há # minutos}}',
     '{delta, plural, =1{a month} other{# months}} ago' => '{delta, plural, =1{há 1 mês} other{há # meses}}',
     '{delta, plural, =1{a second} other{# seconds}} ago' => '{delta, plural, =1{há 1 segundo} other{há # segundos}}',
     '{delta, plural, =1{a year} other{# years}} ago' => '{delta, plural, =1{há 1 ano} other{há # anos}}',
     '{delta, plural, =1{an hour} other{# hours}} ago' => '{delta, plural, =1{há 1 hora} other{há # horas}}',
-    '{nFormatted} B' => '{nFormatted} B',
-    '{nFormatted} GB' => '{nFormatted} GB',
-    '{nFormatted} GiB' => '{nFormatted} GiB',
-    '{nFormatted} KB' => '{nFormatted} KB',
-    '{nFormatted} KiB' => '{nFormatted} KiB',
-    '{nFormatted} MB' => '{nFormatted} MB',
-    '{nFormatted} MiB' => '{nFormatted} MiB',
-    '{nFormatted} PB' => '{nFormatted} PB',
-    '{nFormatted} PiB' => '{nFormatted} PiB',
-    '{nFormatted} TB' => '{nFormatted} TB',
-    '{nFormatted} TiB' => '{nFormatted} TiB',
     '{nFormatted} {n, plural, =1{byte} other{bytes}}' => '{nFormatted} {n, plural, =1{byte} other{bytes}}',
     '{nFormatted} {n, plural, =1{gibibyte} other{gibibytes}}' => '{nFormatted} {n, plural, =1{gibibyte} other{gibibytes}}',
     '{nFormatted} {n, plural, =1{gigabyte} other{gigabytes}}' => '{nFormatted} {n, plural, =1{gigabyte} other{gigabytes}}',
@@ -57,26 +76,44 @@ return [
     '{nFormatted} {n, plural, =1{petabyte} other{petabytes}}' => '{nFormatted} {n, plural, =1{petabyte} other{petabytes}}',
     '{nFormatted} {n, plural, =1{tebibyte} other{tebibytes}}' => '{nFormatted} {n, plural, =1{tebibyte} other{tebibytes}}',
     '{nFormatted} {n, plural, =1{terabyte} other{terabytes}}' => '{nFormatted} {n, plural, =1{terabyte} other{terabytes}}',
-    '(not set)' => '(não definido)',
-    'just now' => 'agora mesmo',
+    '{nFormatted} B' => '{nFormatted} B',
+    '{nFormatted} GB' => '{nFormatted} GB',
+    '{nFormatted} GiB' => '{nFormatted} GiB',
+    '{nFormatted} KB' => '{nFormatted} KB',
+    '{nFormatted} KiB' => '{nFormatted} KiB',
+    '{nFormatted} MB' => '{nFormatted} MB',
+    '{nFormatted} MiB' => '{nFormatted} MiB',
+    '{nFormatted} PB' => '{nFormatted} PB',
+    '{nFormatted} PiB' => '{nFormatted} PiB',
+    '{nFormatted} TB' => '{nFormatted} TB',
+    '{nFormatted} TiB' => '{nFormatted} TiB',
     'An internal server error occurred.' => 'Ocorreu um erro interno do servidor.',
-    'Are you sure you want to delete this item?' => 'Confirma a exclusão deste item?',
+    'Are you sure you want to delete this item?' => 'Deseja realmente excluir este item?',
     'Delete' => 'Excluir',
     'Error' => 'Erro',
     'File upload failed.' => 'O upload do arquivo falhou.',
     'Home' => 'Página Inicial',
+    'in {delta, plural, =1{a day} other{# days}}' => 'em {delta, plural, =1{1 dia} other{# dias}}',
+    'in {delta, plural, =1{a minute} other{# minutes}}' => 'em {delta, plural, =1{1 minuto} other{# minutos}}',
+    'in {delta, plural, =1{a month} other{# months}}' => 'em {delta, plural, =1{1 mês} other{# meses}}',
+    'in {delta, plural, =1{a second} other{# seconds}}' => 'em {delta, plural, =1{1 segundo} other{# segundos}}',
+    'in {delta, plural, =1{a year} other{# years}}' => 'em {delta, plural, =1{1 ano} other{# anos}}',
+    'in {delta, plural, =1{an hour} other{# hours}}' => 'em {delta, plural, =1{1 hora} other{# horas}}',
     'Invalid data received for parameter "{param}".' => 'Dados inválidos recebidos para o parâmetro "{param}".',
+    'just now' => 'agora mesmo',
     'Login Required' => 'Login Necessário.',
     'Missing required arguments: {params}' => 'Argumentos obrigatórios ausentes: {params}',
     'Missing required parameters: {params}' => 'Parâmetros obrigatórios ausentes: {params}',
-    'No' => 'Não',
     'No results found.' => 'Nenhum resultado foi encontrado.',
-    'Only files with these MIME types are allowed: {mimeTypes}.' => 'São permitidos somente arquivos com os seguintes tipos MIME: {mimeTypes}.',
+    'No' => 'Não',
     'Only files with these extensions are allowed: {extensions}.' => 'São permitidos somente arquivos com as seguintes extensões: {extensions}.',
+    'Only files with these MIME types are allowed: {mimeTypes}.' => 'São permitidos somente arquivos com os seguintes tipos MIME: {mimeTypes}.',
     'Page not found.' => 'Página não encontrada.',
     'Please fix the following errors:' => 'Por favor, corrija os seguintes erros:',
     'Please upload a file.' => 'Por favor, faça upload de um arquivo.',
+    'Powered by {yii}' => 'Desenvolvido com {yii}',
     'Showing <b>{begin, number}-{end, number}</b> of <b>{totalCount, number}</b> {totalCount, plural, one{item} other{items}}.' => 'Exibindo <b>{begin, number}-{end, number}</b> de <b>{totalCount, number}</b> {totalCount, plural, one{item} other{itens}}.',
+    'The combination {values} of {attributes} has already been taken.' => 'A combinação {values} de {attributes} já foi utilizado.',
     'The file "{file}" is not an image.' => 'O arquivo "{file}" não é uma imagem.',
     'The file "{file}" is too big. Its size cannot exceed {formattedLimit}.' => 'O arquivo "{file}" é grande demais. Seu tamanho não pode exceder {formattedLimit}.',
     'The file "{file}" is too small. Its size cannot be smaller than {formattedLimit}.' => 'O arquivo "{file}" é pequeno demais. Seu tamanho não pode ser menor que {formattedLimit}.',
@@ -85,45 +122,17 @@ return [
     'The image "{file}" is too large. The width cannot be larger than {limit, number} {limit, plural, one{pixel} other{pixels}}.' => 'O arquivo "{file}" é grande demais. A largura não pode ser maior que {limit, number} {limit, plural, one{pixel} other{pixels}}.',
     'The image "{file}" is too small. The height cannot be smaller than {limit, number} {limit, plural, one{pixel} other{pixels}}.' => 'O arquivo "{file}" é pequeno demais. A altura não pode ser menor que {limit, number} {limit, plural, one{pixel} other{pixels}}.',
     'The image "{file}" is too small. The width cannot be smaller than {limit, number} {limit, plural, one{pixel} other{pixels}}.' => 'O arquivo "{file}" é pequeno demais. A largura não pode ser menor que {limit, number} {limit, plural, one{pixel} other{pixels}}.',
+    'the input value' => 'o valor de entrada',
     'The requested view "{name}" was not found.' => 'A visão "{name}" solicitada não foi encontrada.',
     'The verification code is incorrect.' => 'O código de verificação está incorreto.',
     'Total <b>{count, number}</b> {count, plural, one{item} other{items}}.' => 'Total <b>{count, number}</b> {count, plural, one{item} other{itens}}.',
     'Unable to verify your data submission.' => 'Não foi possível verificar o seu envio de dados.',
+    'Unknown alias: -{name}' => 'Alias desconhecido: -{name}',
     'Unknown option: --{name}' => 'Opção desconhecida : --{name}',
     'Update' => 'Alterar',
     'View' => 'Exibir',
     'Yes' => 'Sim',
+    'Yii Framework' => 'Yii Framework',
     'You are not allowed to perform this action.' => 'Você não está autorizado a realizar essa ação.',
     'You can upload at most {limit, number} {limit, plural, one{file} other{files}}.' => 'Você pode fazer o upload de, no máximo, {limit, number} {limit, plural, one{arquivo} other{arquivos}}.',
-    'the input value' => 'o valor de entrada',
-    '{attribute} "{value}" has already been taken.' => '{attribute} "{value}" já foi utilizado.',
-    'The combination {values} of {attributes} has already been taken.' => 'A combinação {values} de {attributes} já foi utilizado.',
-    '{attribute} cannot be blank.' => '"{attribute}" não pode ficar em branco.',
-    '{attribute} contains wrong subnet mask.' => '{attribute} contém a máscara de sub-rede errado.',
-    '{attribute} is invalid.' => '"{attribute}" é inválido.',
-    '{attribute} is not a valid URL.' => '"{attribute}" não é uma URL válida.',
-    '{attribute} is not a valid email address.' => '"{attribute}" não é um endereço de e-mail válido.',
-    '{attribute} is not in the allowed range.' => '{attribute} intervalo não permitido.',
-    '{attribute} must be "{requiredValue}".' => '"{attribute}" deve ser "{requiredValue}".',
-    '{attribute} must be a number.' => '"{attribute}" deve ser um número.',
-    '{attribute} must be a string.' => '"{attribute}" deve ser um texto.',
-    '{attribute} must be a valid IP address.' => '{attribute} deve ser um endereço IP válido.',
-    '{attribute} must be an IP address with specified subnet.' => '{attribute} deve ser um endereço IP com sub-rede especificada.',
-    '{attribute} must not be a subnet.' => '{attribute} não deve ser uma sub-rede.',
-    '{attribute} must not be an IPv4 address.' => '{attribute} não deve ser um endereço IPv4.',
-    '{attribute} must not be an IPv6 address.' => '{attribute} não deve ser um endereço IPv6.',
-    '{attribute} must be an integer.' => '"{attribute}" deve ser um número inteiro.',
-    '{attribute} must be either "{true}" or "{false}".' => '"{attribute}" deve ser "{true}" ou "{false}".',
-    '{attribute} must be greater than "{compareValueOrAttribute}".' => '"{attribute}" deve ser maior que "{compareValueOrAttribute}".',
-    '{attribute} must be greater than or equal to "{compareValueOrAttribute}".' => '"{attribute}" deve ser maior ou igual a "{compareValueOrAttribute}".',
-    '{attribute} must be less than "{compareValueOrAttribute}".' => '"{attribute}" deve ser menor que "{compareValueOrAttribute}".',
-    '{attribute} must be less than or equal to "{compareValueOrAttribute}".' => '"{attribute}" deve ser menor ou igual a "{compareValueOrAttribute}".',
-    '{attribute} must be no greater than {max}.' => '"{attribute}" não pode ser maior que {max}.',
-    '{attribute} must be no less than {min}.' => '"{attribute}" não pode ser menor que {min}.',
-    '{attribute} must not be equal to "{compareValueOrAttribute}".' => '"{attribute}" não deve ser igual a "{compareValueOrAttribute}".',
-    '{attribute} should contain at least {min, number} {min, plural, one{character} other{characters}}.' => '"{attribute}" deve conter pelo menos {min, number} {min, plural, one{caractere} other{caracteres}}.',
-    '{attribute} should contain at most {max, number} {max, plural, one{character} other{characters}}.' => '"{attribute}" deve conter no máximo {max, number} {max, plural, one{caractere} other{caracteres}}.',
-    '{attribute} should contain {length, number} {length, plural, one{character} other{characters}}.' => '"{attribute}" deve conter {length, number} {length, plural, one{caractere} other{caracteres}}.',
-    '{attribute} must be equal to "{compareValueOrAttribute}".' => '{attribute} deve ser igual a "{compareValueOrAttribute}".',
-    ' and ' => ' e ',
 ];
diff --git a/framework/mutex/FileMutex.php b/framework/mutex/FileMutex.php
index d24a355..18d4280 100644
--- a/framework/mutex/FileMutex.php
+++ b/framework/mutex/FileMutex.php
@@ -17,7 +17,7 @@ use yii\helpers\FileHelper;
  *
  * Application configuration example:
  *
- * ```
+ * ```php
  * [
  *     'components' => [
  *         'mutex' => [
@@ -72,6 +72,7 @@ class FileMutex extends Mutex
      */
     public function init()
     {
+        parent::init();
         $this->mutexPath = Yii::getAlias($this->mutexPath);
         if (!is_dir($this->mutexPath)) {
             FileHelper::createDirectory($this->mutexPath, $this->dirMode, true);
@@ -86,26 +87,54 @@ class FileMutex extends Mutex
      */
     protected function acquireLock($name, $timeout = 0)
     {
-        $file = fopen($this->getLockFilePath($name), 'w+');
-        if ($file === false) {
-            return false;
-        }
-        if ($this->fileMode !== null) {
-            @chmod($this->getLockFilePath($name), $this->fileMode);
-        }
+        $filePath = $this->getLockFilePath($name);
         $waitTime = 0;
-        while (!flock($file, LOCK_EX | LOCK_NB)) {
-            $waitTime++;
-            if ($waitTime > $timeout) {
-                fclose($file);
 
+        while (true) {
+            $file = fopen($filePath, 'w+');
+
+            if ($file === false) {
                 return false;
             }
-            sleep(1);
+
+            if ($this->fileMode !== null) {
+                @chmod($filePath, $this->fileMode);
+            }
+
+            if (!flock($file, LOCK_EX | LOCK_NB)) {
+                fclose($file);
+
+                if (++$waitTime > $timeout) {
+                    return false;
+                }
+
+                sleep(1);
+                continue;
+            }
+
+            // Under unix we delete the lock file before releasing the related handle. Thus it's possible that we've acquired a lock on
+            // a non-existing file here (race condition). We must compare the inode of the lock file handle with the inode of the actual lock file.
+            // If they do not match we simply continue the loop since we can assume the inodes will be equal on the next try.
+            // Example of race condition without inode-comparison:
+            // Script A: locks file
+            // Script B: opens file
+            // Script A: unlinks and unlocks file
+            // Script B: locks handle of *unlinked* file
+            // Script C: opens and locks *new* file
+            // In this case we would have acquired two locks for the same file path.
+            if (DIRECTORY_SEPARATOR !== '\\' && fstat($file)['ino'] !== @fileinode($filePath)) {
+                clearstatcache(true, $filePath);
+                flock($file, LOCK_UN);
+                fclose($file);
+                continue;
+            }
+
+            $this->_files[$name] = $file;
+            return true;
         }
-        $this->_files[$name] = $file;
 
-        return true;
+        // Should not be reached normally.
+        return false;
     }
 
     /**
@@ -115,14 +144,25 @@ class FileMutex extends Mutex
      */
     protected function releaseLock($name)
     {
-        if (!isset($this->_files[$name]) || !flock($this->_files[$name], LOCK_UN)) {
+        if (!isset($this->_files[$name])) {
             return false;
         }
 
-        fclose($this->_files[$name]);
-        unlink($this->getLockFilePath($name));
-        unset($this->_files[$name]);
+        if (DIRECTORY_SEPARATOR === '\\') {
+            // Under windows it's not possible to delete a file opened via fopen (either by own or other process).
+            // That's why we must first unlock and close the handle and then *try* to delete the lock file.
+            flock($this->_files[$name], LOCK_UN);
+            fclose($this->_files[$name]);
+            @unlink($this->getLockFilePath($name));
+        } else {
+            // Under unix it's possible to delete a file opened via fopen (either by own or other process).
+            // That's why we must unlink (the currently locked) lock file first and then unlock and close the handle.
+            unlink($this->getLockFilePath($name));
+            flock($this->_files[$name], LOCK_UN);
+            fclose($this->_files[$name]);
+        }
 
+        unset($this->_files[$name]);
         return true;
     }
 
diff --git a/framework/rbac/BaseManager.php b/framework/rbac/BaseManager.php
index 2f23785..90ed5f4 100644
--- a/framework/rbac/BaseManager.php
+++ b/framework/rbac/BaseManager.php
@@ -125,6 +125,7 @@ abstract class BaseManager extends Component implements ManagerInterface
                 $rule->name = $object->ruleName;
                 $this->addRule($rule);
             }
+
             return $this->addItem($object);
         } elseif ($object instanceof Rule) {
             return $this->addRule($object);
@@ -158,6 +159,7 @@ abstract class BaseManager extends Component implements ManagerInterface
                 $rule->name = $object->ruleName;
                 $this->addRule($rule);
             }
+
             return $this->updateItem($name, $object);
         } elseif ($object instanceof Rule) {
             return $this->updateRule($name, $object);
@@ -193,7 +195,7 @@ abstract class BaseManager extends Component implements ManagerInterface
     }
 
     /**
-     * Returns defaultRoles as array of Role objects
+     * Returns defaultRoles as array of Role objects.
      * @since 2.0.12
      * @return Role[] default roles. The array is indexed by the role names
      */
@@ -203,6 +205,7 @@ abstract class BaseManager extends Component implements ManagerInterface
         foreach ($this->defaultRoles as $roleName) {
             $result[$roleName] = $this->createRole($roleName);
         }
+
         return $result;
     }
 
@@ -241,7 +244,7 @@ abstract class BaseManager extends Component implements ManagerInterface
     }
 
     /**
-     * Checks whether array of $assignments is empty and [[defaultRoles]] property is empty as well
+     * Checks whether array of $assignments is empty and [[defaultRoles]] property is empty as well.
      *
      * @param Assignment[] $assignments array of user's assignments
      * @return bool whether array of $assignments is empty and [[defaultRoles]] property is empty as well
diff --git a/framework/rbac/DbManager.php b/framework/rbac/DbManager.php
index 379d632..ab100b6 100644
--- a/framework/rbac/DbManager.php
+++ b/framework/rbac/DbManager.php
@@ -115,12 +115,19 @@ class DbManager extends BaseManager
         }
     }
 
+    private $_checkAccessAssignments = [];
+
     /**
      * @inheritdoc
      */
     public function checkAccess($userId, $permissionName, $params = [])
     {
-        $assignments = $this->getAssignments($userId);
+        if (isset($this->_checkAccessAssignments[(string) $userId])) {
+            $assignments = $this->_checkAccessAssignments[(string) $userId];
+        } else {
+            $assignments = $this->getAssignments($userId);
+            $this->_checkAccessAssignments[(string) $userId] = $assignments;
+        }
 
         if ($this->hasNoAssignments($assignments)) {
             return false;
@@ -428,7 +435,7 @@ class DbManager extends BaseManager
     }
 
     /**
-     * Populates an auth item with the data fetched from database
+     * Populates an auth item with the data fetched from database.
      * @param array $row the data from the auth item table
      * @return Item the populated auth item instance (either Role or Permission)
      */
@@ -471,6 +478,7 @@ class DbManager extends BaseManager
         foreach ($query->all($this->db) as $row) {
             $roles[$row['name']] = $this->populateItem($row);
         }
+
         return $roles;
     }
 
@@ -516,6 +524,7 @@ class DbManager extends BaseManager
         foreach ($query->all($this->db) as $row) {
             $permissions[$row['name']] = $this->populateItem($row);
         }
+
         return $permissions;
     }
 
@@ -552,6 +561,7 @@ class DbManager extends BaseManager
         foreach ($query->all($this->db) as $row) {
             $permissions[$row['name']] = $this->populateItem($row);
         }
+
         return $permissions;
     }
 
@@ -585,6 +595,7 @@ class DbManager extends BaseManager
         foreach ($query->all($this->db) as $row) {
             $permissions[$row['name']] = $this->populateItem($row);
         }
+
         return $permissions;
     }
 
@@ -600,6 +611,7 @@ class DbManager extends BaseManager
         foreach ($query->all($this->db) as $row) {
             $parents[$row['parent']][] = $row['child'];
         }
+
         return $parents;
     }
 
@@ -639,6 +651,7 @@ class DbManager extends BaseManager
         if (is_resource($data)) {
             $data = stream_get_contents($data);
         }
+
         return unserialize($data);
     }
 
@@ -822,6 +835,7 @@ class DbManager extends BaseManager
                 return true;
             }
         }
+
         return false;
     }
 
@@ -843,6 +857,7 @@ class DbManager extends BaseManager
                 'created_at' => $assignment->createdAt,
             ])->execute();
 
+        unset($this->_checkAccessAssignments[(string) $userId]);
         return $assignment;
     }
 
@@ -855,6 +870,7 @@ class DbManager extends BaseManager
             return false;
         }
 
+        unset($this->_checkAccessAssignments[(string) $userId]);
         return $this->db->createCommand()
             ->delete($this->assignmentTable, ['user_id' => (string) $userId, 'item_name' => $role->name])
             ->execute() > 0;
@@ -869,6 +885,7 @@ class DbManager extends BaseManager
             return false;
         }
 
+        unset($this->_checkAccessAssignments[(string) $userId]);
         return $this->db->createCommand()
             ->delete($this->assignmentTable, ['user_id' => (string) $userId])
             ->execute() > 0;
@@ -953,6 +970,7 @@ class DbManager extends BaseManager
      */
     public function removeAllAssignments()
     {
+        $this->_checkAccessAssignments = [];
         $this->db->createCommand()->delete($this->assignmentTable)->execute();
     }
 
@@ -964,6 +982,7 @@ class DbManager extends BaseManager
             $this->rules = null;
             $this->parents = null;
         }
+        $this->_checkAccessAssignments = [];
     }
 
     public function loadFromCache()
diff --git a/framework/rbac/ManagerInterface.php b/framework/rbac/ManagerInterface.php
index 082d82c..831e59a 100644
--- a/framework/rbac/ManagerInterface.php
+++ b/framework/rbac/ManagerInterface.php
@@ -129,7 +129,7 @@ interface ManagerInterface extends CheckAccessInterface
     public function getRules();
 
     /**
-     * Checks the possibility of adding a child to parent
+     * Checks the possibility of adding a child to parent.
      * @param Item $parent the parent item
      * @param Item $child the child item to be added to the hierarchy
      * @return bool possibility of adding
@@ -182,7 +182,7 @@ interface ManagerInterface extends CheckAccessInterface
     /**
      * Assigns a role to a user.
      *
-     * @param Role $role
+     * @param Role|Permission $role
      * @param string|int $userId the user ID (see [[\yii\web\User::id]])
      * @return Assignment the role assignment information.
      * @throws \Exception if the role has already been assigned to the user
@@ -191,7 +191,7 @@ interface ManagerInterface extends CheckAccessInterface
 
     /**
      * Revokes a role from a user.
-     * @param Role $role
+     * @param Role|Permission $role
      * @param string|int $userId the user ID (see [[\yii\web\User::id]])
      * @return bool whether the revoking is successful
      */
diff --git a/framework/rbac/PhpManager.php b/framework/rbac/PhpManager.php
index e0ffb8e..e15fce4 100644
--- a/framework/rbac/PhpManager.php
+++ b/framework/rbac/PhpManager.php
@@ -441,6 +441,7 @@ class PhpManager extends BaseManager
                 $permissions[$itemName] = $this->items[$itemName];
             }
         }
+
         return $permissions;
     }
 
@@ -514,6 +515,7 @@ class PhpManager extends BaseManager
                 $permissions[$itemName] = $this->items[$itemName];
             }
         }
+
         return $permissions;
     }
 
@@ -874,6 +876,7 @@ class PhpManager extends BaseManager
                 }
             }
         }
+
         return $result;
     }
 }
diff --git a/framework/rbac/migrations/m140506_102106_rbac_init.php b/framework/rbac/migrations/m140506_102106_rbac_init.php
index 9c6d604..d5c01a7 100644
--- a/framework/rbac/migrations/m140506_102106_rbac_init.php
+++ b/framework/rbac/migrations/m140506_102106_rbac_init.php
@@ -9,7 +9,7 @@ use yii\base\InvalidConfigException;
 use yii\rbac\DbManager;
 
 /**
- * Initializes RBAC tables
+ * Initializes RBAC tables.
  *
  * @author Alexander Kochetov <creocoder@gmail.com>
  * @since 2.0
@@ -26,6 +26,7 @@ class m140506_102106_rbac_init extends \yii\db\Migration
         if (!$authManager instanceof DbManager) {
             throw new InvalidConfigException('You should configure "authManager" component to use database before executing this migration.');
         }
+
         return $authManager;
     }
 
diff --git a/framework/rest/UrlRule.php b/framework/rest/UrlRule.php
index beaa679..2cba929 100644
--- a/framework/rest/UrlRule.php
+++ b/framework/rest/UrlRule.php
@@ -264,6 +264,7 @@ class UrlRule extends CompositeUrlRule
             // create status was not changed - there is no rules configured
             $this->createStatus = WebUrlRule::CREATE_STATUS_PARSING_ONLY;
         }
+
         return false;
     }
 }
diff --git a/framework/test/FixtureTrait.php b/framework/test/FixtureTrait.php
index 798a1b0..2a212a5 100644
--- a/framework/test/FixtureTrait.php
+++ b/framework/test/FixtureTrait.php
@@ -37,6 +37,7 @@ trait FixtureTrait
 
     /**
      * Declares the fixtures that are needed by the current test case.
+     *
      * The return value of this method must be an array of fixture configurations. For example,
      *
      * ```php
@@ -125,7 +126,7 @@ trait FixtureTrait
     }
 
     /**
-     * Initialize the fixtures
+     * Initialize the fixtures.
      * @since 2.0.12
      */
     public function initFixtures()
diff --git a/framework/validators/DateValidator.php b/framework/validators/DateValidator.php
index 1acb672..33e466b 100644
--- a/framework/validators/DateValidator.php
+++ b/framework/validators/DateValidator.php
@@ -318,7 +318,7 @@ class DateValidator extends Validator
     }
 
     /**
-     * Parses date string into UNIX timestamp
+     * Parses date string into UNIX timestamp.
      *
      * @param string $value string representing date
      * @return int|false a UNIX timestamp or `false` on failure.
@@ -330,7 +330,7 @@ class DateValidator extends Validator
     }
 
     /**
-     * Parses date string into UNIX timestamp
+     * Parses date string into UNIX timestamp.
      *
      * @param string $value string representing date
      * @param string $format expected date format
@@ -356,7 +356,7 @@ class DateValidator extends Validator
     }
 
     /**
-     * Parses a date value using the IntlDateFormatter::parse()
+     * Parses a date value using the IntlDateFormatter::parse().
      * @param string $value string representing date
      * @param string $format the expected date format
      * @return int|bool a UNIX timestamp or `false` on failure.
@@ -394,7 +394,7 @@ class DateValidator extends Validator
     }
 
     /**
-     * Parses a date value using the DateTime::createFromFormat()
+     * Parses a date value using the DateTime::createFromFormat().
      * @param string $value string representing date
      * @param string $format the expected date format
      * @return int|bool a UNIX timestamp or `false` on failure.
@@ -413,11 +413,12 @@ class DateValidator extends Validator
         if (!$hasTimeInfo) {
             $date->setTime(0, 0, 0);
         }
+
         return $date->getTimestamp();
     }
 
     /**
-     * Formats a timestamp using the specified format
+     * Formats a timestamp using the specified format.
      * @param int $timestamp
      * @param string $format
      * @return string
diff --git a/framework/validators/EachValidator.php b/framework/validators/EachValidator.php
index d86154e..4c830b0 100644
--- a/framework/validators/EachValidator.php
+++ b/framework/validators/EachValidator.php
@@ -97,6 +97,7 @@ class EachValidator extends Validator
         if ($this->_validator === null) {
             $this->_validator = $this->createEmbeddedValidator($model);
         }
+
         return $this->_validator;
     }
 
@@ -115,6 +116,7 @@ class EachValidator extends Validator
             if (!is_object($model)) {
                 $model = new Model(); // mock up context model
             }
+
             return Validator::createValidator($rule[0], $model, $this->attributes, array_slice($rule, 1));
         }
 
diff --git a/framework/validators/ExistValidator.php b/framework/validators/ExistValidator.php
index 31072f8..0ba8022 100644
--- a/framework/validators/ExistValidator.php
+++ b/framework/validators/ExistValidator.php
@@ -148,11 +148,13 @@ class ExistValidator extends Validator
             $conditions = [$targetAttribute => $model->$attribute];
         }
 
-        if (!$model instanceof ActiveRecord) {
+        $targetModelClass = $this->getTargetClass($model);
+        if (!is_subclass_of($targetModelClass, 'yii\db\ActiveRecord')) {
             return $conditions;
         }
 
-        return $this->prefixConditions($model, $conditions);
+        /** @var ActiveRecord $targetModelClass */
+        return $this->applyTableAlias($targetModelClass::find(), $conditions);
     }
 
     /**
@@ -182,6 +184,7 @@ class ExistValidator extends Validator
             if (!$this->allowArray) {
                 return [$this->message, []];
             }
+
             return $query->count("DISTINCT [[$this->targetAttribute]]") == count($value) ? null : [$this->message, []];
         }
 
@@ -208,7 +211,7 @@ class ExistValidator extends Validator
     }
 
     /**
-     * Returns conditions with alias
+     * Returns conditions with alias.
      * @param ActiveQuery $query
      * @param array $conditions array of condition, keys to be modified
      * @param null|string $alias set empty string for no apply alias. Set null for apply primary table alias
@@ -233,21 +236,7 @@ class ExistValidator extends Validator
 
             $prefixedConditions[$prefixedColumn] = $columnValue;
         }
-        return $prefixedConditions;
-    }
-
-    /**
-     * Prefix conditions with aliases
-     *
-     * @param ActiveRecord $model
-     * @param array $conditions
-     * @return array
-     */
-    private function prefixConditions($model, $conditions)
-    {
-        $targetModelClass = $this->getTargetClass($model);
 
-        /** @var ActiveRecord $targetModelClass */
-        return $this->applyTableAlias($targetModelClass::find(), $conditions);
+        return $prefixedConditions;
     }
 }
diff --git a/framework/validators/FileValidator.php b/framework/validators/FileValidator.php
index 791d67e..b297520 100644
--- a/framework/validators/FileValidator.php
+++ b/framework/validators/FileValidator.php
@@ -253,6 +253,7 @@ class FileValidator extends Validator
                 } elseif (!empty($this->mimeTypes) && !$this->validateMimeType($value)) {
                     return [$this->wrongMimeType, ['file' => $value->getClientFilename(), 'mimeTypes' => implode(', ', $this->mimeTypes)]];
                 }
+
                 return null;
             case UPLOAD_ERR_INI_SIZE:
             case UPLOAD_ERR_FORM_SIZE:
@@ -282,6 +283,7 @@ class FileValidator extends Validator
 
     /**
      * Returns the maximum size allowed for uploaded files.
+     *
      * This is determined based on four factors:
      *
      * - 'upload_max_filesize' in php.ini
@@ -325,7 +327,7 @@ class FileValidator extends Validator
     }
 
     /**
-     * Converts php.ini style size to bytes
+     * Converts php.ini style size to bytes.
      *
      * @param string $sizeStr $sizeStr
      * @return int
@@ -458,7 +460,7 @@ class FileValidator extends Validator
     }
 
     /**
-     * Builds the RegExp from the $mask
+     * Builds the RegExp from the $mask.
      *
      * @param string $mask
      * @return string the regular expression
@@ -470,7 +472,7 @@ class FileValidator extends Validator
     }
 
     /**
-     * Checks the mimeType of the $file against the list in the [[mimeTypes]] property
+     * Checks the mimeType of the $file against the list in the [[mimeTypes]] property.
      *
      * @param UploadedFile $file
      * @return bool whether the $file mimeType is allowed
diff --git a/framework/validators/IpValidator.php b/framework/validators/IpValidator.php
index d63914b..6f1896a 100644
--- a/framework/validators/IpValidator.php
+++ b/framework/validators/IpValidator.php
@@ -40,16 +40,17 @@ use yii\web\JsExpression;
 class IpValidator extends Validator
 {
     /**
-     * The length of IPv6 address in bits
+     * The length of IPv6 address in bits.
      */
     const IPV6_ADDRESS_LENGTH = 128;
     /**
-     * The length of IPv4 address in bits
+     * The length of IPv4 address in bits.
      */
     const IPV4_ADDRESS_LENGTH = 32;
     /**
-     * Negation char. Used to negate [[ranges]] or [[networks]]
-     * or to negate validating value when [[negation]] is set to `true`
+     * Negation char.
+     *
+     * Used to negate [[ranges]] or [[networks]] or to negate validating value when [[negation]] is set to `true`.
      * @see negation
      * @see networks
      * @see ranges
@@ -319,7 +320,7 @@ class IpValidator extends Validator
     }
 
     /**
-     * Validates an IPv4/IPv6 address or subnet
+     * Validates an IPv4/IPv6 address or subnet.
      *
      * @param $ip string
      * @return string|array
@@ -404,8 +405,9 @@ class IpValidator extends Validator
     }
 
     /**
-     * Expands an IPv6 address to it's full notation. For example `2001:db8::1` will be
-     * expanded to `2001:0db8:0000:0000:0000:0000:0000:0001`
+     * Expands an IPv6 address to it's full notation.
+     *
+     * For example `2001:db8::1` will be expanded to `2001:0db8:0000:0000:0000:0000:0000:0001`.
      *
      * @param string $ip the original IPv6
      * @return string the expanded IPv6
@@ -455,10 +457,10 @@ class IpValidator extends Validator
     }
 
     /**
-     * Prepares array to fill in [[ranges]]:
-     *  - Recursively substitutes aliases, described in [[networks]] with their values
-     *  - Removes duplicates
+     * Prepares array to fill in [[ranges]].
      *
+     *  - Recursively substitutes aliases, described in [[networks]] with their values,
+     *  - Removes duplicates.
      *
      * @param $ranges
      * @return array
@@ -479,11 +481,12 @@ class IpValidator extends Validator
                 $result[] = $string;
             }
         }
+
         return array_unique($result);
     }
 
     /**
-     * Validates IPv4 address
+     * Validates IPv4 address.
      *
      * @param string $value
      * @return bool
@@ -494,7 +497,7 @@ class IpValidator extends Validator
     }
 
     /**
-     * Validates IPv6 address
+     * Validates IPv6 address.
      *
      * @param string $value
      * @return bool
@@ -505,7 +508,7 @@ class IpValidator extends Validator
     }
 
     /**
-     * Gets the IP version
+     * Gets the IP version.
      *
      * @param string $ip
      * @return int
@@ -516,7 +519,7 @@ class IpValidator extends Validator
     }
 
     /**
-     * Used to get the Regexp pattern for initial IP address parsing
+     * Used to get the Regexp pattern for initial IP address parsing.
      * @return string
      */
     private function getIpParsePattern()
@@ -525,7 +528,7 @@ class IpValidator extends Validator
     }
 
     /**
-     * Checks whether the IP is in subnet range
+     * Checks whether the IP is in subnet range.
      *
      * @param string $ip an IPv4 or IPv6 address
      * @param int $cidr
@@ -555,7 +558,7 @@ class IpValidator extends Validator
     }
 
     /**
-     * Converts IP address to bits representation
+     * Converts IP address to bits representation.
      *
      * @param string $ip
      * @return string bits as a string
diff --git a/framework/validators/StringValidator.php b/framework/validators/StringValidator.php
index 4d1b92c..e01bfe6 100644
--- a/framework/validators/StringValidator.php
+++ b/framework/validators/StringValidator.php
@@ -82,7 +82,7 @@ class StringValidator extends Validator
             $this->length = null;
         }
         if ($this->encoding === null) {
-            $this->encoding = Yii::$app->charset;
+            $this->encoding = Yii::$app ? Yii::$app->charset : 'UTF-8';
         }
         if ($this->message === null) {
             $this->message = Yii::t('yii', '{attribute} must be a string.');
diff --git a/framework/validators/UniqueValidator.php b/framework/validators/UniqueValidator.php
index 55e30ee..98ca037 100644
--- a/framework/validators/UniqueValidator.php
+++ b/framework/validators/UniqueValidator.php
@@ -250,11 +250,13 @@ class UniqueValidator extends Validator
             $conditions = [$targetAttribute => $model->$attribute];
         }
 
-        if (!$model instanceof ActiveRecord) {
+        $targetModelClass = $this->getTargetClass($model);
+        if (!is_subclass_of($targetModelClass, 'yii\db\ActiveRecord')) {
             return $conditions;
         }
 
-        return $this->prefixConditions($model, $conditions);
+        /** @var ActiveRecord $targetModelClass */
+        return $this->applyTableAlias($targetModelClass::find(), $conditions);
     }
 
     /**
@@ -282,7 +284,7 @@ class UniqueValidator extends Validator
     }
 
     /**
-     * Returns conditions with alias
+     * Returns conditions with alias.
      * @param ActiveQuery $query
      * @param array $conditions array of condition, keys to be modified
      * @param null|string $alias set empty string for no apply alias. Set null for apply primary table alias
@@ -307,21 +309,7 @@ class UniqueValidator extends Validator
 
             $prefixedConditions[$prefixedColumn] = $columnValue;
         }
-        return $prefixedConditions;
-    }
 
-    /**
-     * Prefix conditions with aliases
-     *
-     * @param ActiveRecord $model
-     * @param array $conditions
-     * @return array
-     */
-    private function prefixConditions($model, $conditions)
-    {
-        $targetModelClass = $this->getTargetClass($model);
-
-        /** @var ActiveRecord $targetModelClass */
-        return $this->applyTableAlias($targetModelClass::find(), $conditions);
+        return $prefixedConditions;
     }
 }
diff --git a/framework/validators/Validator.php b/framework/validators/Validator.php
index 002b38e..2082ab4 100644
--- a/framework/validators/Validator.php
+++ b/framework/validators/Validator.php
@@ -456,7 +456,7 @@ class Validator extends Component
     }
 
     /**
-     * Returns cleaned attribute names without the `!` character at the beginning
+     * Returns cleaned attribute names without the `!` character at the beginning.
      * @return array attribute names.
      * @since 2.0.12
      */
diff --git a/framework/views/_createTable.php b/framework/views/_createTable.php
index 0944c5f..0768299 100644
--- a/framework/views/_createTable.php
+++ b/framework/views/_createTable.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Creates a call for the method `yii\db\Migration::createTable()`
+ * Creates a call for the method `yii\db\Migration::createTable()`.
  */
 /* @var $table string the name table */
 /* @var $fields array the fields */
diff --git a/framework/views/_dropTable.php b/framework/views/_dropTable.php
index dd302f2..899ee79 100644
--- a/framework/views/_dropTable.php
+++ b/framework/views/_dropTable.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Creates a call for the method `yii\db\Migration::dropTable()`
+ * Creates a call for the method `yii\db\Migration::dropTable()`.
  */
 /* @var $table string the name table */
 /* @var $foreignKeys array the foreign keys */
diff --git a/framework/views/_foreignTables.php b/framework/views/_foreignTables.php
index cdeb76b..2baacda 100644
--- a/framework/views/_foreignTables.php
+++ b/framework/views/_foreignTables.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Creates a call for the method `yii\db\Migration::createTable()`
+ * Creates a call for the method `yii\db\Migration::createTable()`.
  */
 /* @var $foreignKeys array the foreign keys */
 
diff --git a/framework/views/addColumnMigration.php b/framework/views/addColumnMigration.php
index edce9aa..3c39ddb 100644
--- a/framework/views/addColumnMigration.php
+++ b/framework/views/addColumnMigration.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * This view is used by console/controllers/MigrateController.php
+ * This view is used by console/controllers/MigrateController.php.
+ *
  * The following variables are available in this view:
  */
 /* @var $className string the new migration class name without namespace */
diff --git a/framework/views/createJunctionMigration.php b/framework/views/createJunctionMigration.php
index 4df1735..f7ce00f 100644
--- a/framework/views/createJunctionMigration.php
+++ b/framework/views/createJunctionMigration.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * This view is used by console/controllers/MigrateController.php
+ * This view is used by console/controllers/MigrateController.php.
+ *
  * The following variables are available in this view:
  * @since 2.0.7
  * @deprecated since 2.0.8
diff --git a/framework/views/createTableMigration.php b/framework/views/createTableMigration.php
index 619633f..763a752 100644
--- a/framework/views/createTableMigration.php
+++ b/framework/views/createTableMigration.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * This view is used by console/controllers/MigrateController.php
+ * This view is used by console/controllers/MigrateController.php.
+ *
  * The following variables are available in this view:
  */
 /* @var $className string the new migration class name without namespace */
diff --git a/framework/views/dropColumnMigration.php b/framework/views/dropColumnMigration.php
index 5b78e81..32c2002 100644
--- a/framework/views/dropColumnMigration.php
+++ b/framework/views/dropColumnMigration.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * This view is used by console/controllers/MigrateController.php
+ * This view is used by console/controllers/MigrateController.php.
+ *
  * The following variables are available in this view:
  */
 /* @var $className string the new migration class name without namespace */
diff --git a/framework/views/dropTableMigration.php b/framework/views/dropTableMigration.php
index 9e9ef78..fca42a1 100644
--- a/framework/views/dropTableMigration.php
+++ b/framework/views/dropTableMigration.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * This view is used by console/controllers/MigrateController.php
+ * This view is used by console/controllers/MigrateController.php.
+ *
  * The following variables are available in this view:
  */
 /* @var $className string the new migration class name without namespace */
diff --git a/framework/views/migration.php b/framework/views/migration.php
index 98c6e09..cb4c4ac 100644
--- a/framework/views/migration.php
+++ b/framework/views/migration.php
@@ -1,6 +1,7 @@
 <?php
 /**
- * This view is used by console/controllers/MigrateController.php
+ * This view is used by console/controllers/MigrateController.php.
+ *
  * The following variables are available in this view:
  */
 /* @var $className string the new migration class name without namespace */
@@ -14,13 +15,22 @@ if (!empty($namespace)) {
 
 use yii\db\Migration;
 
+/**
+ * Class <?= $className . "\n" ?>
+ */
 class <?= $className ?> extends Migration
 {
+    /**
+     * @inheritdoc
+     */
     public function safeUp()
     {
 
     }
 
+    /**
+     * @inheritdoc
+     */
     public function safeDown()
     {
         echo "<?= $className ?> cannot be reverted.\n";
diff --git a/framework/web/Application.php b/framework/web/Application.php
index e1b5efa..d120f27 100644
--- a/framework/web/Application.php
+++ b/framework/web/Application.php
@@ -89,6 +89,7 @@ class Application extends \yii\base\Application
                     }
                     $url += $request->getQueryParams();
                 }
+
                 return $this->getResponse()->redirect(Url::to($url, $e->scheme), $e->statusCode);
             }
         } else {
diff --git a/framework/web/AssetManager.php b/framework/web/AssetManager.php
index e591208..3b2597b 100644
--- a/framework/web/AssetManager.php
+++ b/framework/web/AssetManager.php
@@ -249,7 +249,7 @@ class AssetManager extends Component
     }
 
     /**
-     * Loads asset bundle class by name
+     * Loads asset bundle class by name.
      *
      * @param string $name bundle name
      * @param array $config bundle object configuration
@@ -267,11 +267,12 @@ class AssetManager extends Component
         if ($publish) {
             $bundle->publish($this);
         }
+
         return $bundle;
     }
 
     /**
-     * Loads dummy bundle by name
+     * Loads dummy bundle by name.
      *
      * @param string $name
      * @return AssetBundle
@@ -286,6 +287,7 @@ class AssetManager extends Component
                 'depends' => [],
             ]);
         }
+
         return $this->_dummyBundles[$name];
     }
 
diff --git a/framework/web/CompositeUrlRule.php b/framework/web/CompositeUrlRule.php
index e09a8ab..3444d5c 100644
--- a/framework/web/CompositeUrlRule.php
+++ b/framework/web/CompositeUrlRule.php
@@ -86,6 +86,7 @@ abstract class CompositeUrlRule extends BaseObject implements UrlRuleInterface
             // create status was not changed - there is no rules configured
             $this->createStatus = UrlRule::CREATE_STATUS_PARSING_ONLY;
         }
+
         return false;
     }
 
diff --git a/framework/web/ConflictHttpException.php b/framework/web/ConflictHttpException.php
index 8b11c53..2e5c99d 100644
--- a/framework/web/ConflictHttpException.php
+++ b/framework/web/ConflictHttpException.php
@@ -8,7 +8,7 @@
 namespace yii\web;
 
 /**
- * ConflictHttpException represents a "Conflict" HTTP exception with status code 409
+ * ConflictHttpException represents a "Conflict" HTTP exception with status code 409.
  *
  * @see https://tools.ietf.org/html/rfc7231#section-6.5.8
  * @author Dan Schmidt <danschmidt5189@gmail.com>
diff --git a/framework/web/Controller.php b/framework/web/Controller.php
index 5933246..a75ed08 100644
--- a/framework/web/Controller.php
+++ b/framework/web/Controller.php
@@ -165,6 +165,7 @@ class Controller extends \yii\base\Controller
             if ($this->enableCsrfValidation && Yii::$app->getErrorHandler()->exception === null && !Yii::$app->getRequest()->validateCsrfToken()) {
                 throw new BadRequestHttpException(Yii::t('yii', 'Unable to verify your data submission.'));
             }
+
             return true;
         }
 
diff --git a/framework/web/DbSession.php b/framework/web/DbSession.php
index 8618fda..fb2a8c6 100644
--- a/framework/web/DbSession.php
+++ b/framework/web/DbSession.php
@@ -189,6 +189,7 @@ class DbSession extends MultiFieldSession
             if (YII_DEBUG) {
                 echo $exception;
             }
+
             return false;
         }
 
diff --git a/framework/web/ErrorHandler.php b/framework/web/ErrorHandler.php
index 7e8f699..db72815 100644
--- a/framework/web/ErrorHandler.php
+++ b/framework/web/ErrorHandler.php
@@ -412,7 +412,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
     }
 
     /**
-     * Converts arguments array to its string representation
+     * Converts arguments array to its string representation.
      *
      * @param array $args arguments array to be converted
      * @return string string representation of the arguments array
@@ -466,7 +466,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
     }
 
     /**
-     * Returns human-readable exception name
+     * Returns human-readable exception name.
      * @param \Exception $exception
      * @return string human-readable exception name or null if it cannot be determined
      */
@@ -477,6 +477,7 @@ class ErrorHandler extends \yii\base\ErrorHandler
             $exception instanceof \yii\base\UnknownMethodException) {
             return $exception->getName();
         }
+
         return null;
     }
 
diff --git a/framework/web/GoneHttpException.php b/framework/web/GoneHttpException.php
index 87faf74..ad736ac 100644
--- a/framework/web/GoneHttpException.php
+++ b/framework/web/GoneHttpException.php
@@ -8,7 +8,7 @@
 namespace yii\web;
 
 /**
- * GoneHttpException represents a "Gone" HTTP exception with status code 410
+ * GoneHttpException represents a "Gone" HTTP exception with status code 410.
  *
  * Throw a GoneHttpException when a user requests a resource that no longer exists
  * at the requested url. For example, after a record is deleted, future requests
diff --git a/framework/web/GroupUrlRule.php b/framework/web/GroupUrlRule.php
index 46892de..4824f91 100644
--- a/framework/web/GroupUrlRule.php
+++ b/framework/web/GroupUrlRule.php
@@ -105,6 +105,7 @@ class GroupUrlRule extends CompositeUrlRule
             }
             $rules[] = $rule;
         }
+
         return $rules;
     }
 
diff --git a/framework/web/JsonParser.php b/framework/web/JsonParser.php
index 4398714..8cae7b5 100644
--- a/framework/web/JsonParser.php
+++ b/framework/web/JsonParser.php
@@ -11,7 +11,7 @@ use yii\base\InvalidArgumentException;
 use yii\helpers\Json;
 
 /**
- * Parses a raw HTTP request using [[\yii\helpers\Json::decode()]]
+ * Parses a raw HTTP request using [[\yii\helpers\Json::decode()]].
  *
  * To enable parsing for JSON requests you can configure [[Request::parsers]] using this class:
  *
@@ -51,6 +51,7 @@ class JsonParser implements RequestParserInterface
             if ($this->throwException) {
                 throw new BadRequestHttpException('Invalid JSON data in request body: ' . $e->getMessage());
             }
+
             return [];
         }
     }
diff --git a/framework/web/MultiFieldSession.php b/framework/web/MultiFieldSession.php
index 02ef540..56ff240 100644
--- a/framework/web/MultiFieldSession.php
+++ b/framework/web/MultiFieldSession.php
@@ -133,6 +133,7 @@ abstract class MultiFieldSession extends Session
                 $_SESSION = array_merge((array) $_SESSION, (array) $extraData);
                 return session_encode();
             }
+
             return $fields['data'];
         }
 
diff --git a/framework/web/MultipartFormDataParser.php b/framework/web/MultipartFormDataParser.php
index fc382e7..1fd7a3b 100644
--- a/framework/web/MultipartFormDataParser.php
+++ b/framework/web/MultipartFormDataParser.php
@@ -88,6 +88,7 @@ class MultipartFormDataParser extends BaseObject implements RequestParserInterfa
         if ($this->_uploadFileMaxSize === null) {
             $this->_uploadFileMaxSize = $this->getByteSize(ini_get('upload_max_filesize'));
         }
+
         return $this->_uploadFileMaxSize;
     }
 
@@ -107,6 +108,7 @@ class MultipartFormDataParser extends BaseObject implements RequestParserInterfa
         if ($this->_uploadFileMaxCount === null) {
             $this->_uploadFileMaxCount = ini_get('max_file_uploads');
         }
+
         return $this->_uploadFileMaxCount;
     }
 
@@ -276,7 +278,8 @@ class MultipartFormDataParser extends BaseObject implements RequestParserInterfa
 
     /**
      * Gets the size in bytes from verbose size representation.
-     * For example: '5K' => 5*1024
+     *
+     * For example: '5K' => 5*1024.
      * @param string $verboseSize verbose size representation.
      * @return int actual size in bytes.
      */
diff --git a/framework/web/NotAcceptableHttpException.php b/framework/web/NotAcceptableHttpException.php
index 7bd39cb..65abdc4 100644
--- a/framework/web/NotAcceptableHttpException.php
+++ b/framework/web/NotAcceptableHttpException.php
@@ -8,7 +8,7 @@
 namespace yii\web;
 
 /**
- * NotAcceptableHttpException represents a "Not Acceptable" HTTP exception with status code 406
+ * NotAcceptableHttpException represents a "Not Acceptable" HTTP exception with status code 406.
  *
  * Use this exception when the client requests a Content-Type that your
  * application cannot return. Note that, according to the HTTP 1.1 specification,
diff --git a/framework/web/Request.php b/framework/web/Request.php
index a8f7855..8128a57 100644
--- a/framework/web/Request.php
+++ b/framework/web/Request.php
@@ -23,9 +23,10 @@ use yii\http\MemoryStream;
 use yii\http\MessageTrait;
 use yii\http\UploadedFile;
 use yii\http\Uri;
+use yii\validators\IpValidator;
 
 /**
- * The web Request class represents an HTTP request
+ * The web Request class represents an HTTP request.
  *
  * It encapsulates the $_SERVER variable and resolves its inconsistency among different Web servers.
  * Also it provides an interface to retrieve request parameters from $_POST, $_GET, $_COOKIES and REST
@@ -99,6 +100,7 @@ use yii\http\Uri;
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
+ * @SuppressWarnings(PHPMD.SuperGlobals)
  */
 class Request extends \yii\base\Request implements RequestInterface
 {
@@ -188,6 +190,82 @@ class Request extends \yii\base\Request implements RequestInterface
      * @since 2.1.0
      */
     public $uploadedFileClass = UploadedFile::class;
+    /**
+     * @var array the configuration for trusted security related headers.
+     *
+     * An array key is an IPv4 or IPv6 IP address in CIDR notation for matching a client.
+     *
+     * An array value is a list of headers to trust. These will be matched against
+     * [[secureHeaders]] to determine which headers are allowed to be sent by a specified host.
+     * The case of the header names must be the same as specified in [[secureHeaders]].
+     *
+     * For example, to trust all headers listed in [[secureHeaders]] for IP addresses
+     * in range `192.168.0.0-192.168.0.254` write the following:
+     *
+     * ```php
+     * [
+     *     '192.168.0.0/24',
+     * ]
+     * ```
+     *
+     * To trust just the `X-Forwarded-For` header from `10.0.0.1`, use:
+     *
+     * ```
+     * [
+     *     '10.0.0.1' => ['X-Forwarded-For']
+     * ]
+     * ```
+     *
+     * Default is to trust all headers except those listed in [[secureHeaders]] from all hosts.
+     * Matches are tried in order and searching is stopped when IP matches.
+     *
+     * > Info: Matching is performed using [[IpValidator]].
+     *   See [[IpValidator::::setRanges()|IpValidator::setRanges()]]
+     *   and [[IpValidator::networks]] for advanced matching.
+     *
+     * @see $secureHeaders
+     * @since 2.0.13
+     */
+    public $trustedHosts = [];
+    /**
+     * @var array lists of headers that are, by default, subject to the trusted host configuration.
+     * These headers will be filtered unless explicitly allowed in [[trustedHosts]].
+     * The match of header names is case-insensitive.
+     * @see https://en.wikipedia.org/wiki/List_of_HTTP_header_fields
+     * @see $trustedHosts
+     * @since 2.0.13
+     */
+    public $secureHeaders = [
+        'X-Forwarded-For',
+        'X-Forwarded-Host',
+        'X-Forwarded-Proto',
+        'Front-End-Https',
+        'X-Rewrite-Url',
+    ];
+    /**
+     * @var string[] List of headers where proxies store the real client IP.
+     * It's not advisable to put insecure headers here.
+     * The match of header names is case-insensitive.
+     * @see $trustedHosts
+     * @see $secureHeaders
+     * @since 2.0.13
+     */
+    public $ipHeaders = [
+        'X-Forwarded-For',
+    ];
+    /**
+     * @var array list of headers to check for determining whether the connection is made via HTTPS.
+     * The array keys are header names and the array value is a list of header values that indicate a secure connection.
+     * The match of header names and values is case-insensitive.
+     * It's not advisable to put insecure headers here.
+     * @see $trustedHosts
+     * @see $secureHeaders
+     * @since 2.0.13
+     */
+    public $secureProtocolHeaders = [
+        'X-Forwarded-Proto' => ['https'],
+        'Front-End-Https' => ['on'],
+    ];
 
     /**
      * @var CookieCollection Collection of request cookies.
@@ -227,6 +305,7 @@ class Request extends \yii\base\Request implements RequestInterface
             } else {
                 $this->_queryParams = $params + $this->_queryParams;
             }
+
             return [$route, $this->getQueryParams()];
         }
 
@@ -234,6 +313,58 @@ class Request extends \yii\base\Request implements RequestInterface
     }
 
     /**
+     * Filters headers according to the [[trustedHosts]].
+     * @param array $rawHeaders
+     * @return array filtered headers
+     * @since 2.0.13
+     */
+    protected function filterHeaders($rawHeaders)
+    {
+        // do not trust any of the [[secureHeaders]] by default
+        $trustedHeaders = [];
+
+        // check if the client is a trusted host
+        if (!empty($this->trustedHosts)) {
+            $validator = $this->getIpValidator();
+            $ip = $this->getRemoteIP();
+            foreach ($this->trustedHosts as $cidr => $headers) {
+                if (!is_array($headers)) {
+                    $cidr = $headers;
+                    $headers = $this->secureHeaders;
+                }
+                $validator->setRanges($cidr);
+                if ($validator->validate($ip)) {
+                    $trustedHeaders = $headers;
+                    break;
+                }
+            }
+        }
+
+        $rawHeaders = array_change_key_case($rawHeaders, CASE_LOWER);
+
+        // filter all secure headers unless they are trusted
+        foreach ($this->secureHeaders as $secureHeader) {
+            if (!in_array($secureHeader, $trustedHeaders)) {
+                unset($rawHeaders[strtolower($secureHeader)]);
+            }
+        }
+
+        return $rawHeaders;
+    }
+
+    /**
+     * Creates instance of [[IpValidator]].
+     * You can override this method to adjust validator or implement different matching strategy.
+     *
+     * @return IpValidator
+     * @since 2.0.13
+     */
+    protected function getIpValidator()
+    {
+        return new IpValidator();
+    }
+
+    /**
      * Returns default message's headers, which should be present once [[headerCollection]] is instantiated.
      * @return string[][] an associative array of the message's headers.
      */
@@ -253,7 +384,7 @@ class Request extends \yii\base\Request implements RequestInterface
             }
         }
 
-        return $headers;
+        return $this->filterHeaders($headers);
     }
 
     /**
@@ -1030,8 +1161,20 @@ class Request extends \yii\base\Request implements RequestInterface
      */
     public function getIsSecureConnection()
     {
-        return isset($_SERVER['HTTPS']) && (strcasecmp($_SERVER['HTTPS'], 'on') === 0 || $_SERVER['HTTPS'] == 1)
-            || strcasecmp($this->getHeaderLine('x-forwarded-proto'), 'https') === 0;
+        if (isset($_SERVER['HTTPS']) && (strcasecmp($_SERVER['HTTPS'], 'on') === 0 || $_SERVER['HTTPS'] == 1)) {
+            return true;
+        }
+        foreach ($this->secureProtocolHeaders as $header => $values) {
+            if ($this->hasHeader($header)) {
+                foreach ($values as $value) {
+                    if (strcasecmp($this->getHeaderLine($header), $value) === 0) {
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
     }
 
     /**
@@ -1098,19 +1241,57 @@ class Request extends \yii\base\Request implements RequestInterface
 
     /**
      * Returns the user IP address.
+     * The IP is determined using headers and / or `$_SERVER` variables.
      * @return string|null user IP address, null if not available
      */
     public function getUserIP()
     {
-        return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
+        foreach ($this->ipHeaders as $ipHeader) {
+            if ($this->hasHeader($ipHeader)) {
+                return trim(explode(',', $this->getHeaderLine($ipHeader))[0]);
+            }
+        }
+
+        return $this->getRemoteIP();
     }
 
     /**
      * Returns the user host name.
+     * The HOST is determined using headers and / or `$_SERVER` variables.
      * @return string|null user host name, null if not available
      */
     public function getUserHost()
     {
+        foreach ($this->ipHeaders as $ipHeader) {
+            if ($this->hasHeader($ipHeader)) {
+                return gethostbyaddr(trim(explode(',', $this->getHeaderLine($ipHeader))[0]));
+            }
+        }
+
+        return $this->getRemoteHost();
+    }
+
+    /**
+     * Returns the IP on the other end of this connection.
+     * This is always the next hop, any headers are ignored.
+     * @return string|null remote IP address, `null` if not available.
+     * @since 2.0.13
+     */
+    public function getRemoteIP()
+    {
+        return isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : null;
+    }
+
+    /**
+     * Returns the host name of the other end of this connection.
+     * This is always the next hop, any headers are ignored.
+     * @return string|null remote host name, `null` if not available
+     * @see getUserHost()
+     * @see getRemoteIP()
+     * @since 2.0.13
+     */
+    public function getRemoteHost()
+    {
         return isset($_SERVER['REMOTE_HOST']) ? $_SERVER['REMOTE_HOST'] : null;
     }
 
@@ -1198,6 +1379,7 @@ class Request extends \yii\base\Request implements RequestInterface
 
     /**
      * Returns the content types acceptable by the end user.
+     *
      * This is determined by the `Accept` HTTP header. For example,
      *
      * ```php
@@ -1426,6 +1608,7 @@ class Request extends \yii\base\Request implements RequestInterface
 
     /**
      * Returns the cookie collection.
+     *
      * Through the returned cookie collection, you may access a cookie using the following syntax:
      *
      * ```php
@@ -1671,6 +1854,7 @@ class Request extends \yii\base\Request implements RequestInterface
         if ($this->enableCsrfCookie) {
             return $this->getCookies()->getValue($this->csrfParam);
         }
+
         return Yii::$app->getSession()->get($this->csrfParam);
     }
 
@@ -1680,13 +1864,14 @@ class Request extends \yii\base\Request implements RequestInterface
      */
     protected function generateCsrfToken()
     {
-        $token = Yii::$app->getSecurity()->generateRandomKey();
+        $token = Yii::$app->getSecurity()->generateRandomString();
         if ($this->enableCsrfCookie) {
             $cookie = $this->createCsrfCookie($token);
             Yii::$app->getResponse()->getCookies()->add($cookie);
         } else {
             Yii::$app->getSession()->set($this->csrfParam, $token);
         }
+
         return $token;
     }
 
@@ -1735,7 +1920,6 @@ class Request extends \yii\base\Request implements RequestInterface
             return true;
         }
 
-
         $trueToken = $this->getCsrfToken();
 
         if ($clientSuppliedToken !== null) {
@@ -1747,7 +1931,7 @@ class Request extends \yii\base\Request implements RequestInterface
     }
 
     /**
-     * Validates CSRF token
+     * Validates CSRF token.
      *
      * @param string $clientSuppliedToken The masked client-supplied token.
      * @param string $trueToken The masked true token.
diff --git a/framework/web/Response.php b/framework/web/Response.php
index bd28889..c8b417b 100644
--- a/framework/web/Response.php
+++ b/framework/web/Response.php
@@ -22,7 +22,7 @@ use yii\http\MessageTrait;
 use yii\http\ResourceStream;
 
 /**
- * The web Response class represents an HTTP response
+ * The web Response class represents an HTTP response.
  *
  * It holds the [[headers]], [[cookies]] and [[content]] that is to be sent to the client.
  * It also controls the HTTP [[statusCode|status code]].
@@ -274,6 +274,7 @@ class Response extends \yii\base\Response implements ResponseInterface
         } else {
             $this->reasonPhrase = $reasonPhrase;
         }
+
         return $this;
     }
 
@@ -313,6 +314,7 @@ class Response extends \yii\base\Response implements ResponseInterface
         } else {
             $this->setStatusCode(500);
         }
+
         return $this;
     }
 
@@ -369,7 +371,7 @@ class Response extends \yii\base\Response implements ResponseInterface
     }
 
     /**
-     * Sends the response headers to the client
+     * Sends the response headers to the client.
      */
     protected function sendHeaders()
     {
@@ -419,7 +421,7 @@ class Response extends \yii\base\Response implements ResponseInterface
     }
 
     /**
-     * Sends the response content to the client
+     * Sends the response content to the client.
      */
     protected function sendContent()
     {
@@ -780,7 +782,7 @@ class Response extends \yii\base\Response implements ResponseInterface
     }
 
     /**
-     * Returns Content-Disposition header value that is safe to use with both old and new browsers
+     * Returns Content-Disposition header value that is safe to use with both old and new browsers.
      *
      * Fallback name:
      *
@@ -812,6 +814,7 @@ class Response extends \yii\base\Response implements ResponseInterface
         if ($utfName !== $fallbackName) {
             $dispositionHeader .= "; filename*=utf-8''{$utfName}";
         }
+
         return $dispositionHeader;
     }
 
@@ -929,6 +932,7 @@ class Response extends \yii\base\Response implements ResponseInterface
 
     /**
      * Returns the cookie collection.
+     *
      * Through the returned cookie collection, you add or remove cookies as follows,
      *
      * ```php
@@ -951,6 +955,7 @@ class Response extends \yii\base\Response implements ResponseInterface
         if ($this->_cookies === null) {
             $this->_cookies = new CookieCollection();
         }
+
         return $this->_cookies;
     }
 
diff --git a/framework/web/Session.php b/framework/web/Session.php
index 4377269..e5ff475 100644
--- a/framework/web/Session.php
+++ b/framework/web/Session.php
@@ -404,6 +404,7 @@ class Session extends Component implements \IteratorAggregate, \ArrayAccess, \Co
 
     /**
      * Sets the value indicating whether cookies should be used to store session IDs.
+     *
      * Three states are possible:
      *
      * - true: cookies and only cookies will be used to store session IDs.
@@ -630,7 +631,7 @@ class Session extends Component implements \IteratorAggregate, \ArrayAccess, \Co
     }
 
     /**
-     * Removes all session variables
+     * Removes all session variables.
      */
     public function removeAll()
     {
diff --git a/framework/web/TooManyRequestsHttpException.php b/framework/web/TooManyRequestsHttpException.php
index 0646434..eb60211 100644
--- a/framework/web/TooManyRequestsHttpException.php
+++ b/framework/web/TooManyRequestsHttpException.php
@@ -8,7 +8,7 @@
 namespace yii\web;
 
 /**
- * TooManyRequestsHttpException represents a "Too Many Requests" HTTP exception with status code 429
+ * TooManyRequestsHttpException represents a "Too Many Requests" HTTP exception with status code 429.
  *
  * Use this exception to indicate that a client has made too many requests in a
  * given period of time. For example, you would throw this exception when
diff --git a/framework/web/UnauthorizedHttpException.php b/framework/web/UnauthorizedHttpException.php
index db26548..2f8350e 100644
--- a/framework/web/UnauthorizedHttpException.php
+++ b/framework/web/UnauthorizedHttpException.php
@@ -8,7 +8,7 @@
 namespace yii\web;
 
 /**
- * UnauthorizedHttpException represents an "Unauthorized" HTTP exception with status code 401
+ * UnauthorizedHttpException represents an "Unauthorized" HTTP exception with status code 401.
  *
  * Use this exception to indicate that a client needs to authenticate via WWW-Authenticate header
  * to perform the requested action.
diff --git a/framework/web/UnsupportedMediaTypeHttpException.php b/framework/web/UnsupportedMediaTypeHttpException.php
index 903dd17..5942ea2 100644
--- a/framework/web/UnsupportedMediaTypeHttpException.php
+++ b/framework/web/UnsupportedMediaTypeHttpException.php
@@ -8,7 +8,7 @@
 namespace yii\web;
 
 /**
- * UnsupportedMediaTypeHttpException represents an "Unsupported Media Type" HTTP exception with status code 415
+ * UnsupportedMediaTypeHttpException represents an "Unsupported Media Type" HTTP exception with status code 415.
  *
  * Use this exception when the client sends data in a format that your
  * application does not understand. For example, you would throw this exception
diff --git a/framework/web/UrlManager.php b/framework/web/UrlManager.php
index 4698e57..01c89c0 100644
--- a/framework/web/UrlManager.php
+++ b/framework/web/UrlManager.php
@@ -241,6 +241,7 @@ class UrlManager extends Component
             }
             $compiledRules[] = $rule;
         }
+
         return $compiledRules;
     }
 
@@ -437,7 +438,7 @@ class UrlManager extends Component
     }
 
     /**
-     * Get URL from internal cache if exists
+     * Get URL from internal cache if exists.
      * @param string $cacheKey generated cache key to store data.
      * @param string $route the route (e.g. `site/index`).
      * @param array $params rule params.
@@ -457,11 +458,12 @@ class UrlManager extends Component
         } else {
             $this->_ruleCache[$cacheKey] = [];
         }
+
         return false;
     }
 
     /**
-     * Store rule (e.g. [[UrlRule]]) to internal cache
+     * Store rule (e.g. [[UrlRule]]) to internal cache.
      * @param $cacheKey
      * @param UrlRuleInterface $rule
      * @since 2.0.8
@@ -531,7 +533,7 @@ class UrlManager extends Component
      */
     public function setBaseUrl($value)
     {
-        $this->_baseUrl = $value === null ? null : rtrim($value, '/');
+        $this->_baseUrl = $value === null ? null : rtrim(Yii::getAlias($value), '/');
     }
 
     /**
diff --git a/framework/web/UrlRule.php b/framework/web/UrlRule.php
index b0f7bce..99df503 100644
--- a/framework/web/UrlRule.php
+++ b/framework/web/UrlRule.php
@@ -33,11 +33,11 @@ use yii\base\InvalidConfigException;
 class UrlRule extends BaseObject implements UrlRuleInterface
 {
     /**
-     * Set [[mode]] with this value to mark that this rule is for URL parsing only
+     * Set [[mode]] with this value to mark that this rule is for URL parsing only.
      */
     const PARSING_ONLY = 1;
     /**
-     * Set [[mode]] with this value to mark that this rule is for URL creation only
+     * Set [[mode]] with this value to mark that this rule is for URL creation only.
      */
     const CREATION_ONLY = 2;
     /**
@@ -179,6 +179,7 @@ class UrlRule extends BaseObject implements UrlRuleInterface
         if ($str === '') {
             return '/';
         }
+
         return $str;
     }
 
@@ -579,6 +580,7 @@ class UrlRule extends BaseObject implements UrlRuleInterface
                 unset($matches[$placeholder]);
             }
         }
+
         return $matches;
     }
 
@@ -594,6 +596,7 @@ class UrlRule extends BaseObject implements UrlRuleInterface
         if (strpos($string, '//') === 0) {
             return '//' . trim($string, '/');
         }
+
         return trim($string, '/');
     }
 }
diff --git a/framework/web/User.php b/framework/web/User.php
index 994c50a..cb132cb 100644
--- a/framework/web/User.php
+++ b/framework/web/User.php
@@ -610,7 +610,7 @@ class User extends Component
         }
 
         /* Ensure any existing identity cookies are removed. */
-        if ($this->enableAutoLogin) {
+        if ($this->enableAutoLogin && ($this->autoRenewCookie || $identity === null)) {
             $this->removeIdentityCookie();
         }
 
@@ -629,7 +629,7 @@ class User extends Component
             if ($this->absoluteAuthTimeout !== null) {
                 $session->set($this->absoluteAuthTimeoutParam, time() + $this->absoluteAuthTimeout);
             }
-            if ($duration > 0 && $this->enableAutoLogin) {
+            if ($this->enableAutoLogin && $duration > 0) {
                 $this->sendIdentityCookie($identity, $duration);
             }
         }
diff --git a/framework/web/View.php b/framework/web/View.php
index fc4b577..df007d5 100644
--- a/framework/web/View.php
+++ b/framework/web/View.php
@@ -579,11 +579,11 @@ class View extends \yii\base\View
                 $lines[] = Html::script(implode("\n", $this->js[self::POS_END]), ['type' => 'text/javascript']);
             }
             if (!empty($this->js[self::POS_READY])) {
-                $js = "jQuery(document).ready(function () {\n" . implode("\n", $this->js[self::POS_READY]) . "\n});";
+                $js = "jQuery(function ($) {\n" . implode("\n", $this->js[self::POS_READY]) . "\n});";
                 $lines[] = Html::script($js, ['type' => 'text/javascript']);
             }
             if (!empty($this->js[self::POS_LOAD])) {
-                $js = "jQuery(window).on('load', function () {\n" . implode("\n", $this->js[self::POS_LOAD]) . "\n});";
+                $js = "jQuery(function ($) {\n$(window).on('load', function () {\n" . implode("\n", $this->js[self::POS_LOAD]) . "\n});\n});";
                 $lines[] = Html::script($js, ['type' => 'text/javascript']);
             }
         }
diff --git a/framework/web/ViewAction.php b/framework/web/ViewAction.php
index 17c2d45..84ca319 100644
--- a/framework/web/ViewAction.php
+++ b/framework/web/ViewAction.php
@@ -98,7 +98,7 @@ class ViewAction extends Action
     }
 
     /**
-     * Renders a view
+     * Renders a view.
      *
      * @param string $viewName view name
      * @return string result of the rendering
diff --git a/framework/web/XmlResponseFormatter.php b/framework/web/XmlResponseFormatter.php
index a31f94e..1e1c144 100644
--- a/framework/web/XmlResponseFormatter.php
+++ b/framework/web/XmlResponseFormatter.php
@@ -126,7 +126,7 @@ class XmlResponseFormatter extends Component implements ResponseFormatterInterfa
     }
 
     /**
-     * Formats scalar value to use in XML text node
+     * Formats scalar value to use in XML text node.
      *
      * @param int|string|bool $value
      * @return string
@@ -160,11 +160,12 @@ class XmlResponseFormatter extends Component implements ResponseFormatterInterfa
         if (empty($name) || is_int($name) || !$this->isValidXmlName($name)) {
             return $this->itemTag;
         }
+
         return $name;
     }
 
     /**
-     * Checks if name is valid to be used in XML
+     * Checks if name is valid to be used in XML.
      *
      * @param mixed $name
      * @return bool
diff --git a/framework/web/migrations/m160313_153426_session_init.php b/framework/web/migrations/m160313_153426_session_init.php
index 279ebf9..9ebc951 100644
--- a/framework/web/migrations/m160313_153426_session_init.php
+++ b/framework/web/migrations/m160313_153426_session_init.php
@@ -8,7 +8,7 @@
 use yii\db\Migration;
 
 /**
- * Initializes Session tables
+ * Initializes Session tables.
  *
  * @author Misbahul D Munir <misbahuldmunir@gmail.com>
  * @since 2.0.8
diff --git a/framework/widgets/ActiveField.php b/framework/widgets/ActiveField.php
index 3c8a6b1..fa7f775 100644
--- a/framework/widgets/ActiveField.php
+++ b/framework/widgets/ActiveField.php
@@ -236,7 +236,7 @@ class ActiveField extends Component
         $inputID = $this->getInputId();
         $attribute = Html::getAttributeName($this->attribute);
         $options = $this->options;
-        $class = isset($options['class']) ? [$options['class']] : [];
+        $class = isset($options['class']) ? (array)$options['class'] : [];
         $class[] = "field-$inputID";
         if ($this->model->isAttributeRequired($attribute)) {
             $class[] = $this->form->requiredCssClass;
@@ -820,7 +820,7 @@ class ActiveField extends Component
     }
 
     /**
-     * Checks if client validation enabled for the field
+     * Checks if client validation enabled for the field.
      * @return bool
      * @since 2.0.11
      */
@@ -830,7 +830,7 @@ class ActiveField extends Component
     }
 
     /**
-     * Checks if ajax validation enabled for the field
+     * Checks if ajax validation enabled for the field.
      * @return bool
      * @since 2.0.11
      */
@@ -850,7 +850,7 @@ class ActiveField extends Component
     }
 
     /**
-     * Adds aria attributes to the input options
+     * Adds aria attributes to the input options.
      * @param $options array input options
      * @since 2.0.11
      */
diff --git a/framework/widgets/ActiveForm.php b/framework/widgets/ActiveForm.php
index ea3ddaf..d1ac4d5 100644
--- a/framework/widgets/ActiveForm.php
+++ b/framework/widgets/ActiveForm.php
@@ -307,6 +307,7 @@ class ActiveForm extends Widget
         if (!isset($config['class'])) {
             $config['class'] = $this->fieldClass;
         }
+
         return Yii::createObject(ArrayHelper::merge($config, $options, [
             'model' => $model,
             'attribute' => $attribute,
diff --git a/framework/widgets/BaseListView.php b/framework/widgets/BaseListView.php
index f38c061..77d35c0 100644
--- a/framework/widgets/BaseListView.php
+++ b/framework/widgets/BaseListView.php
@@ -113,6 +113,7 @@ abstract class BaseListView extends Widget
      */
     public function init()
     {
+        parent::init();
         if ($this->dataProvider === null) {
             throw new InvalidConfigException('The "dataProvider" property must be set.');
         }
diff --git a/framework/widgets/Breadcrumbs.php b/framework/widgets/Breadcrumbs.php
index f2019b6..238038f 100644
--- a/framework/widgets/Breadcrumbs.php
+++ b/framework/widgets/Breadcrumbs.php
@@ -176,6 +176,7 @@ class Breadcrumbs extends Widget
         } else {
             $link = $label;
         }
+
         return strtr($template, ['{link}' => $link]);
     }
 }
diff --git a/framework/widgets/InputWidget.php b/framework/widgets/InputWidget.php
index f59b4ec..a44ea76 100644
--- a/framework/widgets/InputWidget.php
+++ b/framework/widgets/InputWidget.php
@@ -16,9 +16,9 @@ use yii\helpers\Html;
 /**
  * InputWidget is the base class for widgets that collect user inputs.
  *
- * An input widget can be associated with a data model and an attribute,
- * or a name and a value. If the former, the name and the value will
- * be generated automatically.
+ * An input widget can be associated with a data [[model]] and an [[attribute]],
+ * or a [[name]] and a [[value]]. If the former, the name and the value will
+ * be generated automatically (subclasses may call [[renderInputHtml()]] to follow this behavior).
  *
  * Classes extending from this widget can be used in an [[\yii\widgets\ActiveForm|ActiveForm]]
  * using the [[\yii\widgets\ActiveField::widget()|widget()]] method, for example like this:
@@ -87,4 +87,25 @@ class InputWidget extends Widget
     {
         return $this->model instanceof Model && $this->attribute !== null;
     }
+
+    /**
+     * Render a HTML input tag
+     *
+     * This will call [[Html::activeInput()]] if the input widget is [[hasModel()|tied to a model]],
+     * or [[Html::input()]] if not.
+     *
+     * @param string $type the type of the input to create.
+     * @return string the HTML of the input field.
+     * @since 2.0.13
+     * @see Html::activeInput()
+     * @see Html::input()
+     */
+    protected function renderInputHtml($type)
+    {
+        if ($this->hasModel()) {
+            return Html::activeInput($type, $this->model, $this->attribute, $this->options);
+        } else {
+            return Html::input($type, $this->name, $this->value, $this->options);
+        }
+    }
 }
diff --git a/framework/widgets/LinkPager.php b/framework/widgets/LinkPager.php
index 064412e..c4c268b 100644
--- a/framework/widgets/LinkPager.php
+++ b/framework/widgets/LinkPager.php
@@ -42,6 +42,11 @@ class LinkPager extends Widget
      */
     public $options = ['class' => 'pagination'];
     /**
+     * @var array HTML attributes which will be applied to all link containers
+     * @since 2.0.13
+     */
+    public $linkContainerOptions = [];
+    /**
      * @var array HTML attributes for the link in a pager container tag.
      * @see \yii\helpers\Html::renderTagAttributes() for details on how attributes are being rendered.
      */
@@ -213,7 +218,9 @@ class LinkPager extends Widget
             $buttons[] = $this->renderPageButton($lastPageLabel, $pageCount - 1, $this->lastPageCssClass, $currentPage >= $pageCount - 1, false);
         }
 
-        return Html::tag('ul', implode("\n", $buttons), $this->options);
+        $options = $this->options;
+        $tag = ArrayHelper::remove($options, 'tag', 'ul');
+        return Html::tag($tag, implode("\n", $buttons), $options);
     }
 
     /**
@@ -228,7 +235,10 @@ class LinkPager extends Widget
      */
     protected function renderPageButton($label, $page, $class, $disabled, $active)
     {
-        $options = ['class' => empty($class) ? $this->pageCssClass : $class];
+        $options = $this->linkContainerOptions;
+        $linkWrapTag = ArrayHelper::remove($options, 'tag', 'li');
+        Html::addCssClass($options, empty($class) ? $this->pageCssClass : $class);
+
         if ($active) {
             Html::addCssClass($options, $this->activePageCssClass);
         }
@@ -236,12 +246,12 @@ class LinkPager extends Widget
             Html::addCssClass($options, $this->disabledPageCssClass);
             $tag = ArrayHelper::remove($this->disabledListItemSubTagOptions, 'tag', 'span');
 
-            return Html::tag('li', Html::tag($tag, $label, $this->disabledListItemSubTagOptions), $options);
+            return Html::tag($linkWrapTag, Html::tag($tag, $label, $this->disabledListItemSubTagOptions), $options);
         }
         $linkOptions = $this->linkOptions;
         $linkOptions['data-page'] = $page;
 
-        return Html::tag('li', Html::a($label, $this->pagination->createUrl($page), $linkOptions), $options);
+        return Html::tag($linkWrapTag, Html::a($label, $this->pagination->createUrl($page), $linkOptions), $options);
     }
 
     /**
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 34764cf..41d5ee4 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -28,7 +28,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
     }
 
     /**
-     * Returns a test configuration param from /data/config.php
+     * Returns a test configuration param from /data/config.php.
      * @param  string $name params name
      * @param  mixed $default default value to use when param is not set.
      * @return mixed  the value of the configuration param
@@ -93,6 +93,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
         if (!is_dir($vendor)) {
             $vendor = dirname(dirname(dirname(dirname(__DIR__))));
         }
+
         return $vendor;
     }
 
@@ -108,7 +109,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
     }
 
     /**
-     * Asserting two strings equality ignoring line endings
+     * Asserting two strings equality ignoring line endings.
      * @param string $expected
      * @param string $actual
      */
@@ -121,7 +122,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
     }
 
     /**
-     * Invokes a inaccessible method
+     * Invokes a inaccessible method.
      * @param $object
      * @param $method
      * @param array $args
@@ -131,18 +132,19 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
      */
     protected function invokeMethod($object, $method, $args = [], $revoke = true)
     {
-        $reflection = new \ReflectionClass(get_class($object));
+        $reflection = new \ReflectionObject($object);
         $method = $reflection->getMethod($method);
         $method->setAccessible(true);
         $result = $method->invokeArgs($object, $args);
         if ($revoke) {
             $method->setAccessible(false);
         }
+
         return $result;
     }
 
     /**
-     * Sets an inaccessible object property to a designated value
+     * Sets an inaccessible object property to a designated value.
      * @param $object
      * @param $propertyName
      * @param $value
@@ -164,7 +166,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
     }
 
     /**
-     * Gets an inaccessible object property
+     * Gets an inaccessible object property.
      * @param $object
      * @param $propertyName
      * @param bool $revoke whether to make property inaccessible after getting
@@ -182,12 +184,13 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
         if ($revoke) {
             $property->setAccessible(false);
         }
+
         return $result;
     }
 
 
     /**
-     * Asserts that value is one of expected values
+     * Asserts that value is one of expected values.
      *
      * @param mixed $actual
      * @param array $expected
diff --git a/tests/compatibility.php b/tests/compatibility.php
new file mode 100644
index 0000000..9f881f3
--- /dev/null
+++ b/tests/compatibility.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+/*
+ * Ensures compatibility with PHPUnit < 6.x
+ */
+
+namespace PHPUnit\Framework\Constraint {
+    if (!class_exists('PHPUnit\Framework\Constraint\Constraint') && class_exists('PHPUnit_Framework_Constraint')) {
+        abstract class Constraint extends \PHPUnit_Framework_Constraint
+        {
+        }
+    }
+}
+
+namespace PHPUnit\Framework {
+    if (!class_exists('PHPUnit\Framework\TestCase') && class_exists('PHPUnit_Framework_TestCase')) {
+        echo "Applying compatibility patch for PHPUnit 6...\n";
+
+        abstract class TestCase extends \PHPUnit_Framework_TestCase
+        {
+            /**
+             * @param string $exception
+             */
+            public function expectException($exception)
+            {
+                $this->setExpectedException($exception);
+            }
+
+            /**
+             * @param string $message
+             */
+            public function expectExceptionMessage($message)
+            {
+                $parentClassMethods = get_class_methods('PHPUnit_Framework_TestCase');
+                if (in_array('expectExceptionMessage', $parentClassMethods)) {
+                    parent::expectExceptionMessage($message);
+                    return;
+                }
+                $this->setExpectedException($this->getExpectedException(), $message);
+            }
+
+            /**
+             * @param string $messageRegExp
+             */
+            public function expectExceptionMessageRegExp($messageRegExp)
+            {
+                $parentClassMethods = get_class_methods('PHPUnit_Framework_TestCase');
+                if (in_array('expectExceptionMessageRegExp', $parentClassMethods)) {
+                    parent::expectExceptionMessageRegExp($messageRegExp);
+                    return;
+                }
+                $this->setExpectedExceptionRegExp($this->getExpectedException(), $messageRegExp);
+            }
+        }
+    }
+}
diff --git a/tests/data/ar/Animal.php b/tests/data/ar/Animal.php
index 98900f5..7f7d866 100644
--- a/tests/data/ar/Animal.php
+++ b/tests/data/ar/Animal.php
@@ -9,7 +9,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class Animal
+ * Class Animal.
  *
  * @author Jose Lorente <jose.lorente.martin@gmail.com>
  * @property int $id
diff --git a/tests/data/ar/BitValues.php b/tests/data/ar/BitValues.php
index e63256e..fbd5346 100644
--- a/tests/data/ar/BitValues.php
+++ b/tests/data/ar/BitValues.php
@@ -9,7 +9,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * https://github.com/yiisoft/yii2/issues/9006
+ * @see https://github.com/yiisoft/yii2/issues/9006
  *
  * @property int $id
  * @property int $val
diff --git a/tests/data/ar/Cat.php b/tests/data/ar/Cat.php
index 7ad69ba..bfef4d0 100644
--- a/tests/data/ar/Cat.php
+++ b/tests/data/ar/Cat.php
@@ -9,7 +9,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class Cat
+ * Class Cat.
  *
  * @author Jose Lorente <jose.lorente.martin@gmail.com>
  * @since 2.0
diff --git a/tests/data/ar/Customer.php b/tests/data/ar/Customer.php
index 958d910..e607e45 100644
--- a/tests/data/ar/Customer.php
+++ b/tests/data/ar/Customer.php
@@ -11,7 +11,7 @@ use yii\db\ActiveQuery;
 use yiiunit\framework\db\ActiveRecordTest;
 
 /**
- * Class Customer
+ * Class Customer.
  *
  * @property int $id
  * @property string $name
diff --git a/tests/data/ar/CustomerQuery.php b/tests/data/ar/CustomerQuery.php
index 567991c..a53ec90 100644
--- a/tests/data/ar/CustomerQuery.php
+++ b/tests/data/ar/CustomerQuery.php
@@ -10,7 +10,7 @@ namespace yiiunit\data\ar;
 use yii\db\ActiveQuery;
 
 /**
- * CustomerQuery
+ * CustomerQuery.
  */
 class CustomerQuery extends ActiveQuery
 {
diff --git a/tests/data/ar/CustomerWithConstructor.php b/tests/data/ar/CustomerWithConstructor.php
new file mode 100644
index 0000000..7332b55
--- /dev/null
+++ b/tests/data/ar/CustomerWithConstructor.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace yiiunit\data\ar;
+
+/**
+ * CustomerWithConstructor
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $email
+ * @property string $address
+ * @property int $status
+ *
+ * @property ProfileWithConstructor $profile
+ */
+class CustomerWithConstructor extends ActiveRecord
+{
+    public static function tableName()
+    {
+        return 'customer';
+    }
+
+    public function __construct($name, $email, $address)
+    {
+        $this->name = $name;
+        $this->email = $email;
+        $this->address = $address;
+        parent::__construct();
+    }
+
+    public static function instance($refresh = false)
+    {
+        return self::instantiate([]);
+    }
+
+    public static function instantiate($row)
+    {
+        return (new \ReflectionClass(static::class))->newInstanceWithoutConstructor();
+    }
+
+    public function getProfile()
+    {
+        return $this->hasOne(ProfileWithConstructor::class, ['id' => 'profile_id']);
+    }
+}
\ No newline at end of file
diff --git a/tests/data/ar/DefaultPk.php b/tests/data/ar/DefaultPk.php
index 5fbb7eb..1a0d9ad 100644
--- a/tests/data/ar/DefaultPk.php
+++ b/tests/data/ar/DefaultPk.php
@@ -8,7 +8,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * DefaultPk
+ * DefaultPk.
  *
  * @author Jan Waś <janek.jan@gmail.com>
  * @property int $id
diff --git a/tests/data/ar/Dog.php b/tests/data/ar/Dog.php
index 1f0f2d7..17cac2e 100644
--- a/tests/data/ar/Dog.php
+++ b/tests/data/ar/Dog.php
@@ -9,7 +9,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class Dog
+ * Class Dog.
  *
  * @author Jose Lorente <jose.lorente.martin@gmail.com>
  * @since 2.0
diff --git a/tests/data/ar/Item.php b/tests/data/ar/Item.php
index 8c7d091..8bb1f80 100644
--- a/tests/data/ar/Item.php
+++ b/tests/data/ar/Item.php
@@ -8,7 +8,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class Item
+ * Class Item.
  *
  * @property int $id
  * @property string $name
diff --git a/tests/data/ar/NullValues.php b/tests/data/ar/NullValues.php
index c2766a0..afa4548 100644
--- a/tests/data/ar/NullValues.php
+++ b/tests/data/ar/NullValues.php
@@ -8,7 +8,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class NullValues
+ * Class NullValues.
  *
  * @property int $id
  * @property int $var1
diff --git a/tests/data/ar/Order.php b/tests/data/ar/Order.php
index 5cddf67..c26bfb5 100644
--- a/tests/data/ar/Order.php
+++ b/tests/data/ar/Order.php
@@ -8,7 +8,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class Order
+ * Class Order.
  *
  * @property int $id
  * @property int $customer_id
diff --git a/tests/data/ar/OrderItem.php b/tests/data/ar/OrderItem.php
index 37476fe..f9c71e8 100644
--- a/tests/data/ar/OrderItem.php
+++ b/tests/data/ar/OrderItem.php
@@ -8,7 +8,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class OrderItem
+ * Class OrderItem.
  *
  * @property int $order_id
  * @property int $item_id
diff --git a/tests/data/ar/OrderItemWithConstructor.php b/tests/data/ar/OrderItemWithConstructor.php
new file mode 100644
index 0000000..ab0ca94
--- /dev/null
+++ b/tests/data/ar/OrderItemWithConstructor.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace yiiunit\data\ar;
+
+/**
+ * OrderItemWithConstructor
+ *
+ * @property int $order_id
+ * @property int $item_id
+ * @property int $quantity
+ * @property string $subtotal
+ */
+class OrderItemWithConstructor extends ActiveRecord
+{
+    public static function tableName()
+    {
+        return 'order_item';
+    }
+
+    public function __construct($item_id, $quantity)
+    {
+        $this->item_id = $item_id;
+        $this->quantity = $quantity;
+        parent::__construct();
+    }
+
+    public static function instance($refresh = false)
+    {
+        return self::instantiate([]);
+    }
+
+    public static function instantiate($row)
+    {
+        return (new \ReflectionClass(static::class))->newInstanceWithoutConstructor();
+    }
+
+    public function getOrder()
+    {
+        return $this->hasOne(OrderWithConstructor::class, ['id' => 'order_id']);
+    }
+}
\ No newline at end of file
diff --git a/tests/data/ar/OrderItemWithNullFK.php b/tests/data/ar/OrderItemWithNullFK.php
index 09c3494..cc50b62 100644
--- a/tests/data/ar/OrderItemWithNullFK.php
+++ b/tests/data/ar/OrderItemWithNullFK.php
@@ -8,7 +8,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class OrderItem
+ * Class OrderItem.
  *
  * @property int $order_id
  * @property int $item_id
diff --git a/tests/data/ar/OrderWithConstructor.php b/tests/data/ar/OrderWithConstructor.php
new file mode 100644
index 0000000..9352399
--- /dev/null
+++ b/tests/data/ar/OrderWithConstructor.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace yiiunit\data\ar;
+
+/**
+ * OrderWithConstructor
+ *
+ * @property int $id
+ * @property int $customer_id
+ * @property int $created_at
+ * @property string $total
+ *
+ * @property OrderItemWithConstructor $orderItems
+ * @property CustomerWithConstructor $customer
+ * @property CustomerWithConstructor $customerJoinedWithProfile
+ */
+class OrderWithConstructor extends ActiveRecord
+{
+    public static function tableName()
+    {
+        return 'order';
+    }
+
+    public function __construct($id)
+    {
+        $this->id = $id;
+        $this->created_at = time();
+        parent::__construct();
+    }
+
+    public static function instance($refresh = false)
+    {
+        return self::instantiate([]);
+    }
+
+    public static function instantiate($row)
+    {
+        return (new \ReflectionClass(static::class))->newInstanceWithoutConstructor();
+    }
+
+    public function getCustomer()
+    {
+        return $this->hasOne(CustomerWithConstructor::class, ['id' => 'customer_id']);
+    }
+
+    public function getCustomerJoinedWithProfile()
+    {
+        return $this->hasOne(CustomerWithConstructor::class, ['id' => 'customer_id'])
+            ->joinWith('profile');
+    }
+
+    public function getOrderItems()
+    {
+        return $this->hasMany(OrderItemWithConstructor::class, ['order_id' => 'id'])->inverseOf('order');
+    }
+}
\ No newline at end of file
diff --git a/tests/data/ar/OrderWithNullFK.php b/tests/data/ar/OrderWithNullFK.php
index ef09bab..c4c539e 100644
--- a/tests/data/ar/OrderWithNullFK.php
+++ b/tests/data/ar/OrderWithNullFK.php
@@ -8,7 +8,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class Order
+ * Class Order.
  *
  * @property int $id
  * @property int $customer_id
diff --git a/tests/data/ar/Profile.php b/tests/data/ar/Profile.php
index 9bd1285..5b02be3 100644
--- a/tests/data/ar/Profile.php
+++ b/tests/data/ar/Profile.php
@@ -8,7 +8,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Class Profile
+ * Class Profile.
  *
  * @property int $id
  * @property string $description
diff --git a/tests/data/ar/ProfileWithConstructor.php b/tests/data/ar/ProfileWithConstructor.php
new file mode 100644
index 0000000..63a7f78
--- /dev/null
+++ b/tests/data/ar/ProfileWithConstructor.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace yiiunit\data\ar;
+
+/**
+ * ProfileWithConstructor
+ *
+ * @property int $id
+ * @property string $description
+ */
+class ProfileWithConstructor extends ActiveRecord
+{
+    public static function tableName()
+    {
+        return 'profile';
+    }
+
+    public function __construct($description)
+    {
+        $this->description = $description;
+        parent::__construct();
+    }
+
+    public static function instance($refresh = false)
+    {
+        return self::instantiate([]);
+    }
+
+    public static function instantiate($row)
+    {
+        return (new \ReflectionClass(static::class))->newInstanceWithoutConstructor();
+    }
+}
\ No newline at end of file
diff --git a/tests/data/ar/Type.php b/tests/data/ar/Type.php
index 0b86110..bd02d4e 100644
--- a/tests/data/ar/Type.php
+++ b/tests/data/ar/Type.php
@@ -8,7 +8,7 @@
 namespace yiiunit\data\ar;
 
 /**
- * Model representing type table
+ * Model representing type table.
  *
  * @property int $int_col
  * @property int $int_col2 DEFAULT 1
diff --git a/tests/data/base/InvalidRulesModel.php b/tests/data/base/InvalidRulesModel.php
index 4b76f85..fd80c42 100644
--- a/tests/data/base/InvalidRulesModel.php
+++ b/tests/data/base/InvalidRulesModel.php
@@ -10,7 +10,7 @@ namespace yiiunit\data\base;
 use yii\base\Model;
 
 /**
- * InvalidRulesModel
+ * InvalidRulesModel.
  */
 class InvalidRulesModel extends Model
 {
diff --git a/tests/data/base/RulesModel.php b/tests/data/base/RulesModel.php
index f605b43..e8458ac 100644
--- a/tests/data/base/RulesModel.php
+++ b/tests/data/base/RulesModel.php
@@ -10,7 +10,7 @@ namespace yiiunit\data\base;
 use yii\base\Model;
 
 /**
- * model to test different rules combinations in ModelTest
+ * Model to test different rules combinations in ModelTest.
  */
 class RulesModel extends Model
 {
diff --git a/tests/data/base/Singer.php b/tests/data/base/Singer.php
index 9ae6295..444eb54 100644
--- a/tests/data/base/Singer.php
+++ b/tests/data/base/Singer.php
@@ -10,7 +10,7 @@ namespace yiiunit\data\base;
 use yii\base\Model;
 
 /**
- * Singer
+ * Singer.
  */
 class Singer extends Model
 {
diff --git a/tests/data/base/Speaker.php b/tests/data/base/Speaker.php
index 2bd3a65..64c3720 100644
--- a/tests/data/base/Speaker.php
+++ b/tests/data/base/Speaker.php
@@ -10,7 +10,7 @@ namespace yiiunit\data\base;
 use yii\base\Model;
 
 /**
- * Speaker
+ * Speaker.
  */
 class Speaker extends Model
 {
diff --git a/tests/data/cache/MockDependency.php b/tests/data/cache/MockDependency.php
index 7ee846a..794dad8 100644
--- a/tests/data/cache/MockDependency.php
+++ b/tests/data/cache/MockDependency.php
@@ -10,7 +10,7 @@ namespace yiiunit\data\cache;
 use yii\caching\Dependency;
 
 /**
- * Class MockDependency
+ * Class MockDependency.
  *
  * @author Boudewijn Vahrmeijer <vahrmeijer@gmail.com>
  * @since 2.0.11
diff --git a/tests/data/codeclimate/phpmd_ruleset.xml b/tests/data/codeclimate/phpmd_ruleset.xml
index fa84009..9aefde2 100644
--- a/tests/data/codeclimate/phpmd_ruleset.xml
+++ b/tests/data/codeclimate/phpmd_ruleset.xml
@@ -27,6 +27,7 @@
         <exclude name="StaticAccess" />
     </rule>
 
+    <rule ref="rulesets/controversial.xml/Superglobals" />
     <rule ref="rulesets/controversial.xml/CamelCaseClassName" />
     <rule ref="rulesets/controversial.xml/CamelCaseMethodName" />
     <rule ref="rulesets/controversial.xml/CamelCaseParameterName" />
diff --git a/tests/data/config-docker.php b/tests/data/config-docker.php
index ba1ca64..86c3f83 100644
--- a/tests/data/config-docker.php
+++ b/tests/data/config-docker.php
@@ -7,13 +7,17 @@
 
 /**
  * This is the configuration file for the Yii 2 unit tests.
+ *
  * You can override configuration values by creating a `config.local.php` file
  * and manipulate the `$config` variable.
  * For example to change MySQL username and password your `config.local.php` should
  * contain the following:
+ *
+ * ```php
  * <?php
  * $config['databases']['mysql']['username'] = 'yiitest';
  * $config['databases']['mysql']['password'] = 'changeme';
+ * ```
  */
 $config = [
     'databases' => [
diff --git a/tests/data/config.php b/tests/data/config.php
index 22694f4..1ccae2d 100644
--- a/tests/data/config.php
+++ b/tests/data/config.php
@@ -7,13 +7,16 @@
 
 /**
  * This is the configuration file for the Yii 2 unit tests.
+ *
  * You can override configuration values by creating a `config.local.php` file
  * and manipulate the `$config` variable.
  * For example to change MySQL username and password your `config.local.php` should
  * contain the following:
+ * ```php
  * <?php
  * $config['databases']['mysql']['username'] = 'yiitest';
  * $config['databases']['mysql']['password'] = 'changeme';
+ * ```
  */
 $config = [
     'databases' => [
diff --git a/tests/data/console/migrate_create/default.php b/tests/data/console/migrate_create/default.php
index 00dca48..959f064 100644
--- a/tests/data/console/migrate_create/default.php
+++ b/tests/data/console/migrate_create/default.php
@@ -10,13 +10,22 @@ return <<<CODE
 
 use yii\db\Migration;
 
+/**
+ * Class {$class}
+ */
 class {$class} extends Migration
 {
+    /**
+     * @inheritdoc
+     */
     public function safeUp()
     {
 
     }
 
+    /**
+     * @inheritdoc
+     */
     public function safeDown()
     {
         echo "{$class} cannot be reverted.\\n";
diff --git a/tests/data/rbac/UserID.php b/tests/data/rbac/UserID.php
index 88c21b9..e87cd01 100644
--- a/tests/data/rbac/UserID.php
+++ b/tests/data/rbac/UserID.php
@@ -20,4 +20,4 @@ class UserID
     {
         return (string) $this->id;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/data/validators/models/ValidatorTestFunctionModel.php b/tests/data/validators/models/ValidatorTestFunctionModel.php
index 10be83c..57463be 100644
--- a/tests/data/validators/models/ValidatorTestFunctionModel.php
+++ b/tests/data/validators/models/ValidatorTestFunctionModel.php
@@ -17,4 +17,4 @@ class ValidatorTestFunctionModel extends Model
     {
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/framework/BaseYiiTest.php b/tests/framework/BaseYiiTest.php
index b641449..2fd22bb 100644
--- a/tests/framework/BaseYiiTest.php
+++ b/tests/framework/BaseYiiTest.php
@@ -17,7 +17,7 @@ use yiiunit\data\base\Singer;
 use yiiunit\TestCase;
 
 /**
- * BaseYiiTest
+ * BaseYiiTest.
  * @group base
  */
 class BaseYiiTest extends TestCase
diff --git a/tests/framework/ar/ActiveRecordTestTrait.php b/tests/framework/ar/ActiveRecordTestTrait.php
index 6ae229a..483a0aa 100644
--- a/tests/framework/ar/ActiveRecordTestTrait.php
+++ b/tests/framework/ar/ActiveRecordTestTrait.php
@@ -25,25 +25,25 @@ trait ActiveRecordTestTrait
 {
     /* @var $this TestCase */
     /**
-     * This method should return the classname of Customer class
+     * This method should return the classname of Customer class.
      * @return string
      */
     abstract public function getCustomerClass();
 
     /**
-     * This method should return the classname of Order class
+     * This method should return the classname of Order class.
      * @return string
      */
     abstract public function getOrderClass();
 
     /**
-     * This method should return the classname of OrderItem class
+     * This method should return the classname of OrderItem class.
      * @return string
      */
     abstract public function getOrderItemClass();
 
     /**
-     * This method should return the classname of Item class
+     * This method should return the classname of Item class.
      * @return string
      */
     abstract public function getItemClass();
@@ -53,7 +53,7 @@ trait ActiveRecordTestTrait
     abstract public function getOrderItemWithNullFKmClass();
 
     /**
-     * can be overridden to do things after save()
+     * Can be overridden to do things after save().
      */
     public function afterSave()
     {
@@ -559,8 +559,9 @@ trait ActiveRecordTestTrait
     }
 
     /**
-     * Ensure ActiveRelationTrait does preserve order of items on find via()
-     * https://github.com/yiisoft/yii2/issues/1310
+     * Ensure ActiveRelationTrait does preserve order of items on find via().
+     *
+     * @see https://github.com/yiisoft/yii2/issues/1310.
      */
     public function testFindEagerViaRelationPreserveOrder()
     {
diff --git a/tests/framework/base/ActionFilterTest.php b/tests/framework/base/ActionFilterTest.php
index 6d7efb0..6824f1f 100644
--- a/tests/framework/base/ActionFilterTest.php
+++ b/tests/framework/base/ActionFilterTest.php
@@ -101,6 +101,7 @@ class ActionFilterTest extends TestCase
 
     /**
      * @dataProvider actionFilterProvider
+     * @param string|array $filterClass
      */
     public function testActive($filterClass)
     {
diff --git a/tests/framework/base/ApplicationTest.php b/tests/framework/base/ApplicationTest.php
index 78ab37b..c685f55 100644
--- a/tests/framework/base/ApplicationTest.php
+++ b/tests/framework/base/ApplicationTest.php
@@ -63,8 +63,7 @@ class ApplicationTest extends TestCase
                 'withBootstrapInterface',
                 'moduleX',
                 function () {
-                }
-
+                },
             ],
         ]);
         $this->assertSame('Bootstrap with yii\base\Component', Yii::getLogger()->messages[0][1]);
diff --git a/tests/framework/base/BCObject.php b/tests/framework/base/BCObject.php
index 7f916a7..95343e1 100644
--- a/tests/framework/base/BCObject.php
+++ b/tests/framework/base/BCObject.php
@@ -1,8 +1,12 @@
 <?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
 
 namespace yiiunit\framework\base;
 
-
 use yii\base\Object;
 
 class BCObject extends \yii\base\Object
@@ -18,4 +22,4 @@ class BCObject extends \yii\base\Object
     {
         static::$initCalled = true;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/framework/base/ExposedSecurity.php b/tests/framework/base/ExposedSecurity.php
index db4408f..2e7e45a 100644
--- a/tests/framework/base/ExposedSecurity.php
+++ b/tests/framework/base/ExposedSecurity.php
@@ -10,7 +10,7 @@ namespace yiiunit\framework\base;
 use yii\base\Security;
 
 /**
- * ExposedSecurity exposes protected methods for direct testing
+ * ExposedSecurity exposes protected methods for direct testing.
  */
 class ExposedSecurity extends Security
 {
diff --git a/tests/framework/base/ModuleTest.php b/tests/framework/base/ModuleTest.php
index d00988e..633872b 100644
--- a/tests/framework/base/ModuleTest.php
+++ b/tests/framework/base/ModuleTest.php
@@ -8,7 +8,10 @@
 namespace yiiunit\framework\base;
 
 use Yii;
+use yii\base\BaseObject;
 use yii\base\Controller;
+use yii\base\Module;
+use yii\base\Object;
 use yiiunit\TestCase;
 
 /**
@@ -84,6 +87,40 @@ class ModuleTest extends TestCase
         $this->assertNotNull(Yii::$app->controller->action);
         $this->assertEquals('test/test-controller1/test1', Yii::$app->controller->action->uniqueId);
     }
+
+
+    public function testServiceLocatorTraversal()
+    {
+        $parent = new Module('parent');
+        $child = new Module('child', $parent);
+        $grandchild = new Module('grandchild', $child);
+
+        $parentObject = new BaseObject();
+        $childObject = new BaseObject();
+
+        $parent->set('test', $parentObject);
+        $this->assertTrue($grandchild->has('test'));
+        $this->assertTrue($child->has('test'));
+        $this->assertTrue($parent->has('test'));
+        $this->assertSame($parentObject, $grandchild->get('test'));
+        $this->assertSame($parentObject, $child->get('test'));
+        $this->assertSame($parentObject, $parent->get('test'));
+
+        $child->set('test', $childObject);
+        $this->assertSame($childObject, $grandchild->get('test'));
+        $this->assertSame($childObject, $child->get('test'));
+        $this->assertSame($parentObject, $parent->get('test'));
+        $this->assertTrue($grandchild->has('test'));
+        $this->assertTrue($child->has('test'));
+        $this->assertTrue($parent->has('test'));
+
+        $parent->clear('test');
+        $this->assertSame($childObject, $grandchild->get('test'));
+        $this->assertSame($childObject, $child->get('test'));
+        $this->assertTrue($grandchild->has('test'));
+        $this->assertTrue($child->has('test'));
+        $this->assertFalse($parent->has('test'));
+    }
 }
 
 class TestModule extends \yii\base\Module
diff --git a/tests/framework/base/SecurityTest.php b/tests/framework/base/SecurityTest.php
index c938e26..ef7650b 100644
--- a/tests/framework/base/SecurityTest.php
+++ b/tests/framework/base/SecurityTest.php
@@ -12,25 +12,30 @@ namespace yii\base {
      * where different execution paths are chosen based on calling function_exists.
      *
      * This function overrides function_exists from the root namespace in yii\base.
+     * @param string $name
      */
     function function_exists($name)
     {
         if (isset(\yiiunit\framework\base\SecurityTest::$functions[$name])) {
             return \yiiunit\framework\base\SecurityTest::$functions[$name];
         }
+
         return \function_exists($name);
     }
     /**
-     * emulate chunked reading of fread(), to test different branches of Security class
-     * where different execution paths are chosen based on the return value of fopen/fread
+     * Emulate chunked reading of fread(), to test different branches of Security class
+     * where different execution paths are chosen based on the return value of fopen/fread.
      *
      * This function overrides fopen and fread from the root namespace in yii\base.
+     * @param string $filename
+     * @param mixed $mode
      */
     function fopen($filename, $mode)
     {
         if (\yiiunit\framework\base\SecurityTest::$fopen !== null) {
             return \yiiunit\framework\base\SecurityTest::$fopen;
         }
+
         return \fopen($filename, $mode);
     }
     function fread($handle, $length)
@@ -41,6 +46,7 @@ namespace yii\base {
         if (\yiiunit\framework\base\SecurityTest::$fopen !== null) {
             return $length < 8 ? \str_repeat('s', $length) : 'test1234';
         }
+
         return \fread($handle, $length);
     }
 } // closing namespace yii\base;
@@ -153,10 +159,10 @@ class SecurityTest extends TestCase
     }
 
     /**
-     * Generates test vectors like this:
-     *   [key/password, plaintext, ciphertext]
+     * Generates test vectors like this: `[key/password, plaintext, ciphertext]`.
+     *
      * The output can then be used for testing compatibility of data encrypted in one
-     * version of Yii and decrypted in another
+     * version of Yii and decrypted in another.
      */
     public function notestGenerateVectors()
     {
@@ -875,6 +881,7 @@ TEXT;
     /**
      * @dataProvider randomKeyInvalidInputs
      * @expectedException \yii\base\InvalidArgumentException
+     * @param mixed $input
      */
     public function testRandomKeyInvalidInput($input)
     {
@@ -1187,6 +1194,7 @@ TEXT;
 
     /**
      * @dataProvider maskProvider
+     * @param mixed $unmaskedToken
      */
     public function testMasking($unmaskedToken)
     {
diff --git a/tests/framework/base/StaticInstanceTraitTest.php b/tests/framework/base/StaticInstanceTraitTest.php
new file mode 100644
index 0000000..15247bd
--- /dev/null
+++ b/tests/framework/base/StaticInstanceTraitTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace yiiunit\framework\base;
+
+use yiiunit\data\base\Singer;
+use yiiunit\data\base\Speaker;
+use yiiunit\TestCase;
+
+class StaticInstanceTraitTest extends TestCase
+{
+    public function testInstance()
+    {
+        $speakerModel = Speaker::instance();
+        $this->assertTrue($speakerModel instanceof Speaker);
+
+        $singerModel = Singer::instance();
+        $this->assertTrue($singerModel instanceof Singer);
+
+        $this->assertSame($speakerModel, Speaker::instance());
+        $this->assertNotSame($speakerModel, Speaker::instance(true));
+    }
+}
\ No newline at end of file
diff --git a/tests/framework/base/WidgetTest.php b/tests/framework/base/WidgetTest.php
new file mode 100644
index 0000000..0b7a82e
--- /dev/null
+++ b/tests/framework/base/WidgetTest.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yiiunit\framework\base;
+
+use yii\base\Widget;
+use yii\base\WidgetEvent;
+use yiiunit\TestCase;
+
+/**
+ * @group base
+ */
+class WidgetTest extends TestCase
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function tearDown()
+    {
+        parent::tearDown();
+        Widget::$counter = 0;
+        Widget::$stack = [];
+    }
+
+    public function testWidget()
+    {
+        $output = TestWidget::widget(['id' => 'test']);
+        $this->assertSame('<run-test>', $output);
+    }
+
+    public function testBeginEnd()
+    {
+        ob_start();
+        ob_implicit_flush(false);
+
+        $widget = TestWidget::begin(['id' => 'test']);
+        $this->assertTrue($widget instanceof TestWidget);
+        TestWidget::end();
+
+        $output = ob_get_clean();
+
+        $this->assertSame('<run-test>', $output);
+    }
+
+    /**
+     * @depends testBeginEnd
+     */
+    public function testStackTracking()
+    {
+        $this->expectException('yii\base\InvalidCallException');
+        TestWidget::end();
+    }
+
+    /**
+     * @depends testWidget
+     */
+    public function testEvents()
+    {
+        $output = TestWidget::widget([
+            'id' => 'test',
+            'on init' => function ($event) {
+                echo '<init>';
+            },
+            'on beforeRun' => function (WidgetEvent $event) {
+                echo '<before-run>';
+            },
+            'on afterRun' => function (WidgetEvent $event) {
+                $event->result .= '<after-run>';
+            },
+        ]);
+        $this->assertSame('<init><before-run><run-test><after-run>', $output);
+    }
+
+    /**
+     * @depends testEvents
+     */
+    public function testPreventRun()
+    {
+        $output = TestWidget::widget([
+            'id' => 'test',
+            'on beforeRun' => function (WidgetEvent $event) {
+                $event->isValid = false;
+            },
+        ]);
+        $this->assertSame('', $output);
+    }
+}
+
+class TestWidget extends Widget
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function run()
+    {
+        return '<run-' . $this->id . '>';
+    }
+}
\ No newline at end of file
diff --git a/tests/framework/behaviors/AttributeBehaviorTest.php b/tests/framework/behaviors/AttributeBehaviorTest.php
index b02b659..e226bdf 100644
--- a/tests/framework/behaviors/AttributeBehaviorTest.php
+++ b/tests/framework/behaviors/AttributeBehaviorTest.php
@@ -95,6 +95,10 @@ class AttributeBehaviorTest extends TestCase
 
     /**
      * @dataProvider preserveNonEmptyValuesDataProvider
+     * @param string $aliasExpected
+     * @param bool $preserveNonEmptyValues
+     * @param string $name
+     * @param string|null $alias
      */
     public function testPreserveNonEmptyValues(
         $aliasExpected,
diff --git a/tests/framework/behaviors/AttributeTypecastBehaviorTest.php b/tests/framework/behaviors/AttributeTypecastBehaviorTest.php
index 2b35046..94816f7 100644
--- a/tests/framework/behaviors/AttributeTypecastBehaviorTest.php
+++ b/tests/framework/behaviors/AttributeTypecastBehaviorTest.php
@@ -181,7 +181,7 @@ class AttributeTypecastBehaviorTest extends TestCase
         $model->save(false);
 
         $model->refresh();
-        $this->assertEquals('58', $model->amount);
+        $this->assertSame(58, $model->amount);
     }
 }
 
diff --git a/tests/framework/behaviors/AttributesBehaviorTest.php b/tests/framework/behaviors/AttributesBehaviorTest.php
new file mode 100644
index 0000000..9c8dd4a
--- /dev/null
+++ b/tests/framework/behaviors/AttributesBehaviorTest.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yiiunit\framework\behaviors;
+
+use Yii;
+use yii\behaviors\AttributesBehavior;
+use yii\db\ActiveRecord;
+use yii\db\Connection;
+use yiiunit\TestCase;
+
+/**
+ * Unit test for [[\yii\behaviors\AttributesBehavior]].
+ * @see AttributesBehavior
+ *
+ * @group behaviors
+ */
+class AttributesBehaviorTest extends TestCase
+{
+    /**
+     * @var Connection test db connection
+     */
+    protected $dbConnection;
+
+    public static function setUpBeforeClass()
+    {
+        if (!extension_loaded('pdo') || !extension_loaded('pdo_sqlite')) {
+            static::markTestSkipped('PDO and SQLite extensions are required.');
+        }
+    }
+
+    public function setUp()
+    {
+        $this->mockApplication([
+            'components' => [
+                'db' => [
+                    'class' => '\yii\db\Connection',
+                    'dsn' => 'sqlite::memory:',
+                ],
+            ],
+        ]);
+
+        $columns = [
+            'id' => 'pk',
+            'name' => 'string',
+            'alias' => 'string',
+        ];
+        Yii::$app->getDb()->createCommand()->createTable('test_attribute', $columns)->execute();
+    }
+
+    public function tearDown()
+    {
+        Yii::$app->getDb()->close();
+        parent::tearDown();
+    }
+
+    // Tests :
+
+    /**
+     * @return array
+     */
+    public function preserveNonEmptyValuesDataProvider()
+    {
+        return [
+            [
+                'John Doe',
+                false,
+                'John Doe',
+                null,
+            ],
+            [
+                'John Doe',
+                false,
+                'John Doe',
+                'Johnny',
+            ],
+            [
+                'John Doe',
+                true,
+                'John Doe',
+                null,
+            ],
+            [
+                'Johnny',
+                true,
+                'John Doe',
+                'Johnny',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider preserveNonEmptyValuesDataProvider
+     * @param string $aliasExpected
+     * @param bool $preserveNonEmptyValues
+     * @param string $name
+     * @param string|null $alias
+     */
+    public function testPreserveNonEmptyValues(
+        $aliasExpected,
+        $preserveNonEmptyValues,
+        $name,
+        $alias
+    ) {
+        $model = new ActiveRecordWithAttributesBehavior();
+        $model->attributesBehavior->preserveNonEmptyValues = $preserveNonEmptyValues;
+        $model->name = $name;
+        $model->alias = $alias;
+        $model->validate();
+
+        $this->assertEquals($aliasExpected, $model->alias);
+    }
+
+    /**
+     * @return array
+     */
+    public function orderProvider()
+    {
+        return [
+            [
+                'name: Johnny',
+                [ActiveRecordWithAttributesBehavior::EVENT_BEFORE_VALIDATE => ['name', 'alias']],
+                // 1: name = alias; 2: alias = name; check alias
+                'John Doe', // name
+                'Johnny', // alias
+            ],
+            [
+                'John Doe',
+                [ActiveRecordWithAttributesBehavior::EVENT_BEFORE_VALIDATE => ['alias', 'name']],
+                // 2: alias = name; 1: name = alias; check alias
+                'John Doe', // name
+                'Johnny', // alias
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider orderProvider
+     * @param string $aliasExpected
+     * @param array $order
+     * @param string $name
+     * @param string $alias
+     */
+    public function testOrder(
+        $aliasExpected,
+        $order,
+        $name,
+        $alias
+    ) {
+        $model = new ActiveRecordWithAttributesBehavior();
+        $model->attributesBehavior->order = $order;
+        $model->name = $name;
+        $model->alias = $alias;
+        $model->validate();
+
+        $this->assertEquals($aliasExpected, $model->alias);
+    }
+}
+
+/**
+ * Test Active Record class with [[AttributesBehavior]] behavior attached.
+ *
+ * @property int $id
+ * @property string $name
+ * @property string $alias
+ *
+ * @property AttributesBehavior $attributesBehavior
+ */
+class ActiveRecordWithAttributesBehavior extends ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'attributes' => [
+                'class' => AttributesBehavior::class,
+                'attributes' => [
+                    'alias' => [
+                        self::EVENT_BEFORE_VALIDATE => function ($event) {
+                            return $event->sender->name;
+                        },
+                    ],
+                    'name' => [
+                        self::EVENT_BEFORE_VALIDATE => function ($event, $attribute) {
+                            return $attribute . ': ' . $event->sender->alias;
+                        },
+                    ],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'test_attribute';
+    }
+
+    /**
+     * @return AttributesBehavior
+     */
+    public function getAttributesBehavior()
+    {
+        return $this->getBehavior('attributes');
+    }
+}
diff --git a/tests/framework/behaviors/TimestampBehaviorTest.php b/tests/framework/behaviors/TimestampBehaviorTest.php
index 73170af..ba26262 100644
--- a/tests/framework/behaviors/TimestampBehaviorTest.php
+++ b/tests/framework/behaviors/TimestampBehaviorTest.php
@@ -141,6 +141,8 @@ class TimestampBehaviorTest extends TestCase
 
     /**
      * @dataProvider expressionProvider
+     * @param mixed $expression
+     * @param mixed $expected
      */
     public function testNewRecordExpression($expression, $expected)
     {
diff --git a/tests/framework/caching/ApcCacheTest.php b/tests/framework/caching/ApcCacheTest.php
index 8515b9b..7109261 100644
--- a/tests/framework/caching/ApcCacheTest.php
+++ b/tests/framework/caching/ApcCacheTest.php
@@ -11,7 +11,7 @@ use yii\caching\ApcCache;
 use yii\caching\Cache;
 
 /**
- * Class for testing APC cache backend
+ * Class for testing APC cache backend.
  * @group apc
  * @group caching
  */
diff --git a/tests/framework/caching/ArrayCacheTest.php b/tests/framework/caching/ArrayCacheTest.php
index 39186b4..2e831e7 100644
--- a/tests/framework/caching/ArrayCacheTest.php
+++ b/tests/framework/caching/ArrayCacheTest.php
@@ -11,7 +11,7 @@ use yii\caching\ArrayCache;
 use yii\caching\Cache;
 
 /**
- * Class for testing file cache backend
+ * Class for testing file cache backend.
  * @group caching
  */
 class ArrayCacheTest extends CacheTestCase
@@ -28,6 +28,7 @@ class ArrayCacheTest extends CacheTestCase
                 'handler' => new ArrayCache()
             ]);
         }
+
         return $this->_cacheInstance;
     }
 
diff --git a/tests/framework/caching/CacheTestCase.php b/tests/framework/caching/CacheTestCase.php
index 99f08fc..9f466da 100644
--- a/tests/framework/caching/CacheTestCase.php
+++ b/tests/framework/caching/CacheTestCase.php
@@ -8,7 +8,7 @@
 namespace yii\caching;
 
 /**
- * Mock for the time() function for caching classes
+ * Mock for the time() function for caching classes.
  * @return int
  */
 function time()
@@ -17,7 +17,7 @@ function time()
 }
 
 /**
- * Mock for the microtime() function for caching classes
+ * Mock for the microtime() function for caching classes.
  * @param bool $float
  * @return float
  */
@@ -33,7 +33,7 @@ use yii\caching\TagDependency;
 use yiiunit\TestCase;
 
 /**
- * Base class for testing cache backends
+ * Base class for testing cache backends.
  */
 abstract class CacheTestCase extends TestCase
 {
@@ -114,6 +114,7 @@ abstract class CacheTestCase extends TestCase
 
     /**
      * @dataProvider dataProviderSetMultiple
+     * @param int $expiry
      */
     public function testSetMultiple($expiry)
     {
@@ -245,12 +246,12 @@ abstract class CacheTestCase extends TestCase
     {
         $cache = $this->prepare();
 
-        $this->assertNotNull($cache->get('number_test'));
+        $this->assertEquals(42, $cache->get('number_test'));
         $this->assertTrue($cache->delete('number_test'));
         $this->assertNull($cache->get('number_test'));
     }
 
-    public function testFlush()
+    public function testClear()
     {
         $cache = $this->prepare();
         $this->assertTrue($cache->clear());
diff --git a/tests/framework/caching/DbCacheTest.php b/tests/framework/caching/DbCacheTest.php
index 8efee0e..a85a7c7 100644
--- a/tests/framework/caching/DbCacheTest.php
+++ b/tests/framework/caching/DbCacheTest.php
@@ -11,7 +11,7 @@ use yii\caching\Cache;
 use yii\caching\DbCache;
 
 /**
- * Class for testing file cache backend
+ * Class for testing file cache backend.
  * @group db
  * @group caching
  */
diff --git a/tests/framework/caching/DependencyTest.php b/tests/framework/caching/DependencyTest.php
index 3c8b239..f40e6b2 100644
--- a/tests/framework/caching/DependencyTest.php
+++ b/tests/framework/caching/DependencyTest.php
@@ -14,7 +14,7 @@ use yiiunit\data\cache\MockDependency;
 use yiiunit\TestCase;
 
 /**
- * Dependency (abstract) tests
+ * Dependency (abstract) tests.
  * @group caching
  * @author Boudewijn Vahrmeijer <vahrmeijer@gmail.com>
  * @since 2.0.11
diff --git a/tests/framework/caching/FileCacheTest.php b/tests/framework/caching/FileCacheTest.php
index ce68a0a..2ef8a4c 100644
--- a/tests/framework/caching/FileCacheTest.php
+++ b/tests/framework/caching/FileCacheTest.php
@@ -11,7 +11,7 @@ use yii\caching\Cache;
 use yii\caching\FileCache;
 
 /**
- * Class for testing file cache backend
+ * Class for testing file cache backend.
  * @group caching
  */
 class FileCacheTest extends CacheTestCase
diff --git a/tests/framework/caching/MemCachedTest.php b/tests/framework/caching/MemCachedTest.php
index 1c0b5ec..43f320b 100644
--- a/tests/framework/caching/MemCachedTest.php
+++ b/tests/framework/caching/MemCachedTest.php
@@ -11,7 +11,7 @@ use yii\caching\Cache;
 use yii\caching\MemCached;
 
 /**
- * Class for testing memcached cache backend
+ * Class for testing memcached cache backend.
  * @group memcached
  * @group caching
  */
diff --git a/tests/framework/caching/WinCacheTest.php b/tests/framework/caching/WinCacheTest.php
index 1f45a08..4428e71 100644
--- a/tests/framework/caching/WinCacheTest.php
+++ b/tests/framework/caching/WinCacheTest.php
@@ -11,7 +11,7 @@ use yii\caching\Cache;
 use yii\caching\WinCache;
 
 /**
- * Class for testing wincache backend
+ * Class for testing wincache backend.
  * @group wincache
  * @group caching
  */
diff --git a/tests/framework/console/RequestTest.php b/tests/framework/console/RequestTest.php
index 272275f..b9ced1f 100644
--- a/tests/framework/console/RequestTest.php
+++ b/tests/framework/console/RequestTest.php
@@ -141,6 +141,9 @@ class RequestTest extends TestCase
 
     /**
      * @dataProvider provider
+     * @param array $params
+     * @param array $expected
+     * @param array|null $expectedException
      */
     public function testResolve($params, $expected, $expectedException = null)
     {
diff --git a/tests/framework/console/UnkownCommandExceptionTest.php b/tests/framework/console/UnkownCommandExceptionTest.php
index 32258f5..ecfc79b 100644
--- a/tests/framework/console/UnkownCommandExceptionTest.php
+++ b/tests/framework/console/UnkownCommandExceptionTest.php
@@ -54,6 +54,8 @@ class UnkownCommandExceptionTest extends TestCase
 
     /**
      * @dataProvider suggestedCommandsProvider
+     * @param string $command
+     * @param array $expectedSuggestion
      */
     public function testSuggestCommand($command, $expectedSuggestion)
     {
diff --git a/tests/framework/console/controllers/AssetControllerTest.php b/tests/framework/console/controllers/AssetControllerTest.php
index 881ac98..ad1f853 100644
--- a/tests/framework/console/controllers/AssetControllerTest.php
+++ b/tests/framework/console/controllers/AssetControllerTest.php
@@ -571,7 +571,7 @@ EOL;
     }
 
     /**
-     * Data provider for [[testFindRealPath()]]
+     * Data provider for [[testFindRealPath()]].
      * @return array test data
      */
     public function findRealPathDataProvider()
@@ -752,7 +752,7 @@ EOL;
 }
 
 /**
- * Mock class for [[\yii\console\controllers\AssetController]]
+ * Mock class for [[\yii\console\controllers\AssetController]].
  */
 class AssetControllerMock extends AssetController
 {
diff --git a/tests/framework/console/controllers/BaseMessageControllerTest.php b/tests/framework/console/controllers/BaseMessageControllerTest.php
index 5288940..82614cd 100644
--- a/tests/framework/console/controllers/BaseMessageControllerTest.php
+++ b/tests/framework/console/controllers/BaseMessageControllerTest.php
@@ -80,7 +80,7 @@ abstract class BaseMessageControllerTest extends TestCase
     }
 
     /**
-     * Creates source file with given content
+     * Creates source file with given content.
      * @param string $content file content
      * @return string path to source file
      */
@@ -92,7 +92,7 @@ abstract class BaseMessageControllerTest extends TestCase
     }
 
     /**
-     * Saves messages
+     * Saves messages.
      *
      * @param array $messages
      * @param string $category
@@ -100,7 +100,7 @@ abstract class BaseMessageControllerTest extends TestCase
     abstract protected function saveMessages($messages, $category);
 
     /**
-     * Loads messages
+     * Loads messages.
      *
      * @param string $category
      * @return array
@@ -113,7 +113,7 @@ abstract class BaseMessageControllerTest extends TestCase
     abstract protected function getDefaultConfig();
 
     /**
-     * Returns config
+     * Returns config.
      *
      * @param array $additionalConfig
      * @return array
diff --git a/tests/framework/console/controllers/CacheControllerTest.php b/tests/framework/console/controllers/CacheControllerTest.php
index ee8e5a1..9e1609c 100644
--- a/tests/framework/console/controllers/CacheControllerTest.php
+++ b/tests/framework/console/controllers/CacheControllerTest.php
@@ -8,6 +8,7 @@
 namespace yiiunit\framework\console\controllers;
 
 use Yii;
+use yii\caching\ArrayCache;
 use yii\console\controllers\CacheController;
 use yiiunit\TestCase;
 
@@ -49,8 +50,10 @@ class CacheControllerTest extends TestCase
         $this->mockApplication([
             'components' => [
                 'firstCache' => 'yii\caching\ArrayCache',
-                'secondCache' => 'yii\caching\ArrayCache',
-                'session' => 'yii\web\CacheSession', // should be ignored at `actionClearAll()`
+                'secondCache' => function () {
+                    return new ArrayCache();
+                },
+                'session' => 'yii\web\CacheSession', // should be ignored at `actionFlushAll()`
                 'db' => [
                     'class' => isset($config['class']) ? $config['class'] : 'yii\db\Connection',
                     'dsn' => $config['dsn'],
@@ -117,7 +120,7 @@ class CacheControllerTest extends TestCase
         $this->assertNull(Yii::$app->secondCache->get('thirdKey'), 'second cache data should be flushed');
     }
 
-    public function testNotFoundFlush()
+    public function testNotFoundClear()
     {
         Yii::$app->firstCache->set('firstKey', 'firstValue');
 
diff --git a/tests/framework/console/controllers/DbMessageControllerTest.php b/tests/framework/console/controllers/DbMessageControllerTest.php
index 1fe55d3..e45a0d1 100644
--- a/tests/framework/console/controllers/DbMessageControllerTest.php
+++ b/tests/framework/console/controllers/DbMessageControllerTest.php
@@ -103,6 +103,7 @@ class DbMessageControllerTest extends BaseMessageControllerTest
             }
             static::$db = $db;
         }
+
         return static::$db;
     }
 
diff --git a/tests/framework/console/controllers/FixtureControllerTest.php b/tests/framework/console/controllers/FixtureControllerTest.php
index 66759f7..e166a2d 100644
--- a/tests/framework/console/controllers/FixtureControllerTest.php
+++ b/tests/framework/console/controllers/FixtureControllerTest.php
@@ -57,6 +57,18 @@ class FixtureControllerTest extends TestCase
         $this->assertCount(1, FixtureStorage::$firstFixtureData, 'first fixture data should be loaded');
     }
 
+    public function testLoadGlobalFixtureWithFixture()
+    {
+        $this->_fixtureController->globalFixtures = [
+            '\yiiunit\data\console\controllers\fixtures\GlobalFixture',
+        ];
+
+        $this->_fixtureController->actionLoad(['First']);
+
+        $this->assertCount(1, FixtureStorage::$globalFixturesData, 'global fixture data should be loaded');
+        $this->assertCount(1, FixtureStorage::$firstFixtureData, 'first fixture data should be loaded');
+    }
+
     public function testUnloadGlobalFixture()
     {
         $this->_fixtureController->globalFixtures = [
diff --git a/tests/framework/console/controllers/HelpControllerTest.php b/tests/framework/console/controllers/HelpControllerTest.php
index 29825f9..b86cf50 100644
--- a/tests/framework/console/controllers/HelpControllerTest.php
+++ b/tests/framework/console/controllers/HelpControllerTest.php
@@ -41,8 +41,8 @@ class HelpControllerTest extends TestCase
 
     /**
      * Emulates running controller action.
-     * @param  string $actionID id of action to be run.
-     * @param  array $args action arguments.
+     * @param string $actionID id of action to be run.
+     * @param array $actionParams action arguments.
      * @return string command output.
      */
     protected function runControllerAction($actionID, $actionParams = [])
@@ -77,6 +77,7 @@ help/usage
 migrate
 migrate/create
 migrate/down
+migrate/fresh
 migrate/history
 migrate/mark
 migrate/new
diff --git a/tests/framework/console/controllers/MigrateControllerTest.php b/tests/framework/console/controllers/MigrateControllerTest.php
index 8382cd1..a0368c2 100644
--- a/tests/framework/console/controllers/MigrateControllerTest.php
+++ b/tests/framework/console/controllers/MigrateControllerTest.php
@@ -234,6 +234,28 @@ class MigrateControllerTest extends TestCase
     }
 
     /**
+     * Test the migrate:fresh command.
+     */
+    public function testRefreshMigration()
+    {
+        Yii::$app->db->createCommand('create table hall_of_fame(id int, string varchar(255))')
+            ->execute();
+
+        Yii::$app->db->createCommand("insert into hall_of_fame values(1, 'Qiang Xue');")
+            ->execute();
+        Yii::$app->db->createCommand("insert into hall_of_fame values(2, 'Alexander Makarov');")
+            ->execute();
+
+        $result = $this->runMigrateControllerAction('fresh');
+
+        // Drop worked
+        $this->assertContains('Table hall_of_fame dropped.', $result);
+
+        // Migration was restarted
+        $this->assertContains('No new migrations found. Your system is up-to-date.', $result);
+    }
+
+    /**
      * @see https://github.com/yiisoft/yii2/issues/12980
      */
     public function testGetMigrationHistory()
diff --git a/tests/framework/console/controllers/MigrateControllerTestTrait.php b/tests/framework/console/controllers/MigrateControllerTestTrait.php
index 8fe97a8..663c5f5 100644
--- a/tests/framework/console/controllers/MigrateControllerTestTrait.php
+++ b/tests/framework/console/controllers/MigrateControllerTestTrait.php
@@ -13,7 +13,7 @@ use yii\helpers\FileHelper;
 use yiiunit\TestCase;
 
 /**
- * This trait provides unit tests shared by the different migration controllers implementations
+ * This trait provides unit tests shared by the different migration controllers implementations.
  * @see BaseMigrateController
  */
 trait MigrateControllerTestTrait
@@ -98,6 +98,7 @@ trait MigrateControllerTestTrait
     /**
      * @param string $name
      * @param string|null $date
+     * @param string|null $path
      * @return string generated class name
      */
     protected function createMigration($name, $date = null, $path = null)
@@ -161,7 +162,7 @@ CODE;
     }
 
     /**
-     * Change class name migration to $class
+     * Change class name migration to $class.
      * @param string $class name class
      * @return string content generated class migration
      * @see https://github.com/yiisoft/yii2/pull/10213
@@ -490,7 +491,7 @@ CODE;
     }
 
     /**
-     * Test migration with using multiple migration paths and namespaces
+     * Test migration with using multiple migration paths and namespaces.
      */
     public function testCombinedMigrationProcess()
     {
diff --git a/tests/framework/console/controllers/StdOutBufferControllerTrait.php b/tests/framework/console/controllers/StdOutBufferControllerTrait.php
index bfae262..7449436 100644
--- a/tests/framework/console/controllers/StdOutBufferControllerTrait.php
+++ b/tests/framework/console/controllers/StdOutBufferControllerTrait.php
@@ -9,7 +9,7 @@ namespace yiiunit\framework\console\controllers;
 
 /**
  * StdOutBufferControllerTrait is a trait, which can be applied to [[yii\console\Controller]],
- * allowing to store all output into internal buffer instead of direct sending it to 'stdout'
+ * allowing to store all output into internal buffer instead of direct sending it to 'stdout'.
  */
 trait StdOutBufferControllerTrait
 {
diff --git a/tests/framework/console/widgets/TableTest.php b/tests/framework/console/widgets/TableTest.php
index edf7e42..7435a2a 100644
--- a/tests/framework/console/widgets/TableTest.php
+++ b/tests/framework/console/widgets/TableTest.php
@@ -171,4 +171,59 @@ EXPECTED;
             ])
         );
     }
+
+    public function testShortRow()
+    {
+        $table = new Table();
+
+        $expected = <<<'EXPECTED'
+╔═══════════════╤═══════════════╤═══════════════╗
+║ test1         │ test2         │ test3         ║
+╟───────────────┼───────────────┼───────────────╢
+║ testcontent1  │ testcontent2  │               ║
+╟───────────────┼───────────────┼───────────────╢
+║ testcontent21 │ testcontent22 │               ║
+╟───────────────┼───────────────┼───────────────╢
+║ testcontent31 │               │               ║
+╟───────────────┼───────────────┼───────────────╢
+║ testcontent41 │               │ testcontent43 ║
+╟───────────────┼───────────────┼───────────────╢
+║               │               │ testcontent53 ║
+╚═══════════════╧═══════════════╧═══════════════╝
+
+EXPECTED;
+
+        $this->assertEqualsWithoutLE($expected, $table->setHeaders(['test1', 'test2', 'test3'])
+            ->setRows([
+                ['testcontent1', 'testcontent2'],
+                ['testcontent21', 'testcontent22', null],
+                ['testcontent31'],
+                ['testcontent41', null, 'testcontent43'],
+                [null, null, 'testcontent53'],
+            ])->setScreenWidth(200)->run()
+        );
+    }
+
+    public function testEmptyRow()
+    {
+        $table = new Table();
+
+        $expected = <<<'EXPECTED'
+╔═══════╤═══════╤═══════╗
+║ test1 │ test2 │ test3 ║
+╟───────┼───────┼───────╢
+║       │       │       ║
+╟───────┼───────┼───────╢
+║       │       │       ║
+╚═══════╧═══════╧═══════╝
+
+EXPECTED;
+
+        $this->assertEqualsWithoutLE($expected, $table->setHeaders(['test1', 'test2', 'test3'])
+            ->setRows([
+                [null, null, null],
+                [],
+            ])->setScreenWidth(200)->run()
+        );
+    }
 }
diff --git a/tests/framework/data/BaseDataProviderTest.php b/tests/framework/data/BaseDataProviderTest.php
index 5528e78..6685a74 100644
--- a/tests/framework/data/BaseDataProviderTest.php
+++ b/tests/framework/data/BaseDataProviderTest.php
@@ -28,7 +28,7 @@ class BaseDataProviderTest extends TestCase
 }
 
 /**
- * ConcreteDataProvider
+ * ConcreteDataProvider.
  */
 class ConcreteDataProvider extends BaseDataProvider
 {
diff --git a/tests/framework/data/PaginationTest.php b/tests/framework/data/PaginationTest.php
index 85951ff..98bc9ec 100644
--- a/tests/framework/data/PaginationTest.php
+++ b/tests/framework/data/PaginationTest.php
@@ -28,7 +28,7 @@ class PaginationTest extends TestCase
     }
 
     /**
-     * Data provider for [[testCreateUrl()]]
+     * Data provider for [[testCreateUrl()]].
      * @return array test data
      */
     public function dataProviderCreateUrl()
@@ -67,6 +67,7 @@ class PaginationTest extends TestCase
      * @param int $page
      * @param int $pageSize
      * @param string $expectedUrl
+     * @param array $params
      */
     public function testCreateUrl($page, $pageSize, $expectedUrl, $params)
     {
diff --git a/tests/framework/data/SortTest.php b/tests/framework/data/SortTest.php
index 426b6b5..ff50a98 100644
--- a/tests/framework/data/SortTest.php
+++ b/tests/framework/data/SortTest.php
@@ -282,6 +282,7 @@ class CustomSort extends Sort
         foreach ($params as $item) {
             $attributes[] = ($item['dir'] == 'desc') ? '-' . $item['field'] : $item['field'];
         }
+
         return $attributes;
     }
 }
diff --git a/tests/framework/db/ActiveQueryTest.php b/tests/framework/db/ActiveQueryTest.php
index 2ac32d4..235b5d9 100644
--- a/tests/framework/db/ActiveQueryTest.php
+++ b/tests/framework/db/ActiveQueryTest.php
@@ -16,7 +16,7 @@ use yiiunit\data\ar\Customer;
 use yiiunit\data\ar\Profile;
 
 /**
- * Class ActiveQueryTest the base class for testing ActiveQuery
+ * Class ActiveQueryTest the base class for testing ActiveQuery.
  */
 abstract class ActiveQueryTest extends DatabaseTestCase
 {
diff --git a/tests/framework/db/ActiveRecordTest.php b/tests/framework/db/ActiveRecordTest.php
index d038a67..9df5fa2 100644
--- a/tests/framework/db/ActiveRecordTest.php
+++ b/tests/framework/db/ActiveRecordTest.php
@@ -15,15 +15,19 @@ use yiiunit\data\ar\Cat;
 use yiiunit\data\ar\Category;
 use yiiunit\data\ar\Customer;
 use yiiunit\data\ar\CustomerQuery;
+use yiiunit\data\ar\CustomerWithConstructor;
 use yiiunit\data\ar\Document;
 use yiiunit\data\ar\Dog;
 use yiiunit\data\ar\Item;
 use yiiunit\data\ar\NullValues;
 use yiiunit\data\ar\Order;
 use yiiunit\data\ar\OrderItem;
+use yiiunit\data\ar\OrderItemWithConstructor;
 use yiiunit\data\ar\OrderItemWithNullFK;
+use yiiunit\data\ar\OrderWithConstructor;
 use yiiunit\data\ar\OrderWithNullFK;
 use yiiunit\data\ar\Profile;
+use yiiunit\data\ar\ProfileWithConstructor;
 use yiiunit\data\ar\Type;
 use yiiunit\framework\ar\ActiveRecordTestTrait;
 use yiiunit\framework\db\cubrid\ActiveRecordTest as CubridActiveRecordTest;
@@ -241,7 +245,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/5341
+     * @see https://github.com/yiisoft/yii2/issues/5341
      *
      * Issue:     Plan     1 -- * Account * -- * User
      * Our Tests: Category 1 -- * Item    * -- * Order
@@ -552,6 +556,9 @@ abstract class ActiveRecordTest extends DatabaseTestCase
         $this->assertEquals(2, $orders[0]->items[0]->category->id);
     }
 
+    /**
+     * @depends testJoinWith
+     */
     public function testJoinWithAndScope()
     {
         // hasOne inner join
@@ -584,8 +591,9 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * This query will do the same join twice, ensure duplicated JOIN gets removed
-     * https://github.com/yiisoft/yii2/pull/2650
+     * This query will do the same join twice, ensure duplicated JOIN gets removed.
+     *
+     * @see https://github.com/yiisoft/yii2/pull/2650
      */
     public function testJoinWithVia()
     {
@@ -609,7 +617,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * Tests the alias syntax for joinWith: 'alias' => 'relation'
+     * Tests the alias syntax for joinWith: 'alias' => 'relation'.
      * @dataProvider aliasMethodProvider
      * @param string $aliasMethod whether alias is specified explicitly or using the query syntax {{@tablename}}
      */
@@ -885,8 +893,8 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/10201
-     * https://github.com/yiisoft/yii2/issues/9047
+     * @see https://github.com/yiisoft/yii2/issues/10201
+     * @see https://github.com/yiisoft/yii2/issues/9047
      */
     public function testFindCompositeRelationWithJoin()
     {
@@ -931,6 +939,8 @@ abstract class ActiveRecordTest extends DatabaseTestCase
      * Test whether conditions are quoted correctly in conditions where joinWith is used.
      * @see https://github.com/yiisoft/yii2/issues/11088
      * @dataProvider tableNameProvider
+     * @param string $orderTableName
+     * @param string $orderItemTableName
      */
     public function testRelationWhereParams($orderTableName, $orderItemTableName)
     {
@@ -1304,7 +1314,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/9006
+     * @see https://github.com/yiisoft/yii2/issues/9006
      */
     public function testBit()
     {
@@ -1423,7 +1433,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/12213
+     * @see https://github.com/yiisoft/yii2/issues/12213
      */
     public function testUnlinkAllOnCondition()
     {
@@ -1454,7 +1464,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/12213
+     * @see https://github.com/yiisoft/yii2/issues/12213
      */
     public function testUnlinkAllOnConditionViaTable()
     {
@@ -1484,7 +1494,7 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * verify that {{}} are not going to be replaced in parameters
+     * Verify that {{}} are not going to be replaced in parameters.
      */
     public function testNoTablenameReplacement()
     {
@@ -1509,8 +1519,9 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * Ensure no ambiguous column error occurs if ActiveQuery adds a JOIN
-     * https://github.com/yiisoft/yii2/issues/13757
+     * Ensure no ambiguous column error occurs if ActiveQuery adds a JOIN.
+     *
+     * @see https://github.com/yiisoft/yii2/issues/13757
      */
     public function testAmbiguousColumnFindOne()
     {
@@ -1521,13 +1532,13 @@ abstract class ActiveRecordTest extends DatabaseTestCase
     }
 
     /**
-     * Ensure no ambiguous column error occurs on indexBy with JOIN
-     * https://github.com/yiisoft/yii2/issues/13859
+     * Ensure no ambiguous column error occurs on indexBy with JOIN.
+     *
+     * @see https://github.com/yiisoft/yii2/issues/13859
      */
     public function testAmbiguousColumnIndexBy()
     {
-        switch ($this->driverName)
-        {
+        switch ($this->driverName) {
             case 'pgsql':
             case 'sqlite':
                 $selectExpression = "(customer.name || ' in ' || p.description) AS name";
@@ -1548,4 +1559,46 @@ abstract class ActiveRecordTest extends DatabaseTestCase
             3 => 'user3 in profile customer 3',
         ], $result);
     }
+
+    /**
+     * @see https://github.com/yiisoft/yii2/issues/5786
+     *
+     * @depends testJoinWith
+     */
+    public function testFindWithConstructors()
+    {
+        /** @var OrderWithConstructor[] $orders */
+        $orders = OrderWithConstructor::find()
+            ->with(['customer.profile', 'orderItems'])
+            ->orderBy('id')
+            ->all();
+
+        $this->assertCount(3, $orders);
+        $order = $orders[0];
+        $this->assertEquals(1, $order->id);
+
+        $this->assertNotNull($order->customer);
+        $this->assertInstanceOf(CustomerWithConstructor::class, $order->customer);
+        $this->assertEquals(1, $order->customer->id);
+
+        $this->assertNotNull($order->customer->profile);
+        $this->assertInstanceOf(ProfileWithConstructor::class, $order->customer->profile);
+        $this->assertEquals(1, $order->customer->profile->id);
+
+        $this->assertNotNull($order->customerJoinedWithProfile);
+        $customerWithProfile = $order->customerJoinedWithProfile;
+        $this->assertInstanceOf(CustomerWithConstructor::class, $customerWithProfile);
+        $this->assertEquals(1, $customerWithProfile->id);
+
+        $this->assertNotNull($customerProfile = $customerWithProfile->profile);
+        $this->assertInstanceOf(ProfileWithConstructor::class, $customerProfile);
+        $this->assertEquals(1, $customerProfile->id);
+
+        $this->assertCount(2, $order->orderItems);
+
+        $item = $order->orderItems[0];
+        $this->assertInstanceOf(OrderItemWithConstructor::class, $item);
+
+        $this->assertEquals(1, $item->item_id);
+    }
 }
diff --git a/tests/framework/db/AnyValue.php b/tests/framework/db/AnyValue.php
index 84e357b..e36ed25 100644
--- a/tests/framework/db/AnyValue.php
+++ b/tests/framework/db/AnyValue.php
@@ -19,6 +19,7 @@ class AnyValue extends CompareValue
         if (self::$_instance === null) {
             self::$_instance = new self();
         }
+
         return self::$_instance;
     }
 }
diff --git a/tests/framework/db/ColumnSchemaBuilderTest.php b/tests/framework/db/ColumnSchemaBuilderTest.php
index 881e406..23a4ef8 100644
--- a/tests/framework/db/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/ColumnSchemaBuilderTest.php
@@ -49,6 +49,10 @@ abstract class ColumnSchemaBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider typesProvider
+     * @param string $expected
+     * @param string $type
+     * @param int|null $length
+     * @param mixed $calls
      */
     public function testCustomTypes($expected, $type, $length, $calls)
     {
@@ -58,7 +62,7 @@ abstract class ColumnSchemaBuilderTest extends DatabaseTestCase
     /**
      * @param string $expected
      * @param string $type
-     * @param int $length
+     * @param int|null $length
      * @param array $calls
      */
     public function checkBuildString($expected, $type, $length, $calls)
diff --git a/tests/framework/db/CommandTest.php b/tests/framework/db/CommandTest.php
index 3ff8e17..1ed2541 100644
--- a/tests/framework/db/CommandTest.php
+++ b/tests/framework/db/CommandTest.php
@@ -235,8 +235,9 @@ SQL;
     }
 
     /**
-     * Test whether param binding works in other places than WHERE
+     * Test whether param binding works in other places than WHERE.
      * @dataProvider paramsNonWhereProvider
+     * @param string $sql
      */
     public function testBindParamsNonWhere($sql)
     {
@@ -308,6 +309,61 @@ SQL;
         }
     }
 
+    /**
+     * Test batch insert with different data types.
+     *
+     * Ensure double is inserted with `.` decimal separator.
+     *
+     * https://github.com/yiisoft/yii2/issues/6526
+     */
+    public function testBatchInsertDataTypesLocale()
+    {
+        $locale = setlocale(LC_NUMERIC, 0);
+        if (false === $locale) {
+            $this->markTestSkipped('Your platform does not support locales.');
+        }
+        $db = $this->getConnection();
+
+        try {
+            // This one sets decimal mark to comma sign
+            setlocale(LC_NUMERIC, 'ru_RU.utf8');
+
+            $cols = ['int_col', 'char_col', 'float_col', 'bool_col'];
+            $data = [
+                [1, 'A', 9.735, true],
+                [2, 'B', -2.123, false],
+                [3, 'C', 2.123, false],
+            ];
+
+            // clear data in "type" table
+            $db->createCommand()->delete('type')->execute();
+            // batch insert on "type" table
+            $db->createCommand()->batchInsert('type', $cols, $data)->execute();
+
+            $data = $db->createCommand('SELECT int_col, char_col, float_col, bool_col FROM {{type}} WHERE [[int_col]] IN (1,2,3) ORDER BY [[int_col]];')->queryAll();
+            $this->assertEquals(3, count($data));
+            $this->assertEquals(1, $data[0]['int_col']);
+            $this->assertEquals(2, $data[1]['int_col']);
+            $this->assertEquals(3, $data[2]['int_col']);
+            $this->assertEquals('A', rtrim($data[0]['char_col'])); // rtrim because Postgres padds the column with whitespace
+            $this->assertEquals('B', rtrim($data[1]['char_col']));
+            $this->assertEquals('C', rtrim($data[2]['char_col']));
+            $this->assertEquals('9.735', $data[0]['float_col']);
+            $this->assertEquals('-2.123', $data[1]['float_col']);
+            $this->assertEquals('2.123', $data[2]['float_col']);
+            $this->assertEquals('1', $data[0]['bool_col']);
+            $this->assertIsOneOf($data[1]['bool_col'], ['0', false]);
+            $this->assertIsOneOf($data[2]['bool_col'], ['0', false]);
+        } catch (\Exception $e) {
+            setlocale(LC_NUMERIC, $locale);
+            throw $e;
+        } catch (\Throwable $e) {
+            setlocale(LC_NUMERIC, $locale);
+            throw $e;
+        }
+        setlocale(LC_NUMERIC, $locale);
+    }
+
     public function testInsert()
     {
         $db = $this->getConnection();
@@ -332,7 +388,7 @@ SQL;
     }
 
     /**
-     * verify that {{}} are not going to be replaced in parameters
+     * verify that {{}} are not going to be replaced in parameters.
      */
     public function testNoTablenameReplacement()
     {
@@ -365,7 +421,7 @@ SQL;
     }
 
     /**
-     * Test INSERT INTO ... SELECT SQL statement
+     * Test INSERT INTO ... SELECT SQL statement.
      */
     public function testInsertSelect()
     {
@@ -419,7 +475,7 @@ SQL;
     }
 
     /**
-     * Test INSERT INTO ... SELECT SQL statement with alias syntax
+     * Test INSERT INTO ... SELECT SQL statement with alias syntax.
      */
     public function testInsertSelectAlias()
     {
@@ -473,7 +529,7 @@ SQL;
     }
 
     /**
-     * Data provider for testInsertSelectFailed
+     * Data provider for testInsertSelectFailed.
      * @return array
      */
     public function invalidSelectColumns()
@@ -486,11 +542,12 @@ SQL;
     }
 
     /**
-     * Test INSERT INTO ... SELECT SQL statement with wrong query object
+     * Test INSERT INTO ... SELECT SQL statement with wrong query object.
      *
      * @dataProvider invalidSelectColumns
      * @expectedException \yii\base\InvalidArgumentException
      * @expectedExceptionMessage Expected select query object with enumerated (named) parameters
+     * @param mixed $invalidSelectColumns
      */
     public function testInsertSelectFailed($invalidSelectColumns)
     {
@@ -929,7 +986,7 @@ SQL;
     }
 
     /**
-     * Data provider for [[testGetRawSql()]]
+     * Data provider for [[testGetRawSql()]].
      * @return array test data
      */
     public function dataProviderGetRawSql()
diff --git a/tests/framework/db/ConnectionTest.php b/tests/framework/db/ConnectionTest.php
index b488ef4..182a305 100644
--- a/tests/framework/db/ConnectionTest.php
+++ b/tests/framework/db/ConnectionTest.php
@@ -49,8 +49,12 @@ abstract class ConnectionTest extends DatabaseTestCase
         $connection = $this->getConnection(false, false);
         $connection->open();
         $serialized = serialize($connection);
+
+        $this->assertNotNull($connection->pdo);
+
         $unserialized = unserialize($serialized);
         $this->assertInstanceOf('yii\db\Connection', $unserialized);
+        $this->assertNull($unserialized->pdo);
 
         $this->assertEquals(123, $unserialized->createCommand('SELECT 123')->queryScalar());
     }
@@ -406,7 +410,7 @@ abstract class ConnectionTest extends DatabaseTestCase
 
 
     /**
-     * Test whether slave connection is recovered when call getSlavePdo() after close()
+     * Test whether slave connection is recovered when call getSlavePdo() after close().
      *
      * @see https://github.com/yiisoft/yii2/issues/14165
      */
@@ -428,6 +432,6 @@ abstract class ConnectionTest extends DatabaseTestCase
         $slavePdo = $connection->getSlavePdo(false);
         $this->assertNotFalse($slavePdo);
         $this->assertNotNull($slavePdo);
-        $this->assertNotSame($masterPdo,$slavePdo);
+        $this->assertNotSame($masterPdo, $slavePdo);
     }
 }
diff --git a/tests/framework/db/DatabaseTestCase.php b/tests/framework/db/DatabaseTestCase.php
index 048e367..8aa13b5 100644
--- a/tests/framework/db/DatabaseTestCase.php
+++ b/tests/framework/db/DatabaseTestCase.php
@@ -73,6 +73,7 @@ abstract class DatabaseTestCase extends TestCase
         } catch (\Exception $e) {
             $this->markTestSkipped('Something wrong when preparing database: ' . $e->getMessage());
         }
+
         return $this->_db;
     }
 
@@ -101,11 +102,12 @@ abstract class DatabaseTestCase extends TestCase
                 }
             }
         }
+
         return $db;
     }
 
     /**
-     * adjust dbms specific escaping
+     * Adjust dbms specific escaping.
      * @param $sql
      * @return mixed
      */
diff --git a/tests/framework/db/GetTablesAliasTestTrait.php b/tests/framework/db/GetTablesAliasTestTrait.php
index 6e0103f..70359d9 100644
--- a/tests/framework/db/GetTablesAliasTestTrait.php
+++ b/tests/framework/db/GetTablesAliasTestTrait.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 yiiunit\framework\db;
 
diff --git a/tests/framework/db/QueryBuilderTest.php b/tests/framework/db/QueryBuilderTest.php
index 5376d5e..956fea1 100644
--- a/tests/framework/db/QueryBuilderTest.php
+++ b/tests/framework/db/QueryBuilderTest.php
@@ -41,6 +41,8 @@ abstract class QueryBuilderTest extends DatabaseTestCase
     /**
      * @throws \Exception
      * @return QueryBuilder
+     * @param bool $reset
+     * @param bool $open
      */
     protected function getQueryBuilder($reset = true, $open = false)
     {
@@ -66,8 +68,8 @@ abstract class QueryBuilderTest extends DatabaseTestCase
     }
 
     /**
-     * this is not used as a dataprovider for testGetColumnType to speed up the test
-     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here
+     * This is not used as a dataprovider for testGetColumnType to speed up the test
+     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here.
      */
     public function columnTypes()
     {
@@ -1153,6 +1155,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
         foreach ($conditions as $i => $condition) {
             $conditions[$i][1] = $this->replaceQuotes($condition[1]);
         }
+
         return $conditions;
     }
 
@@ -1201,11 +1204,15 @@ abstract class QueryBuilderTest extends DatabaseTestCase
         foreach ($conditions as $i => $condition) {
             $conditions[$i][1] = $this->replaceQuotes($condition[1]);
         }
+
         return $conditions;
     }
 
     /**
      * @dataProvider conditionProvider
+     * @param array $condition
+     * @param string $expected
+     * @param array $expectedParams
      */
     public function testBuildCondition($condition, $expected, $expectedParams)
     {
@@ -1217,6 +1224,9 @@ abstract class QueryBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider filterConditionProvider
+     * @param array $condition
+     * @param string $expected
+     * @param array $expectedParams
      */
     public function testBuildFilterCondition($condition, $expected, $expectedParams)
     {
@@ -1254,6 +1264,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider primaryKeysProvider
+     * @param string $sql
      */
     public function testAddDropPrimaryKey($sql, \Closure $builder)
     {
@@ -1289,6 +1300,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider foreignKeysProvider
+     * @param string $sql
      */
     public function testAddDropForeignKey($sql, \Closure $builder)
     {
@@ -1336,6 +1348,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider indexesProvider
+     * @param string $sql
      */
     public function testCreateDropIndex($sql, \Closure $builder)
     {
@@ -1372,6 +1385,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider uniquesProvider
+     * @param string $sql
      */
     public function testAddDropUnique($sql, \Closure $builder)
     {
@@ -1400,6 +1414,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider checksProvider
+     * @param string $sql
      */
     public function testAddDropCheck($sql, \Closure $builder)
     {
@@ -1428,6 +1443,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider defaultValuesProvider
+     * @param string $sql
      */
     public function testAddDropDefaultValue($sql, \Closure $builder)
     {
@@ -1444,6 +1460,8 @@ abstract class QueryBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider existsParamsProvider
+     * @param string $cond
+     * @param string $expectedQuerySql
      */
     public function testBuildWhereExists($cond, $expectedQuerySql)
     {
@@ -1606,7 +1624,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/10869
+     * @see https://github.com/yiisoft/yii2/issues/10869
      */
     public function testFromIndexHint()
     {
@@ -1802,6 +1820,10 @@ abstract class QueryBuilderTest extends DatabaseTestCase
 
     /**
      * @dataProvider batchInsertProvider
+     * @param string $table
+     * @param array $columns
+     * @param array $value
+     * @param string $expected
      */
     public function testBatchInsert($table, $columns, $value, $expected)
     {
@@ -1891,11 +1913,15 @@ abstract class QueryBuilderTest extends DatabaseTestCase
                 $conditions[$i][2][$name] = strtr($conditions[$i][2][$name], $this->likeParameterReplacements);
             }
         }
+
         return $conditions;
     }
 
     /**
      * @dataProvider likeConditionProvider
+     * @param array $condition
+     * @param string $expected
+     * @param array $expectedParams
      */
     public function testBuildLikeCondition($condition, $expected, $expectedParams)
     {
diff --git a/tests/framework/db/QueryTest.php b/tests/framework/db/QueryTest.php
index 01b2775..34c6c4c 100644
--- a/tests/framework/db/QueryTest.php
+++ b/tests/framework/db/QueryTest.php
@@ -337,13 +337,13 @@ abstract class QueryTest extends DatabaseTestCase
 
 
     /**
-     * Ensure no ambiguous column error occurs on indexBy with JOIN
-     * https://github.com/yiisoft/yii2/issues/13859
+     * Ensure no ambiguous column error occurs on indexBy with JOIN.
+     *
+     * @see https://github.com/yiisoft/yii2/issues/13859
      */
     public function testAmbiguousColumnIndexBy()
     {
-        switch ($this->driverName)
-        {
+        switch ($this->driverName) {
             case 'pgsql':
             case 'sqlite':
                 $selectExpression = "(customer.name || ' in ' || p.description) AS name";
@@ -357,7 +357,7 @@ abstract class QueryTest extends DatabaseTestCase
         }
 
         $db = $this->getConnection();
-        $result = (new Query)->select([$selectExpression])->from('customer')
+        $result = (new Query())->select([$selectExpression])->from('customer')
             ->innerJoin('profile p', '{{customer}}.[[profile_id]] = {{p}}.[[id]]')
             ->indexBy('id')->column($db);
         $this->assertEquals([
@@ -526,6 +526,7 @@ abstract class QueryTest extends DatabaseTestCase
         if (is_numeric($result)) {
             $result = (int) $result;
         }
+
         return $result;
     }
 
diff --git a/tests/framework/db/SchemaTest.php b/tests/framework/db/SchemaTest.php
index cbb675a..09da833 100644
--- a/tests/framework/db/SchemaTest.php
+++ b/tests/framework/db/SchemaTest.php
@@ -29,6 +29,7 @@ abstract class SchemaTest extends DatabaseTestCase
 
     /**
      * @dataProvider pdoAttributesProvider
+     * @param array $pdoAttributes
      */
     public function testGetTableNames($pdoAttributes)
     {
@@ -52,6 +53,7 @@ abstract class SchemaTest extends DatabaseTestCase
 
     /**
      * @dataProvider pdoAttributesProvider
+     * @param array $pdoAttributes
      */
     public function testGetTableSchemas($pdoAttributes)
     {
@@ -570,6 +572,9 @@ abstract class SchemaTest extends DatabaseTestCase
 
     /**
      * @dataProvider constraintsProvider
+     * @param string $tableName
+     * @param string $type
+     * @param mixed $expected
      */
     public function testTableSchemaConstraints($tableName, $type, $expected)
     {
@@ -583,6 +588,9 @@ abstract class SchemaTest extends DatabaseTestCase
 
     /**
      * @dataProvider uppercaseConstraintsProvider
+     * @param string $tableName
+     * @param string $type
+     * @param mixed $expected
      */
     public function testTableSchemaConstraintsWithPdoUppercase($tableName, $type, $expected)
     {
@@ -598,6 +606,9 @@ abstract class SchemaTest extends DatabaseTestCase
 
     /**
      * @dataProvider lowercaseConstraintsProvider
+     * @param string $tableName
+     * @param string $type
+     * @param mixed $expected
      */
     public function testTableSchemaConstraintsWithPdoLowercase($tableName, $type, $expected)
     {
diff --git a/tests/framework/db/cubrid/ColumnSchemaBuilderTest.php b/tests/framework/db/cubrid/ColumnSchemaBuilderTest.php
index 75164fd..b6cdc92 100644
--- a/tests/framework/db/cubrid/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/cubrid/ColumnSchemaBuilderTest.php
@@ -11,7 +11,7 @@ use yii\db\cubrid\ColumnSchemaBuilder;
 use yii\db\Schema;
 
 /**
- * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for Cubrid
+ * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for Cubrid.
  * @group db
  * @group cubrid
  */
diff --git a/tests/framework/db/cubrid/QueryBuilderTest.php b/tests/framework/db/cubrid/QueryBuilderTest.php
index c2d3c69..79c8e92 100644
--- a/tests/framework/db/cubrid/QueryBuilderTest.php
+++ b/tests/framework/db/cubrid/QueryBuilderTest.php
@@ -24,8 +24,8 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
     ];
 
     /**
-     * this is not used as a dataprovider for testGetColumnType to speed up the test
-     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here
+     * This is not used as a dataprovider for testGetColumnType to speed up the test
+     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here.
      */
     public function columnTypes()
     {
diff --git a/tests/framework/db/cubrid/SchemaTest.php b/tests/framework/db/cubrid/SchemaTest.php
index 82e33b5..8b53ed5 100644
--- a/tests/framework/db/cubrid/SchemaTest.php
+++ b/tests/framework/db/cubrid/SchemaTest.php
@@ -119,6 +119,7 @@ class SchemaTest extends \yiiunit\framework\db\SchemaTest
             foreach ($object as $name => $value) {
                 $result[] = $this->convertPropertiesToAnycase($value);
             }
+
             return $result;
         }
 
@@ -129,6 +130,7 @@ class SchemaTest extends \yiiunit\framework\db\SchemaTest
         } elseif (is_array($object) || is_string($object)) {
             $object = new AnyCaseValue($object);
         }
+
         return $object;
     }
 }
diff --git a/tests/framework/db/mssql/ColumnSchemaBuilderTest.php b/tests/framework/db/mssql/ColumnSchemaBuilderTest.php
index 59fe034..020d598 100644
--- a/tests/framework/db/mssql/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/mssql/ColumnSchemaBuilderTest.php
@@ -10,7 +10,7 @@ namespace yiiunit\framework\db\mssql;
 use yii\db\ColumnSchemaBuilder;
 
 /**
- * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for MSSQL
+ * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for MSSQL.
  * @group db
  * @group mssql
  */
diff --git a/tests/framework/db/mssql/QueryBuilderTest.php b/tests/framework/db/mssql/QueryBuilderTest.php
index 43a90e0..0048fa2 100644
--- a/tests/framework/db/mssql/QueryBuilderTest.php
+++ b/tests/framework/db/mssql/QueryBuilderTest.php
@@ -94,8 +94,8 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
     }
 
     /**
-     * this is not used as a dataprovider for testGetColumnType to speed up the test
-     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here
+     * This is not used as a dataprovider for testGetColumnType to speed up the test
+     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here.
      */
     public function columnTypes()
     {
diff --git a/tests/framework/db/mysql/ColumnSchemaBuilderTest.php b/tests/framework/db/mysql/ColumnSchemaBuilderTest.php
index f25d28a..7f1b0ff 100644
--- a/tests/framework/db/mysql/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/mysql/ColumnSchemaBuilderTest.php
@@ -11,7 +11,7 @@ use yii\db\mysql\ColumnSchemaBuilder;
 use yii\db\Schema;
 
 /**
- * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for MySQL
+ * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for MySQL.
  * @group db
  * @group mysql
  */
diff --git a/tests/framework/db/mysql/QueryBuilderTest.php b/tests/framework/db/mysql/QueryBuilderTest.php
index 848e121..6601be7 100644
--- a/tests/framework/db/mysql/QueryBuilderTest.php
+++ b/tests/framework/db/mysql/QueryBuilderTest.php
@@ -18,8 +18,8 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
     protected $driverName = 'mysql';
 
     /**
-     * this is not used as a dataprovider for testGetColumnType to speed up the test
-     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here
+     * This is not used as a dataprovider for testGetColumnType to speed up the test
+     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here.
      */
     public function columnTypes()
     {
diff --git a/tests/framework/db/mysql/QueryTest.php b/tests/framework/db/mysql/QueryTest.php
index f225398..b33d64a 100644
--- a/tests/framework/db/mysql/QueryTest.php
+++ b/tests/framework/db/mysql/QueryTest.php
@@ -19,7 +19,7 @@ class QueryTest extends \yiiunit\framework\db\QueryTest
     protected $driverName = 'mysql';
 
     /**
-     * Tests MySQL specific syntax for index hints
+     * Tests MySQL specific syntax for index hints.
      */
     public function testQueryIndexHint()
     {
diff --git a/tests/framework/db/mysql/connection/DeadLockTest.php b/tests/framework/db/mysql/connection/DeadLockTest.php
index 8b813e4..28605e9 100644
--- a/tests/framework/db/mysql/connection/DeadLockTest.php
+++ b/tests/framework/db/mysql/connection/DeadLockTest.php
@@ -23,7 +23,7 @@ class DeadLockTest extends \yiiunit\framework\db\mysql\ConnectionTest
     const CHILD_EXIT_CODE_DEADLOCK = 15;
 
     /**
-     * Test deadlock exception
+     * Test deadlock exception.
      *
      * Accident deadlock exception lost while rolling back a transaction or savepoint
      * @link https://github.com/yiisoft/yii2/issues/12715
@@ -279,7 +279,7 @@ class DeadLockTest extends \yiiunit\framework\db\mysql\ConnectionTest
     }
 
     /**
-     * Sets filename for log file shared between children processes
+     * Sets filename for log file shared between children processes.
      * @param string $filename
      */
     private function setLogFile($filename)
@@ -312,6 +312,7 @@ class DeadLockTest extends \yiiunit\framework\db\mysql\ConnectionTest
             unlink($this->logFile);
             return $content;
         }
+
         return null;
     }
 
diff --git a/tests/framework/db/oci/ColumnSchemaBuilderTest.php b/tests/framework/db/oci/ColumnSchemaBuilderTest.php
index dda7b73..9535ac8 100644
--- a/tests/framework/db/oci/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/oci/ColumnSchemaBuilderTest.php
@@ -11,7 +11,7 @@ use yii\db\oci\ColumnSchemaBuilder;
 use yii\db\Schema;
 
 /**
- * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for Oracle
+ * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for Oracle.
  * @group db
  * @group oci
  */
diff --git a/tests/framework/db/oci/QueryBuilderTest.php b/tests/framework/db/oci/QueryBuilderTest.php
index 40b4070..0e1dbbf 100644
--- a/tests/framework/db/oci/QueryBuilderTest.php
+++ b/tests/framework/db/oci/QueryBuilderTest.php
@@ -27,8 +27,8 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest
     ];
 
     /**
-     * this is not used as a dataprovider for testGetColumnType to speed up the test
-     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here
+     * This is not used as a dataprovider for testGetColumnType to speed up the test
+     * when used as dataprovider every single line will cause a reconnect with the database which is not needed here.
      */
     public function columnTypes()
     {
diff --git a/tests/framework/db/pgsql/ActiveRecordTest.php b/tests/framework/db/pgsql/ActiveRecordTest.php
index 4333a90..f7dc08a 100644
--- a/tests/framework/db/pgsql/ActiveRecordTest.php
+++ b/tests/framework/db/pgsql/ActiveRecordTest.php
@@ -116,7 +116,7 @@ class ActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/4672
+     * @see https://github.com/yiisoft/yii2/issues/4672
      */
     public function testBooleanValues2()
     {
diff --git a/tests/framework/db/pgsql/ColumnSchemaBuilderTest.php b/tests/framework/db/pgsql/ColumnSchemaBuilderTest.php
index dd61271..641d780 100644
--- a/tests/framework/db/pgsql/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/pgsql/ColumnSchemaBuilderTest.php
@@ -10,7 +10,7 @@ namespace yiiunit\framework\db\pgsql;
 use yii\db\ColumnSchemaBuilder;
 
 /**
- * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for Oracle
+ * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for Oracle.
  * @group db
  * @group pgsql
  */
diff --git a/tests/framework/db/pgsql/SchemaTest.php b/tests/framework/db/pgsql/SchemaTest.php
index 423abcf..7208024 100644
--- a/tests/framework/db/pgsql/SchemaTest.php
+++ b/tests/framework/db/pgsql/SchemaTest.php
@@ -151,6 +151,7 @@ class SchemaTest extends \yiiunit\framework\db\SchemaTest
 
     /**
      * @dataProvider bigintValueProvider
+     * @param int $bigint
      */
     public function testBigintValue($bigint)
     {
@@ -172,7 +173,7 @@ class SchemaTest extends \yiiunit\framework\db\SchemaTest
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/12483
+     * @see https://github.com/yiisoft/yii2/issues/12483
      */
     public function testParenthesisDefaultValue()
     {
@@ -197,7 +198,7 @@ class SchemaTest extends \yiiunit\framework\db\SchemaTest
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/14192
+     * @see https://github.com/yiisoft/yii2/issues/14192
      */
     public function testTimestampNullDefaultValue()
     {
diff --git a/tests/framework/db/sqlite/ColumnSchemaBuilderTest.php b/tests/framework/db/sqlite/ColumnSchemaBuilderTest.php
index 9660329..7831c80 100644
--- a/tests/framework/db/sqlite/ColumnSchemaBuilderTest.php
+++ b/tests/framework/db/sqlite/ColumnSchemaBuilderTest.php
@@ -11,7 +11,7 @@ use yii\db\Schema;
 use yii\db\sqlite\ColumnSchemaBuilder;
 
 /**
- * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for SQLite
+ * ColumnSchemaBuilderTest tests ColumnSchemaBuilder for SQLite.
  * @group db
  * @group sqlite
  */
diff --git a/tests/framework/db/sqlite/SqlTokenizerTest.php b/tests/framework/db/sqlite/SqlTokenizerTest.php
index b745792..0e5c4e6 100644
--- a/tests/framework/db/sqlite/SqlTokenizerTest.php
+++ b/tests/framework/db/sqlite/SqlTokenizerTest.php
@@ -1119,6 +1119,7 @@ SELECT*from/*foo*/`T_constraints_1`WHERE not`C_check`=\'foo\'\'bar\'--bar
 
     /**
      * @dataProvider sqlProvider
+     * @param string $sql
      */
     public function testTokenizer($sql, SqlToken $expectedToken)
     {
diff --git a/tests/framework/di/InstanceTest.php b/tests/framework/di/InstanceTest.php
index 9195c9c..c088f3f 100644
--- a/tests/framework/di/InstanceTest.php
+++ b/tests/framework/di/InstanceTest.php
@@ -151,7 +151,7 @@ class InstanceTest extends TestCase
     }
 
     /**
-     * This tests the usage example given in yii\di\Instance class PHPdoc
+     * This tests the usage example given in yii\di\Instance class PHPDoc.
      */
     public function testLazyInitializationExample()
     {
diff --git a/tests/framework/di/ServiceLocatorTest.php b/tests/framework/di/ServiceLocatorTest.php
index 643a3a3..cf00873 100644
--- a/tests/framework/di/ServiceLocatorTest.php
+++ b/tests/framework/di/ServiceLocatorTest.php
@@ -88,7 +88,7 @@ class ServiceLocatorTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/11771
+     * @see https://github.com/yiisoft/yii2/issues/11771
      */
     public function testModulePropertyIsset()
     {
diff --git a/tests/framework/filters/AccessRuleTest.php b/tests/framework/filters/AccessRuleTest.php
index a9fbd54..9e2565f 100644
--- a/tests/framework/filters/AccessRuleTest.php
+++ b/tests/framework/filters/AccessRuleTest.php
@@ -61,6 +61,7 @@ class AccessRuleTest extends \yiiunit\TestCase
         if ($userid !== null) {
             $user->setIdentity(UserIdentity::findIdentity($userid));
         }
+
         return $user;
     }
 
@@ -208,7 +209,7 @@ class AccessRuleTest extends \yiiunit\TestCase
     }
 
     /**
-     * Data provider for testMatchRole
+     * Data provider for testMatchRole.
      *
      * @return array or arrays
      *           the id of the action
@@ -251,7 +252,7 @@ class AccessRuleTest extends \yiiunit\TestCase
     }
 
     /**
-     * Test that a user matches certain roles
+     * Test that a user matches certain roles.
      *
      * @dataProvider matchRoleProvider
      * @param string $actionid the action id
@@ -281,7 +282,7 @@ class AccessRuleTest extends \yiiunit\TestCase
     }
 
     /**
-     * Test that matching role is not possible without User component
+     * Test that matching role is not possible without User component.
      *
      * @see https://github.com/yiisoft/yii2/issues/4793
      */
diff --git a/tests/framework/filters/AjaxFilterTest.php b/tests/framework/filters/AjaxFilterTest.php
index a677689..e34335c 100644
--- a/tests/framework/filters/AjaxFilterTest.php
+++ b/tests/framework/filters/AjaxFilterTest.php
@@ -10,7 +10,6 @@ namespace yiiunit\framework\filters;
 use Yii;
 use yii\base\Action;
 use yii\filters\AjaxFilter;
-use yii\web\BadRequestHttpException;
 use yii\web\Controller;
 use yii\web\Request;
 use yiiunit\TestCase;
@@ -21,7 +20,7 @@ use yiiunit\TestCase;
 class AjaxFilterTest extends TestCase
 {
     /**
-     * @param boolean $isAjax
+     * @param bool $isAjax
      * @return Request
      */
     protected function mockRequest($isAjax)
@@ -49,4 +48,4 @@ class AjaxFilterTest extends TestCase
         $this->expectException('yii\web\BadRequestHttpException');
         $filter->beforeAction($action);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/framework/filters/PageCacheTest.php b/tests/framework/filters/PageCacheTest.php
index 3c53b6d..6540379 100644
--- a/tests/framework/filters/PageCacheTest.php
+++ b/tests/framework/filters/PageCacheTest.php
@@ -139,6 +139,7 @@ class PageCacheTest extends TestCase
 
     /**
      * @dataProvider cacheTestCaseProvider
+     * @param array $testCase
      */
     public function testCache($testCase)
     {
diff --git a/tests/framework/filters/auth/AuthTest.php b/tests/framework/filters/auth/AuthTest.php
index 4044e71..c53b18b 100644
--- a/tests/framework/filters/auth/AuthTest.php
+++ b/tests/framework/filters/auth/AuthTest.php
@@ -92,6 +92,8 @@ class AuthTest extends \yiiunit\TestCase
 
     /**
      * @dataProvider tokenProvider
+     * @param string|null $token
+     * @param string|null $login
      */
     public function testQueryParamAuth($token, $login)
     {
@@ -104,6 +106,8 @@ class AuthTest extends \yiiunit\TestCase
 
     /**
      * @dataProvider tokenProvider
+     * @param string|null $token
+     * @param string|null $login
      */
     public function testHttpBasicAuth($token, $login)
     {
@@ -117,6 +121,8 @@ class AuthTest extends \yiiunit\TestCase
 
     /**
      * @dataProvider tokenProvider
+     * @param string|null $token
+     * @param string|null $login
      */
     public function testHttpBasicAuthCustom($token, $login)
     {
@@ -139,6 +145,8 @@ class AuthTest extends \yiiunit\TestCase
 
     /**
      * @dataProvider tokenProvider
+     * @param string|null $token
+     * @param string|null $login
      */
     public function testHttpBearerAuth($token, $login)
     {
@@ -161,6 +169,7 @@ class AuthTest extends \yiiunit\TestCase
 
     /**
      * @dataProvider authMethodProvider
+     * @param string $authClass
      */
     public function testActive($authClass)
     {
@@ -209,7 +218,7 @@ class AuthTest extends \yiiunit\TestCase
 }
 
 /**
- * Class TestAuthController
+ * Class TestAuthController.
  *
  * @author Dmitry Naumenko <d.naumenko.a@gmail.com>
  * @since 2.0.7
diff --git a/tests/framework/filters/auth/CompositeAuthTest.php b/tests/framework/filters/auth/CompositeAuthTest.php
index 7366633..af04b6b 100644
--- a/tests/framework/filters/auth/CompositeAuthTest.php
+++ b/tests/framework/filters/auth/CompositeAuthTest.php
@@ -108,7 +108,7 @@ class CompositeAuthTest extends \yiiunit\TestCase
     }
 
     /**
-     * reproducing the issue specified in https://github.com/yiisoft/yii2/issues/7409
+     * @see https://github.com/yiisoft/yii2/issues/7409
      */
     public function testRunAction()
     {
diff --git a/tests/framework/filters/stubs/MockAuthManager.php b/tests/framework/filters/stubs/MockAuthManager.php
index 1ed140e..8b0bb26 100644
--- a/tests/framework/filters/stubs/MockAuthManager.php
+++ b/tests/framework/filters/stubs/MockAuthManager.php
@@ -12,7 +12,7 @@ use yii\rbac\PhpManager;
 class MockAuthManager extends PhpManager
 {
     /**
-     * This mock does not persist
+     * This mock does not persist.
      * @inheritdoc
      */
     protected function saveToFile($data, $file)
diff --git a/tests/framework/filters/stubs/UserIdentity.php b/tests/framework/filters/stubs/UserIdentity.php
index 086ab8b..c97eb21 100644
--- a/tests/framework/filters/stubs/UserIdentity.php
+++ b/tests/framework/filters/stubs/UserIdentity.php
@@ -12,7 +12,7 @@ use yii\base\NotSupportedException;
 use yii\web\IdentityInterface;
 
 /**
- * Class UserIdentity
+ * Class UserIdentity.
  * @author Dmitry Naumenko <d.naumenko.a@gmail.com>
  * @since 2.0.7
  */
diff --git a/tests/framework/grid/RadiobuttonColumnTest.php b/tests/framework/grid/RadiobuttonColumnTest.php
index ab7c0d2..1dfe935 100644
--- a/tests/framework/grid/RadiobuttonColumnTest.php
+++ b/tests/framework/grid/RadiobuttonColumnTest.php
@@ -15,7 +15,7 @@ use yii\web\Request;
 use yiiunit\TestCase;
 
 /**
- * Class RadiobuttonColumnTest
+ * Class RadiobuttonColumnTest.
  * @group grid
  * @since 2.0.11
  */
diff --git a/tests/framework/helpers/ArrayHelperTest.php b/tests/framework/helpers/ArrayHelperTest.php
index cf31984..a84fa79 100644
--- a/tests/framework/helpers/ArrayHelperTest.php
+++ b/tests/framework/helpers/ArrayHelperTest.php
@@ -7,6 +7,7 @@
 
 namespace yiiunit\framework\helpers;
 
+use yii\base\Arrayable;
 use yii\base\BaseObject;
 use yii\data\Sort;
 use yii\helpers\ArrayHelper;
@@ -32,7 +33,7 @@ class Post2 extends BaseObject
 class Post3 extends BaseObject
 {
     public $id = 33;
-    /** @var Object */
+    /** @var BaseObject */
     public $subObject;
 
     public function init()
@@ -56,7 +57,7 @@ class ArrayHelperTest extends TestCase
 
     public function testToArray()
     {
-        $dataArrayable = $this->createMock(\yii\base\Arrayable::class);
+        $dataArrayable = $this->getMockBuilder(Arrayable::class)->getMock();
         $dataArrayable->method('toArray')->willReturn([]);
         $this->assertEquals([], ArrayHelper::toArray($dataArrayable));
         $this->assertEquals(['foo'], ArrayHelper::toArray('foo'));
@@ -331,6 +332,7 @@ class ArrayHelperTest extends TestCase
                 $o = ['Bug' => 'C', 'Enh' => 'D'];
                 return $o[$m[1]] . ' ' . (!empty($m[2]) ? $m[2] : 'AAAA' . $i++);
             }
+
             return 'B' . $i++;
         }, SORT_ASC, SORT_NATURAL);
         $this->assertEquals([
@@ -802,7 +804,8 @@ class ArrayHelperTest extends TestCase
     }
 
     /**
-     * This is expected to result in a PHP error
+     * This is expected to result in a PHP error.
+     * @expectedException \PHPUnit_Framework_Error
      */
     public function testGetValueNonexistingProperties1()
     {
@@ -812,7 +815,8 @@ class ArrayHelperTest extends TestCase
     }
 
     /**
-     * This is expected to result in a PHP error
+     * This is expected to result in a PHP error.
+     * @expectedException \PHPUnit_Framework_Error
      */
     public function testGetValueNonexistingProperties2()
     {
@@ -822,7 +826,7 @@ class ArrayHelperTest extends TestCase
     }
 
     /**
-     * Data provider for [[testSetValue()]]
+     * Data provider for [[testSetValue()]].
      * @return array test data
      */
     public function dataProviderSetValue()
@@ -870,7 +874,7 @@ class ArrayHelperTest extends TestCase
                 [
                     'key' => [
                         'val1',
-                        'in' => 'val'
+                        'in' => 'val',
                     ],
                 ],
             ],
@@ -892,7 +896,7 @@ class ArrayHelperTest extends TestCase
                 [
                     'key1' => 'val1',
                     'key' => [
-                        'in' => ['val']
+                        'in' => ['val'],
                     ],
                 ],
             ],
@@ -906,8 +910,8 @@ class ArrayHelperTest extends TestCase
                     'key1' => 'val1',
                     'key' => [
                         'in' => [
-                            'arr' => 'val'
-                        ]
+                            'arr' => 'val',
+                        ],
                     ],
                 ],
             ],
@@ -920,15 +924,15 @@ class ArrayHelperTest extends TestCase
                     'key1' => 'val1',
                     'key' => [
                         'in' => [
-                            'arr' => ['val']
-                        ]
+                            'arr' => ['val'],
+                        ],
                     ],
                 ],
             ],
             [
                 [
                     'key' => [
-                        'in' => ['val1']
+                        'in' => ['val1'],
                     ],
                 ],
                 'key.in.arr', 'val',
@@ -936,8 +940,8 @@ class ArrayHelperTest extends TestCase
                     'key' => [
                         'in' => [
                             'val1',
-                            'arr' => 'val'
-                        ]
+                            'arr' => 'val',
+                        ],
                     ],
                 ],
             ],
@@ -951,8 +955,8 @@ class ArrayHelperTest extends TestCase
                     'key' => [
                         'in' => [
                             'val1',
-                            'arr' => ['val']
-                        ]
+                            'arr' => ['val'],
+                        ],
                     ],
                 ],
             ],
@@ -961,8 +965,8 @@ class ArrayHelperTest extends TestCase
                     'key' => [
                         'in' => [
                             'val1',
-                            'key' => 'val'
-                        ]
+                            'key' => 'val',
+                        ],
                     ],
                 ],
                 'key.in.0', ['arr' => 'val'],
@@ -970,8 +974,8 @@ class ArrayHelperTest extends TestCase
                     'key' => [
                         'in' => [
                             ['arr' => 'val'],
-                            'key' => 'val'
-                        ]
+                            'key' => 'val',
+                        ],
                     ],
                 ],
             ],
@@ -980,14 +984,14 @@ class ArrayHelperTest extends TestCase
                     'key' => [
                         'in' => [
                             'val1',
-                            'key' => 'val'
-                        ]
+                            'key' => 'val',
+                        ],
                     ],
                 ],
                 'key.in', ['arr' => 'val'],
                 [
                     'key' => [
-                        'in' => ['arr' => 'val']
+                        'in' => ['arr' => 'val'],
                     ],
                 ],
             ],
@@ -1000,8 +1004,8 @@ class ArrayHelperTest extends TestCase
                                 'attr1',
                                 'attr2',
                                 'attr3',
-                            ]
-                        ]
+                            ],
+                        ],
                     ],
                 ],
                 'key.in.schema', 'array',
@@ -1014,8 +1018,8 @@ class ArrayHelperTest extends TestCase
                                 'attr1',
                                 'attr2',
                                 'attr3',
-                            ]
-                        ]
+                            ],
+                        ],
                     ],
                 ],
             ],
@@ -1024,7 +1028,7 @@ class ArrayHelperTest extends TestCase
                     'key' => [
                         'in.array' => [
                             'key' => 'val',
-                        ]
+                        ],
                     ],
                 ],
                 ['key', 'in.array', 'ok.schema'], 'array',
@@ -1033,7 +1037,7 @@ class ArrayHelperTest extends TestCase
                         'in.array' => [
                             'key' => 'val',
                             'ok.schema' => 'array',
-                        ]
+                        ],
                     ],
                 ],
             ],
diff --git a/tests/framework/helpers/ConsoleTest.php b/tests/framework/helpers/ConsoleTest.php
index f4ad39d..20c2a35 100644
--- a/tests/framework/helpers/ConsoleTest.php
+++ b/tests/framework/helpers/ConsoleTest.php
@@ -137,6 +137,8 @@ class ConsoleTest extends TestCase
 
     /**
      * @dataProvider ansiFormats
+     * @param string $ansi
+     * @param string $html
      */
     public function testAnsi2Html($ansi, $html)
     {
diff --git a/tests/framework/helpers/FallbackInflector.php b/tests/framework/helpers/FallbackInflector.php
index f9ab341..868c51d 100644
--- a/tests/framework/helpers/FallbackInflector.php
+++ b/tests/framework/helpers/FallbackInflector.php
@@ -10,7 +10,7 @@ namespace yiiunit\framework\helpers;
 use yii\helpers\BaseInflector;
 
 /**
- * Forces Inflector::slug to use PHP even if intl is available
+ * Forces Inflector::slug to use PHP even if intl is available.
  */
 class FallbackInflector extends BaseInflector
 {
diff --git a/tests/framework/helpers/FileHelperTest.php b/tests/framework/helpers/FileHelperTest.php
index b473ecb..1be6ce7 100644
--- a/tests/framework/helpers/FileHelperTest.php
+++ b/tests/framework/helpers/FileHelperTest.php
@@ -9,7 +9,7 @@ use yii\helpers\FileHelper;
 use yiiunit\TestCase;
 
 /**
- * Unit test for [[yii\helpers\FileHelper]]
+ * Unit test for [[yii\helpers\FileHelper]].
  * @see FileHelper
  * @group helpers
  */
@@ -98,7 +98,7 @@ class FileHelperTest extends TestCase
     }
 
     /**
-     * Creates test files structure,
+     * Creates test files structure.
      * @param array  $items    file system objects to be created in format: objectName => objectContent
      *                         Arrays specifies directories, other values - files.
      * @param string $basePath structure base file path.
diff --git a/tests/framework/helpers/HtmlTest.php b/tests/framework/helpers/HtmlTest.php
index 53fa9c5..eecd897 100644
--- a/tests/framework/helpers/HtmlTest.php
+++ b/tests/framework/helpers/HtmlTest.php
@@ -171,7 +171,7 @@ class HtmlTest extends TestCase
     }
 
     /**
-     * Data provider for [[testBeginFormSimulateViaPost()]]
+     * Data provider for [[testBeginFormSimulateViaPost()]].
      * @return array test data
      */
     public function dataProviderBeginFormSimulateViaPost()
@@ -309,6 +309,9 @@ class HtmlTest extends TestCase
 
     /**
      * @dataProvider imgDataProvider
+     * @param string $expected
+     * @param string $src
+     * @param array $options
      */
     public function testImg($expected, $src, $options)
     {
@@ -424,6 +427,10 @@ class HtmlTest extends TestCase
 
     /**
      * @dataProvider textareaDataProvider
+     * @param string $expected
+     * @param string $name
+     * @param string $value
+     * @param array $options
      */
     public function testTextarea($expected, $name, $value, $options)
     {
@@ -1048,7 +1055,7 @@ EOD;
     }
 
     /**
-     * Data provider for [[testActiveTextInput()]]
+     * Data provider for [[testActiveTextInput()]].
      * @return array test data
      */
     public function dataProviderActiveTextInput()
@@ -1091,7 +1098,7 @@ EOD;
     }
 
     /**
-     * Data provider for [[testActivePasswordInput()]]
+     * Data provider for [[testActivePasswordInput()]].
      * @return array test data
      */
     public function dataProviderActivePasswordInput()
@@ -1213,7 +1220,7 @@ EOD;
     }
 
     /**
-     * Data provider for [[testActiveTextArea()]]
+     * Data provider for [[testActiveTextArea()]].
      * @return array test data
      */
     public function dataProviderActiveTextArea()
@@ -1263,7 +1270,7 @@ EOD;
     }
 
     /**
-     * Fixes #10078
+     * @see https://github.com/yiisoft/yii2/issues/10078
      */
     public function testCsrfDisable()
     {
@@ -1282,7 +1289,7 @@ EOD;
     }
 
     /**
-     * Data provider for [[testActiveRadio()]]
+     * Data provider for [[testActiveRadio()]].
      * @return array test data
      */
     public function dataProviderActiveRadio()
@@ -1326,7 +1333,7 @@ EOD;
     }
 
     /**
-     * Data provider for [[testActiveCheckbox()]]
+     * Data provider for [[testActiveCheckbox()]].
      * @return array test data
      */
     public function dataProviderActiveCheckbox()
@@ -1370,7 +1377,7 @@ EOD;
     }
 
     /**
-     * Data provider for [[testAttributeNameValidation()]]
+     * Data provider for [[testAttributeNameValidation()]].
      * @return array test data
      */
     public function validAttributeNamesProvider()
@@ -1396,7 +1403,7 @@ EOD;
     }
 
     /**
-     * Data provider for [[testAttributeNameValidation()]]
+     * Data provider for [[testAttributeNameValidation()]].
      * @return array test data
      */
     public function invalidAttributeNamesProvider()
diff --git a/tests/framework/helpers/MarkdownTest.php b/tests/framework/helpers/MarkdownTest.php
index ec39b39..9f76a39 100644
--- a/tests/framework/helpers/MarkdownTest.php
+++ b/tests/framework/helpers/MarkdownTest.php
@@ -11,7 +11,7 @@ use yii\helpers\Markdown;
 use yiiunit\TestCase;
 
 /**
- * Description of MarkdownTest
+ * Description of MarkdownTest.
  *
  * @author Misbahul D Munir <misbahuldmunir@gmail.com>
  * @group helpers
diff --git a/tests/framework/helpers/StringHelperTest.php b/tests/framework/helpers/StringHelperTest.php
index 59ae764..fbe3d28 100644
--- a/tests/framework/helpers/StringHelperTest.php
+++ b/tests/framework/helpers/StringHelperTest.php
@@ -11,7 +11,7 @@ use yii\helpers\StringHelper;
 use yiiunit\TestCase;
 
 /**
- * StringHelperTest
+ * StringHelperTest.
  * @group helpers
  */
 class StringHelperTest extends TestCase
@@ -19,7 +19,9 @@ class StringHelperTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Helper must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testStrlen()
@@ -149,6 +151,9 @@ class StringHelperTest extends TestCase
 
     /**
      * @dataProvider providerStartsWith
+     * @param bool $result
+     * @param string $string
+     * @param string|null $with
      */
     public function testStartsWith($result, $string, $with)
     {
@@ -159,7 +164,7 @@ class StringHelperTest extends TestCase
     }
 
     /**
-     * Rules that should work the same for case-sensitive and case-insensitive `startsWith()`
+     * Rules that should work the same for case-sensitive and case-insensitive `startsWith()`.
      */
     public function providerStartsWith()
     {
@@ -202,6 +207,9 @@ class StringHelperTest extends TestCase
 
     /**
      * @dataProvider providerEndsWith
+     * @param bool $result
+     * @param string $string
+     * @param string|null $with
      */
     public function testEndsWith($result, $string, $with)
     {
@@ -212,7 +220,7 @@ class StringHelperTest extends TestCase
     }
 
     /**
-     * Rules that should work the same for case-sensitive and case-insensitive `endsWith()`
+     * Rules that should work the same for case-sensitive and case-insensitive `endsWith()`.
      */
     public function providerEndsWith()
     {
diff --git a/tests/framework/helpers/UrlTest.php b/tests/framework/helpers/UrlTest.php
index a31c831..613c9f8 100644
--- a/tests/framework/helpers/UrlTest.php
+++ b/tests/framework/helpers/UrlTest.php
@@ -18,7 +18,7 @@ use yiiunit\framework\filters\stubs\UserIdentity;
 use yiiunit\TestCase;
 
 /**
- * UrlTest
+ * UrlTest.
  * @group helpers
  */
 class UrlTest extends TestCase
@@ -54,7 +54,7 @@ class UrlTest extends TestCase
     }
 
     /**
-     * Mocks controller action with parameters
+     * Mocks controller action with parameters.
      *
      * @param string $controllerId
      * @param string $actionID
@@ -228,7 +228,7 @@ class UrlTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/11925
+     * @see https://github.com/yiisoft/yii2/issues/11925
      */
     public function testToWithSuffix()
     {
diff --git a/tests/framework/helpers/VarDumperTest.php b/tests/framework/helpers/VarDumperTest.php
index b8eac90..6bc818e 100644
--- a/tests/framework/helpers/VarDumperTest.php
+++ b/tests/framework/helpers/VarDumperTest.php
@@ -56,7 +56,7 @@ class VarDumperTest extends TestCase
     }
 
     /**
-     * Data provider for [[testExport()]]
+     * Data provider for [[testExport()]].
      * @return array test data
      */
     public function dataProviderExport()
diff --git a/tests/framework/i18n/DbMessageSourceTest.php b/tests/framework/i18n/DbMessageSourceTest.php
index 76cb6eb..4aa8417 100644
--- a/tests/framework/i18n/DbMessageSourceTest.php
+++ b/tests/framework/i18n/DbMessageSourceTest.php
@@ -138,6 +138,7 @@ class DbMessageSourceTest extends I18NTest
             }
             static::$db = $db;
         }
+
         return static::$db;
     }
 
diff --git a/tests/framework/i18n/FallbackMessageFormatterTest.php b/tests/framework/i18n/FallbackMessageFormatterTest.php
index 8521fb4..b5b692c 100644
--- a/tests/framework/i18n/FallbackMessageFormatterTest.php
+++ b/tests/framework/i18n/FallbackMessageFormatterTest.php
@@ -178,6 +178,9 @@ _MSG_
 
     /**
      * @dataProvider patterns
+     * @param string $pattern
+     * @param string $expected
+     * @param array $args
      */
     public function testNamedArguments($pattern, $expected, $args)
     {
diff --git a/tests/framework/i18n/FormatterDateTest.php b/tests/framework/i18n/FormatterDateTest.php
index 6a24110..cd32246 100644
--- a/tests/framework/i18n/FormatterDateTest.php
+++ b/tests/framework/i18n/FormatterDateTest.php
@@ -185,6 +185,13 @@ class FormatterDateTest extends TestCase
         $this->assertRegExp(date('~M j, Y,? g:i:s A~', $value->getTimestamp()), $this->formatter->asDatetime($value));
         $this->assertSame(date('Y/m/d h:i:s A', $value->getTimestamp()), $this->formatter->asDatetime($value, 'php:Y/m/d h:i:s A'));
 
+        // empty time
+        $value = new DateTime();
+        $date = $value->format('Y-m-d');
+        $value = new DateTime($date);
+        $this->assertRegExp(date('~M j, Y,? g:i:s A~', $value->getTimestamp()), $this->formatter->asDatetime($date));
+        $this->assertSame(date('Y/m/d h:i:s A', $value->getTimestamp()), $this->formatter->asDatetime($date, 'php:Y/m/d h:i:s A'));
+
         if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
             $value = new \DateTimeImmutable();
             $this->assertRegExp(date('~M j, Y,? g:i:s A~', $value->getTimestamp()), $this->formatter->asDatetime($value));
@@ -232,8 +239,8 @@ class FormatterDateTest extends TestCase
     }
 
     /**
-     * Test for dates before 1970
-     * https://github.com/yiisoft/yii2/issues/3126
+     * Test for dates before 1970.
+     * @see https://github.com/yiisoft/yii2/issues/3126
      */
     public function testDateRangeLow()
     {
@@ -252,8 +259,8 @@ class FormatterDateTest extends TestCase
     }
 
     /**
-     * Test for dates after 2038
-     * https://github.com/yiisoft/yii2/issues/3126
+     * Test for dates after 2038.
+     * @see https://github.com/yiisoft/yii2/issues/3126
      */
     public function testDateRangeHigh()
     {
@@ -272,6 +279,7 @@ class FormatterDateTest extends TestCase
         foreach ($intervals as $interval) {
             $date->sub($interval);
         }
+
         return $date;
     }
 
@@ -513,6 +521,9 @@ class FormatterDateTest extends TestCase
 
     /**
      * @dataProvider dateInputs
+     * @param mixed $expected
+     * @param mixed $value
+     * @param mixed|null $expectedException
      */
     public function testIntlDateInput($expected, $value, $expectedException = null)
     {
@@ -521,6 +532,9 @@ class FormatterDateTest extends TestCase
 
     /**
      * @dataProvider dateInputs
+     * @param mixed $expected
+     * @param mixed $value
+     * @param mixed|null $expectedException
      */
     public function testDateInput($expected, $value, $expectedException = null)
     {
@@ -546,7 +560,7 @@ class FormatterDateTest extends TestCase
     }
 
     /**
-     * provide default timezones times input date value
+     * Provide default timezones times input date value.
      */
     public function provideTimesAndTz()
     {
@@ -571,12 +585,16 @@ class FormatterDateTest extends TestCase
                 $result[] = [$tz[0], new \DateTimeImmutable('2014-08-10 14:41:00', $berlin), new \DateTimeImmutable('2014-01-01 13:41:00', $berlin)];
             }
         }
+
         return $result;
     }
 
     /**
-     * Test timezones with input date and time in other timezones
+     * Test timezones with input date and time in other timezones.
      * @dataProvider provideTimesAndTz
+     * @param string $defaultTz
+     * @param mixed $inputTimeDst
+     * @param mixed $inputTimeNonDst
      */
     public function testIntlTimezoneInput($defaultTz, $inputTimeDst, $inputTimeNonDst)
     {
@@ -584,8 +602,11 @@ class FormatterDateTest extends TestCase
     }
 
     /**
-     * Test timezones with input date and time in other timezones
+     * Test timezones with input date and time in other timezones.
      * @dataProvider provideTimesAndTz
+     * @param string $defaultTz
+     * @param mixed $inputTimeDst
+     * @param mixed $inputTimeNonDst
      */
     public function testTimezoneInput($defaultTz, $inputTimeDst, $inputTimeNonDst)
     {
@@ -633,7 +654,7 @@ class FormatterDateTest extends TestCase
     }
 
     /**
-     * Test timezones with input date and time in other timezones
+     * Test timezones with input date and time in other timezones.
      */
     public function testTimezoneInputNonDefault()
     {
@@ -707,9 +728,9 @@ class FormatterDateTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/13343
-     *
      * Prevent timezone conversion for time-only values.
+     *
+     * @see https://github.com/yiisoft/yii2/issues/13343
      */
     public function testTimeOnlyValues()
     {
@@ -729,13 +750,14 @@ class FormatterDateTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/6263
+     * @see https://github.com/yiisoft/yii2/issues/6263.
      *
      * it is a PHP bug: https://bugs.php.net/bug.php?id=45543
      * Fixed in this commit: https://github.com/php/php-src/commit/22dba2f5f3211efe6c3b9bb24734c811ca64c68c#diff-7b738accc3d60f74c259da18588ddc5dL2996
      * Fixed in PHP >5.4.26 and >5.5.10. http://3v4l.org/mlZX7
      *
      * @dataProvider provideTimezones
+     * @param string $dtz
      */
     public function testIssue6263($dtz)
     {
diff --git a/tests/framework/i18n/FormatterNumberTest.php b/tests/framework/i18n/FormatterNumberTest.php
index d93f0bd..543cbf2 100644
--- a/tests/framework/i18n/FormatterNumberTest.php
+++ b/tests/framework/i18n/FormatterNumberTest.php
@@ -43,7 +43,7 @@ class FormatterNumberTest extends TestCase
     }
 
     /**
-     * Provides some configuration that should not affect Integer formatter
+     * Provides some configuration that should not affect Integer formatter.
      */
     public function differentConfigProvider()
     {
@@ -80,6 +80,7 @@ class FormatterNumberTest extends TestCase
 
     /**
      * @dataProvider differentConfigProvider
+     * @param array $config
      */
     public function testIntlAsInteger($config)
     {
@@ -247,51 +248,52 @@ class FormatterNumberTest extends TestCase
         //$value = '-123456.123';
         //$this->assertSame("($123,456.12)", $this->formatter->asCurrency($value));
 
+        // "\xc2\xa0" is used as non-breaking space explicitly
         $this->formatter->locale = 'de-DE';
         $this->formatter->currencyCode = null;
-        $this->assertSame('123,00 €', $this->formatter->asCurrency('123'));
+        $this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123'));
         $this->formatter->currencyCode = 'USD';
-        $this->assertSame('123,00 $', $this->formatter->asCurrency('123'));
+        $this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123'));
         $this->formatter->currencyCode = 'EUR';
-        $this->assertSame('123,00 €', $this->formatter->asCurrency('123'));
+        $this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123'));
 
         $this->formatter->locale = 'de-DE';
         $this->formatter->currencyCode = null;
-        $this->assertSame('123,00 €', $this->formatter->asCurrency('123', 'EUR'));
-        $this->assertSame('123,00 $', $this->formatter->asCurrency('123', 'USD'));
+        $this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
+        $this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
         $this->formatter->currencyCode = 'USD';
-        $this->assertSame('123,00 €', $this->formatter->asCurrency('123', 'EUR'));
-        $this->assertSame('123,00 $', $this->formatter->asCurrency('123', 'USD'));
+        $this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
+        $this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
         $this->formatter->currencyCode = 'EUR';
-        $this->assertSame('123,00 €', $this->formatter->asCurrency('123', 'EUR'));
-        $this->assertSame('123,00 $', $this->formatter->asCurrency('123', 'USD'));
+        $this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
+        $this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
 
         // default russian currency symbol
         $this->formatter->locale = 'ru-RU';
         $this->formatter->currencyCode = null;
-        $this->assertIsOneOf($this->formatter->asCurrency('123'), ['123,00 ₽', '123,00 руб.']);
+        $this->assertIsOneOf($this->formatter->asCurrency('123'), ["123,00\xc2\xa0₽", "123,00\xc2\xa0руб."]);
         $this->formatter->currencyCode = 'RUB';
-        $this->assertIsOneOf($this->formatter->asCurrency('123'), ['123,00 ₽', '123,00 руб.']);
+        $this->assertIsOneOf($this->formatter->asCurrency('123'), ["123,00\xc2\xa0₽", "123,00\xc2\xa0руб."]);
 
         // custom currency symbol
         $this->formatter->currencyCode = null;
         $this->formatter->numberFormatterSymbols = [
             NumberFormatter::CURRENCY_SYMBOL => '₽',
         ];
-        $this->assertSame('123,00 ₽', $this->formatter->asCurrency('123'));
+        $this->assertSame("123,00\xc2\xa0₽", $this->formatter->asCurrency('123'));
         $this->formatter->numberFormatterSymbols = [
             NumberFormatter::CURRENCY_SYMBOL => 'RUR',
         ];
-        $this->assertSame('123,00 RUR', $this->formatter->asCurrency('123'));
+        $this->assertSame("123,00\xc2\xa0RUR", $this->formatter->asCurrency('123'));
 
         /* See https://github.com/yiisoft/yii2/issues/13629
         // setting the currency code overrides the symbol
         $this->formatter->currencyCode = 'RUB';
-        $this->assertIsOneOf($this->formatter->asCurrency('123'), ['123,00 ₽', '123,00 руб.']);
+        $this->assertIsOneOf($this->formatter->asCurrency('123'), ["123,00\xc2\xa0₽", "123,00\xc2\xa0руб."]);
         $this->formatter->numberFormatterSymbols = [NumberFormatter::CURRENCY_SYMBOL => '₽'];
-        $this->assertSame('123,00 $', $this->formatter->asCurrency('123', 'USD'));
+        $this->assertSame("123,00\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
         $this->formatter->numberFormatterSymbols = [NumberFormatter::CURRENCY_SYMBOL => '₽'];
-        $this->assertSame('123,00 €', $this->formatter->asCurrency('123', 'EUR'));
+        $this->assertSame("123,00\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
         */
 
         // custom separators
@@ -299,22 +301,22 @@ class FormatterNumberTest extends TestCase
         $this->formatter->currencyCode = null;
         $this->formatter->numberFormatterSymbols = [];
         $this->formatter->thousandSeparator = ' ';
-        $this->assertSame('123 456,00 €', $this->formatter->asCurrency('123456', 'EUR'));
+        $this->assertSame("123 456,00\xc2\xa0€", $this->formatter->asCurrency('123456', 'EUR'));
 
         // empty input
         $this->formatter->locale = 'de-DE';
         $this->formatter->currencyCode = null;
         $this->formatter->numberFormatterSymbols = [];
         $this->formatter->thousandSeparator = null;
-        $this->assertSame('0,00 €', $this->formatter->asCurrency(false));
-        $this->assertSame('0,00 €', $this->formatter->asCurrency(''));
+        $this->assertSame("0,00\xc2\xa0€", $this->formatter->asCurrency(false));
+        $this->assertSame("0,00\xc2\xa0€", $this->formatter->asCurrency(''));
 
         // decimal formatting
         $this->formatter->locale = 'de-DE';
-        $this->assertSame('100 $', \Yii::$app->formatter->asCurrency(100, 'USD', [
+        $this->assertSame("100\xc2\xa0$", \Yii::$app->formatter->asCurrency(100, 'USD', [
             NumberFormatter::MAX_FRACTION_DIGITS => 0,
         ]));
-        $this->assertSame('100,00 $', $this->formatter->asCurrency(100, 'USD', [
+        $this->assertSame("100,00\xc2\xa0$", $this->formatter->asCurrency(100, 'USD', [
             NumberFormatter::MAX_FRACTION_DIGITS => 2,
         ]));
 
@@ -323,7 +325,7 @@ class FormatterNumberTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/12345
+     * @see https://github.com/yiisoft/yii2/issues/12345
      */
     public function testIntlCurrencyFraction()
     {
@@ -333,33 +335,33 @@ class FormatterNumberTest extends TestCase
         ];
         $this->formatter->locale = 'de-DE';
         $this->formatter->currencyCode = null;
-        $this->assertSame('123 €', $this->formatter->asCurrency('123'));
-        $this->assertSame('123 €', $this->formatter->asCurrency('123', 'EUR'));
+        $this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123'));
+        $this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
         $this->formatter->currencyCode = 'USD';
-        $this->assertSame('123 $', $this->formatter->asCurrency('123'));
-        $this->assertSame('123 $', $this->formatter->asCurrency('123', 'USD'));
-        $this->assertSame('123 €', $this->formatter->asCurrency('123', 'EUR'));
+        $this->assertSame("123\xc2\xa0$", $this->formatter->asCurrency('123'));
+        $this->assertSame("123\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
+        $this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
         $this->formatter->currencyCode = 'EUR';
-        $this->assertSame('123 €', $this->formatter->asCurrency('123'));
-        $this->assertSame('123 $', $this->formatter->asCurrency('123', 'USD'));
-        $this->assertSame('123 €', $this->formatter->asCurrency('123', 'EUR'));
+        $this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123'));
+        $this->assertSame("123\xc2\xa0$", $this->formatter->asCurrency('123', 'USD'));
+        $this->assertSame("123\xc2\xa0€", $this->formatter->asCurrency('123', 'EUR'));
 
         $this->formatter->locale = 'ru-RU';
         $this->formatter->currencyCode = null;
-        $this->assertIsOneOf($this->formatter->asCurrency('123'), ['123 ₽', '123 руб.']);
+        $this->assertIsOneOf($this->formatter->asCurrency('123'), ["123\xc2\xa0₽", "123\xc2\xa0руб."]);
 
         $this->formatter->numberFormatterSymbols = [
             NumberFormatter::CURRENCY_SYMBOL => '&#8381;',
         ];
-        $this->assertSame('123 &#8381;', $this->formatter->asCurrency('123'));
+        $this->assertSame("123\xc2\xa0&#8381;", $this->formatter->asCurrency('123'));
 
         $this->formatter->numberFormatterSymbols = [];
         $this->formatter->currencyCode = 'RUB';
-        $this->assertIsOneOf($this->formatter->asCurrency('123'), ['123 ₽', '123 руб.']);
+        $this->assertIsOneOf($this->formatter->asCurrency('123'), ["123\xc2\xa0₽", "123\xc2\xa0руб."]);
     }
 
     /**
-     * https://github.com/yiisoft/yii2/pull/5261
+     * @see https://github.com/yiisoft/yii2/pull/5261
      */
     public function testIntlIssue5261()
     {
@@ -462,7 +464,7 @@ class FormatterNumberTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/14278
+     * @see https://github.com/yiisoft/yii2/issues/14278
      */
     public function testIntlAsOrdinalDate()
     {
@@ -678,7 +680,7 @@ class FormatterNumberTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/4960
+     * @see https://github.com/yiisoft/yii2/issues/4960
      */
     public function testAsSizeConfiguration()
     {
diff --git a/tests/framework/i18n/FormatterTest.php b/tests/framework/i18n/FormatterTest.php
index 7cf6052..f17f57b 100644
--- a/tests/framework/i18n/FormatterTest.php
+++ b/tests/framework/i18n/FormatterTest.php
@@ -8,11 +8,12 @@
 namespace yiiunit\framework\i18n;
 
 use Yii;
+use yii\base\InvalidConfigException;
 use yii\i18n\Formatter;
 use yiiunit\TestCase;
 
 /**
- * Test for basic formatter functions
+ * Test for basic formatter functions.
  *
  * See FormatterDateTest and FormatterNumberTest for date/number formatting.
  *
@@ -57,10 +58,11 @@ class FormatterTest extends TestCase
         $this->assertSame(date('Y-m-d', $value), $this->formatter->format($value, function ($value) {
             return date('Y-m-d', $value);
         }));
-        $this->assertSame('from: ' . date('Y-m-d', $value), $this->formatter->format($value, function ($value, $formatter) {
-            /** @var $formatter Formatter */
-            return 'from: ' . $formatter->asDate($value, 'php:Y-m-d');
-        }));
+        $this->assertSame('from: ' . date('Y-m-d', $value),
+            $this->formatter->format($value, function ($value, $formatter) {
+                /** @var $formatter Formatter */
+                return 'from: ' . $formatter->asDate($value, 'php:Y-m-d');
+            }));
     }
 
     public function testLocale()
@@ -157,7 +159,8 @@ class FormatterTest extends TestCase
         $value = 'test@sample.com';
         $this->assertSame("<a href=\"mailto:$value\">$value</a>", $this->formatter->asEmail($value));
         $value = 'test@sample.com';
-        $this->assertSame("<a href=\"mailto:$value\" target=\"_blank\">$value</a>", $this->formatter->asEmail($value, ['target' => '_blank']));
+        $this->assertSame("<a href=\"mailto:$value\" target=\"_blank\">$value</a>",
+            $this->formatter->asEmail($value, ['target' => '_blank']));
 
         // null display
         $this->assertSame($this->formatter->nullDisplay, $this->formatter->asEmail(null));
@@ -172,9 +175,11 @@ class FormatterTest extends TestCase
         $value = 'www.yiiframework.com/';
         $this->assertSame("<a href=\"http://$value\">$value</a>", $this->formatter->asUrl($value));
         $value = 'https://www.yiiframework.com/?name=test&value=5"';
-        $this->assertSame('<a href="https://www.yiiframework.com/?name=test&amp;value=5&quot;">https://www.yiiframework.com/?name=test&amp;value=5&quot;</a>', $this->formatter->asUrl($value));
+        $this->assertSame('<a href="https://www.yiiframework.com/?name=test&amp;value=5&quot;">https://www.yiiframework.com/?name=test&amp;value=5&quot;</a>',
+            $this->formatter->asUrl($value));
         $value = 'http://www.yiiframework.com/';
-        $this->assertSame("<a href=\"$value\" target=\"_blank\">$value</a>", $this->formatter->asUrl($value, ['target' => '_blank']));
+        $this->assertSame("<a href=\"$value\" target=\"_blank\">$value</a>",
+            $this->formatter->asUrl($value, ['target' => '_blank']));
 
         // null display
         $this->assertSame($this->formatter->nullDisplay, $this->formatter->asUrl(null));
@@ -222,4 +227,205 @@ class FormatterTest extends TestCase
         $dateTime = new \DateTime('2016-01-01 00:00:00.000', new \DateTimeZone('Europe/Berlin'));
         $this->assertSame('1451602800', $this->formatter->asTimestamp($dateTime));
     }
+
+    public function lengthDataProvider()
+    {
+        return [
+            [
+                'Empty value gets proper output',
+                [null], '<span class="not-set">(not set)</span>', '<span class="not-set">(not set)</span>'
+            ],
+            [
+                'Wrong value is casted properly',
+                ['NaN'], '0 millimeters', '0 mm'
+            ],
+            [
+                'Negative value works',
+                [-3], '-3 meters', '-3 m'
+            ],
+            [
+                'Zero value works',
+                [0], '0 millimeters', '0 mm'
+            ],
+            [
+                'Decimal value is resolved in base units',
+                [0.001], '1 millimeter', '1 mm'
+            ],
+            [
+                'Decimal value smaller than minimum base unit gets rounded (#1)',
+                [0.0004], '0 millimeters', '0 mm'
+            ],
+            [
+                'Decimal value smaller than minimum base unit gets rounded (#2)',
+                [0.00169], '2 millimeters', '2 mm'
+            ],
+            [
+                'Integer value #1 works',
+                [1], '1 meter', '1 m'
+            ],
+            [
+                'Integer value #2 works',
+                [453], '453 meters', '453 m'
+            ],
+            [
+                'Double value works',
+                [19913.13], '19.913 kilometers', '19.913 km'
+            ],
+            [
+                'It is possible to change number of decimals',
+                [19913.13, 1], '19.9 kilometers', '19.9 km'
+            ],
+            [
+                'It is possible to change number formatting options',
+                [100, null, [
+                    \NumberFormatter::MIN_FRACTION_DIGITS => 4,
+                ]], '100.0000 meters', '100.0000 m'
+            ],
+            [
+                'It is possible to change text options',
+                [-19913.13, null, null, [
+                    \NumberFormatter::NEGATIVE_PREFIX => 'MINUS'
+                ]], 'MINUS19.913 kilometers', 'MINUS19.913 km'
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider lengthDataProvider
+     */
+    public function testIntlAsLength($message, $arguments, $expected)
+    {
+        $this->ensureIntlUnitDataIsAvailable();
+        $this->assertSame($expected, call_user_func_array([$this->formatter, 'asLength'], $arguments), 'Failed asserting that ' . $message);
+    }
+
+    /**
+     * @dataProvider lengthDataProvider
+     */
+    public function testIntlAsShortLength($message, $arguments, $_, $expected)
+    {
+        $this->ensureIntlUnitDataIsAvailable();
+        $this->assertSame($expected, call_user_func_array([$this->formatter, 'asShortLength'], $arguments), 'Failed asserting that ' . $message);
+    }
+
+    public function weightDataProvider()
+    {
+        return [
+            [
+                'Empty value gets proper output',
+                [null], '<span class="not-set">(not set)</span>', '<span class="not-set">(not set)</span>'
+            ],
+            [
+                'Wrong value is casted properly',
+                ['NaN'], '0 grams', '0 g'
+            ],
+            [
+                'Negative value works',
+                [-3], '-3 kilograms', '-3 kg'
+            ],
+            [
+                'Zero value works',
+                [0], '0 grams', '0 g'
+            ],
+            [
+                'Decimal value is resolved in base units',
+                [0.001], '1 gram', '1 g'
+            ],
+            [
+                'Decimal value smaller than minimum base unit gets rounded (#1)',
+                [0.0004], '0 grams', '0 g'
+            ],
+            [
+                'Decimal value smaller than minimum base unit gets rounded (#2)',
+                [0.00169], '2 grams', '2 g'
+            ],
+            [
+                'Integer value #1 works',
+                [1], '1 kilogram', '1 kg'
+            ],
+            [
+                'Integer value #2 works',
+                [453], '453 kilograms', '453 kg'
+            ],
+            [
+                'Double value works',
+                [19913.13], '19.913 tons', '19.913 tn'
+            ],
+            [
+                'It is possible to change number of decimals',
+                [19913.13, 1], '19.9 tons', '19.9 tn'
+            ],
+            [
+                'It is possible to change number formatting options',
+                [100, null, [
+                    \NumberFormatter::MIN_FRACTION_DIGITS => 4,
+                ]], '100.0000 kilograms', '100.0000 kg'
+            ],
+            [
+                'It is possible to change text options',
+                [-19913.13, null, null, [
+                    \NumberFormatter::NEGATIVE_PREFIX => 'MINUS'
+                ]], 'MINUS19.913 tons', 'MINUS19.913 tn'
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider weightDataProvider
+     */
+    public function testIntlAsWeight($message, $arguments, $expected)
+    {
+        $this->ensureIntlUnitDataIsAvailable();
+        $this->assertSame($expected, call_user_func_array([$this->formatter, 'asWeight'], $arguments), 'Failed asserting that ' . $message);
+    }
+
+    /**
+     * @dataProvider weightDataProvider
+     */
+    public function testIntlAsShortWeight($message, $arguments, $_, $expected)
+    {
+        $this->ensureIntlUnitDataIsAvailable();
+        $this->assertSame($expected, call_user_func_array([$this->formatter, 'asShortWeight'], $arguments), 'Failed asserting that ' . $message);
+    }
+
+    /**
+     * @expectedException \yii\base\InvalidConfigException
+     * @expectedExceptionMessage Format of mass is only supported when PHP intl extension is installed.
+     */
+    public function testAsWeight()
+    {
+        $this->formatter->asWeight(10);
+    }
+
+    /**
+     * @expectedException \yii\base\InvalidConfigException
+     * @expectedExceptionMessage Format of length is only supported when PHP intl extension is installed.
+     */
+    public function testAsLength()
+    {
+        $this->formatter->asShortLength(10);
+    }
+
+    protected function ensureIntlUnitDataIsAvailable()
+    {
+        $skip = function () {
+            $this->markTestSkipped('ICU data does not contain measure units information.');
+        };
+
+        if (defined('HHVM_VERSION')) {
+            return $skip();
+        }
+
+        try {
+            $bundle = new \ResourceBundle($this->formatter->locale, 'ICUDATA-unit');
+            $massUnits = $bundle['units']['mass'];
+            $lengthUnits = $bundle['units']['length'];
+
+            if ($massUnits === null || $lengthUnits === null) {
+                $skip();
+            }
+        } catch (\IntlException $e) {
+            $skip();
+        }
+    }
 }
diff --git a/tests/framework/i18n/I18NTest.php b/tests/framework/i18n/I18NTest.php
index aa2f8f9..cbec789 100644
--- a/tests/framework/i18n/I18NTest.php
+++ b/tests/framework/i18n/I18NTest.php
@@ -99,7 +99,7 @@ class I18NTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/7964
+     * @see https://github.com/yiisoft/yii2/issues/7964
      */
     public function testSourceLanguageFallback()
     {
@@ -165,7 +165,8 @@ class I18NTest extends TestCase
 
     /**
      * When translation is missing source language should be used for formatting.
-     * https://github.com/yiisoft/yii2/issues/2209
+     *
+     * @see https://github.com/yiisoft/yii2/issues/2209
      */
     public function testMissingTranslationFormatting()
     {
@@ -173,7 +174,7 @@ class I18NTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/7093
+     * @see https://github.com/yiisoft/yii2/issues/7093
      */
     public function testRussianPlurals()
     {
@@ -194,7 +195,7 @@ class I18NTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/2519
+     * @see https://github.com/yiisoft/yii2/issues/2519
      */
     public function testMissingTranslationEvent()
     {
@@ -267,7 +268,7 @@ class I18NTest extends TestCase
 
     /**
      * Formatting a message that contains params but they are not provided.
-     * https://github.com/yiisoft/yii2/issues/10884
+     * @see https://github.com/yiisoft/yii2/issues/10884
      */
     public function testFormatMessageWithNoParam()
     {
diff --git a/tests/framework/i18n/IntlTestHelper.php b/tests/framework/i18n/IntlTestHelper.php
index 18862f0..b6a23df 100644
--- a/tests/framework/i18n/IntlTestHelper.php
+++ b/tests/framework/i18n/IntlTestHelper.php
@@ -15,9 +15,9 @@ namespace yiiunit\framework\i18n {
         public static $enableIntl;
 
         /**
-         * emulate disabled intl extension
+         * Emulate disabled intl extension.
          *
-         * enable it only for tests prefixed with testIntl
+         * Enable it only for tests prefixed with testIntl.
          * @param Testcase $test
          */
         public static function setIntlStatus($test)
@@ -49,6 +49,7 @@ namespace yii\i18n {
             if ($name === 'intl' && IntlTestHelper::$enableIntl !== null) {
                 return IntlTestHelper::$enableIntl;
             }
+
             return \extension_loaded($name);
         }
     }
@@ -63,6 +64,7 @@ namespace yii\helpers {
             if ($name === 'intl' && IntlTestHelper::$enableIntl !== null) {
                 return IntlTestHelper::$enableIntl;
             }
+
             return \extension_loaded($name);
         }
     }
@@ -77,6 +79,7 @@ namespace yii\validators {
             if ($name === 'intl' && IntlTestHelper::$enableIntl !== null) {
                 return IntlTestHelper::$enableIntl;
             }
+
             return \extension_loaded($name);
         }
     }
diff --git a/tests/framework/i18n/MessageFormatterTest.php b/tests/framework/i18n/MessageFormatterTest.php
index 44da695..87f4d13 100644
--- a/tests/framework/i18n/MessageFormatterTest.php
+++ b/tests/framework/i18n/MessageFormatterTest.php
@@ -337,6 +337,11 @@ _MSG_
 
     /**
      * @dataProvider patterns
+     * @param string $pattern
+     * @param string $expected
+     * @param array $args
+     * @param bool $skip
+     * @param string $skipMessage
      */
     public function testNamedArguments($pattern, $expected, $args, $skip = false, $skipMessage = '')
     {
@@ -350,6 +355,10 @@ _MSG_
 
     /**
      * @dataProvider parsePatterns
+     * @param string $pattern
+     * @param string $expected
+     * @param array $args
+     * @param string $locale
      */
     public function testParseNamedArguments($pattern, $expected, $args, $locale = 'en-US')
     {
diff --git a/tests/framework/log/ArrayTarget.php b/tests/framework/log/ArrayTarget.php
new file mode 100644
index 0000000..763df95
--- /dev/null
+++ b/tests/framework/log/ArrayTarget.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace yiiunit\framework\log;
+
+use yii\base\Exception;
+use yii\log\Target;
+
+/**
+ * ArrayTarget logs messages into an array, useful for tracking data in tests.
+ */
+class ArrayTarget extends Target
+{
+    public $exportInterval = 1000000;
+
+    /**
+     * Exports log [[messages]] to a specific destination.
+     */
+    public function export()
+    {
+        // throw exception if message limit is reached
+        throw new Exception('More than 1000000 messages logged.');
+    }
+}
diff --git a/tests/framework/log/DbTargetTest.php b/tests/framework/log/DbTargetTest.php
index 230c25e..7a1452b 100644
--- a/tests/framework/log/DbTargetTest.php
+++ b/tests/framework/log/DbTargetTest.php
@@ -113,11 +113,12 @@ abstract class DbTargetTest extends TestCase
             }
             static::$db = $db;
         }
+
         return static::$db;
     }
 
     /**
-     * Tests that precision isn't lost for log timestamps
+     * Tests that precision isn't lost for log timestamps.
      * @see https://github.com/yiisoft/yii2/issues/7384
      */
     public function testTimestamp()
diff --git a/tests/framework/log/EmailTargetTest.php b/tests/framework/log/EmailTargetTest.php
index 28865f0..4b3562d 100644
--- a/tests/framework/log/EmailTargetTest.php
+++ b/tests/framework/log/EmailTargetTest.php
@@ -11,7 +11,7 @@ use yii\log\EmailTarget;
 use yiiunit\TestCase;
 
 /**
- * Class EmailTargetTest
+ * Class EmailTargetTest.
  * @group log
  */
 class EmailTargetTest extends TestCase
@@ -22,7 +22,7 @@ class EmailTargetTest extends TestCase
     protected $mailer;
 
     /**
-     * Set up mailer
+     * Set up mailer.
      */
     protected function setUp()
     {
diff --git a/tests/framework/log/FileTargetTest.php b/tests/framework/log/FileTargetTest.php
index f5c4a59..c350fd9 100644
--- a/tests/framework/log/FileTargetTest.php
+++ b/tests/framework/log/FileTargetTest.php
@@ -35,6 +35,7 @@ class FileTargetTest extends TestCase
 
     /**
      * @dataProvider booleanDataProvider
+     * @param bool $rotateByCopy
      */
     public function testRotate($rotateByCopy)
     {
diff --git a/tests/framework/log/SyslogTargetTest.php b/tests/framework/log/SyslogTargetTest.php
index 2dd07c5..4a07dbc 100644
--- a/tests/framework/log/SyslogTargetTest.php
+++ b/tests/framework/log/SyslogTargetTest.php
@@ -33,14 +33,14 @@ namespace yiiunit\framework\log {
     use yiiunit\TestCase;
 
     /**
-     * Class SyslogTargetTest
+     * Class SyslogTargetTest.
      *
      * @group log
      */
     class SyslogTargetTest extends TestCase
     {
         /**
-         * Array of static functions
+         * Array of static functions.
          *
          * @var array
          */
@@ -52,7 +52,7 @@ namespace yiiunit\framework\log {
         protected $syslogTarget;
 
         /**
-         * Set up syslogTarget as the mock object
+         * Set up syslogTarget as the mock object.
          */
         protected function setUp()
         {
diff --git a/tests/framework/log/TargetTest.php b/tests/framework/log/TargetTest.php
index d54ce5f..4da1db9 100644
--- a/tests/framework/log/TargetTest.php
+++ b/tests/framework/log/TargetTest.php
@@ -51,6 +51,8 @@ class TargetTest extends TestCase
 
     /**
      * @dataProvider filters
+     * @param array $filter
+     * @param array $expected
      */
     public function testFilter($filter, $expected)
     {
@@ -123,6 +125,23 @@ class TargetTest extends TestCase
         $this->assertNotContains('E_b', $context);
         $this->assertNotContains('E_c', $context);
     }
+
+    public function testGetEnabled()
+    {
+        /** @var Target $target */
+        $target = $this->getMockForAbstractClass('yii\\log\\Target');
+
+        $target->enabled = true;
+        $this->assertTrue($target->enabled);
+
+        $target->enabled = false;
+        $this->assertFalse($target->enabled);
+
+        $target->enabled = function ($target) {
+            return empty($target->messages);
+        };
+        $this->assertTrue($target->enabled);
+    }
 }
 
 class TestTarget extends Target
diff --git a/tests/framework/mutex/FileMutexTest.php b/tests/framework/mutex/FileMutexTest.php
index 3dfe21c..eba5983 100644
--- a/tests/framework/mutex/FileMutexTest.php
+++ b/tests/framework/mutex/FileMutexTest.php
@@ -11,7 +11,7 @@ use yii\mutex\FileMutex;
 use yiiunit\TestCase;
 
 /**
- * Class FileMutexTest
+ * Class FileMutexTest.
  *
  * @group mutex
  */
diff --git a/tests/framework/mutex/MutexTestTrait.php b/tests/framework/mutex/MutexTestTrait.php
index 934b99d..2ebe60b 100644
--- a/tests/framework/mutex/MutexTestTrait.php
+++ b/tests/framework/mutex/MutexTestTrait.php
@@ -10,7 +10,7 @@ namespace yiiunit\framework\mutex;
 use yii\mutex\Mutex;
 
 /**
- * Class MutexTestTrait
+ * Class MutexTestTrait.
  */
 trait MutexTestTrait
 {
@@ -27,6 +27,7 @@ trait MutexTestTrait
         $mutex = $this->createMutex();
 
         $this->assertTrue($mutex->acquire(self::$mutexName));
+        $this->assertTrue($mutex->release(self::$mutexName));
     }
 
     public function testThatMutexLockIsWorking()
diff --git a/tests/framework/mutex/MysqlMutexTest.php b/tests/framework/mutex/MysqlMutexTest.php
index 0a3531b..0288e29 100644
--- a/tests/framework/mutex/MysqlMutexTest.php
+++ b/tests/framework/mutex/MysqlMutexTest.php
@@ -11,7 +11,7 @@ use yii\mutex\MysqlMutex;
 use yiiunit\framework\db\DatabaseTestCase;
 
 /**
- * Class MysqlMutexTest
+ * Class MysqlMutexTest.
  *
  * @group mutex
  * @group db
diff --git a/tests/framework/mutex/PgsqlMutexTest.php b/tests/framework/mutex/PgsqlMutexTest.php
index a9e2bad..b2d08d2 100644
--- a/tests/framework/mutex/PgsqlMutexTest.php
+++ b/tests/framework/mutex/PgsqlMutexTest.php
@@ -11,7 +11,7 @@ use yii\mutex\PgsqlMutex;
 use yiiunit\framework\db\DatabaseTestCase;
 
 /**
- * Class PgsqlMutexTest
+ * Class PgsqlMutexTest.
  *
  * @group mutex
  * @group db
diff --git a/tests/framework/rbac/ActionRule.php b/tests/framework/rbac/ActionRule.php
index a5fa76b..336052f 100644
--- a/tests/framework/rbac/ActionRule.php
+++ b/tests/framework/rbac/ActionRule.php
@@ -10,7 +10,7 @@ namespace yiiunit\framework\rbac;
 use yii\rbac\Rule;
 
 /**
- * Description of ActionRule
+ * Description of ActionRule.
  */
 class ActionRule extends Rule
 {
diff --git a/tests/framework/rbac/AuthorRule.php b/tests/framework/rbac/AuthorRule.php
index 0a7fe9a..4a0dd4d 100644
--- a/tests/framework/rbac/AuthorRule.php
+++ b/tests/framework/rbac/AuthorRule.php
@@ -10,7 +10,7 @@ namespace yiiunit\framework\rbac;
 use yii\rbac\Rule;
 
 /**
- * Checks if authorID matches userID passed via params
+ * Checks if authorID matches userID passed via params.
  */
 class AuthorRule extends Rule
 {
diff --git a/tests/framework/rbac/DbManagerTestCase.php b/tests/framework/rbac/DbManagerTestCase.php
index a17a12d..eeeadaa 100644
--- a/tests/framework/rbac/DbManagerTestCase.php
+++ b/tests/framework/rbac/DbManagerTestCase.php
@@ -7,7 +7,10 @@
 
 namespace yiiunit\framework\rbac;
 
+use Psr\Log\LogLevel;
 use Yii;
+use yii\caching\ArrayCache;
+use yii\caching\Cache;
 use yii\console\Application;
 use yii\console\ExitCode;
 use yii\db\Connection;
@@ -17,9 +20,10 @@ use yii\rbac\Permission;
 use yii\rbac\Role;
 use yiiunit\data\rbac\UserID;
 use yiiunit\framework\console\controllers\EchoMigrateController;
+use yiiunit\framework\log\ArrayTarget;
 
 /**
- * DbManagerTestCase
+ * DbManagerTestCase.
  * @group db
  * @group rbac
  * @group mysql
@@ -108,6 +112,7 @@ abstract class DbManagerTestCase extends ManagerTestCase
         if ($this->db === null) {
             $this->db = static::createConnection();
         }
+
         return $this->db;
     }
 
@@ -125,6 +130,7 @@ abstract class DbManagerTestCase extends ManagerTestCase
         if (!$db->isActive) {
             $db->open();
         }
+
         return $db;
     }
 
@@ -158,12 +164,15 @@ abstract class DbManagerTestCase extends ManagerTestCase
         return [
             [0, 0, true],
             [0, new UserID(0), true],
-            ['', '', false]
+            ['', '', false],
         ];
     }
 
     /**
      * @dataProvider emptyValuesProvider
+     * @param mixed $userId
+     * @param mixed $searchUserId
+     * @param mixed $isValid
      */
     public function testGetPermissionsByUserWithEmptyValue($userId, $searchUserId, $isValid)
     {
@@ -181,6 +190,9 @@ abstract class DbManagerTestCase extends ManagerTestCase
 
     /**
      * @dataProvider emptyValuesProvider
+     * @param mixed $userId
+     * @param mixed $searchUserId
+     * @param mixed $isValid
      */
     public function testGetRolesByUserWithEmptyValue($userId, $searchUserId, $isValid)
     {
@@ -198,6 +210,9 @@ abstract class DbManagerTestCase extends ManagerTestCase
 
     /**
      * @dataProvider emptyValuesProvider
+     * @param mixed $userId
+     * @param mixed $searchUserId
+     * @param mixed $isValid
      */
     public function testGetAssignmentWithEmptyValue($userId, $searchUserId, $isValid)
     {
@@ -215,6 +230,9 @@ abstract class DbManagerTestCase extends ManagerTestCase
 
     /**
      * @dataProvider emptyValuesProvider
+     * @param mixed $userId
+     * @param mixed $searchUserId
+     * @param mixed $isValid
      */
     public function testGetAssignmentsWithEmptyValue($userId, $searchUserId, $isValid)
     {
@@ -233,6 +251,9 @@ abstract class DbManagerTestCase extends ManagerTestCase
 
     /**
      * @dataProvider emptyValuesProvider
+     * @param mixed $userId
+     * @param mixed $searchUserId
+     * @param mixed $isValid
      */
     public function testRevokeWithEmptyValue($userId, $searchUserId, $isValid)
     {
@@ -250,6 +271,9 @@ abstract class DbManagerTestCase extends ManagerTestCase
 
     /**
      * @dataProvider emptyValuesProvider
+     * @param mixed $userId
+     * @param mixed $searchUserId
+     * @param mixed $isValid
      */
     public function testRevokeAllWithEmptyValue($userId, $searchUserId, $isValid)
     {
@@ -263,4 +287,77 @@ abstract class DbManagerTestCase extends ManagerTestCase
             $this->assertFalse($result);
         }
     }
+
+    /**
+     * Ensure assignments are read from DB only once on subsequent tests.
+     */
+    public function testCheckAccessCache()
+    {
+        $this->mockApplication();
+        $this->prepareData();
+
+        // warm up item cache, so only assignment queries are sent to DB
+        $this->auth->cache = new Cache(['handler' => new ArrayCache()]);
+        $this->auth->checkAccess('author B', 'readPost');
+        $this->auth->checkAccess(new UserID('author B'), 'createPost');
+
+        // track db queries
+        /* @var $logger \yii\log\Logger */
+        $logger = Yii::$app->getLogger();
+
+        $logger->flushInterval = 1;
+        $logger->messages = [];
+        $logTarget = new ArrayTarget([
+            'categories' => ['yii\\db\\Command::query'],
+            'levels' => [LogLevel::INFO],
+        ]);
+        $logger->addTarget($logTarget, 'rbacqueries');
+        $this->assertCount(0, $logTarget->messages);
+
+        // testing access on two different permissons for the same user should only result in one DB query for user assignments
+        foreach (['readPost' => true, 'createPost' => false] as $permission => $result) {
+            $this->assertEquals($result, $this->auth->checkAccess('reader A', $permission), "Checking $permission");
+        }
+        $this->assertSingleQueryToAssignmentsTable($logTarget);
+
+        // verify cache is flushed on assign (createPost is now true)
+        $this->auth->assign($this->auth->getRole('admin'), 'reader A');
+        foreach (['readPost' => true, 'createPost' => true] as $permission => $result) {
+            $this->assertEquals($result, $this->auth->checkAccess('reader A', $permission), "Checking $permission");
+        }
+        $this->assertSingleQueryToAssignmentsTable($logTarget);
+
+        // verify cache is flushed on unassign (createPost is now false again)
+        $this->auth->revoke($this->auth->getRole('admin'), 'reader A');
+        foreach (['readPost' => true, 'createPost' => false] as $permission => $result) {
+            $this->assertEquals($result, $this->auth->checkAccess('reader A', $permission), "Checking $permission");
+        }
+        $this->assertSingleQueryToAssignmentsTable($logTarget);
+
+        // verify cache is flushed on revokeall
+        $this->auth->revokeAll('reader A');
+        foreach (['readPost' => false, 'createPost' => false] as $permission => $result) {
+            $this->assertEquals($result, $this->auth->checkAccess('reader A', $permission), "Checking $permission");
+        }
+        $this->assertSingleQueryToAssignmentsTable($logTarget);
+
+        // verify cache is flushed on removeAllAssignments
+        $this->auth->assign($this->auth->getRole('admin'), 'reader A');
+        foreach (['readPost' => true, 'createPost' => true] as $permission => $result) {
+            $this->assertEquals($result, $this->auth->checkAccess('reader A', $permission), "Checking $permission");
+        }
+        $this->assertSingleQueryToAssignmentsTable($logTarget);
+        $this->auth->removeAllAssignments();
+        foreach (['readPost' => false, 'createPost' => false] as $permission => $result) {
+            $this->assertEquals($result, $this->auth->checkAccess('reader A', $permission), "Checking $permission");
+        }
+        $this->assertSingleQueryToAssignmentsTable($logTarget);
+    }
+
+    private function assertSingleQueryToAssignmentsTable($logTarget)
+    {
+        $this->assertCount(1, $logTarget->messages, 'Only one query should have been performed, but there are the following logs: ' . print_r($logTarget->messages, true));
+        $this->assertContains('auth_assignment', $logTarget->messages[0][1], 'Log message should be a query to auth_assignment table');
+        $logTarget->messages = [];
+    }
 }
diff --git a/tests/framework/rbac/ExposedPhpManager.php b/tests/framework/rbac/ExposedPhpManager.php
index a3a97dd..ec92b10 100644
--- a/tests/framework/rbac/ExposedPhpManager.php
+++ b/tests/framework/rbac/ExposedPhpManager.php
@@ -10,7 +10,7 @@ namespace yiiunit\framework\rbac;
 use yii\rbac\PhpManager;
 
 /**
- * Exposes protected properties and methods to inspect from outside
+ * Exposes protected properties and methods to inspect from outside.
  */
 class ExposedPhpManager extends PhpManager
 {
diff --git a/tests/framework/rbac/ManagerTestCase.php b/tests/framework/rbac/ManagerTestCase.php
index 92d2430..0133478 100644
--- a/tests/framework/rbac/ManagerTestCase.php
+++ b/tests/framework/rbac/ManagerTestCase.php
@@ -13,7 +13,7 @@ use yii\rbac\Role;
 use yiiunit\TestCase;
 
 /**
- * ManagerTestCase
+ * ManagerTestCase.
  */
 abstract class ManagerTestCase extends TestCase
 {
@@ -454,34 +454,46 @@ abstract class ManagerTestCase extends TestCase
         $this->assertNotEmpty($this->auth->getRoles());
     }
 
-    public function testAssignRule()
+    public function RBACItemsProvider()
+    {
+        return [
+            [Item::TYPE_ROLE],
+            [Item::TYPE_PERMISSION],
+        ];
+    }
+
+    /**
+     * @dataProvider RBACItemsProvider
+     * @param mixed $RBACItemType
+     */
+    public function testAssignRule($RBACItemType)
     {
         $auth = $this->auth;
         $userId = 3;
 
         $auth->removeAll();
-        $role = $auth->createRole('Admin');
-        $auth->add($role);
-        $auth->assign($role, $userId);
+        $item = $this->createRBACItem($RBACItemType, 'Admin');
+        $auth->add($item);
+        $auth->assign($item, $userId);
         $this->assertTrue($auth->checkAccess($userId, 'Admin'));
 
         // with normal register rule
         $auth->removeAll();
         $rule = new ActionRule();
         $auth->add($rule);
-        $role = $auth->createRole('Reader');
-        $role->ruleName = $rule->name;
-        $auth->add($role);
-        $auth->assign($role, $userId);
+        $item = $this->createRBACItem($RBACItemType, 'Reader');
+        $item->ruleName = $rule->name;
+        $auth->add($item);
+        $auth->assign($item, $userId);
         $this->assertTrue($auth->checkAccess($userId, 'Reader', ['action' => 'read']));
         $this->assertFalse($auth->checkAccess($userId, 'Reader', ['action' => 'write']));
 
         // using rule class name
         $auth->removeAll();
-        $role = $auth->createRole('Reader');
-        $role->ruleName = 'yiiunit\framework\rbac\ActionRule';
-        $auth->add($role);
-        $auth->assign($role, $userId);
+        $item = $this->createRBACItem($RBACItemType, 'Reader');
+        $item->ruleName = 'yiiunit\framework\rbac\ActionRule';
+        $auth->add($item);
+        $auth->assign($item, $userId);
         $this->assertTrue($auth->checkAccess($userId, 'Reader', ['action' => 'read']));
         $this->assertFalse($auth->checkAccess($userId, 'Reader', ['action' => 'write']));
 
@@ -490,37 +502,103 @@ abstract class ManagerTestCase extends TestCase
         \Yii::$container->set('delete_rule', ['class' => 'yiiunit\framework\rbac\ActionRule', 'action' => 'delete']);
         \Yii::$container->set('all_rule', ['class' => 'yiiunit\framework\rbac\ActionRule', 'action' => 'all']);
 
-        $role = $auth->createRole('Writer');
-        $role->ruleName = 'write_rule';
-        $auth->add($role);
-        $auth->assign($role, $userId);
+        $item = $this->createRBACItem($RBACItemType, 'Writer');
+        $item->ruleName = 'write_rule';
+        $auth->add($item);
+        $auth->assign($item, $userId);
         $this->assertTrue($auth->checkAccess($userId, 'Writer', ['action' => 'write']));
         $this->assertFalse($auth->checkAccess($userId, 'Writer', ['action' => 'update']));
 
-        $role = $auth->createRole('Deleter');
-        $role->ruleName = 'delete_rule';
-        $auth->add($role);
-        $auth->assign($role, $userId);
+        $item = $this->createRBACItem($RBACItemType, 'Deleter');
+        $item->ruleName = 'delete_rule';
+        $auth->add($item);
+        $auth->assign($item, $userId);
         $this->assertTrue($auth->checkAccess($userId, 'Deleter', ['action' => 'delete']));
         $this->assertFalse($auth->checkAccess($userId, 'Deleter', ['action' => 'update']));
 
-        $role = $auth->createRole('Author');
-        $role->ruleName = 'all_rule';
-        $auth->add($role);
-        $auth->assign($role, $userId);
+        $item = $this->createRBACItem($RBACItemType, 'Author');
+        $item->ruleName = 'all_rule';
+        $auth->add($item);
+        $auth->assign($item, $userId);
         $this->assertTrue($auth->checkAccess($userId, 'Author', ['action' => 'update']));
 
         // update role and rule
-        $role = $auth->getRole('Reader');
-        $role->name = 'AdminPost';
-        $role->ruleName = 'all_rule';
-        $auth->update('Reader', $role);
+        $item = $this->getRBACItem($RBACItemType, 'Reader');
+        $item->name = 'AdminPost';
+        $item->ruleName = 'all_rule';
+        $auth->update('Reader', $item);
         $this->assertTrue($auth->checkAccess($userId, 'AdminPost', ['action' => 'print']));
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/10176
-     * https://github.com/yiisoft/yii2/issues/12681
+     * @dataProvider RBACItemsProvider
+     * @param mixed $RBACItemType
+     */
+    public function testRevokeRule($RBACItemType)
+    {
+        $userId = 3;
+        $auth = $this->auth;
+
+        $auth->removeAll();
+        $item = $this->createRBACItem($RBACItemType, 'Admin');
+        $auth->add($item);
+        $auth->assign($item, $userId);
+
+        $this->assertTrue($auth->revoke($item, $userId));
+        $this->assertFalse($auth->checkAccess($userId, 'Admin'));
+
+        $auth->removeAll();
+        $rule = new ActionRule();
+        $auth->add($rule);
+        $item = $this->createRBACItem($RBACItemType, 'Reader');
+        $item->ruleName = $rule->name;
+        $auth->add($item);
+        $auth->assign($item, $userId);
+
+        $this->assertTrue($auth->revoke($item, $userId));
+        $this->assertFalse($auth->checkAccess($userId, 'Reader', ['action' => 'read']));
+        $this->assertFalse($auth->checkAccess($userId, 'Reader', ['action' => 'write']));
+    }
+
+    /**
+     * Create Role or Permission RBAC item.
+     * @param int $RBACItemType
+     * @param string $name
+     * @return Permission|Role
+     */
+    private function createRBACItem($RBACItemType, $name)
+    {
+        if ($RBACItemType === Item::TYPE_ROLE) {
+            return $this->auth->createRole($name);
+        }
+        if ($RBACItemType === Item::TYPE_PERMISSION) {
+            return $this->auth->createPermission($name);
+        }
+
+        throw new \InvalidArgumentException();
+    }
+
+    /**
+     * Get Role or Permission RBAC item.
+     * @param int $RBACItemType
+     * @param string $name
+     * @return Permission|Role
+     */
+    private function getRBACItem($RBACItemType, $name)
+    {
+        if ($RBACItemType === Item::TYPE_ROLE) {
+            return $this->auth->getRole($name);
+        }
+        if ($RBACItemType === Item::TYPE_PERMISSION) {
+            return $this->auth->getPermission($name);
+        }
+
+        throw new \InvalidArgumentException();
+    }
+
+    /**
+     * @see https://github.com/yiisoft/yii2/issues/10176
+     * @see https://github.com/yiisoft/yii2/issues/12681
      */
     public function testRuleWithPrivateFields()
     {
diff --git a/tests/framework/rbac/MySQLManagerCacheTest.php b/tests/framework/rbac/MySQLManagerCacheTest.php
index 8ca698c..017a39f 100644
--- a/tests/framework/rbac/MySQLManagerCacheTest.php
+++ b/tests/framework/rbac/MySQLManagerCacheTest.php
@@ -12,7 +12,7 @@ use yii\caching\FileCache;
 use yii\rbac\DbManager;
 
 /**
- * MySQLManagerCacheTest
+ * MySQLManagerCacheTest.
  * @group rbac
  * @group db
  * @group mysql
diff --git a/tests/framework/rbac/MySQLManagerTest.php b/tests/framework/rbac/MySQLManagerTest.php
index b37c167..99f2ef3 100644
--- a/tests/framework/rbac/MySQLManagerTest.php
+++ b/tests/framework/rbac/MySQLManagerTest.php
@@ -8,7 +8,7 @@
 namespace yiiunit\framework\rbac;
 
 /**
- * MySQLManagerTest
+ * MySQLManagerTest.
  * @group db
  * @group rbac
  * @group mysql
diff --git a/tests/framework/rbac/PgSQLManagerCacheTest.php b/tests/framework/rbac/PgSQLManagerCacheTest.php
index c6bc118..57771f7 100644
--- a/tests/framework/rbac/PgSQLManagerCacheTest.php
+++ b/tests/framework/rbac/PgSQLManagerCacheTest.php
@@ -12,7 +12,7 @@ use yii\caching\FileCache;
 use yii\rbac\DbManager;
 
 /**
- * PgSQLManagerTest
+ * PgSQLManagerTest.
  * @group db
  * @group rbac
  * @group pgsql
diff --git a/tests/framework/rbac/PgSQLManagerTest.php b/tests/framework/rbac/PgSQLManagerTest.php
index bf211ad..01e805d 100644
--- a/tests/framework/rbac/PgSQLManagerTest.php
+++ b/tests/framework/rbac/PgSQLManagerTest.php
@@ -8,7 +8,7 @@
 namespace yiiunit\framework\rbac;
 
 /**
- * PgSQLManagerTest
+ * PgSQLManagerTest.
  * @group db
  * @group rbac
  * @group pgsql
diff --git a/tests/framework/rbac/PhpManagerTest.php b/tests/framework/rbac/PhpManagerTest.php
index fb7825b..546ee54 100644
--- a/tests/framework/rbac/PhpManagerTest.php
+++ b/tests/framework/rbac/PhpManagerTest.php
@@ -9,6 +9,7 @@ namespace yii\rbac;
 
 /**
  * Mock for the filemtime() function for rbac classes. Avoid random test fails.
+ * @param string $file
  * @return int
  */
 function filemtime($file)
diff --git a/tests/framework/rbac/SqliteManagerTest.php b/tests/framework/rbac/SqliteManagerTest.php
index c94dcf4..df3addf 100644
--- a/tests/framework/rbac/SqliteManagerTest.php
+++ b/tests/framework/rbac/SqliteManagerTest.php
@@ -8,7 +8,7 @@
 namespace yiiunit\framework\rbac;
 
 /**
- * SqliteManagerTest
+ * SqliteManagerTest.
  * @group db
  * @group rbac
  */
@@ -24,6 +24,7 @@ class SqliteManagerTest extends DbManagerTestCase
         if (static::$sqliteDb === null) {
             static::$sqliteDb = parent::createConnection();
         }
+
         return static::$sqliteDb;
     }
 }
diff --git a/tests/framework/rest/SerializerTest.php b/tests/framework/rest/SerializerTest.php
index d456a97..698a27f 100644
--- a/tests/framework/rest/SerializerTest.php
+++ b/tests/framework/rest/SerializerTest.php
@@ -113,7 +113,7 @@ class SerializerTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/12107
+     * @see https://github.com/yiisoft/yii2/issues/12107
      */
     public function testExpandInvalidInput()
     {
diff --git a/tests/framework/validators/DateValidatorTest.php b/tests/framework/validators/DateValidatorTest.php
index cb2b99c..96ce6fb 100644
--- a/tests/framework/validators/DateValidatorTest.php
+++ b/tests/framework/validators/DateValidatorTest.php
@@ -44,6 +44,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testIntlValidateValue($timezone)
     {
@@ -83,6 +84,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testValidateValue($timezone)
     {
@@ -125,6 +127,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testIntlValidateAttributePHPFormat($timezone)
     {
@@ -133,6 +136,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testValidateAttributePHPFormat($timezone)
     {
@@ -169,6 +173,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testIntlValidateAttributeICUFormat($timezone)
     {
@@ -177,6 +182,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testValidateAttributeICUFormat($timezone)
     {
@@ -252,11 +258,17 @@ class DateValidatorTest extends TestCase
                 $return[] = [null, '2013-09-13', 1379030400, $tz[0], $appTz[0]];
             }
         }
+
         return $return;
     }
 
     /**
      * @dataProvider timestampFormatProvider
+     * @param string|null $format
+     * @param string $date
+     * @param string|int $expectedDate
+     * @param string $timezone
+     * @param string $appTimezone
      */
     public function testIntlTimestampAttributeFormat($format, $date, $expectedDate, $timezone, $appTimezone)
     {
@@ -265,6 +277,11 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider timestampFormatProvider
+     * @param string|null $format
+     * @param string $date
+     * @param string|int $expectedDate
+     * @param string $timezone
+     * @param string $appTimezone
      */
     public function testTimestampAttributeFormat($format, $date, $expectedDate, $timezone, $appTimezone)
     {
@@ -282,6 +299,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testIntlValidationWithTime($timezone)
     {
@@ -321,6 +339,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testValidationWithTime($timezone)
     {
@@ -383,6 +402,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testIntlValidationWithTimeAndOutputTimeZone($timezone)
     {
@@ -391,6 +411,7 @@ class DateValidatorTest extends TestCase
 
     /**
      * @dataProvider provideTimezones
+     * @param string $timezone
      */
     public function testValidationWithTimeAndOutputTimeZone($timezone)
     {
@@ -559,9 +580,9 @@ class DateValidatorTest extends TestCase
     }
 
     /**
-     * returns true if the version of ICU is old and has a bug that makes it
+     * Returns true if the version of ICU is old and has a bug that makes it
      * impossible to parse two digit years properly.
-     * see http://bugs.icu-project.org/trac/ticket/9836
+     * @see http://bugs.icu-project.org/trac/ticket/9836
      * @return bool
      */
     private function checkOldIcuBug()
diff --git a/tests/framework/validators/EmailValidatorTest.php b/tests/framework/validators/EmailValidatorTest.php
index 3786505..8a6d188 100644
--- a/tests/framework/validators/EmailValidatorTest.php
+++ b/tests/framework/validators/EmailValidatorTest.php
@@ -164,10 +164,11 @@ class EmailValidatorTest extends TestCase
     }
 
     /**
-     * Test malicious email addresses that can be used to exploit SwiftMailer vulnerability CVE-2016-10074
-     * https://legalhackers.com/advisories/SwiftMailer-Exploit-Remote-Code-Exec-CVE-2016-10074-Vuln.html
+     * Test malicious email addresses that can be used to exploit SwiftMailer vulnerability CVE-2016-10074.
+     * @see https://legalhackers.com/advisories/SwiftMailer-Exploit-Remote-Code-Exec-CVE-2016-10074-Vuln.html
      *
      * @dataProvider malformedAddressesProvider
+     * @param string $value
      */
     public function testMalformedAddresses($value)
     {
diff --git a/tests/framework/validators/ExistValidatorTest.php b/tests/framework/validators/ExistValidatorTest.php
index 5e2d22f..45eaafd 100644
--- a/tests/framework/validators/ExistValidatorTest.php
+++ b/tests/framework/validators/ExistValidatorTest.php
@@ -191,7 +191,7 @@ abstract class ExistValidatorTest extends DatabaseTestCase
     }
 
    /**
-    * Test expresssion in targetAttribute
+    * Test expresssion in targetAttribute.
     * @see https://github.com/yiisoft/yii2/issues/14304
     */
    public function testExpresionInAttributeColumnName()
diff --git a/tests/framework/validators/FileValidatorTest.php b/tests/framework/validators/FileValidatorTest.php
index 1724809..18ca500 100644
--- a/tests/framework/validators/FileValidatorTest.php
+++ b/tests/framework/validators/FileValidatorTest.php
@@ -392,26 +392,53 @@ class FileValidatorTest extends TestCase
     public function validMimeTypes()
     {
         return [
-            ['test.svg', 'image/*'],
-            ['test.jpg', 'image/*'],
-            ['test.png', 'image/*'],
-            ['test.png', 'IMAGE/*'],
-            ['test.txt', 'text/*'],
-            ['test.xml', '*/xml'],
-            ['test.odt', 'application/vnd*'],
+            ['test.svg', 'image/*', 'svg'],
+            ['test.jpg', 'image/*', 'jpg'],
+            ['test.png', 'image/*', 'png'],
+            ['test.png', 'IMAGE/*', 'png'],
+            ['test.txt', 'text/*', 'txt'],
+            ['test.xml', '*/xml', 'xml'],
+            ['test.odt', 'application/vnd*', 'odt'],
         ];
     }
 
     public function invalidMimeTypes()
     {
         return [
-            ['test.txt', 'image/*'],
-            ['test.odt', 'text/*'],
-            ['test.xml', '*/svg+xml'],
-            ['test.png', 'image/x-iso9660-image'],
+            ['test.txt', 'image/*', 'png, jpg'],
+            ['test.odt', 'text/*', 'txt'],
+            ['test.xml', '*/svg+xml', 'svg'],
+            ['test.png', 'image/x-iso9660-image', 'bmp'],
+            ['test.svg', 'application/*', 'jpg'],
         ];
     }
 
+    /**
+     * @param string $fileName
+     * @param mixed $_
+     * @param string|array $allowedExtensions
+     * @dataProvider validMimeTypes
+     */
+    public function testValidateFileByExtensionUsingMimeType($fileName, $_, $allowedExtensions)
+    {
+        $validator = new FileValidator(['extensions' => (array)$allowedExtensions]);
+        $file = $this->getRealTestFile($fileName);
+        $this->assertTrue($validator->validate($file));
+    }
+
+    /**
+     * @param string $fileName
+     * @param mixed $_
+     * @param string|array $allowedExtensions
+     * @dataProvider invalidMimeTypes
+     */
+    public function testValidateFileByExtensionUsingMimeTypeInvalid($fileName, $_, $allowedExtensions)
+    {
+        $validator = new FileValidator(['extensions' => (array)$allowedExtensions]);
+        $file = $this->getRealTestFile($fileName);
+        $this->assertFalse($validator->validate($file));
+    }
+
     protected function createModelForAttributeTest()
     {
         return FakedValidationModel::createWithAttributes(
diff --git a/tests/framework/validators/IpValidatorTest.php b/tests/framework/validators/IpValidatorTest.php
index 118dc0b..4895441 100644
--- a/tests/framework/validators/IpValidatorTest.php
+++ b/tests/framework/validators/IpValidatorTest.php
@@ -42,6 +42,8 @@ class IpValidatorTest extends TestCase
 
     /**
      * @dataProvider provideRangesForSubstitution
+     * @param array $range
+     * @param array $expectedRange
      */
     public function testRangesSubstitution($range, $expectedRange)
     {
@@ -70,6 +72,7 @@ class IpValidatorTest extends TestCase
 
     /**
      * @dataProvider provideBadIps
+     * @param mixed $badIp
      */
     public function testValidateValueNotAnIP($badIp)
     {
@@ -80,6 +83,7 @@ class IpValidatorTest extends TestCase
 
     /**
      * @dataProvider provideBadIps
+     * @param mixed $badIp
      */
     public function testValidateModelAttributeNotAnIP($badIp)
     {
diff --git a/tests/framework/validators/NumberValidatorTest.php b/tests/framework/validators/NumberValidatorTest.php
index af20efa..b26c8c8 100644
--- a/tests/framework/validators/NumberValidatorTest.php
+++ b/tests/framework/validators/NumberValidatorTest.php
@@ -250,7 +250,7 @@ class NumberValidatorTest extends TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/3118
+     * @see https://github.com/yiisoft/yii2/issues/3118
      */
     public function testClientValidateComparison()
     {
diff --git a/tests/framework/validators/StringValidatorTest.php b/tests/framework/validators/StringValidatorTest.php
index 01e4045..d858c39 100644
--- a/tests/framework/validators/StringValidatorTest.php
+++ b/tests/framework/validators/StringValidatorTest.php
@@ -19,7 +19,9 @@ class StringValidatorTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $this->mockApplication();
+
+        // destroy application, Validator must work without Yii::$app
+        $this->destroyApplication();
     }
 
     public function testValidateValue()
diff --git a/tests/framework/validators/UniqueValidatorTest.php b/tests/framework/validators/UniqueValidatorTest.php
index a23d0f8..b97f41b 100644
--- a/tests/framework/validators/UniqueValidatorTest.php
+++ b/tests/framework/validators/UniqueValidatorTest.php
@@ -395,7 +395,7 @@ abstract class UniqueValidatorTest extends DatabaseTestCase
     }
 
     /**
-     * Test ambiguous column name in select clause
+     * Test ambiguous column name in select clause.
      * @see https://github.com/yiisoft/yii2/issues/14042
      */
     public function testAmbiguousColumnName()
@@ -415,7 +415,7 @@ abstract class UniqueValidatorTest extends DatabaseTestCase
     }
 
     /**
-     * Test expresssion in targetAttribute
+     * Test expresssion in targetAttribute.
      * @see https://github.com/yiisoft/yii2/issues/14304
      */
     public function testExpresionInAttributeColumnName()
diff --git a/tests/framework/validators/ValidatorTest.php b/tests/framework/validators/ValidatorTest.php
index 835e77b..850c50a 100644
--- a/tests/framework/validators/ValidatorTest.php
+++ b/tests/framework/validators/ValidatorTest.php
@@ -287,9 +287,9 @@ class ValidatorTest extends TestCase
     }
 
     /**
-     * Make sure attribute names are calculated dynamically
-     * https://github.com/yiisoft/yii2/issues/13979
-     * https://github.com/yiisoft/yii2/pull/14413
+     * Make sure attribute names are calculated dynamically.
+     * @see https://github.com/yiisoft/yii2/issues/13979
+     * @see https://github.com/yiisoft/yii2/pull/14413
      */
     public function testAttributeNamesDynamic()
     {
diff --git a/tests/framework/web/AssetBundleTest.php b/tests/framework/web/AssetBundleTest.php
index 967519f..2783690 100644
--- a/tests/framework/web/AssetBundleTest.php
+++ b/tests/framework/web/AssetBundleTest.php
@@ -49,7 +49,7 @@ class AssetBundleTest extends \yiiunit\TestCase
     }
 
     /**
-     * Returns View with configured AssetManager
+     * Returns View with configured AssetManager.
      *
      * @param array $config may be used to override default AssetManager config
      * @return View
@@ -263,6 +263,8 @@ EOF;
 
     /**
      * @dataProvider positionProvider
+     * @param int $pos
+     * @param bool $jqAlreadyRegistered
      */
     public function testPositionDependency($pos, $jqAlreadyRegistered)
     {
@@ -332,6 +334,8 @@ EOF;
 
     /**
      * @dataProvider positionProvider
+     * @param int $pos
+     * @param bool $jqAlreadyRegistered
      */
     public function testPositionDependencyConflict($pos, $jqAlreadyRegistered)
     {
@@ -503,8 +507,9 @@ EOF;
      * @dataProvider registerFileDataProvider
      * @param string $type either `js` or `css`
      * @param string $path
-     * @param string bool $appendTimestamp
+     * @param string|bool $appendTimestamp
      * @param string $expected
+     * @param string|null $webAlias
      */
     public function testRegisterFileAppendTimestamp($type, $path, $appendTimestamp, $expected, $webAlias = null)
     {
diff --git a/tests/framework/web/ErrorActionTest.php b/tests/framework/web/ErrorActionTest.php
index a4ddc45..341a458 100644
--- a/tests/framework/web/ErrorActionTest.php
+++ b/tests/framework/web/ErrorActionTest.php
@@ -26,7 +26,7 @@ class ErrorActionTest extends TestCase
     }
 
     /**
-     * Creates a controller instance
+     * Creates a controller instance.
      *
      * @param array $actionConfig
      * @return TestController
diff --git a/tests/framework/web/FormatterTest.php b/tests/framework/web/FormatterTest.php
index 9839e8e..d41d14b 100644
--- a/tests/framework/web/FormatterTest.php
+++ b/tests/framework/web/FormatterTest.php
@@ -34,7 +34,7 @@ abstract class FormatterTest extends \yiiunit\TestCase
     abstract protected function getFormatterInstance();
 
     /**
-     * Formatter should not format null
+     * Formatter should not format null.
      */
     public function testFormatNull()
     {
diff --git a/tests/framework/web/RequestTest.php b/tests/framework/web/RequestTest.php
index fbba4db..d2bbae8 100644
--- a/tests/framework/web/RequestTest.php
+++ b/tests/framework/web/RequestTest.php
@@ -41,7 +41,7 @@ class RequestTest extends TestCase
             text/x-dvi; q=0.8, text/x-c'));
     }
 
-    public function testPrefferedLanguage()
+    public function testPreferredLanguage()
     {
         $this->mockApplication([
             'language' => 'en',
@@ -82,6 +82,20 @@ class RequestTest extends TestCase
         $this->assertEquals('pl', $request->getPreferredLanguage(['pl', 'ru-ru']));
     }
 
+    /**
+     * @see https://github.com/yiisoft/yii2/issues/14542
+     */
+    public function testCsrfTokenContainsASCIIOnly()
+    {
+        $this->mockWebApplication();
+
+        $request = new Request();
+        $request->enableCsrfCookie = false;
+
+        $token = $request->getCsrfToken();
+        $this->assertRegExp('~[-_=a-z0-9]~i', $token);
+    }
+
     public function testCsrfTokenValidation()
     {
         $this->mockWebApplication();
@@ -128,7 +142,7 @@ class RequestTest extends TestCase
     }
 
     /**
-     * test CSRF token validation by POST param
+     * Test CSRF token validation by POST param.
      */
     public function testCsrfTokenPost()
     {
@@ -156,7 +170,7 @@ class RequestTest extends TestCase
     }
 
     /**
-     * test CSRF token validation by POST param
+     * Test CSRF token validation by POST param.
      */
     public function testCsrfTokenHeader()
     {
@@ -296,6 +310,230 @@ class RequestTest extends TestCase
         $this->assertEquals(null, $request->getServerPort());
     }
 
+    public function isSecureServerDataProvider()
+    {
+        return [
+            [['HTTPS' => 1], true],
+            [['HTTPS' => 'on'], true],
+            [['HTTPS' => 0], false],
+            [['HTTPS' => 'off'], false],
+            [[], false],
+            [['HTTP_X_FORWARDED_PROTO' => 'https'], false],
+            [['HTTP_X_FORWARDED_PROTO' => 'http'], false],
+            [[
+                'HTTP_X_FORWARDED_PROTO' => 'https',
+                'REMOTE_HOST' => 'test.com',
+            ], false],
+            [[
+                'HTTP_X_FORWARDED_PROTO' => 'https',
+                'REMOTE_HOST' => 'othertest.com',
+            ], false],
+            [[
+                'HTTP_X_FORWARDED_PROTO' => 'https',
+                'REMOTE_ADDR' => '192.168.0.1',
+            ], true],
+            [[
+                'HTTP_X_FORWARDED_PROTO' => 'https',
+                'REMOTE_ADDR' => '192.169.0.1',
+            ], false],
+            [['HTTP_FRONT_END_HTTPS' => 'on'], false],
+            [['HTTP_FRONT_END_HTTPS' => 'off'], false],
+            [[
+                'HTTP_FRONT_END_HTTPS' => 'on',
+                'REMOTE_HOST' => 'test.com',
+            ], false],
+            [[
+                'HTTP_FRONT_END_HTTPS' => 'on',
+                'REMOTE_HOST' => 'othertest.com',
+            ], false],
+            [[
+                'HTTP_FRONT_END_HTTPS' => 'on',
+                'REMOTE_ADDR' => '192.168.0.1',
+            ], true],
+            [[
+                'HTTP_FRONT_END_HTTPS' => 'on',
+                'REMOTE_ADDR' => '192.169.0.1',
+            ], false],
+        ];
+    }
+
+    /**
+     * @dataProvider isSecureServerDataProvider
+     * @param array $server
+     * @param bool $expected
+     */
+    public function testGetIsSecureConnection($server, $expected)
+    {
+        $original = $_SERVER;
+        $request = new Request([
+            'trustedHosts' => [
+                '192.168.0.0/24',
+            ],
+        ]);
+        $_SERVER = $server;
+
+        $this->assertEquals($expected, $request->getIsSecureConnection());
+        $_SERVER = $original;
+    }
+
+    public function getUserIPDataProvider()
+    {
+        return [
+            [
+                [
+                    'HTTP_X_FORWARDED_PROTO' => 'https',
+                    'HTTP_X_FORWARDED_FOR' => '123.123.123.123',
+                    'REMOTE_ADDR' => '192.168.0.1',
+                ],
+                '123.123.123.123',
+            ],
+            [
+                [
+                    'HTTP_X_FORWARDED_PROTO' => 'https',
+                    'HTTP_X_FORWARDED_FOR' => '123.123.123.123',
+                    'REMOTE_ADDR' => '192.169.1.1',
+                ],
+                '192.169.1.1',
+            ],
+            [
+                [
+                    'HTTP_X_FORWARDED_PROTO' => 'https',
+                    'HTTP_X_FORWARDED_FOR' => '123.123.123.123',
+                    'REMOTE_HOST' => 'untrusted.com',
+                    'REMOTE_ADDR' => '192.169.1.1',
+                ],
+                '192.169.1.1',
+            ],
+            [
+                [
+                    'HTTP_X_FORWARDED_PROTO' => 'https',
+                    'HTTP_X_FORWARDED_FOR' => '192.169.1.1',
+                    'REMOTE_HOST' => 'untrusted.com',
+                    'REMOTE_ADDR' => '192.169.1.1',
+                ],
+                '192.169.1.1',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getUserIPDataProvider
+     * @param array $server
+     * @param string $expected
+     */
+    public function testGetUserIP($server, $expected)
+    {
+        $original = $_SERVER;
+        $_SERVER = $server;
+        $request = new Request([
+            'trustedHosts' => [
+                '192.168.0.0/24',
+            ],
+        ]);
+
+        $this->assertEquals($expected, $request->getUserIP());
+        $_SERVER = $original;
+    }
+
+    public function getMethodDataProvider()
+    {
+        return [
+            [
+                [
+                    'REQUEST_METHOD' => 'DEFAULT',
+                    'HTTP_X-HTTP-METHOD-OVERRIDE' => 'OVERRIDE',
+                ],
+                'OVERRIDE',
+            ],
+            [
+                [
+                    'REQUEST_METHOD' => 'DEFAULT',
+                ],
+                'DEFAULT',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getMethodDataProvider
+     * @param array $server
+     * @param string $expected
+     */
+    public function testGetMethod($server, $expected)
+    {
+        $original = $_SERVER;
+        $_SERVER = $server;
+        $request = new Request();
+
+        $this->assertEquals($expected, $request->getMethod());
+        $_SERVER = $original;
+    }
+
+    public function getIsAjaxDataProvider()
+    {
+        return [
+            [
+                [
+                ],
+                false,
+            ],
+            [
+                [
+                    'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest',
+                ],
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getIsAjaxDataProvider
+     * @param array $server
+     * @param bool $expected
+     */
+    public function testGetIsAjax($server, $expected)
+    {
+        $original = $_SERVER;
+        $_SERVER = $server;
+        $request = new Request();
+
+        $this->assertEquals($expected, $request->getIsAjax());
+        $_SERVER = $original;
+    }
+
+    public function getIsPjaxDataProvider()
+    {
+        return [
+            [
+                [
+                ],
+                false,
+            ],
+            [
+                [
+                    'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest',
+                    'HTTP_X_PJAX' => 'any value',
+                ],
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider getIsPjaxDataProvider
+     * @param array $server
+     * @param bool $expected
+     */
+    public function testGetIsPjax($server, $expected)
+    {
+        $original = $_SERVER;
+        $_SERVER = $server;
+        $request = new Request();
+
+        $this->assertEquals($expected, $request->getIsPjax());
+        $_SERVER = $original;
+    }
+
     public function testGetOrigin()
     {
         $_SERVER['HTTP_ORIGIN'] = 'https://www.w3.org';
diff --git a/tests/framework/web/ResponseTest.php b/tests/framework/web/ResponseTest.php
index cd627bf..2522a95 100644
--- a/tests/framework/web/ResponseTest.php
+++ b/tests/framework/web/ResponseTest.php
@@ -43,6 +43,10 @@ class ResponseTest extends \yiiunit\TestCase
 
     /**
      * @dataProvider rightRanges
+     * @param string $rangeHeader
+     * @param string $expectedHeader
+     * @param int $length
+     * @param string $expectedContent
      */
     public function testSendFileRanges($rangeHeader, $expectedHeader, $length, $expectedContent)
     {
@@ -75,6 +79,7 @@ class ResponseTest extends \yiiunit\TestCase
 
     /**
      * @dataProvider wrongRanges
+     * @param string $rangeHeader
      */
     public function testSendFileWrongRanges($rangeHeader)
     {
@@ -91,7 +96,7 @@ class ResponseTest extends \yiiunit\TestCase
     }
 
     /**
-     * https://github.com/yiisoft/yii2/issues/7529
+     * @see https://github.com/yiisoft/yii2/issues/7529
      */
     public function testSendContentAsFile()
     {
@@ -127,6 +132,8 @@ class ResponseTest extends \yiiunit\TestCase
 
     /**
      * @dataProvider dataProviderSetStatusCodeByException
+     * @param \Exception $exception
+     * @param int $statusCode
      */
     public function testSetStatusCodeByException($exception, $statusCode)
     {
diff --git a/tests/framework/web/SessionTest.php b/tests/framework/web/SessionTest.php
index c5d353d..b11900a 100644
--- a/tests/framework/web/SessionTest.php
+++ b/tests/framework/web/SessionTest.php
@@ -16,7 +16,7 @@ use yiiunit\TestCase;
 class SessionTest extends TestCase
 {
     /**
-     * Test to prove that after Session::destroy session id set to old value
+     * Test to prove that after Session::destroy session id set to old value.
      */
     public function testDestroySessionId()
     {
diff --git a/tests/framework/web/UrlManagerCreateUrlTest.php b/tests/framework/web/UrlManagerCreateUrlTest.php
index 51cb239..b379bad 100644
--- a/tests/framework/web/UrlManagerCreateUrlTest.php
+++ b/tests/framework/web/UrlManagerCreateUrlTest.php
@@ -97,6 +97,10 @@ class UrlManagerCreateUrlTest extends TestCase
      * without rules.
      *
      * @dataProvider variationsProvider
+     * @param string $method
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testWithoutRules($method, $showScriptName, $prefix, $config)
     {
@@ -122,12 +126,17 @@ class UrlManagerCreateUrlTest extends TestCase
     }
 
     /**
-     * Test createUrl() and createAbsoluteUrl()
-     * with varying $showScriptName
-     * without rules.
-     * With UrlManager::$suffix
+     * Test createUrl() and createAbsoluteUrl().
+     *
+     * - with varying $showScriptName,
+     * - without rules,
+     * - with UrlManager::$suffix.
      *
      * @dataProvider variationsProvider
+     * @param string $method
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testWithoutRulesWithSuffix($method, $showScriptName, $prefix, $config)
     {
@@ -182,6 +191,10 @@ class UrlManagerCreateUrlTest extends TestCase
      * with simple rules.
      *
      * @dataProvider variationsProvider
+     * @param string $method
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testSimpleRules($method, $showScriptName, $prefix, $config)
     {
@@ -225,12 +238,17 @@ class UrlManagerCreateUrlTest extends TestCase
     }
 
     /**
-     * Test createUrl() and createAbsoluteUrl()
-     * with varying $showScriptName
-     * with simple rules.
-     * With UrlManager::$suffix
+     * Test createUrl() and createAbsoluteUrl().
+     *
+     * - with varying $showScriptName,
+     * - with simple rules,
+     * - with UrlManager::$suffix.
      *
      * @dataProvider variationsProvider
+     * @param string $method
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testSimpleRulesWithSuffix($method, $showScriptName, $prefix, $config)
     {
@@ -280,6 +298,10 @@ class UrlManagerCreateUrlTest extends TestCase
      * with rules that have varadic controller/actions.
      *
      * @dataProvider variationsProvider
+     * @param string $method
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testControllerActionParams($method, $showScriptName, $prefix, $config)
     {
@@ -327,6 +349,10 @@ class UrlManagerCreateUrlTest extends TestCase
      * with rules that have default values for parameters.
      *
      * @dataProvider variationsProvider
+     * @param string $method
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testRulesWithDefaultParams($method, $showScriptName, $prefix, $config)
     {
@@ -401,6 +427,10 @@ class UrlManagerCreateUrlTest extends TestCase
      *
      * @dataProvider variationsProvider
      * @see https://github.com/yiisoft/yii2/issues/10935
+     * @param string $method
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testWithNullParams($method, $showScriptName, $prefix, $config)
     {
@@ -437,6 +467,10 @@ class UrlManagerCreateUrlTest extends TestCase
      *
      * @dataProvider variationsProvider
      * @see https://github.com/yiisoft/yii2/issues/6717
+     * @param string $method
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testWithEmptyPattern($method, $showScriptName, $prefix, $config)
     {
@@ -505,6 +539,9 @@ class UrlManagerCreateUrlTest extends TestCase
     /**
      * Test rules that have host info in the patterns.
      * @dataProvider absolutePatternsVariations
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testAbsolutePatterns($showScriptName, $prefix, $config)
     {
@@ -563,6 +600,9 @@ class UrlManagerCreateUrlTest extends TestCase
      * Test rules that have host info in the patterns, that are protocol relative.
      * @dataProvider absolutePatternsVariations
      * @see https://github.com/yiisoft/yii2/issues/12691
+     * @param bool $showScriptName
+     * @param string $prefix
+     * @param array $config
      */
     public function testProtocolRelativeAbsolutePattern($showScriptName, $prefix, $config)
     {
@@ -650,10 +690,11 @@ class UrlManagerCreateUrlTest extends TestCase
     }
 
     /**
-     * Test matching of Url rules dependent on the current host info
+     * Test matching of Url rules dependent on the current host info.
      *
      * @dataProvider multipleHostsRulesDataProvider
      * @see https://github.com/yiisoft/yii2/issues/7948
+     * @param string $host
      */
     public function testMultipleHostsRules($host)
     {
@@ -768,13 +809,13 @@ class UrlManagerCreateUrlTest extends TestCase
         $this->mockWebApplication([
             'components' => [
                 'cache' => ArrayCache::class,
-            ]
+            ],
         ]);
         $urlManager = $this->getUrlManager([
             'cache' => 'cache',
             'rules' => [
-                '/' => 'site/index'
-            ]
+                '/' => 'site/index',
+            ],
         ]);
 
         $cachedUrlManager = $this->getUrlManager([
@@ -784,7 +825,7 @@ class UrlManagerCreateUrlTest extends TestCase
             ],
             'rules' => [
                 '/' => 'site/index',
-            ]
+            ],
         ]);
 
         $this->assertNotEquals($urlManager->rules, $cachedUrlManager->rules);
diff --git a/tests/framework/web/UrlManagerParseUrlTest.php b/tests/framework/web/UrlManagerParseUrlTest.php
index a3a2293..6628102 100644
--- a/tests/framework/web/UrlManagerParseUrlTest.php
+++ b/tests/framework/web/UrlManagerParseUrlTest.php
@@ -112,6 +112,7 @@ class UrlManagerParseUrlTest extends TestCase
 
     /**
      * @dataProvider suffixProvider
+     * @param string $suffix
      */
     public function testWithoutRulesWithSuffix($suffix)
     {
@@ -198,6 +199,7 @@ class UrlManagerParseUrlTest extends TestCase
 
     /**
      * @dataProvider suffixProvider
+     * @param string $suffix
      */
     public function testSimpleRulesWithSuffix($suffix)
     {
@@ -242,6 +244,7 @@ class UrlManagerParseUrlTest extends TestCase
 
     /**
      * @dataProvider suffixProvider
+     * @param string $suffix
      */
     public function testSimpleRulesWithSuffixStrict($suffix)
     {
diff --git a/tests/framework/web/UrlManagerTest.php b/tests/framework/web/UrlManagerTest.php
index ee5f8b7..f81c003 100644
--- a/tests/framework/web/UrlManagerTest.php
+++ b/tests/framework/web/UrlManagerTest.php
@@ -73,6 +73,8 @@ class UrlManagerTest extends TestCase
 
     /**
      * @dataProvider ignoredOptionsProvider
+     * @param bool $showScriptName
+     * @param bool $enableStrictParsing
      */
     public function testCreateUrlSimple($showScriptName, $enableStrictParsing)
     {
@@ -96,6 +98,8 @@ class UrlManagerTest extends TestCase
 
     /**
      * @dataProvider ignoredOptionsProvider
+     * @param bool $showScriptName
+     * @param bool $enableStrictParsing
      */
     public function testCreateUrlWithParams($showScriptName, $enableStrictParsing)
     {
@@ -117,6 +121,8 @@ class UrlManagerTest extends TestCase
      * @dataProvider ignoredOptionsProvider
      *
      * @see https://github.com/yiisoft/yii2/pull/9596
+     * @param bool $showScriptName
+     * @param bool $enableStrictParsing
      */
     public function testCreateUrlWithAnchor($showScriptName, $enableStrictParsing)
     {
@@ -140,6 +146,8 @@ class UrlManagerTest extends TestCase
 
     /**
      * @dataProvider ignoredOptionsProvider
+     * @param bool $showScriptName
+     * @param bool $enableStrictParsing
      */
     public function testCreateAbsoluteUrl($showScriptName, $enableStrictParsing)
     {
@@ -186,6 +194,8 @@ class UrlManagerTest extends TestCase
     /**
      * Test normalisation of different routes.
      * @dataProvider ignoredOptionsProvider
+     * @param bool $showScriptName
+     * @param bool $enableStrictParsing
      */
     public function testCreateUrlRouteVariants($showScriptName, $enableStrictParsing)
     {
@@ -216,6 +226,7 @@ class UrlManagerTest extends TestCase
 
     /**
      * @dataProvider routeParamProvider
+     * @param string $routeParam
      */
     public function testParseRequest($routeParam)
     {
@@ -243,4 +254,16 @@ class UrlManagerTest extends TestCase
         $this->assertEquals(['site/index', []], $result);
         $this->assertEquals(5, $request->getQueryParam('id'));
     }
+
+    public function testSetBaseUrl()
+    {
+        $manager = $this->getUrlManager();
+
+        $manager->setBaseUrl('example.com');
+        $this->assertEquals('example.com', $manager->getBaseUrl());
+
+        Yii::setAlias('@testAlias', 'example.com/');
+        $manager->setBaseUrl('@testAlias');
+        $this->assertEquals('example.com', $manager->getBaseUrl());
+    }
 }
diff --git a/tests/framework/web/UrlNormalizerTest.php b/tests/framework/web/UrlNormalizerTest.php
index 7a172b5..e0a6a83 100644
--- a/tests/framework/web/UrlNormalizerTest.php
+++ b/tests/framework/web/UrlNormalizerTest.php
@@ -118,9 +118,9 @@ class UrlNormalizerTest extends TestCase
     }
 
     /**
-     * Test usage of UrlNormalizer in UrlManager
+     * Test usage of UrlNormalizer in UrlManager.
      *
-     * trailing slash is insignificant if normalizer is enabled
+     * Trailing slash is insignificant if normalizer is enabled.
      */
     public function testUrlManager()
     {
diff --git a/tests/framework/web/UserTest.php b/tests/framework/web/UserTest.php
index 1d0737b..77eb1b1 100644
--- a/tests/framework/web/UserTest.php
+++ b/tests/framework/web/UserTest.php
@@ -8,7 +8,7 @@
 namespace yii\web;
 
 /**
- * Mock for the time() function for web classes
+ * Mock for the time() function for web classes.
  * @return int
  */
 function time()
@@ -97,6 +97,61 @@ class UserTest extends TestCase
         $this->assertFalse(Yii::$app->user->can('doSomething'));
     }
 
+    /**
+     * Make sure autologin works more than once.
+     * @see https://github.com/yiisoft/yii2/issues/11825
+     */
+    public function testIssue11825()
+    {
+        global $cookiesMock;
+        $cookiesMock = new CookieCollection();
+
+        $appConfig = [
+            'components' => [
+                'user' => [
+                    'identityClass' => UserIdentity::class,
+                    'authTimeout' => 10,
+                    'enableAutoLogin' => true,
+                    'autoRenewCookie' => false,
+                ],
+                'response' => [
+                    'class' => MockResponse::class,
+                ],
+                'request' => [
+                    'class' => MockRequest::class,
+                ],
+            ],
+        ];
+        $this->mockWebApplication($appConfig);
+
+        Yii::$app->session->removeAll();
+        static::$time = \time();
+        Yii::$app->user->login(UserIdentity::findIdentity('user1'), 20);
+
+        // User is logged in
+        $this->mockWebApplication($appConfig);
+        $this->assertFalse(Yii::$app->user->isGuest);
+
+        // IdentityCookie is valid
+        Yii::$app->session->removeAll();
+        static::$time += 5;
+        $this->mockWebApplication($appConfig);
+        $this->assertFalse(Yii::$app->user->isGuest);
+
+        // IdentityCookie is still valid
+        Yii::$app->session->removeAll();
+        static::$time += 10;
+        $this->mockWebApplication($appConfig);
+        $this->assertFalse(Yii::$app->user->isGuest);
+
+        // IdentityCookie is no longer valid (we remove it manually, but browser will do it automatically)
+        $this->invokeMethod(Yii::$app->user, 'removeIdentityCookie');
+        Yii::$app->session->removeAll();
+        static::$time += 25;
+        $this->mockWebApplication($appConfig);
+        $this->assertTrue(Yii::$app->user->isGuest);
+    }
+
     public function testCookieCleanup()
     {
         global $cookiesMock;
diff --git a/tests/framework/web/XmlResponseFormatterTest.php b/tests/framework/web/XmlResponseFormatterTest.php
index 6d07b30..947c50a 100644
--- a/tests/framework/web/XmlResponseFormatterTest.php
+++ b/tests/framework/web/XmlResponseFormatterTest.php
@@ -34,6 +34,7 @@ class XmlResponseFormatterTest extends FormatterTest
         foreach ($data as &$item) {
             $item[1] = $this->xmlHead . $item[1];
         }
+
         return $data;
     }
 
diff --git a/tests/framework/widgets/ActiveFieldTest.php b/tests/framework/widgets/ActiveFieldTest.php
index c3c61cf..f42336a 100644
--- a/tests/framework/widgets/ActiveFieldTest.php
+++ b/tests/framework/widgets/ActiveFieldTest.php
@@ -258,6 +258,8 @@ EOT;
 
     /**
      * @dataProvider hintDataProvider
+     * @param mixed $hint
+     * @param string $expectedHtml
      */
     public function testHint($hint, $expectedHtml)
     {
@@ -527,7 +529,39 @@ EOD;
     }
 
     /**
-     * Helper methods
+     * @depends testHiddenInput
+     *
+     * @see https://github.com/yiisoft/yii2/issues/14773
+     */
+    public function testOptionsClass()
+    {
+        $this->activeField->options = ['class' => 'test-wrapper'];
+        $expectedValue = <<<HTML
+<div class="test-wrapper field-activefieldtestmodel-attributename">
+
+<input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
+
+
+</div>
+HTML;
+        $actualValue = $this->activeField->hiddenInput()->label(false)->error(false)->hint(false)->render();
+        $this->assertEqualsWithoutLE($expectedValue, trim($actualValue));
+
+        $this->activeField->options = ['class' => ['test-wrapper', 'test-add']];
+        $expectedValue = <<<HTML
+<div class="test-wrapper test-add field-activefieldtestmodel-attributename">
+
+<input type="hidden" id="activefieldtestmodel-attributename" class="form-control" name="ActiveFieldTestModel[attributeName]">
+
+
+</div>
+HTML;
+        $actualValue = $this->activeField->hiddenInput()->label(false)->error(false)->hint(false)->render();
+        $this->assertEqualsWithoutLE($expectedValue, trim($actualValue));
+    }
+
+    /**
+     * Helper methods.
      */
     protected function getView()
     {
@@ -552,7 +586,7 @@ class ActiveFieldTestModel extends DynamicModel
 }
 
 /**
- * Helper Classes
+ * Helper Classes.
  */
 class ActiveFieldExtend extends ActiveField
 {
diff --git a/tests/framework/widgets/BreadcrumbsTest.php b/tests/framework/widgets/BreadcrumbsTest.php
index 54055f4..61b42f2 100644
--- a/tests/framework/widgets/BreadcrumbsTest.php
+++ b/tests/framework/widgets/BreadcrumbsTest.php
@@ -176,7 +176,9 @@ class BreadcrumbsTest extends \yiiunit\TestCase
     }
 
     /**
-     * Helper methods
+     * Helper methods.
+     * @param string $class
+     * @param string $method
      */
     protected function reflectMethod($class = '\yii\widgets\Breadcrumbs', $method = 'renderItem')
     {
diff --git a/tests/framework/widgets/DetailViewTest.php b/tests/framework/widgets/DetailViewTest.php
index ea0b505..019c6cd 100644
--- a/tests/framework/widgets/DetailViewTest.php
+++ b/tests/framework/widgets/DetailViewTest.php
@@ -317,7 +317,7 @@ class DetailViewTest extends \yiiunit\TestCase
 }
 
 /**
- * Helper Class
+ * Helper Class.
  */
 class ArrayableMock implements Arrayable
 {
@@ -329,7 +329,7 @@ class ArrayableMock implements Arrayable
 }
 
 /**
- * Helper Class
+ * Helper Class.
  */
 class ModelMock extends Model
 {
@@ -363,17 +363,17 @@ class ModelMock extends Model
 }
 
 /**
- * Used for testing attributes containing non-English characters
+ * Used for testing attributes containing non-English characters.
  */
 class UnicodeAttributesModelMock extends Model
 {
     /**
-     * Product's ID (Russian)
+     * Product's ID (Russian).
      * @var mixed
      */
     public $ИдентификаторТовара;
     /**
-     * ID (Greek)
+     * ID (Greek).
      * @var mixed
      */
     public $το_αναγνωριστικό_του;
diff --git a/tests/framework/widgets/LinkPagerTest.php b/tests/framework/widgets/LinkPagerTest.php
index e3af651..db14465 100644
--- a/tests/framework/widgets/LinkPagerTest.php
+++ b/tests/framework/widgets/LinkPagerTest.php
@@ -8,6 +8,7 @@
 namespace yiiunit\framework\widgets;
 
 use yii\data\Pagination;
+use yii\helpers\StringHelper;
 use yii\widgets\LinkPager;
 
 /**
@@ -27,13 +28,24 @@ class LinkPagerTest extends \yiiunit\TestCase
         ]);
     }
 
-    public function testFirstLastPageLabels()
+    /**
+     * Get pagination.
+     * @param int $page
+     * @return Pagination
+     */
+    private function getPagination($page)
     {
         $pagination = new Pagination();
-        $pagination->setPage(5);
+        $pagination->setPage($page);
         $pagination->totalCount = 500;
         $pagination->route = 'test';
 
+        return $pagination;
+    }
+
+    public function testFirstLastPageLabels()
+    {
+        $pagination = $this->getPagination(5);
         $output = LinkPager::widget([
             'pagination' => $pagination,
             'firstPageLabel' => true,
@@ -64,13 +76,8 @@ class LinkPagerTest extends \yiiunit\TestCase
 
     public function testDisabledPageElementOptions()
     {
-        $pagination = new Pagination();
-        $pagination->setPage(0);
-        $pagination->totalCount = 50;
-        $pagination->route = 'test';
-
         $output = LinkPager::widget([
-            'pagination' => $pagination,
+            'pagination' => $this->getPagination(0),
             'disabledListItemSubTagOptions' => ['class' => 'foo-bar'],
         ]);
 
@@ -79,13 +86,8 @@ class LinkPagerTest extends \yiiunit\TestCase
 
     public function testDisabledPageElementOptionsWithTagOption()
     {
-        $pagination = new Pagination();
-        $pagination->setPage(0);
-        $pagination->totalCount = 50;
-        $pagination->route = 'test';
-
         $output = LinkPager::widget([
-            'pagination' => $pagination,
+            'pagination' => $this->getPagination(0),
             'disabledListItemSubTagOptions' => ['class' => 'foo-bar', 'tag' => 'div'],
         ]);
 
@@ -94,11 +96,7 @@ class LinkPagerTest extends \yiiunit\TestCase
 
     public function testDisableCurrentPageButton()
     {
-        $pagination = new Pagination();
-        $pagination->setPage(5);
-        $pagination->totalCount = 500;
-        $pagination->route = 'test';
-
+        $pagination = $this->getPagination(5);
         $output = LinkPager::widget([
             'pagination' => $pagination,
             'disableCurrentPageButton' => false,
@@ -113,4 +111,37 @@ class LinkPagerTest extends \yiiunit\TestCase
 
         static::assertContains('<li class="active disabled"><span>6</span></li>', $output);
     }
+
+    public function testOptionsWithTagOption()
+    {
+        $output = LinkPager::widget([
+            'pagination' => $this->getPagination(5),
+            'options' => [
+                'tag' => 'div',
+            ],
+        ]);
+
+        $this->assertTrue(StringHelper::startsWith($output, '<div>'));
+        $this->assertTrue(StringHelper::endsWith($output, '</div>'));
+    }
+
+    public function testLinkWrapOptions()
+    {
+        $output = LinkPager::widget([
+            'pagination' => $this->getPagination(1),
+            'linkContainerOptions' => [
+                'tag' => 'div',
+                'class' => 'my-class',
+            ],
+        ]);
+
+        $this->assertContains(
+            '<div class="my-class"><a href="/?r=test&amp;page=3" data-page="2">3</a></div>',
+            $output
+        );
+        $this->assertContains(
+            '<div class="my-class active"><a href="/?r=test&amp;page=2" data-page="1">2</a></div>',
+            $output
+        );
+    }
 }
diff --git a/tests/framework/widgets/ListViewTest.php b/tests/framework/widgets/ListViewTest.php
index 2bc50d6..33e24ec 100644
--- a/tests/framework/widgets/ListViewTest.php
+++ b/tests/framework/widgets/ListViewTest.php
@@ -7,8 +7,8 @@
 
 namespace yiiunit\framework\widgets;
 
-use Yii;
 use yii\data\ArrayDataProvider;
+use yii\data\DataProviderInterface;
 use yii\widgets\ListView;
 use yiiunit\TestCase;
 
@@ -25,39 +25,43 @@ class ListViewTest extends TestCase
 
     public function testEmptyListShown()
     {
-        $actual = $this->getListView([
+        $out = $this->getListView([
             'dataProvider' => new ArrayDataProvider(['allModels' => []]),
             'emptyText' => 'Nothing at all',
         ])->run();
 
-        $this->assertEqualsWithoutLE('<div id="w0" class="list-view"><div class="empty">Nothing at all</div></div>', $actual);
+        $this->assertEqualsWithoutLE('<div id="w0" class="list-view"><div class="empty">Nothing at all</div></div>', $out);
     }
 
     public function testEmpty()
     {
-        $actual = $this->getListView([
+        $out = $this->getListView([
             'dataProvider' => new ArrayDataProvider(['allModels' => []]),
             'emptyText' => false,
         ])->run();
 
-        $this->assertEqualsWithoutLE('<div id="w0" class="list-view"></div>', $actual);
+        $this->assertEqualsWithoutLE('<div id="w0" class="list-view"></div>', $out);
     }
 
     public function testEmptyListNotShown()
     {
-        $actual = $this->getListView([
+        $out = $this->getListView([
             'dataProvider' => new ArrayDataProvider(['allModels' => []]),
             'showOnEmpty' => true,
         ])->run();
 
-        $expected = <<<'HTML'
+        $this->assertEqualsWithoutLE(<<<'HTML'
 <div id="w0" class="list-view">
 
 </div>
-HTML;
-        $this->assertEqualsWithoutLE($expected, $actual);
+HTML
+        , $out);
     }
 
+    /**
+     * @param array $options
+     * @return ListView
+     */
     private function getListView($options = [])
     {
         return new ListView(array_merge([
@@ -66,6 +70,9 @@ HTML;
         ], $options));
     }
 
+    /**
+     * @return DataProviderInterface
+     */
     private function getDataProvider()
     {
         return new ArrayDataProvider([
@@ -79,29 +86,28 @@ HTML;
 
     public function testSimplyListView()
     {
-        $actual = $this->getListView()->run();
+        $out = $this->getListView()->run();
 
-        $expected = <<<'HTML'
+        $this->assertEqualsWithoutLE(<<<'HTML'
 <div id="w0" class="list-view"><div class="summary">Showing <b>1-3</b> of <b>3</b> items.</div>
 <div data-key="0">0</div>
 <div data-key="1">1</div>
 <div data-key="2">2</div>
 </div>
-HTML;
-        
-        $this->assertEqualsWithoutLE($expected, $actual);
+HTML
+        , $out);
     }
 
     public function testWidgetOptions()
     {
-        $actual = $this->getListView(['options' => ['class' => 'test-passed'], 'separator' => ''])->run();
+        $out = $this->getListView(['options' => ['class' => 'test-passed'], 'separator' => ''])->run();
 
-        $expected = <<<'HTML'
+        $this->assertEqualsWithoutLE(<<<'HTML'
 <div id="w0" class="test-passed"><div class="summary">Showing <b>1-3</b> of <b>3</b> items.</div>
 <div data-key="0">0</div><div data-key="1">1</div><div data-key="2">2</div>
 </div>
-HTML;
-        $this->assertEqualsWithoutLE($expected, $actual);
+HTML
+        , $out);
     }
 
     public function itemViewOptions()
@@ -138,11 +144,14 @@ HTML;
 
     /**
      * @dataProvider itemViewOptions
+     * @param mixed $itemView
+     * @param string $expected
      */
     public function testItemViewOptions($itemView, $expected)
     {
-        $actual = $this->getListView(['itemView' => $itemView])->run();
-        $this->assertEqualsWithoutLE($expected, $actual);
+        $out = $this->getListView(['itemView' => $itemView])->run();
+
+        $this->assertEqualsWithoutLE($expected, $out);
     }
 
     public function itemOptions()
@@ -179,11 +188,14 @@ HTML;
 
     /**
      * @dataProvider itemOptions
+     * @param mixed $itemOptions
+     * @param string $expected
      */
     public function testItemOptions($itemOptions, $expected)
     {
-        $actual = $this->getListView(['itemOptions' => $itemOptions])->run();
-        $this->assertEqualsWithoutLE($expected, $actual);
+        $out = $this->getListView(['itemOptions' => $itemOptions])->run();
+
+        $this->assertEqualsWithoutLE($expected, $out);
     }
 
     public function testBeforeAndAfterItem()
@@ -199,12 +211,13 @@ HTML;
             $widget = get_class($widget);
             return "<!-- after: {$model['id']}, key: $key, index: $index, widget: $widget -->";
         };
-        $actual = $this->getListView([
+
+        $out = $this->getListView([
             'beforeItem' => $before,
             'afterItem' => $after,
         ])->run();
 
-        $expected = <<<'HTML'
+        $this->assertEqualsWithoutLE(<<<HTML
 <div id="w0" class="list-view"><div class="summary">Showing <b>1-3</b> of <b>3</b> items.</div>
 <!-- before: 1, key: 0, index: 0, widget: yii\widgets\ListView -->
 <div data-key="0">0</div>
@@ -215,7 +228,23 @@ HTML;
 <div data-key="2">2</div>
 <!-- after: 3, key: 2, index: 2, widget: yii\widgets\ListView -->
 </div>
-HTML;
-        $this->assertEqualsWithoutLE($expected, $actual);
+HTML
+    , $out
+);
+    }
+
+    /**
+     * @see https://github.com/yiisoft/yii2/pull/14596
+     */
+    public function testShouldTriggerInitEvent()
+    {
+        $initTriggered = false;
+        $this->getListView([
+            'on init' => function () use (&$initTriggered) {
+                $initTriggered = true;
+            },
+            'dataProvider' => new ArrayDataProvider(['allModels' => []]),
+        ]);
+        $this->assertTrue($initTriggered);
     }
 }
diff --git a/tests/js/data/yii.activeForm.html b/tests/js/data/yii.activeForm.html
new file mode 100644
index 0000000..912c549
--- /dev/null
+++ b/tests/js/data/yii.activeForm.html
@@ -0,0 +1,3 @@
+<form id="w0">
+    <input id="name" type="text" name="name" value="">
+</form>
diff --git a/tests/js/tests/yii.activeForm.test.js b/tests/js/tests/yii.activeForm.test.js
new file mode 100644
index 0000000..3981599
--- /dev/null
+++ b/tests/js/tests/yii.activeForm.test.js
@@ -0,0 +1,118 @@
+var assert = require('chai').assert;
+var sinon;
+var jsdom = require('mocha-jsdom');
+
+var fs = require('fs');
+var vm = require('vm');
+
+describe('yii.activeForm', function () {
+    var yiiActiveFormPath = 'framework/assets/yii.activeForm.js';
+    var yiiPath = 'framework/assets/yii.js';
+    var jQueryPath = 'vendor/bower-asset/jquery/dist/jquery.js';
+    var $;
+    var $activeForm;
+
+    function registerYii() {
+        var code = fs.readFileSync(yiiPath);
+        var script = new vm.Script(code);
+        var sandbox = {window: window, jQuery: $};
+        var context = new vm.createContext(sandbox);
+        script.runInContext(context);
+        return sandbox.window.yii;
+    }
+
+    function registerTestableCode() {
+        var yii = registerYii();
+        var code = fs.readFileSync(yiiActiveFormPath);
+        var script = new vm.Script(code);
+        var context = new vm.createContext({window: window, document: window.document, yii: yii});
+        script.runInContext(context);
+    }
+
+    var activeFormHtml = fs.readFileSync('tests/js/data/yii.activeForm.html', 'utf-8');
+    var html = '<!doctype html><html><head><meta charset="utf-8"></head><body>' + activeFormHtml + '</body></html>';
+
+    jsdom({
+        html: html,
+        src: fs.readFileSync(jQueryPath, 'utf-8')
+    });
+
+    before(function () {
+        $ = window.$;
+        registerTestableCode();
+        sinon = require('sinon');
+    });
+
+    describe('validate method', function () {
+        var windowSetTimeoutStub;
+        var afterValidateSpy;
+
+        beforeEach(function () {
+            windowSetTimeoutStub = sinon.stub(window, 'setTimeout', function (callback) {
+                callback();
+            });
+            afterValidateSpy = sinon.spy();
+        });
+
+        afterEach(function () {
+            windowSetTimeoutStub.restore();
+            afterValidateSpy.reset();
+        });
+
+        describe('with forceValidate parameter set to true', function () {
+            it('should trigger manual form validation', function () {
+                var inputId = 'name';
+
+                $activeForm = $('#w0');
+                $activeForm.yiiActiveForm([
+                    {
+                        id: inputId,
+                        input: '#' + inputId
+                    }
+                ]).on('afterValidate', afterValidateSpy);
+
+                $activeForm.yiiActiveForm('validate', true);
+                // https://github.com/yiisoft/yii2/issues/14510
+                assert.isTrue($activeForm.data('yiiActiveForm').validated);
+                // https://github.com/yiisoft/yii2/issues/14186
+                assert.isTrue(afterValidateSpy.calledOnce);
+            });
+        });
+    });
+
+    describe('events', function () {
+        describe('afterValidateAttribute', function () {
+            var afterValidateAttributeSpy;
+            var eventData;
+
+            before(function () {
+                afterValidateAttributeSpy = sinon.spy(function (event, data) {
+                    eventData = data;
+                });
+            });
+
+            after(function () {
+                afterValidateAttributeSpy.reset();
+            });
+
+            // https://github.com/yiisoft/yii2/issues/14318
+
+            it('should allow to get updated attribute value', function () {
+                var inputId = 'name';
+                var $input = $('#' + inputId);
+
+                $activeForm = $('#w0');
+                $activeForm.yiiActiveForm([
+                    {
+                        id: inputId,
+                        input: '#' + inputId
+                    }
+                ]).on('afterValidateAttribute', afterValidateAttributeSpy);
+
+                $input.val('New value');
+                $activeForm.yiiActiveForm('updateAttribute', inputId);
+                assert.equal('New value', eventData.value);
+            });
+        });
+    });
+});
diff --git a/tests/runtime/.gitignore b/tests/runtime/.gitignore
index 5e31724..40f6bf6 100644
--- a/tests/runtime/.gitignore
+++ b/tests/runtime/.gitignore
@@ -1,3 +1,3 @@
 *
 !.gitignore
-!/coveralls/.gitkeep
+!/assets/
diff --git a/tests/runtime/assets/.gitignore b/tests/runtime/assets/.gitignore
index f59ec20..d6b7ef3 100644
--- a/tests/runtime/assets/.gitignore
+++ b/tests/runtime/assets/.gitignore
@@ -1 +1,2 @@
-*
\ No newline at end of file
+*
+!.gitignore