* query-filter:
added CHANGELOG lines
added tests for redis
added proper tests for elasticsearch
removed unnecessary code duplication
adjusted tests
typo
renamed Query::filter() to Query::filterWhere()
reverted elasticsearch rename of filter
Adjusted search model code generated by Gii CRUD generator
Added support for arbitrary number of parameters for NOT, AND, OR in filter methods of Query
Gii CRUD generator now uses new addFilter method
Query::filter() adjustments
fixes#2002
Added tests for Query::filter()
Conflicts:
framework/db/QueryTrait.php
* '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
