jclaveau / php-logical-filter

src/Rule/Trait_RuleWithField.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
     /**
      * @return string $field
      */
-    final public function setField( $field )
+    final public function setField($field)
     {
         if (!is_scalar($field)) {
             throw new \InvalidArgumentEXception(
@@ -49,16 +49,16 @@ 
     final public function renameField($renamings)
     {
         if (is_callable($renamings)) {
-            $this->setField( call_user_func($renamings, $this->field) );
+            $this->setField(call_user_func($renamings, $this->field));
         }
         elseif (is_array($renamings)) {
             if (isset($renamings[$this->field]))
-                $this->setField( $renamings[$this->field] );
+                $this->setField($renamings[$this->field]);
         }
         else {
             throw new \InvalidArgumentException(
                 "\$renamings MUST be a callable or an associative array "
-                ."instead of: " . var_export($renamings, true)
+                ."instead of: ".var_export($renamings, true)
             );
         }
 

src/Rule/AbstractOperationRule.php

Spacing +45 added lines, -45 removed lines

@@ -20,7 +20,7 @@ 
     const remove_negations        = 'remove_negations';
     const rootify_disjunctions    = 'rootify_disjunctions';
     const unify_atomic_operands   = 'unify_atomic_operands';
-    const remove_invalid_branches = 'remove_invalid_branches';    // simplified after this step
+    const remove_invalid_branches = 'remove_invalid_branches'; // simplified after this step
 
     const simplified              = self::remove_invalid_branches;
 
@@ -43,9 +43,9 @@ 
 
     /**
      */
-    public function __construct( array $operands=[] )
+    public function __construct(array $operands = [])
     {
-        $this->setOperands( $operands );
+        $this->setOperands($operands);
         $this->flushCache();
     }
 
@@ -64,10 +64,10 @@ 
      *
      * @return $this
      */
-    public function addOperand( AbstractRule $new_operand )
+    public function addOperand(AbstractRule $new_operand)
     {
-        if (!isset($this->operands[ $id = $new_operand->getSemanticId() ])) {
-            $this->operands[ $id ] = $new_operand;
+        if (!isset($this->operands[$id = $new_operand->getSemanticId()])) {
+            $this->operands[$id] = $new_operand;
 
             if ($this->current_simplification_step)
                 $this->current_simplification_step = null;
@@ -83,7 +83,7 @@ 
      */
     public function getOperands()
     {
-        return array_values( $this->operands );
+        return array_values($this->operands);
     }
 
     /**
@@ -123,7 +123,7 @@ 
     /**
      * @param string $step_to_go_to
      */
-    public function moveSimplificationStepForward($step_to_go_to, array $simplification_options, $force=false)
+    public function moveSimplificationStepForward($step_to_go_to, array $simplification_options, $force = false)
     {
         if (!in_array($step_to_go_to, self::simplification_steps)) {
             throw new \InvalidArgumentException(
@@ -135,18 +135,18 @@ 
         if (!$force && $this->current_simplification_step != null) {
             $steps_indices = array_flip(self::simplification_steps);
 
-            $current_index = $steps_indices[ $this->current_simplification_step ];
-            $target_index  = $steps_indices[ $step_to_go_to ];
+            $current_index = $steps_indices[$this->current_simplification_step];
+            $target_index  = $steps_indices[$step_to_go_to];
 
-            if ( $current_index >= $target_index ) {
+            if ($current_index >= $target_index) {
                 // allow recall of previous step without going back
                 return;
             }
-            elseif ( $current_index < $target_index - 1 ) {
+            elseif ($current_index < $target_index - 1) {
                 throw new \LogicException(
-                    "$step_to_go_to MUST be fullfilled after " . self::simplification_steps[$target_index - 1]
-                    . " instead of the current step: " . $this->current_simplification_step
-                    ."\nfor: " . $this
+                    "$step_to_go_to MUST be fullfilled after ".self::simplification_steps[$target_index - 1]
+                    . " instead of the current step: ".$this->current_simplification_step
+                    ."\nfor: ".$this
                 );
             }
         }
@@ -174,8 +174,8 @@ 
 
         $steps_indices = array_flip(self::simplification_steps);
 
-        $current_index = $steps_indices[ $this->current_simplification_step ];
-        $step_index    = $steps_indices[ $step ];
+        $current_index = $steps_indices[$this->current_simplification_step];
+        $step_index    = $steps_indices[$step];
 
         return $current_index >= $step_index;
     }
@@ -202,7 +202,7 @@ 
                 }
 
                 if ($operands[$i] instanceof AbstractOperationRule) {
-                    $operands[$i]->removeNegations( $contextual_options );
+                    $operands[$i]->removeNegations($contextual_options);
                 }
             }
 
@@ -222,10 +222,10 @@ 
      *
      * @return $this;
      */
-    public function cleanOperations($simplification_options, $recurse=true)
+    public function cleanOperations($simplification_options, $recurse = true)
     {
         if ($recurse) foreach ($this->operands as $i => $operand) {
-            if (    $operand instanceof AbstractOperationRule
+            if ($operand instanceof AbstractOperationRule
                 && !$operand instanceof InRule
                 && !$operand instanceof NotEqualRule
                 && !$operand instanceof NotInRule
@@ -294,7 +294,7 @@ 
     public function unifyAtomicOperands($simplification_strategy_step = false, array $contextual_options)
     {
         if ($simplification_strategy_step)
-            $this->moveSimplificationStepForward( self::unify_atomic_operands, $contextual_options );
+            $this->moveSimplificationStepForward(self::unify_atomic_operands, $contextual_options);
 
         // $this->dump(true);
 
@@ -328,7 +328,7 @@ 
                 catch (\Exception $e) {
                     VisibilityViolator::setHiddenProperty(
                         $e, 'message',
-                        $e->getMessage() . "\n" . var_export($operandsByOperator, true)
+                        $e->getMessage()."\n".var_export($operandsByOperator, true)
                     );
 
                     throw $e;
@@ -336,7 +336,7 @@ 
             }
         }
 
-        return $this->setOperandsOrReplaceByOperation( $unifiedOperands, $contextual_options );
+        return $this->setOperandsOrReplaceByOperation($unifiedOperands, $contextual_options);
     }
 
     private static $simplification_cache = [];
@@ -352,10 +352,10 @@ 
      *
      * @return AbstractRule the simplified rule
      */
-    final public function simplify($options=[])
+    final public function simplify($options = [])
     {
-        $step_to_stop_before = !empty($options['stop_before'])        ? $options['stop_before'] : null;
-        $step_to_stop_after  = !empty($options['stop_after'])         ? $options['stop_after']  : null;
+        $step_to_stop_before = !empty($options['stop_before']) ? $options['stop_before'] : null;
+        $step_to_stop_after  = !empty($options['stop_after']) ? $options['stop_after'] : null;
         $force_logical_core  = !empty($options['force_logical_core']) ? $options['force_logical_core'] : false;
 
         if ($step_to_stop_before && !in_array($step_to_stop_before, self::simplification_steps)) {
@@ -390,8 +390,8 @@ 
 
         // $instance->dump(true);
 
-        if ($step_to_stop_after  == self::remove_negations ||
-            $step_to_stop_before == self::rootify_disjunctions )
+        if ($step_to_stop_after == self::remove_negations ||
+            $step_to_stop_before == self::rootify_disjunctions)
             return $instance;
 
         // $instance->dump(true);
@@ -403,8 +403,8 @@ 
 
         // $instance->dump(true);
 
-        if ($step_to_stop_after  == self::rootify_disjunctions ||
-            $step_to_stop_before == self::unify_atomic_operands )
+        if ($step_to_stop_after == self::rootify_disjunctions ||
+            $step_to_stop_before == self::unify_atomic_operands)
             return $instance;
 
         if (!$instance instanceof AbstractAtomicRule) {
@@ -414,8 +414,8 @@ 
 
             // $instance->dump(true);
 
-            if ($step_to_stop_after  == self::unify_atomic_operands ||
-                $step_to_stop_before == self::remove_invalid_branches )
+            if ($step_to_stop_after == self::unify_atomic_operands ||
+                $step_to_stop_before == self::remove_invalid_branches)
                 return $instance;
 
             $instance->cleanOperations($options);
@@ -431,7 +431,7 @@ 
         // last non recursive clean
         // TODO kind of monad|become|cese
         //@see https://github.com/jclaveau/php-logical-filter/issues/20
-        if ($instance instanceof AndRule || $instance instanceof OrRule ) {
+        if ($instance instanceof AndRule || $instance instanceof OrRule) {
 
             if (!$instance->getOperands())
                 return $instance;
@@ -470,7 +470,7 @@ 
 
         $cache_keys[] = $instance->getSemanticId().'-'.$options_id;
         foreach ($cache_keys as $cache_key) {
-            self::$simplification_cache[ $cache_key ] = $instance;
+            self::$simplification_cache[$cache_key] = $instance;
         }
 
         return $instance->copy();
@@ -493,13 +493,13 @@ 
             // For FilteredValue and FilteredKey
             $field = (string) $field;
 
-            if (!isset($operandsByFields[ $field ]))
-                $operandsByFields[ $field ] = [];
+            if (!isset($operandsByFields[$field]))
+                $operandsByFields[$field] = [];
 
-            if (!isset($operandsByFields[ $field ][ $operand::operator ]))
-                $operandsByFields[ $field ][ $operand::operator ] = [];
+            if (!isset($operandsByFields[$field][$operand::operator]))
+                $operandsByFields[$field][$operand::operator] = [];
 
-            $operandsByFields[ $field ][ $operand::operator ][] = $operand;
+            $operandsByFields[$field][$operand::operator][] = $operand;
         }
 
         return $operandsByFields;
@@ -522,13 +522,13 @@ 
             // For FilteredValue and FilteredKey
             $field = (string) $field;
 
-            if (!isset($operandsByFields[ $field ]))
-                $operandsByFields[ $field ] = [];
+            if (!isset($operandsByFields[$field]))
+                $operandsByFields[$field] = [];
 
-            if (!isset($operandsByFields[ $field ][ $operand::operator ]))
-                $operandsByFields[ $field ][ $operand::operator ] = [];
+            if (!isset($operandsByFields[$field][$operand::operator]))
+                $operandsByFields[$field][$operand::operator] = [];
 
-            $operandsByFields[ $field ][ $operand::operator ][] = $operand;
+            $operandsByFields[$field][$operand::operator][] = $operand;
         }
 
         return $operandsByFields;
@@ -566,7 +566,7 @@ 
      *
      * @return AbstractRule|null The operand if it exists or null
      */
-    protected function getOperandAt($index=0)
+    protected function getOperandAt($index = 0)
     {
         $operands = array_values($this->operands);
         if (isset($operands[$index]))

src/Rule/AbstractRule.php

Spacing +20 added lines, -20 removed lines

@@ -33,9 +33,9 @@ 
      */
     public static function findSymbolicOperator($english_operator)
     {
-        $association = array_flip( self::$ruleAliases );
-        if (isset($association[ $english_operator ]))
-            return $association[ $english_operator ];
+        $association = array_flip(self::$ruleAliases);
+        if (isset($association[$english_operator]))
+            return $association[$english_operator];
 
         return $english_operator;
     }
@@ -45,8 +45,8 @@ 
     public static function findEnglishOperator($symbolic_operator)
     {
         $association = self::$ruleAliases;
-        if (isset($association[ $symbolic_operator ]))
-            return $association[ $symbolic_operator ];
+        if (isset($association[$symbolic_operator]))
+            return $association[$symbolic_operator];
 
         return $symbolic_operator;
     }
@@ -63,15 +63,15 @@ 
      *
      * @return $this
      */
-    public static function generateSimpleRule($field, $type, $values, array $options=[])
+    public static function generateSimpleRule($field, $type, $values, array $options = [])
     {
-        $cache_key = hash('md4', serialize( func_get_args()) );
+        $cache_key = hash('md4', serialize(func_get_args()));
         if (isset(self::$static_cache['rules_generation'][$cache_key]))
             return self::$static_cache['rules_generation'][$cache_key]->copy();
 
         $ruleClass = self::getRuleClass($type);
 
-        return self::$static_cache['rules_generation'][$cache_key] = new $ruleClass( $field, $values, $options );
+        return self::$static_cache['rules_generation'][$cache_key] = new $ruleClass($field, $values, $options);
     }
 
     /**
@@ -88,7 +88,7 @@ 
             . str_replace('_', '', ucwords($english_rule_operator, '_'))
             . 'Rule';
 
-        if (!class_exists( $rule_class)) {
+        if (!class_exists($rule_class)) {
             throw new \InvalidArgumentException(
                 "The class '$rule_class' corresponding to the  operator "
                 ."'$rule_operator' / '$english_rule_operator' cannot be found."
@@ -117,7 +117,7 @@ 
      *
      * @return $this
      */
-    final public function dump($exit=false, array $options=[])
+    final public function dump($exit = false, array $options = [])
     {
         $default_options = [
             'callstack_depth' => 2,
@@ -125,17 +125,17 @@ 
             // 'show_instance'   => false,
         ];
         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);
 
         $bt = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, $callstack_depth);
-        $caller = $bt[ $callstack_depth - 2 ];
+        $caller = $bt[$callstack_depth - 2];
 
-        echo "\n" . $caller['file'] . ':' . $caller['line'] . "\n";
+        echo "\n".$caller['file'].':'.$caller['line']."\n";
         if ($mode == 'string') {
-            if ( ! isset($options['indent_unit']))
+            if (!isset($options['indent_unit']))
                 $options['indent_unit'] = "    ";
 
             echo ($this->toString($options));
@@ -150,10 +150,10 @@ 
                 ini_set('xdebug.overload_var_dump', 1);
         }
         elseif ($mode == 'xdebug') {
-            if ( ! function_exists('xdebug_is_enabled')) {
+            if (!function_exists('xdebug_is_enabled')) {
                 throw new \RuntimeException("Xdebug is not installed");
             }
-            if ( ! xdebug_is_enabled()) {
+            if (!xdebug_is_enabled()) {
                 throw new \RuntimeException("Xdebug is disabled");
             }
 
@@ -171,7 +171,7 @@ 
         else {
             throw new \InvalidArgumentException(
                  "'mode' option must belong to ['string', 'export', 'dump'] "
-                ."instead of " . var_export($mode, true)
+                ."instead of ".var_export($mode, true)
             );
         }
         echo "\n\n";
@@ -250,9 +250,9 @@ 
             return $this->cache['semantic_id'];
 
         // return hash('crc32b', serialize( $this->toArray() ));
-        return hash('md4', serialize( $this->toArray(['semantic' => true]) ))  // faster but longer
+        return hash('md4', serialize($this->toArray(['semantic' => true])))  // faster but longer
               .'-'
-              .hash('md4', serialize( $this->options ))
+              .hash('md4', serialize($this->options))
               ;
     }
 

Braces +46 added lines, -40 removed lines

@@ -34,8 +34,9 @@ 
     public static function findSymbolicOperator($english_operator)
     {
         $association = array_flip( self::$ruleAliases );
-        if (isset($association[ $english_operator ]))
-            return $association[ $english_operator ];
+        if (isset($association[ $english_operator ])) {
+                    return $association[ $english_operator ];
+        }
 
         return $english_operator;
     }
@@ -45,8 +46,9 @@ 
     public static function findEnglishOperator($symbolic_operator)
     {
         $association = self::$ruleAliases;
-        if (isset($association[ $symbolic_operator ]))
-            return $association[ $symbolic_operator ];
+        if (isset($association[ $symbolic_operator ])) {
+                    return $association[ $symbolic_operator ];
+        }
 
         return $symbolic_operator;
     }
@@ -66,8 +68,9 @@ 
     public static function generateSimpleRule($field, $type, $values, array $options=[])
     {
         $cache_key = hash('md4', serialize( func_get_args()) );
-        if (isset(self::$static_cache['rules_generation'][$cache_key]))
-            return self::$static_cache['rules_generation'][$cache_key]->copy();
+        if (isset(self::$static_cache['rules_generation'][$cache_key])) {
+                    return self::$static_cache['rules_generation'][$cache_key]->copy();
+        }
 
         $ruleClass = self::getRuleClass($type);
 
@@ -125,8 +128,9 @@ 
             // 'show_instance'   => false,
         ];
         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);
 
@@ -135,21 +139,22 @@ 
 
         echo "\n" . $caller['file'] . ':' . $caller['line'] . "\n";
         if ($mode == 'string') {
-            if ( ! isset($options['indent_unit']))
-                $options['indent_unit'] = "    ";
+            if ( ! isset($options['indent_unit'])) {
+                            $options['indent_unit'] = "    ";
+            }
 
             echo ($this->toString($options));
-        }
-        elseif ($mode == 'dump') {
-            if ($xdebug_enabled = ini_get('xdebug.overload_var_dump'))
-                ini_set('xdebug.overload_var_dump', 0);
+        } elseif ($mode == 'dump') {
+            if ($xdebug_enabled = ini_get('xdebug.overload_var_dump')) {
+                            ini_set('xdebug.overload_var_dump', 0);
+            }
 
             var_dump($this->toArray($options));
 
-            if ($xdebug_enabled)
-                ini_set('xdebug.overload_var_dump', 1);
-        }
-        elseif ($mode == 'xdebug') {
+            if ($xdebug_enabled) {
+                            ini_set('xdebug.overload_var_dump', 1);
+            }
+        } elseif ($mode == 'xdebug') {
             if ( ! function_exists('xdebug_is_enabled')) {
                 throw new \RuntimeException("Xdebug is not installed");
             }
@@ -157,18 +162,18 @@ 
                 throw new \RuntimeException("Xdebug is disabled");
             }
 
-            if ($xdebug_enabled = ini_get('xdebug.overload_var_dump'))
-                ini_set('xdebug.overload_var_dump', 1);
+            if ($xdebug_enabled = ini_get('xdebug.overload_var_dump')) {
+                            ini_set('xdebug.overload_var_dump', 1);
+            }
 
             var_dump($this->toArray($options));
 
-            if ($xdebug_enabled)
-                ini_set('xdebug.overload_var_dump', 0);
-        }
-        elseif ($mode == 'export') {
+            if ($xdebug_enabled) {
+                            ini_set('xdebug.overload_var_dump', 0);
+            }
+        } elseif ($mode == 'export') {
             var_export($this->toArray($options));
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException(
                  "'mode' option must belong to ['string', 'export', 'dump'] "
                 ."instead of " . var_export($mode, true)
@@ -176,8 +181,9 @@ 
         }
         echo "\n\n";
 
-        if ($exit)
-            exit;
+        if ($exit) {
+                    exit;
+        }
 
         return $this;
     }
@@ -233,8 +239,9 @@ 
      */
     public function getInstanceId()
     {
-        if ($this->instance_id)
-            return $this->instance_id;
+        if ($this->instance_id) {
+                    return $this->instance_id;
+        }
 
         return $this->instance_id = get_class($this).':'.spl_object_id($this);
     }
@@ -246,8 +253,9 @@ 
      */
     final public function getSemanticId()
     {
-        if (isset($this->cache['semantic_id']))
-            return $this->cache['semantic_id'];
+        if (isset($this->cache['semantic_id'])) {
+                    return $this->cache['semantic_id'];
+        }
 
         // return hash('crc32b', serialize( $this->toArray() ));
         return hash('md4', serialize( $this->toArray(['semantic' => true]) ))  // faster but longer
@@ -276,20 +284,18 @@ 
                     $this
                 ])
             ]);
-        }
-        elseif ($this instanceof AndRule) {
+        } elseif ($this instanceof AndRule) {
             $ruleTree = new OrRule([
                 $this
             ]);
-        }
-        elseif ($this instanceof OrRule) {
+        } elseif ($this instanceof OrRule) {
             foreach ($this->operands as $i => $operand) {
-                if (!$operand instanceof AndRule)
-                    $this->operands[$i] = new AndRule([$operand]);
+                if (!$operand instanceof AndRule) {
+                                    $this->operands[$i] = new AndRule([$operand]);
+                }
             }
             $ruleTree = $this;
-        }
-        else {
+        } else {
             throw new \LogicException(
                 "Unhandled type of simplified rules provided for conversion: "
                 .$this