jclaveau / php-logical-filter

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);
     }
 
     /**
@@ -125,7 +125,7 @@ 
      * @param array  $simplification_options
      * @param bool   $force
      */
-    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(
@@ -137,18 +137,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
                 );
             }
         }
@@ -176,8 +176,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;
     }
@@ -204,7 +204,7 @@ 
                 }
 
                 if ($operands[$i] instanceof AbstractOperationRule) {
-                    $operands[$i]->removeNegations( $contextual_options );
+                    $operands[$i]->removeNegations($contextual_options);
                 }
             }
 
@@ -224,10 +224,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
@@ -296,7 +296,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);
 
@@ -330,7 +330,7 @@ 
                 catch (\Exception $e) {
                     VisibilityViolator::setHiddenProperty(
                         $e, 'message',
-                        $e->getMessage() . "\n" . var_export($operandsByOperator, true)
+                        $e->getMessage()."\n".var_export($operandsByOperator, true)
                     );
 
                     throw $e;
@@ -338,7 +338,7 @@ 
             }
         }
 
-        return $this->setOperandsOrReplaceByOperation( $unifiedOperands, $contextual_options );
+        return $this->setOperandsOrReplaceByOperation($unifiedOperands, $contextual_options);
     }
 
     private static $simplification_cache = [];
@@ -354,10 +354,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)) {
@@ -392,8 +392,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);
@@ -405,8 +405,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) {
@@ -416,8 +416,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);
@@ -433,7 +433,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;
@@ -472,7 +472,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();
@@ -495,13 +495,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;
@@ -524,13 +524,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;
@@ -568,7 +568,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]))

Braces +74 added lines, -53 removed lines

@@ -69,8 +69,9 @@ 
         if (!isset($this->operands[ $id = $new_operand->getSemanticId() ])) {
             $this->operands[ $id ] = $new_operand;
 
-            if ($this->current_simplification_step)
-                $this->current_simplification_step = null;
+            if ($this->current_simplification_step) {
+                            $this->current_simplification_step = null;
+            }
 
             $this->flushCache();
         }
@@ -108,10 +109,11 @@ 
     public function renameFields($renamings)
     {
         foreach ($this->operands as $operand) {
-            if (method_exists($operand, 'renameField'))
-                $operand->renameField($renamings);
-            else
-                $operand->renameFields($renamings);
+            if (method_exists($operand, 'renameField')) {
+                            $operand->renameField($renamings);
+            } else {
+                            $operand->renameFields($renamings);
+            }
         }
 
         // TODO flush cache only in case of change?
@@ -143,8 +145,7 @@ 
             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
@@ -171,8 +172,9 @@ 
             );
         }
 
-        if ($this->current_simplification_step === null)
-            return false;
+        if ($this->current_simplification_step === null) {
+                    return false;
+        }
 
         $steps_indices = array_flip(self::simplification_steps);
 
