* 'master' of github.com:yiisoft/yii2: (79 commits)
Refactored app bootstrap logic.
Update authorization.md
Fixes#3052: Fixed the issue that cache dependency data is not reused when `reusable` is set true
start debug logging only if debug runs when bootstrap.
Update finnish translation
Add ODBC support to yii\db\Connection
updated error handler and requirement checker links.
fixed broken API links [skip ci]
added more doc [skip ci]
update class map.
Fixes#2034: Added `ContentNegotiator` to support response format and language negotiation
renamed attributes to attributeNames in model
updated phpdoc
Removed `Application::preload` in favor of `Application::bootstrap`
Update module-debug.md
Update model.md
Fixes
Update basics.md
typo fix [skip ci]
Added `HtmlResponseFormatter` and `JsonResponseFormatter`
...
* '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
allow extending only one class to add scopes, fixes#2146
TODO:
- [ ] adjust guide docs
- [ ] adjust README files of extensions
- [ ] finish work and fix test breaks
