From fbefdd5a4b619cd9fdd6349934a14a4dd1d9b990 Mon Sep 17 00:00:00 2001
From: Linas Mockus <linas.mockus@ongr.io>
Date: Tue, 9 Dec 2014 13:20:18 +0200
Subject: [PATCH] CS and few scrutinizer issues fixes

---
 Aggregation/RangeAggregation.php    | 2 +-
 Aggregation/Type/BucketingTrait.php | 3 +++
 Aggregation/Type/MetricTrait.php    | 3 +++
 BuilderInterface.php                | 3 +++
 Filter/AbstractFilter.php           | 1 +
 Filter/QueryFilter.php              | 1 +
 Query/FilteredQuery.php             | 3 ++-
 Suggester/Completion.php            | 2 +-
 Suggester/Term.php                  | 2 +-
 9 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Aggregation/RangeAggregation.php b/Aggregation/RangeAggregation.php
index b8ebf15..942e555 100644
--- a/Aggregation/RangeAggregation.php
+++ b/Aggregation/RangeAggregation.php
@@ -49,7 +49,7 @@ class RangeAggregation extends AbstractAggregation
      */
     public function addRange($from = null, $to = null, $key = '')
     {
-        $range  = [];
+        $range = [];
 
         if (!empty($from)) {
             $range['from'] = $from;
diff --git a/Aggregation/Type/BucketingTrait.php b/Aggregation/Type/BucketingTrait.php
index 51a0a8c..b0918e7 100644
--- a/Aggregation/Type/BucketingTrait.php
+++ b/Aggregation/Type/BucketingTrait.php
@@ -11,6 +11,9 @@
 
 namespace ONGR\ElasticsearchBundle\DSL\Aggregation\Type;
 
+/**
+ * Trait used by Aggregations which supports nesting.
+ */
 trait BucketingTrait
 {
     /**
diff --git a/Aggregation/Type/MetricTrait.php b/Aggregation/Type/MetricTrait.php
index 1acafe4..26c1f92 100644
--- a/Aggregation/Type/MetricTrait.php
+++ b/Aggregation/Type/MetricTrait.php
@@ -11,6 +11,9 @@
 
 namespace ONGR\ElasticsearchBundle\DSL\Aggregation\Type;
 
+/**
+ * Trait used by Aggregations which do not support nesting.
+ */
 trait MetricTrait
 {
     /**
diff --git a/BuilderInterface.php b/BuilderInterface.php
index abd3068..cefbfce 100644
--- a/BuilderInterface.php
+++ b/BuilderInterface.php
@@ -11,6 +11,9 @@
 
 namespace ONGR\ElasticsearchBundle\DSL;
 
+/**
+ * Interface BuilderInterface.
+ */
 interface BuilderInterface
 {
     /**
diff --git a/Filter/AbstractFilter.php b/Filter/AbstractFilter.php
index 6a6fe42..662f851 100644
--- a/Filter/AbstractFilter.php
+++ b/Filter/AbstractFilter.php
@@ -74,6 +74,7 @@ abstract class AbstractFilter
      */
     public function toArray()
     {
+        $output = [];
         $output[$this->filters->getType()] = $this->filters->toArray();
 
         return $output;
diff --git a/Filter/QueryFilter.php b/Filter/QueryFilter.php
index 74d0036..1ea4b68 100644
--- a/Filter/QueryFilter.php
+++ b/Filter/QueryFilter.php
@@ -54,6 +54,7 @@ class QueryFilter implements BuilderInterface
     public function toArray()
     {
         if ($this->hasParameter('_cache')) {
+            $query = [];
             $query['query'] = [$this->query->getType() => $this->query->toArray()];
             $output = $this->processArray($query);
 
diff --git a/Query/FilteredQuery.php b/Query/FilteredQuery.php
index 21b1ec4..73b3244 100644
--- a/Query/FilteredQuery.php
+++ b/Query/FilteredQuery.php
@@ -27,7 +27,7 @@ class FilteredQuery extends AbstractFilter implements BuilderInterface
     private $query;
 
     /**
-     * @param Query  $query
+     * @param Query $query
      */
     public function __construct($query = null)
     {
@@ -68,6 +68,7 @@ class FilteredQuery extends AbstractFilter implements BuilderInterface
      */
     public function toArray()
     {
+        $output = [];
         $output['filter'] = parent::toArray();
 
         if ($this->query !== null) {
diff --git a/Suggester/Completion.php b/Suggester/Completion.php
index 697c5bc..767d6bb 100644
--- a/Suggester/Completion.php
+++ b/Suggester/Completion.php
@@ -74,7 +74,7 @@ class Completion extends AbstractSuggester
         );
 
         $completion = [
-            'field' => $this->getField()
+            'field' => $this->getField(),
         ];
 
         if (empty($fuzzy) && $this->isFuzzy()) {
diff --git a/Suggester/Term.php b/Suggester/Term.php
index 283f3f3..f56d4c7 100644
--- a/Suggester/Term.php
+++ b/Suggester/Term.php
@@ -75,7 +75,7 @@ class Term extends AbstractSuggester
                     'size' => $this->getSize(),
                     'term' => $suggester,
                 ]
-            )
+            ),
         ];
     }
 
-- 
GitLab