* 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
* master: (59 commits)
updated ext composer.json for issue labels
moved redis to extensions
fixed whitespaces
update composer to include sphinx
Added initial steps about configuring DB-based RBAC
Fixes#1297: CSRF not generated on error pages
fixes#1158 mentioned @web alias in docs
Merged RBAC draft into authorization
"yii\sphinx\ActiveQuery" updated to throw exception on conflict between "asArray" and "snippetByModel" options.
Code style and docs at "yii\sphinx\*" fixed.
Docs for Sphinx extension updated.
Redundant typecast removed from yii\sphinx\ActiveRecord::create()
yii\sphinx\Command reworked to extend yii\db\Command. yii\sphinx\DataReader removed.
Sphinx Active Record updated to be compatible with ActiveDataProvider.
Sphinx documentation updated.
Sphinx documentation updated.
Sphinx has many relation test prepared.
Sphinx Query refactored.
Create relation methods added to Sphinx Active Record.
Sphinx Query Builder updated to respect column types for where statements
...
