phayes / elasticentityquery

src/QueryAggregate.php

Braces +3 added lines, -6 removed lines

@@ -18,8 +18,7 @@ 
         foreach ($agg['buckets'] as $bucket) {
           $res = array_merge($res, $this->getResultFromBucket($bucket, $group_field));
         }
-      }
-      else {
+      } else {
         $res[] = [$group_field => $agg['value']];
       }
     }
@@ -91,8 +90,7 @@ 
         $group_by[$group['field']]['terms']['field'] = $group['field'];
         if ($prev) {
           $group_by[$group['field']]['aggs'] = $prev;
-        }
-        elseif (!empty($aggregates)) {
+        } elseif (!empty($aggregates)) {
           $group_by[$group['field']]['aggs'] = $aggregates;
           
           // Sort by aggregate values
@@ -119,8 +117,7 @@ 
         $prev = $group_by;
       }
       $params['body']['aggs'] = $group_by;
-    }
-    elseif (!empty($aggregates)) {
+    } elseif (!empty($aggregates)) {
       // Aggregate without grouping. Will only ever produce one result since it's aggregating on the whole dataset.
       $params['body']['aggs'] = $aggregates;
     }

src/Query.php

Spacing +4 added lines, -4 removed lines

@@ -260,19 +260,19 @@
       }
       elseif ($operator == "ENDS_WITH" && $conjunction == "AND") {
         //TODO: WARNING THIS IS EXPENSIVE
-        $bool['filter'][] = ['wildcard' => [$field => '*'.$value]];
+        $bool['filter'][] = ['wildcard' => [$field => '*' . $value]];
       }
       elseif ($operator == "ENDS_WITH" && $conjunction == "OR") {
         //TODO: WARNING THIS IS EXPENSIVE
-        $bool['should'][] = ['wildcard' => [$field => '*'.$value]];
+        $bool['should'][] = ['wildcard' => [$field => '*' . $value]];
       }
       elseif ($operator == "CONTAINS" && $conjunction == "AND") {
         //TODO: WARNING THIS IS EXPENSIVE
-        $bool['filter'][] = ['wildcard' => [$field => '*'.$value.'*']];
+        $bool['filter'][] = ['wildcard' => [$field => '*' . $value . '*']];
       }
       elseif ($operator == "CONTAINS" && $conjunction == "OR") {
         //TODO: WARNING THIS IS EXPENSIVE
-        $bool['should'][] = ['wildcard' => [$field => '*'.$value.'*']];
+        $bool['should'][] = ['wildcard' => [$field => '*' . $value . '*']];
       }
     }
 

Indentation +2 added lines, -2 removed lines

@@ -125,8 +125,8 @@
 
     // For regular (non-count) queries    
     if (!$this->count) {
-       // Don't include source
-       $params['body']['_source'] = $this->includeSource();
+        // Don't include source
+        $params['body']['_source'] = $this->includeSource();
     }
 
     // Top-level condition

Braces +31 added lines, -62 removed lines

