From 654c2aa703e7238cacc2671a01fca51a25d1f3d4 Mon Sep 17 00:00:00 2001
From: Martynas Sudintas <martynas.sudintas@ongr.io>
Date: Wed, 29 Apr 2015 13:40:34 +0300
Subject: [PATCH] OrFilter is now extending AndFilter
---
Filter/OrFilter.php | 37 +++----------------------------------
1 file changed, 3 insertions(+), 34 deletions(-)
diff --git a/Filter/OrFilter.php b/Filter/OrFilter.php
index b85cc18..6825f23 100644
--- a/Filter/OrFilter.php
+++ b/Filter/OrFilter.php
@@ -16,26 +16,11 @@ use ONGR\ElasticsearchBundle\DSL\ParametersTrait;
/**
* Represents Elasticsearch "or" filter.
+ *
+ * @link http://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-or-filter.html
*/
-class OrFilter implements BuilderInterface
+class OrFilter extends AndFilter
{
- use ParametersTrait;
-
- /**
- * @var BuilderInterface[]
- */
- private $filters;
-
- /**
- * @param BuilderInterface[] $filters Filters.
- * @param array $parameters Optional parameters.
- */
- public function __construct($filters, array $parameters = [])
- {
- $this->filters = $filters;
- $this->setParameters($parameters);
- }
-
/**
* {@inheritdoc}
*/
@@ -43,20 +28,4 @@ class OrFilter implements BuilderInterface
{
return 'or';
}
-
- /**
- * {@inheritdoc}
- */
- public function toArray()
- {
- $query = [];
-
- foreach ($this->filters as $filter) {
- $query['filters'][] = [$filter->getType() => $filter->toArray()];
- }
-
- $output = $this->processArray($query);
-
- return $output;
- }
}
--
GitLab