jclaveau / php-logical-filter

src/LogicalFilter.php

Spacing +86 added lines, -86 removed lines

@@ -51,12 +51,12 @@ 
      *
      * @see self::addRules
      */
-    public function __construct($rules=[], Filterer $default_filterer=null, array $options=[])
+    public function __construct($rules = [], Filterer $default_filterer = null, array $options = [])
     {
         if ($rules instanceof AbstractRule) {
             $rules = $rules->copy();
         }
-        elseif ( ! is_null($rules) && ! is_array($rules)) {
+        elseif (!is_null($rules) && !is_array($rules)) {
             throw new \InvalidArgumentException(
                 "\$rules must be a rules description or an AbstractRule instead of"
                 .var_export($rules, true)
@@ -72,7 +72,7 @@ 
         }
 
         if ($rules) {
-            $this->and_( $rules );
+            $this->and_($rules);
         }
     }
 
@@ -80,7 +80,7 @@ 
      */
     protected function getDefaultFilterer()
     {
-        if ( ! $this->default_filterer) {
+        if (!$this->default_filterer) {
             $this->default_filterer = new PhpFilterer();
         }
 
@@ -138,7 +138,7 @@ 
      * @param  array         $rules_description Rules description
      * @return LogicalFilter $this
      */
-    protected function addRules( $operation, array $rules_description )
+    protected function addRules($operation, array $rules_description)
     {
         if ($rules_description == [null]) {
             // TODO this is due to the bad design of using "Null" instead of
@@ -161,7 +161,7 @@ 
             }
         }
 
-        if (   3 == count($rules_description)
+        if (3 == count($rules_description)
             && is_string($rules_description[0])
             && is_string($rules_description[1])
         ) {
@@ -177,30 +177,30 @@ 
         }
         elseif (count($rules_description) == count(array_filter($rules_description, function($arg) {
             return $arg instanceof LogicalFilter;
-        })) ) {
+        }))) {
             // Already instanciated rules
             foreach ($rules_description as $i => $filter) {
                 $rules = $filter->getRules();
                 if (null !== $rules) {
-                    $this->addRule( $rules, $operation);
+                    $this->addRule($rules, $operation);
                 }
             }
         }
         elseif (count($rules_description) == count(array_filter($rules_description, function($arg) {
             return $arg instanceof AbstractRule;
-        })) ) {
+        }))) {
             // Already instanciated rules
             foreach ($rules_description as $i => $new_rule) {
-                $this->addRule( $new_rule, $operation);
+                $this->addRule($new_rule, $operation);
             }
         }
         elseif (1 == count($rules_description) && is_array($rules_description[0])) {
             if (count($rules_description[0]) == count(array_filter($rules_description[0], function($arg) {
                 return $arg instanceof AbstractRule;
-            })) ) {
+            }))) {
                 // Case of $filter->or_([AbstractRule, AbstractRule, AbstractRule, ...])
                 foreach ($rules_description[0] as $i => $new_rule) {
-                    $this->addRule( $new_rule, $operation );
+                    $this->addRule($new_rule, $operation);
                 }
             }
             else {
@@ -211,7 +211,7 @@ 
                     $fake_root
                 );
 
