* '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
* 'master' of github.com:yiisoft/yii2: (40 commits)
Fixes#2624: Html::textArea() should respect "name" option.
Removed unused "use" statements
Changed "and" to "&&"
Used ternary operator instead of "or" for constant definition
Removed unused variables
Removed executable flag from asset files
Changelog for #2607
Added note about overriding asset bundles according to #2556
Added some documentation to new pjax attribute
Add unit tests
typo fix.
Update MessageController.php
Update MessageController.php
add findAndModify() method to the Collection class
Add an option to ignore pjax request on some links.
fix code style php5.4 syntax
Inline control structures are not allowed
fix code style
fix code style
fix typo double `;`, `Each PHP statement must be on a line by itself`
...
