jclaveau / php-logical-filter

src/Filterer/FiltererInterface.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      * @param LogicalFilter $filter
      * @param Iterable      $data_to_filter
      */
-    public function apply( LogicalFilter $filter, $tree_to_filter, $options=[] );
+    public function apply(LogicalFilter $filter, $tree_to_filter, $options = []);
 
     public function validateRule($field, $operator, $value, $row, array $path, $all_operands, $options);
 

src/Filterer/CustomizableFilterer.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
     /**
      */
-    public function __construct( callable $rule_validator )
+    public function __construct(callable $rule_validator)
     {
         $this->rule_validator = $rule_validator;
     }
@@ -25,7 +25,7 @@ 
      */
     public function validateRule($field, $operator, $value, $row, array $path, $all_operands, $options)
     {
-        return call_user_func_array( $this->rule_validator, get_defined_vars() );
+        return call_user_func_array($this->rule_validator, get_defined_vars());
     }
 
     /**/

src/Converter/ConverterInterface.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     /**
      * @param LogicalFilter $filter
      */
-    public function convert( LogicalFilter $filter );
+    public function convert(LogicalFilter $filter);
 
     /**/
 }

src/Converter/MinimalConverter.php

Indentation +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
                 foreach ($operandsByOperator as $operator => $operandsOfOperator) {
                     if (count($operandsOfOperator) != 1) {
                         throw new \RuntimeException(
-                             "Once a logical filter is simplified, there MUST be "
+                                "Once a logical filter is simplified, there MUST be "
                             ."no more than one operand by operator instead of for '$field' / '$operator': "
                             .var_export($operandsOfOperator, true)
                         );

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
     /**
      * @param LogicalFilter $filter
      */
-    public function convert( LogicalFilter $filter )
+    public function convert(LogicalFilter $filter)
     {
         $rootOr = $filter->simplify(['force_logical_core' => true])->getRules();
 
@@ -44,7 +44,7 @@ 
                         );
                     }
 
-                    $operandsByFields[ $field ][ $operator ] = $operandsOfOperator[0];
+                    $operandsByFields[$field][$operator] = $operandsOfOperator[0];
                 }
             }
 

src/Converter/CustomizableMinimalConverter.php

Spacing +3 added lines, -3 removed lines