-                $this->addRule( $fake_root->getOperands()[0], $operation );
+                $this->addRule($fake_root->getOperands()[0], $operation);
             }
         }
         else {
@@ -232,10 +232,10 @@ 
      *
      * @return $this
      */
-    protected function addRule( AbstractRule $rule, $operation=AndRule::operator )
+    protected function addRule(AbstractRule $rule, $operation = AndRule::operator)
     {
-        if ( $this->rules && in_array( get_class($this->rules), [AndRule::class, OrRule::class] )
-            && ! $this->rules->getOperands() ) {
+        if ($this->rules && in_array(get_class($this->rules), [AndRule::class, OrRule::class])
+            && !$this->rules->getOperands()) {
             throw new \LogicException(
                  "You are trying to add rules to a LogicalFilter which had "
                 ."only contradictory rules that have already been simplified: "
@@ -284,7 +284,7 @@ 
         array $rules_composition,
         AbstractOperationRule $recursion_position
     ) {
-        if ( ! array_filter($rules_composition, function ($rule_composition_part) {
+        if (!array_filter($rules_composition, function($rule_composition_part) {
             return is_string($rule_composition_part);
         })) {
             // at least one operator is required for operation rules
@@ -293,13 +293,13 @@ 
                 .var_export($rules_composition, true)
             );
         }
-        elseif ( 3 == count($rules_composition)
-            && ! in_array( AndRule::operator, $rules_composition, true )
-            && ! in_array( OrRule::operator,  $rules_composition, true )
-            && ! in_array( NotRule::operator, $rules_composition, true )
-            && ! in_array( AbstractRule::findSymbolicOperator( AndRule::operator ), $rules_composition, true )
-            && ! in_array( AbstractRule::findSymbolicOperator( OrRule::operator ),  $rules_composition, true )
-            && ! in_array( AbstractRule::findSymbolicOperator( NotRule::operator ), $rules_composition, true )
+        elseif (3 == count($rules_composition)
+            && !in_array(AndRule::operator, $rules_composition, true)
+            && !in_array(OrRule::operator, $rules_composition, true)
+            && !in_array(NotRule::operator, $rules_composition, true)
+            && !in_array(AbstractRule::findSymbolicOperator(AndRule::operator), $rules_composition, true)
+            && !in_array(AbstractRule::findSymbolicOperator(OrRule::operator), $rules_composition, true)
+            && !in_array(AbstractRule::findSymbolicOperator(NotRule::operator), $rules_composition, true)
         ) {
             // atomic or composit rules
             $operand_left  = $rules_composition[0];
@@ -309,20 +309,20 @@ 
             $rule = AbstractRule::generateSimpleRule(
                 $operand_left, $operation, $operand_right, $this->getOptions()
             );
-            $recursion_position->addOperand( $rule );
+            $recursion_position->addOperand($rule);
         }
         else {
             // operations
-            if (   NotRule::operator == $rules_composition[0]
-                || $rules_composition[0] == AbstractRule::findSymbolicOperator( NotRule::operator ) ) {
+            if (NotRule::operator == $rules_composition[0]
+                || $rules_composition[0] == AbstractRule::findSymbolicOperator(NotRule::operator)) {
                 $rule = new NotRule();
             }
-            elseif (in_array( AndRule::operator, $rules_composition )
-                || in_array( AbstractRule::findSymbolicOperator( AndRule::operator ), $rules_composition )) {
+            elseif (in_array(AndRule::operator, $rules_composition)
+                || in_array(AbstractRule::findSymbolicOperator(AndRule::operator), $rules_composition)) {
                 $rule = new AndRule();
             }
-            elseif (in_array( OrRule::operator, $rules_composition )
-                || in_array( AbstractRule::findSymbolicOperator( OrRule::operator ), $rules_composition ) ) {
+            elseif (in_array(OrRule::operator, $rules_composition)
+                || in_array(AbstractRule::findSymbolicOperator(OrRule::operator), $rules_composition)) {
                 $rule = new OrRule();
             }
             else {
@@ -336,8 +336,8 @@ 
 
             $operands_descriptions = array_filter(
                 $rules_composition,
-                function ($operand) use ($operator) {
-                    return ! in_array($operand, [$operator, AbstractRule::findSymbolicOperator( $operator )]);
+                function($operand) use ($operator) {
+                    return !in_array($operand, [$operator, AbstractRule::findSymbolicOperator($operator)]);
                 }
             );
 
@@ -352,7 +352,7 @@ 
 
             foreach ($operands_descriptions as $i => $operands_description) {
                 if (false === $operands_description) {
-                    $operands_descriptions[ $i ] = ['and']; // FalseRule hack
+                    $operands_descriptions[$i] = ['and']; // FalseRule hack
                 }
                 elseif (null === $operands_description || true === $operands_description) {
                     $operands_description = ['and'];
@@ -363,25 +363,25 @@ 
                         );
                     }
 
-                    unset($operands_descriptions[ $i ]);
+                    unset($operands_descriptions[$i]);
                 }
             }
 
             $remaining_operations = array_filter(
                 $operands_descriptions,
                 function($operand) {
-                    return ! is_array($operand)
-                        && ! $operand instanceof AbstractRule
-                        && ! $operand instanceof LogicalFilter
+                    return !is_array($operand)
+                        && !$operand instanceof AbstractRule
+                        && !$operand instanceof LogicalFilter
                         ;
                 }
             );
 
-            if ( ! empty($remaining_operations)) {
+            if (!empty($remaining_operations)) {
                 throw new \InvalidArgumentException(
                     "Mixing different operations in the same rule level not implemented: \n["
                     . implode(', ', $remaining_operations)."]\n"
-                    . 'in ' . var_export($rules_composition, true)
+                    . 'in '.var_export($rules_composition, true)
                 );
             }
 
@@ -407,7 +407,7 @@ 
                 }
             }
 
-            $recursion_position->addOperand( $rule );
+            $recursion_position->addOperand($rule);
         }
 
         return $this;
@@ -436,7 +436,7 @@ 
      */
     public function and_()
     {
-        $this->addRules( AndRule::operator, func_get_args());
+        $this->addRules(AndRule::operator, func_get_args());
         return $this;
     }
 
@@ -464,7 +464,7 @@ 
      */
     public function or_()
     {
-        $this->addRules( OrRule::operator, func_get_args());
+        $this->addRules(OrRule::operator, func_get_args());
         return $this;
     }
 
@@ -511,12 +511,12 @@ 
      * @param  array $options stop_after | stop_before |
      * @return $this
      */
-    public function simplify($options=[])
+    public function simplify($options = [])
     {
         if ($this->rules) {
             // AndRule added to make all Operation methods available
             $this->rules = (new AndRule([$this->rules]))
-                ->simplify( $options )
+                ->simplify($options)
                 // ->dump(true, false)
                 ;
         }
@@ -537,9 +537,9 @@ 
      *
      * @return bool
      */
-    public function hasSolution($save_simplification=true)
+    public function hasSolution($save_simplification = true)
     {
-        if ( ! $this->rules) {
+        if (!$this->rules) {
             return true;
         }
 
@@ -558,7 +558,7 @@ 
      *
      * @return array A description of the rules.
      */
-    public function toArray(array $options=[])
+    public function toArray(array $options = [])
     {
         return $this->rules ? $this->rules->toArray($options) : $this->rules;
     }
@@ -570,7 +570,7 @@ 
      *
      * @return array A description of the rules.
      */
-    public function toString(array $options=[])
+    public function toString(array $options = [])
     {
         return $this->rules ? $this->rules->toString($options) : $this->rules;
     }
@@ -608,7 +608,7 @@ 
      * @param  mixed $row
      * @return bool
      */
-    public function __invoke($row, $key=null)
+    public function __invoke($row, $key = null)
     {
         return $this->validates($row, $key);
     }
@@ -658,8 +658,8 @@ 
             [
                 Filterer::on_row_matches => function($rule, $key, &$rows, $matching_case) use (&$cache_flush_required) {
                     // $rule->dump();
-                    unset( $rows[$key] );
-                    if ( ! $rows ) {
+                    unset($rows[$key]);
+                    if (!$rows) {
                         throw new \Exception(
                              "Removing the only rule $rule from the filter $this "
                             ."produces a case which has no possible solution due to missing "
@@ -695,15 +695,15 @@ 
      *
      * @todo Merge with rules
      */
-    public function keepLeafRulesMatching($filter=[], array $options=[])
+    public function keepLeafRulesMatching($filter = [], array $options = [])
     {
-        $clean_empty_branches = ! isset($options['clean_empty_branches']) || $options['clean_empty_branches'];
+        $clean_empty_branches = !isset($options['clean_empty_branches']) || $options['clean_empty_branches'];
 
         $filter = (new LogicalFilter($filter, new RuleFilterer))
         // ->dump()
         ;
 
-        $options[ Filterer::leaves_only ] = true;
+        $options[Filterer::leaves_only] = true;
 
         $this->rules = (new RuleFilterer)->apply($filter, $this->rules, $options);
         // $this->rules->dump(true);
@@ -719,7 +719,7 @@ 
                 $this->rules,
                 [
                     Filterer::on_row_matches => function($rule, $key, &$rows) {
-                        unset( $rows[$key] );
+                        unset($rows[$key]);
                     },
                     Filterer::on_row_mismatches => function($rule, $key, &$rows) {
                     },
@@ -744,13 +744,13 @@ 
      *
      * @todo Merge with rules
      */
-    public function listLeafRulesMatching($filter=[])
+    public function listLeafRulesMatching($filter = [])
     {
         $filter = (new LogicalFilter($filter, new RuleFilterer))
         // ->dump()
         ;
 
-        if ( ! $this->rules) {
+        if (!$this->rules) {
             return [];
         }
 
@@ -764,9 +764,9 @@ 
                     $key,
                     array $siblings
                 ) use (&$out) {
-                    if (   ! $matching_rule instanceof AndRule
-                        && ! $matching_rule instanceof OrRule
-                        && ! $matching_rule instanceof NotRule
+                    if (!$matching_rule instanceof AndRule
+                        && !$matching_rule instanceof OrRule
+                        && !$matching_rule instanceof NotRule
                     ) {
                         $out[] = $matching_rule;
                     }
@@ -787,13 +787,13 @@ 
      *
      * @todo Make it available on AbstractRule also
      */
-    public function onEachRule($filter=[], $options)
+    public function onEachRule($filter = [], $options)
     {
         $filter = (new LogicalFilter($filter, new RuleFilterer))
         // ->dump()
         ;
 
-        if ( ! $this->rules) {
+        if (!$this->rules) {
             return [];
         }
 
@@ -818,7 +818,7 @@ 
     {
         $this->simplify(['force_logical_core' => true]);
 
-        if ( ! $this->rules) {
+        if (!$this->rules) {
             return $this;
         }
 
@@ -863,7 +863,7 @@ 
      *
      * @return LogicalFilter
      */
-    public function saveAs( &$variable )
+    public function saveAs(&$variable)
     {
         return $variable = $this;
     }
@@ -874,7 +874,7 @@ 
      *
      * @return LogicalFilter
      */
-    public function saveCopyAs( &$copied_variable )
+    public function saveCopyAs(&$copied_variable)
     {
         $copied_variable = $this->copy();
         return $this;
@@ -887,15 +887,15 @@ 
      *
      * @return $this
      */
-    public function dump($exit=false, array $options=[])
+    public function dump($exit = false, array $options = [])
     {
         $default_options = [
             'callstack_depth' => 3,
             'mode'            => 'string',
         ];
         foreach ($default_options as $default_option => &$default_value) {
-            if ( ! isset($options[ $default_option ])) {
-                $options[ $default_option ] = $default_value;
+            if (!isset($options[$default_option])) {
+                $options[$default_option] = $default_value;
             }
         }
         extract($options);
@@ -906,23 +906,23 @@ 
         else {
             // TODO dump a TrueRule
             $bt     = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $callstack_depth);
-            $caller = $bt[ $callstack_depth - 2 ];
+            $caller = $bt[$callstack_depth - 2];
 
             // get line and file from the previous level of the caller
             // TODO go deeper if this case exist?
-            if ( ! isset($caller['file'])) {
-                $caller['file'] = $bt[ $callstack_depth - 3 ]['file'];
+            if (!isset($caller['file'])) {
+                $caller['file'] = $bt[$callstack_depth - 3]['file'];
             }
-            if ( ! isset($caller['line'])) {
-                $caller['line'] = $bt[ $callstack_depth - 3 ]['line'];
+            if (!isset($caller['line'])) {
+                $caller['line'] = $bt[$callstack_depth - 3]['line'];
             }
 
             try {
-                echo "\n" . $caller['file'] . ':' . $caller['line'] . "\n";
+                echo "\n".$caller['file'].':'.$caller['line']."\n";
                 var_export($this->toArray($options));
             }
             catch (\Exception $e) {
-                echo "\nError while dumping: " . $e->getMessage() . "\n";
+                echo "\nError while dumping: ".$e->getMessage()."\n";
                 var_export($caller);
                 echo "\n\n";
                 var_export($bt);
@@ -947,15 +947,15 @@ 
      *
      * @return mixed The filtered data
      */
-    public function applyOn($data_to_filter, $action_on_matches=null, $filterer=null)
+    public function applyOn($data_to_filter, $action_on_matches = null, $filterer = null)
     {
-        if ( ! $filterer) {
+        if (!$filterer) {
             $filterer = $this->getDefaultFilterer();
         }
         elseif (is_callable($filterer)) {
             $filterer = new CustomizableFilterer($filterer);
         }
-        elseif ( ! $filterer instanceof Filterer) {
+        elseif (!$filterer instanceof Filterer) {
             throw new \InvalidArgumentException(
                  "The given \$filterer must be null or a callable or a instance "
                 ."of Filterer instead of: ".var_export($filterer, true)
@@ -963,11 +963,11 @@ 
         }
 
         if ($data_to_filter instanceof LogicalFilter) {
-            $filtered_rules = $filterer->apply( $this, $data_to_filter->getRules() );
-            return $data_to_filter->flushRules()->addRule( $filtered_rules );
+            $filtered_rules = $filterer->apply($this, $data_to_filter->getRules());
+            return $data_to_filter->flushRules()->addRule($filtered_rules);
         }
         else {
-            return $filterer->apply( $this, $data_to_filter );
+            return $filterer->apply($this, $data_to_filter);
         }
     }
 
@@ -982,22 +982,22 @@ 
      *                                 + Null if the target has no sens (operation filtered by field for example)
      *                                 + A rule tree containing the first matching case if there is one.
      */
-    public function validates($value_to_check, $key_to_check=null, $filterer=null)
+    public function validates($value_to_check, $key_to_check = null, $filterer = null)
     {
-        if ( ! $filterer) {
+        if (!$filterer) {
             $filterer = $this->getDefaultFilterer();
         }
         elseif (is_callable($filterer)) {
             $filterer = new CustomizableFilterer($filterer);
         }
-        elseif ( ! $filterer instanceof Filterer) {
+        elseif (!$filterer instanceof Filterer) {
             throw new \InvalidArgumentException(
                  "The given \$filterer must be null or a callable or a instance "
                 ."of Filterer instead of: ".var_export($filterer, true)
             );
         }
 
-        return $filterer->hasMatchingCase( $this, $value_to_check, $key_to_check );
+        return $filterer->hasMatchingCase($this, $value_to_check, $key_to_check);
     }
 
     /**/

Braces +28 added lines, -56 removed lines

@@ -55,8 +55,7 @@ 
     {
         if ($rules instanceof AbstractRule) {
             $rules = $rules->copy();
-        }
-        elseif ( ! is_null($rules) && ! is_array($rules)) {
+        } elseif ( ! is_null($rules) && ! is_array($rules)) {
             throw new \InvalidArgumentException(
                 "\$rules must be a rules description or an AbstractRule instead of"
                 .var_export($rules, true)
@@ -148,13 +147,11 @@ 
             if (AndRule::operator == $operation) {
                 // A && True <=> A
                 return $this;
-            }
-            elseif (OrRule::operator == $operation) {
+            } elseif (OrRule::operator == $operation) {
                 // A || True <=> True
                 $this->rules = null;
                 return $this;
-            }
-            else {
+            } else {
                 throw new InvalidArgumentException(
                     "Unhandled operation '$operation'"
                 );
@@ -174,8 +171,7 @@ 
             );
 
             $this->addRule($new_rule, $operation);
-        }
-        elseif (count($rules_description) == count(array_filter($rules_description, function($arg) {
+        } elseif (count($rules_description) == count(array_filter($rules_description, function($arg) {
             return $arg instanceof LogicalFilter;
         })) ) {
             // Already instanciated rules
@@ -185,16 +181,14 @@ 
                     $this->addRule( $rules, $operation);
                 }
             }
-        }
-        elseif (count($rules_description) == count(array_filter($rules_description, function($arg) {
+        } elseif (count($rules_description) == count(array_filter($rules_description, function($arg) {
             return $arg instanceof AbstractRule;
         })) ) {
             // Already instanciated rules
             foreach ($rules_description as $i => $new_rule) {
                 $this->addRule( $new_rule, $operation);
             }
-        }
-        elseif (1 == count($rules_description) && is_array($rules_description[0])) {
+        } elseif (1 == count($rules_description) && is_array($rules_description[0])) {
             if (count($rules_description[0]) == count(array_filter($rules_description[0], function($arg) {
                 return $arg instanceof AbstractRule;
             })) ) {
@@ -202,8 +196,7 @@ 
                 foreach ($rules_description[0] as $i => $new_rule) {
                     $this->addRule( $new_rule, $operation );
                 }
-            }
-            else {
+            } else {
                 $fake_root = new AndRule;
 
                 $this->addCompositeRule_recursion(
@@ -213,8 +206,7 @@ 
 
                 $this->addRule( $fake_root->getOperands()[0], $operation );
             }
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException(
                 "Bad set of arguments provided for rules addition: "
                 .var_export($rules_description, true)
@@ -245,24 +237,20 @@ 
 
         if (null === $this->rules) {
             $this->rules = $rule;
-        }
-        elseif (($tmp_rules = $this->rules) // $this->rules::operator not supported in PHP 5.6
+        } elseif (($tmp_rules = $this->rules) // $this->rules::operator not supported in PHP 5.6
             && ($tmp_rules::operator != $operation)
         ) {
             if (AndRule::operator == $operation) {
                 $this->rules = new AndRule([$this->rules, $rule]);
-            }
-            elseif (OrRule::operator == $operation) {
+            } elseif (OrRule::operator == $operation) {
                 $this->rules = new OrRule([$this->rules, $rule]);
-            }
-            else {
+            } else {
                 throw new \InvalidArgumentException(
                     "\$operation must be '".AndRule::operator."' or '".OrRule::operator
                     ."' instead of: ".var_export($operation, true)
                 );
             }
-        }
-        else {
+        } else {
             $this->rules->addOperand($rule);
         }
 
@@ -292,8 +280,7 @@ 
                 "Please provide an operator for the operation: \n"
                 .var_export($rules_composition, true)
             );
-        }
-        elseif ( 3 == count($rules_composition)
+        } elseif ( 3 == count($rules_composition)
             && ! in_array( AndRule::operator, $rules_composition, true )
             && ! in_array( OrRule::operator,  $rules_composition, true )
             && ! in_array( NotRule::operator, $rules_composition, true )
@@ -310,22 +297,18 @@ 
                 $operand_left, $operation, $operand_right, $this->getOptions()
             );
             $recursion_position->addOperand( $rule );
-        }
-        else {
+        } else {
             // operations
             if (   NotRule::operator == $rules_composition[0]
                 || $rules_composition[0] == AbstractRule::findSymbolicOperator( NotRule::operator ) ) {
                 $rule = new NotRule();
-            }
-            elseif (in_array( AndRule::operator, $rules_composition )
+            } elseif (in_array( AndRule::operator, $rules_composition )
                 || in_array( AbstractRule::findSymbolicOperator( AndRule::operator ), $rules_composition )) {
                 $rule = new AndRule();
-            }
-            elseif (in_array( OrRule::operator, $rules_composition )
+            } elseif (in_array( OrRule::operator, $rules_composition )
                 || in_array( AbstractRule::findSymbolicOperator( OrRule::operator ), $rules_composition ) ) {
                 $rule = new OrRule();
-            }
-            else {
+            } else {
                 throw new \InvalidArgumentException(
                     "A rule description seems to be an operation but do "
                     ."not contains a valid operator: ".var_export($rules_composition, true)
@@ -353,8 +336,7 @@ 
             foreach ($operands_descriptions as $i => $operands_description) {
                 if (false === $operands_description) {
                     $operands_descriptions[ $i ] = ['and']; // FalseRule hack
-                }
-                elseif (null === $operands_description || true === $operands_description) {
+                } elseif (null === $operands_description || true === $operands_description) {
                     $operands_description = ['and'];
                     if (empty($non_true_rule_descriptions)) {
                         throw new \LogicException(
@@ -395,11 +377,9 @@ 
             foreach ($operands_descriptions as $operands_description) {
                 if ($operands_description instanceof AbstractRule) {
                     $rule->addOperand($operands_description);
-                }
-                elseif ($operands_description instanceof LogicalFilter) {
+                } elseif ($operands_description instanceof LogicalFilter) {
                     $rule->addOperand($operands_description->getRules());
-                }
-                else {
+                } else {
                     $this->addCompositeRule_recursion(
                         $operands_description,
                         $rule
@@ -634,8 +614,7 @@ 
     {
         if (method_exists($this->rules, 'renameField')) {
             $this->rules->renameField($renamings);
-        }
-        elseif ($this->rules) {
+        } elseif ($this->rules) {
             $this->rules->renameFields($renamings);
         }
 
@@ -902,8 +881,7 @@ 
 
         if ($this->rules) {
             $this->rules->dump($exit, $options);
-        }
-        else {
+        } else {
             // TODO dump a TrueRule
             $bt     = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $callstack_depth);
             $caller = $bt[ $callstack_depth - 2 ];
@@ -920,8 +898,7 @@ 
             try {
                 echo "\n" . $caller['file'] . ':' . $caller['line'] . "\n";
                 var_export($this->toArray($options));
-            }
-            catch (\Exception $e) {
+            } catch (\Exception $e) {
                 echo "\nError while dumping: " . $e->getMessage() . "\n";
                 var_export($caller);
                 echo "\n\n";
@@ -951,11 +928,9 @@ 
     {
         if ( ! $filterer) {
             $filterer = $this->getDefaultFilterer();
-        }
-        elseif (is_callable($filterer)) {
+        } elseif (is_callable($filterer)) {
             $filterer = new CustomizableFilterer($filterer);
-        }
-        elseif ( ! $filterer instanceof Filterer) {
+        } elseif ( ! $filterer instanceof Filterer) {
             throw new \InvalidArgumentException(
                  "The given \$filterer must be null or a callable or a instance "
                 ."of Filterer instead of: ".var_export($filterer, true)
@@ -965,8 +940,7 @@ 
         if ($data_to_filter instanceof LogicalFilter) {
             $filtered_rules = $filterer->apply( $this, $data_to_filter->getRules() );
             return $data_to_filter->flushRules()->addRule( $filtered_rules );
-        }
-        else {
+        } else {
             return $filterer->apply( $this, $data_to_filter );
         }
     }
@@ -986,11 +960,9 @@ 
     {
         if ( ! $filterer) {
             $filterer = $this->getDefaultFilterer();
-        }
-        elseif (is_callable($filterer)) {
+        } elseif (is_callable($filterer)) {
             $filterer = new CustomizableFilterer($filterer);
-        }
-        elseif ( ! $filterer instanceof Filterer) {
+        } elseif ( ! $filterer instanceof Filterer) {
             throw new \InvalidArgumentException(
                  "The given \$filterer must be null or a callable or a instance "
                 ."of Filterer instead of: ".var_export($filterer, true)