@@ -189,8 +191,9 @@ 
      */
     public function removeNegations(array $contextual_options)
     {
-        if (!$this->isNormalizationAllowed($contextual_options))
-            return $this;
+        if (!$this->isNormalizationAllowed($contextual_options)) {
+                    return $this;
+        }
 
         $this->moveSimplificationStepForward(self::remove_negations, $contextual_options);
 
@@ -226,28 +229,33 @@ 
      */
     public function cleanOperations($simplification_options, $recurse=true)
     {
-        if ($recurse) foreach ($this->operands as $i => $operand) {
+        if ($recurse) {
+            foreach ($this->operands as $i => $operand) {
             if (    $operand instanceof AbstractOperationRule
                 && !$operand instanceof InRule
                 && !$operand instanceof NotEqualRule
                 && !$operand instanceof NotInRule
             ) {
                 $this->operands[$i] = $operand->cleanOperations($simplification_options);
+        }
             }
         }
 
-        if ($this instanceof NotRule)
-            return $this;
+        if ($this instanceof NotRule) {
+                    return $this;
+        }
 
         $is_modified = true;
         while ($is_modified) {
             $is_modified = false;
 
-            if ($this->removeMonooperandOperationsOperands($simplification_options))
-                $is_modified = true;
+            if ($this->removeMonooperandOperationsOperands($simplification_options)) {
+                            $is_modified = true;
+            }
 
-            if ($this->removeSameOperationOperands($simplification_options))
-                $is_modified = true;
+            if ($this->removeSameOperationOperands($simplification_options)) {
+                            $is_modified = true;
+            }
         }
 
         return $this;
@@ -265,13 +273,13 @@ 
     public function removeMonooperandOperationsOperands(array $simplification_options)
     {
         foreach ($this->operands as $i => $operand) {
-            if (!$operand instanceof AbstractOperationRule || $operand instanceof NotRule)
-                continue;
+            if (!$operand instanceof AbstractOperationRule || $operand instanceof NotRule) {
+                            continue;
+            }
 
             if ($operand instanceof InRule && !$operand->isNormalizationAllowed($simplification_options)) {
                 $count = count($operand->getPossibilities());
-            }
-            else {
+            } else {
                 $count = count($operand->getOperands());
             }
 
@@ -295,13 +303,15 @@ 
      */
     public function unifyAtomicOperands($simplification_strategy_step = false, array $contextual_options)
     {
-        if ($simplification_strategy_step)
-            $this->moveSimplificationStepForward( self::unify_atomic_operands, $contextual_options );
+        if ($simplification_strategy_step) {
+                    $this->moveSimplificationStepForward( self::unify_atomic_operands, $contextual_options );
+        }
 
         // $this->dump(true);
 
-        if (!$this->isNormalizationAllowed($contextual_options))
-            return $this;
+        if (!$this->isNormalizationAllowed($contextual_options)) {
+                    return $this;
+        }
 
         $operands = $this->getOperands();
         foreach ($operands as &$operand) {
@@ -326,8 +336,7 @@ 
             foreach ($operandsByOperator as $operator => $operands) {
                 try {
                     $unifiedOperands = array_merge($unifiedOperands, $operands);
-                }
-                catch (\Exception $e) {
+                } catch (\Exception $e) {
                     VisibilityViolator::setHiddenProperty(
                         $e, 'message',
                         $e->getMessage() . "\n" . var_export($operandsByOperator, true)
@@ -370,8 +379,9 @@ 
         $options_id = hash('md4', serialize($options));
 
         $id = $this->getSemanticId().'-'.$options_id;
-        if (isset(self::$simplification_cache[$id]))
-            return self::$simplification_cache[$id]->copy();
+        if (isset(self::$simplification_cache[$id])) {
+                    return self::$simplification_cache[$id]->copy();
+        }
 
         $this->flushCache();
 
@@ -384,8 +394,9 @@ 
 
         $cache_keys[] = $instance->getSemanticId().'-'.$options_id;
 
-        if ($step_to_stop_before == self::remove_negations)
-            return $instance;
+        if ($step_to_stop_before == self::remove_negations) {
+                    return $instance;
+        }
 
         // $this->dump(!true);
         $instance = $instance->removeNegations($options);
@@ -393,8 +404,9 @@ 
         // $instance->dump(true);
 
         if ($step_to_stop_after  == self::remove_negations ||
-            $step_to_stop_before == self::rootify_disjunctions )
-            return $instance;
+            $step_to_stop_before == self::rootify_disjunctions ) {
+                    return $instance;
+        }
 
         // $instance->dump(true);
 
@@ -406,8 +418,9 @@ 
         // $instance->dump(true);
 
         if ($step_to_stop_after  == self::rootify_disjunctions ||
-            $step_to_stop_before == self::unify_atomic_operands )
-            return $instance;
+            $step_to_stop_before == self::unify_atomic_operands ) {
+                    return $instance;
+        }
 
         if (!$instance instanceof AbstractAtomicRule) {
 
@@ -417,8 +430,9 @@ 
             // $instance->dump(true);
 
             if ($step_to_stop_after  == self::unify_atomic_operands ||
-                $step_to_stop_before == self::remove_invalid_branches )
-                return $instance;
+                $step_to_stop_before == self::remove_invalid_branches ) {
+                            return $instance;
+            }
 
             $instance->cleanOperations($options);
             if (method_exists($instance, 'removeInvalidBranches')) {
@@ -435,16 +449,18 @@ 
         //@see https://github.com/jclaveau/php-logical-filter/issues/20
         if ($instance instanceof AndRule || $instance instanceof OrRule ) {
 
-            if (!$instance->getOperands())
-                return $instance;
+            if (!$instance->getOperands()) {
+                            return $instance;
+            }
 
             $operands = (new AndRule([$instance]))
                 ->cleanOperations($options, false)
                 // ->dump(true)
                 ->getOperands();
 
-            if (count($operands) == 1)
-                $instance = reset($operands);
+            if (count($operands) == 1) {
+                            $instance = reset($operands);
+            }
         }
 
 
@@ -495,11 +511,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;
         }
@@ -524,11 +542,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;
         }
@@ -571,8 +591,9 @@ 
     protected function getOperandAt($index=0)
     {
         $operands = array_values($this->operands);
-        if (isset($operands[$index]))
-            return $operands[$index];
+        if (isset($operands[$index])) {
+                    return $operands[$index];
+        }
     }
 
     /**/