Merge pull request #2605 branch 'feature' of https://github.com/mongosoft/yii2 into code-style

* 'feature' of https://github.com/mongosoft/yii2:
  returned back formatting language files
  code style. WHILE
  code style. FOR
  code style. FOREACH
  code style. operator IF
  @param, @var, @property and @return must declare types as boolean, integer, string, array or null
  short echo tags
  short array syntax

Conflicts:
	extensions/apidoc/commands/RenderController.php
	extensions/apidoc/models/BaseDoc.php
	extensions/apidoc/models/Context.php
	extensions/apidoc/templates/bootstrap/Renderer.php
	extensions/apidoc/templates/bootstrap/layouts/guide.php
	extensions/apidoc/templates/bootstrap/layouts/main.php
	extensions/apidoc/templates/bootstrap/views/index.php
	extensions/apidoc/templates/html/Renderer.php
	extensions/apidoc/templates/offline/views/index.php
	extensions/apidoc/templates/offline/views/offline.php
	extensions/apidoc/templates/online/views/index.php
	extensions/elasticsearch/Connection.php
	extensions/redis/ActiveQuery.php
	framework/base/ErrorException.php
	framework/helpers/BaseFileHelper.php
	tests/unit/framework/helpers/FileHelperTest.php

NavBar.php

@@ -70,7 +70,7 @@ class NavBar extends Widget
 	 */
 	public $screenReaderToggleText = 'Toggle navigation';
 	/**
-	 * @var bool whether the navbar content should be included in an inner div container which by default
+	 * @var boolean whether the navbar content should be included in an inner div container which by default
 	 * adds left and right padding. Set this to false for a 100% width navbar.
 	 */
 	public $renderInnerContainer = true;

Progress.php

@@ -133,7 +133,7 @@ class Progress extends Widget
 
 	/**
 	 * Generates a bar
-	 * @param int $percent the percentage of the bar
+	 * @param integer $percent the percentage of the bar
 	 * @param string $label, optional, the label to display at the bar
 	 * @param array $options the HTML attributes of the bar
 	 * @return string the rendering result.