@@ -30,14 +30,14 @@ 
      */
     public function onOpenOr()
     {
-        call_user_func( $this->callbacks[ __FUNCTION__ ] );
+        call_user_func($this->callbacks[__FUNCTION__]);
     }
 
     /**
      */
     public function onCloseOr()
     {
-        call_user_func( $this->callbacks[ __FUNCTION__ ] );
+        call_user_func($this->callbacks[__FUNCTION__]);
     }
 
     /**
@@ -47,7 +47,7 @@ 
     public function onAndPossibility($field, $operator, $operand, array $allOperandsByField)
     {
         call_user_func(
-            $this->callbacks[ __FUNCTION__ ],
+            $this->callbacks[__FUNCTION__],
             $field,
             $operator,
             $operand,

src/Converter/ElasticSearchMinimalConverter.php

Indentation +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
                 // https://www.elastic.co/guide/en/elasticsearch/guide/current/_dealing_with_null_values.html#_missing_query
                 $new_rule = [
                     'missing' => [
-                         'field' => $field,
+                            'field' => $field,
                     ],
                 ];
             }
@@ -105,7 +105,7 @@ 
             // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-query.html
             $new_rule = [
                 'exists' => [
-                     'field' => $field,
+                        'field' => $field,
                 ],
             ];
         }
@@ -113,7 +113,7 @@ 
             // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-query.html
             $new_rule = [
                 'regexp' => [
-                     $field => [
+                        $field => [
                         'value' => $operand->getPattern()
                         // 'flags' => 'INTERSECTION|COMPLEMENT|EMPTY',
                         // 'max_determinized_states' => 2000

Braces +9 added lines, -18 removed lines

@@ -67,23 +67,20 @@ 
                          'field' => $field,
                     ],
                 ];
-            }
-            else {
+            } else {
                 $new_rule = [
                     'term' => [
                         $field => $operand->getValue()
                     ]
                 ];
             }
-        }
-        elseif ($operator == 'in') {
+        } elseif ($operator == 'in') {
             $new_rule = [
                 'terms' => [
                     $field => $operand->getPossibilities()
                 ]
             ];
-        }
-        elseif ($operator == '<') {
+        } elseif ($operator == '<') {
             $new_rule = [
                 'range' => [
                     $field => [
@@ -91,8 +88,7 @@ 
                     ],
                 ]
             ];
-        }
-        elseif ($operator == '>') {
+        } elseif ($operator == '>') {
             $new_rule = [
                 'range' => [
                     $field => [
@@ -100,8 +96,7 @@ 
                     ],
                 ]
             ];
-        }
-        elseif ($operator == '<=') {
+        } elseif ($operator == '<=') {
             $new_rule = [
                 'range' => [
                     $field => [
@@ -109,8 +104,7 @@ 
                     ],
                 ]
             ];
-        }
-        elseif ($operator == '>=') {
+        } elseif ($operator == '>=') {
             $new_rule = [
                 'range' => [
                     $field => [
@@ -118,16 +112,14 @@ 
                     ],
                 ]
             ];
-        }
-        elseif ($operator == '!=' && $operand->getValue() === null) {
+        } elseif ($operator == '!=' && $operand->getValue() === null) {
             // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-query.html
             $new_rule = [
                 'exists' => [
                      'field' => $field,
                 ],
             ];
-        }
-        elseif ($operator == 'regexp') {
+        } elseif ($operator == 'regexp') {
             // https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-query.html
             $new_rule = [
                 'regexp' => [
@@ -138,8 +130,7 @@ 
                     ],
                 ],
             ];
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException(
                 "Unhandled operator '$operator' during ES query generation"
             );

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
     /**
      * @param LogicalFilter $filter
      */
-    public function convert( LogicalFilter $filter )
+    public function convert(LogicalFilter $filter)
     {
         $this->output = [
         ];
@@ -162,7 +162,7 @@ 
     protected function appendToLastOrOperandKey($rule)
     {
         $last_key                                    = $this->getLastOrOperandKey();
-        $this->output[ $last_key ]['bool']['must'][] = $rule;
+        $this->output[$last_key]['bool']['must'][] = $rule;
     }
 
     /**/

src/Rule/BetweenOrEqualBothRule.php

Spacing +3 added lines, -3 removed lines

@@ -14,10 +14,10 @@
 
     /**
      */
-    public function __construct( $field, array $limits )
+    public function __construct($field, array $limits)
     {
-        $this->addOperand( new AboveOrEqualRule($field, $limits[0]) );
-        $this->addOperand( new BelowOrEqualRule($field, $limits[1]) );
+        $this->addOperand(new AboveOrEqualRule($field, $limits[0]));
+        $this->addOperand(new BelowOrEqualRule($field, $limits[1]));
     }
 
     /**

src/Rule/Trait_RuleWithOptions.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
     /**
      */
-    public function getOption($name, array $contextual_options=[])
+    public function getOption($name, array $contextual_options = [])
     {
         $options = $this->getOptions($contextual_options);
 
@@ -39,7 +39,7 @@ 
     /**
      * @param $contextual_options
      */
-    public function getOptions(array $contextual_options=[])
+    public function getOptions(array $contextual_options = [])
     {
         $default_options = LogicalFilter::getDefaultOptions();
 

src/Rule/EqualRule.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
      * @param string $field The field to apply the rule on.
      * @param array  $value The value the field can equal to.
      */
-    public function __construct( $field, $value )
+    public function __construct($field, $value)
     {
         $this->field = $field;
         $this->value = $value;
@@ -42,7 +42,7 @@ 
      *
      * @return bool
      */
-    public function hasSolution(array $contextual_options=[])
+    public function hasSolution(array $contextual_options = [])
     {
         return true;
     }