reverted elasticsearch rename of filter

extensions/elasticsearch/Query.php

@@ -92,10 +92,11 @@ class Query extends Component implements QueryInterface
      * @var array|string The filter part of this search query. This is an array or json string that follows the format of
      * the elasticsearch [Query DSL](http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/query-dsl.html).
      */
-    public $filterPart;
+    public $filter;
 
     public $facets = [];
 
+
     public function init()
     {
         parent::init();
@@ -271,7 +272,6 @@ class Query extends Component implements QueryInterface
         foreach ($result['hits']['hits'] as $row) {
             $column[] = isset($row['fields'][$field]) ? $row['fields'][$field] : null;
         }
-
         return $column;
     }
 
@@ -316,7 +316,6 @@ class Query extends Component implements QueryInterface
     public function addFacet($name, $type, $options)
     {
         $this->facets[$name] = [$type => $options];
-
         return $this;
     }
 
@@ -450,7 +449,6 @@ class Query extends Component implements QueryInterface
     public function query($query)
     {
         $this->query = $query;
-
         return $this;
     }
 
@@ -459,10 +457,9 @@ class Query extends Component implements QueryInterface
      * @param  string $filter
      * @return static the query object itself
      */
-    public function filterPart($filter)
+    public function filter($filter)
     {
-        $this->filterPart = $filter;
-
+        $this->filter = $filter;
         return $this;
     }
 
@@ -479,7 +476,6 @@ class Query extends Component implements QueryInterface
     {
         $this->index = $index;
         $this->type = $type;
-
         return $this;
     }
 
@@ -496,7 +492,6 @@ class Query extends Component implements QueryInterface
         } else {
             $this->fields = func_get_args();
         }
-
         return $this;
     }
 
@@ -510,7 +505,6 @@ class Query extends Component implements QueryInterface
     public function timeout($timeout)
     {
         $this->timeout = $timeout;
-
         return $this;
     }
 }

extensions/elasticsearch/QueryBuilder.php

@@ -62,17 +62,17 @@ class QueryBuilder extends \yii\base\Object
         }
 
         $whereFilter = $this->buildCondition($query->where);
-        if (is_string($query->filterPart)) {
+        if (is_string($query->filter)) {
             if (empty($whereFilter)) {
-                $parts['filter'] = $query->filterPart;
+                $parts['filter'] = $query->filter;
             } else {
-                $parts['filter'] = '{"and": [' . $query->filterPart . ', ' . Json::encode($whereFilter) . ']}';
+                $parts['filter'] = '{"and": [' . $query->filter . ', ' . Json::encode($whereFilter) . ']}';
             }
-        } elseif ($query->filterPart !== null) {
+        } elseif ($query->filter !== null) {
             if (empty($whereFilter)) {
-                $parts['filter'] = $query->filterPart;
+                $parts['filter'] = $query->filter;
             } else {
-                $parts['filter'] = ['and' => [$query->filterPart, $whereFilter]];
+                $parts['filter'] = ['and' => [$query->filter, $whereFilter]];
             }
         } elseif (!empty($whereFilter)) {
             $parts['filter'] = $whereFilter;