@@ -79,8 +79,7 @@ 
 
     if ($this->count) {
       return $result['count'];
-    }
-    else {
+    } else {
       // TODO: support for revisions? See https://api.drupal.org/api/drupal/core%21lib%21Drupal%21Core%21Entity%21Query%21QueryInterface.php/function/QueryInterface%3A%3Aexecute/8.2.x
       $results = array();
       foreach ($result['hits']['hits'] as $hit) {
@@ -94,8 +93,7 @@ 
     $params = $this->buildRequest();
     if ($this->count) {
       $result = $this->client->count($params);
-    }
-    else {
+    } else {
       $result = $this->client->search($params);
     }
     
@@ -176,104 +174,75 @@ 
 
       if (is_object($field) && $conjunction == "AND") {
         $bool['filter'][] = ['bool' => $this->getElasticFilterItem($field)];
-      }
-      elseif (is_object($field) && $conjunction == "AND") {
+      } elseif (is_object($field) && $conjunction == "AND") {
         $bool['should'][] = ['bool' => $this->getElasticFilterItem($field)];
-      }
-      elseif ($operator == "=" && $conjunction == "AND") {
+      } elseif ($operator == "=" && $conjunction == "AND") {
         $bool['filter'][] = ['term' => [$field => $value]];
-      }
-      elseif ($operator == "=" && $conjunction == "OR") {
+      } elseif ($operator == "=" && $conjunction == "OR") {
         $bool['should'][] = ['term' => [$field => $value]];
-      }
-      elseif (($operator == "<>" || $operator == "!=") && $conjunction == "AND") {
+      } elseif (($operator == "<>" || $operator == "!=") && $conjunction == "AND") {
         $bool['must_not'][] = ['term' => [$field => $value]];
-      }
-      elseif (($operator == "<>" || $operator == "!=") && $conjunction == "OR") {
+      } elseif (($operator == "<>" || $operator == "!=") && $conjunction == "OR") {
         $bool['should'][] = ['bool' => ['must_not' => ['term' => [$field => $value]]]];
-      }
-      elseif ($operator == "IN" && $conjunction == "AND") {
+      } elseif ($operator == "IN" && $conjunction == "AND") {
         $bool['filter'][] = ['terms' => [$field => $value]];
-      }
-      elseif ($operator == "IN" && $conjunction == "OR") {
+      } elseif ($operator == "IN" && $conjunction == "OR") {
         $bool['should'][] = ['terms' => [$field => $value]];
-      }
-      elseif ($operator == "NOT IN" && $conjunction == "AND") {
+      } elseif ($operator == "NOT IN" && $conjunction == "AND") {
         $bool['must_not'][] = ['terms' => [$field => $value]];
-      }
-      elseif ($operator == "NOT IN" && $conjunction == "OR") {
+      } elseif ($operator == "NOT IN" && $conjunction == "OR") {
         $bool['should'][] = ['bool' => ['must_not' => ['terms' => [$field => $value]]]];
-      }
-      elseif ($operator == "IS NULL" && $conjunction == "AND") {
+      } elseif ($operator == "IS NULL" && $conjunction == "AND") {
         $bool['must_not'][] = ['exists' => ['field' => $field]];
-      }
-      elseif ($operator == "IS NULL" && $conjunction == "OR") {
+      } elseif ($operator == "IS NULL" && $conjunction == "OR") {
         $bool['should'][] = ['bool' => ['must_not' => ['exists' => ['field' => $field]]]];
-      }
-      elseif ($operator == "IS NOT NULL" && $conjunction == "AND") {
+      } elseif ($operator == "IS NOT NULL" && $conjunction == "AND") {
         $bool['filter'][] = ['exists' => ['field' => $field]];
-      }
-      elseif ($operator == "IS NOT NULL" && $conjunction == "OR") {
+      } elseif ($operator == "IS NOT NULL" && $conjunction == "OR") {
         $bool['should'][] = ['exists' => ['field' => $field]];
-      }
-      elseif ($operator == ">" && $conjunction == "AND") {
+      } elseif ($operator == ">" && $conjunction == "AND") {
         $bool['filter'][] = ['range' => [$field => ['gt' => $value]]];
-      }
-      elseif ($operator == ">" && $conjunction == "OR") {
+      } elseif ($operator == ">" && $conjunction == "OR") {
         $bool['should'][] = ['range' => [$field => ['gt' => $value]]];
-      }
-      elseif ($operator == ">=" && $conjunction == "AND") {
+      } elseif ($operator == ">=" && $conjunction == "AND") {
         $bool['filter'][] = ['range' => [$field => ['gte' => $value]]];
-      }
-      elseif ($operator == ">=" && $conjunction == "OR") {
+      } elseif ($operator == ">=" && $conjunction == "OR") {
         $bool['should'][] = ['range' => [$field => ['gte' => $value]]];
-      }
-      elseif ($operator == "<" && $conjunction == "AND") {
+      } elseif ($operator == "<" && $conjunction == "AND") {
         $bool['filter'][] = ['range' => [$field => ['lt' => $value]]];
-      }
-      elseif ($operator == "<" && $conjunction == "OR") {
+      } elseif ($operator == "<" && $conjunction == "OR") {
         $bool['should'][] = ['range' => [$field => ['lt' => $value]]];
-      }
-      elseif ($operator == "<=" && $conjunction == "AND") {
+      } elseif ($operator == "<=" && $conjunction == "AND") {
         $bool['filter'][] = ['range' => [$field => ['lte' => $value]]];
-      }
-      elseif ($operator == "<=" && $conjunction == "OR") {
+      } elseif ($operator == "<=" && $conjunction == "OR") {
         $bool['should'][] = ['range' => [$field => ['lte' => $value]]];
-      }
-      elseif ($operator == "BETWEEN") {
+      } elseif ($operator == "BETWEEN") {
         natsort($value);
         if ($conjunction == "AND") {
           $bool['filter'][] = ['range' => [$field => [
             'gt' => $value[0],
             'lt' => $value[1],
           ]]];
-        }
-        elseif ($conjunction == "OR") {
+        } elseif ($conjunction == "OR") {
           $bool['should'][] = ['range' => [$field => [
             'gt' => $value[0],
             'lt' => $value[1],
           ]]];
         }
-      }
-      elseif ($operator == "STARTS_WITH" && $conjunction == "AND") {
+      } elseif ($operator == "STARTS_WITH" && $conjunction == "AND") {
         $bool['filter'][] = ['prefix' => [$field => $value]];
-      }
-      elseif ($operator == "STARTS_WITH" && $conjunction == "OR") {
+      } elseif ($operator == "STARTS_WITH" && $conjunction == "OR") {
         $bool['should'][] = ['prefix' => [$field => $value]];
-      }
-      elseif ($operator == "ENDS_WITH" && $conjunction == "AND") {
+      } elseif ($operator == "ENDS_WITH" && $conjunction == "AND") {
         //TODO: WARNING THIS IS EXPENSIVE
         $bool['filter'][] = ['wildcard' => [$field => '*'.$value]];
-      }
-      elseif ($operator == "ENDS_WITH" && $conjunction == "OR") {
+      } elseif ($operator == "ENDS_WITH" && $conjunction == "OR") {
         //TODO: WARNING THIS IS EXPENSIVE
         $bool['should'][] = ['wildcard' => [$field => '*'.$value]];
-      }
-      elseif ($operator == "CONTAINS" && $conjunction == "AND") {
+      } elseif ($operator == "CONTAINS" && $conjunction == "AND") {
         //TODO: WARNING THIS IS EXPENSIVE
         $bool['filter'][] = ['wildcard' => [$field => '*'.$value.'*']];
-      }
-      elseif ($operator == "CONTAINS" && $conjunction == "OR") {
+      } elseif ($operator == "CONTAINS" && $conjunction == "OR") {
         //TODO: WARNING THIS IS EXPENSIVE
         $bool['should'][] = ['wildcard' => [$field => '*'.$value.'*']];
       }

src/Elastic.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
  */
 class Elastic {
 
-  public static function client($config =[]) {
+  public static function client($config = []) {
     static $client; 
     if (!empty($client)) {
       return $client;