jclaveau / php-logical-filter

src/Rule/AbstractOperationRule.php

Spacing +42 added lines, -42 removed lines

@@ -21,7 +21,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;
 
@@ -44,9 +44,9 @@ 
 
     /**
      */
-    public function __construct( array $operands=[] )
+    public function __construct(array $operands = [])
     {
-        $this->setOperands( $operands );
+        $this->setOperands($operands);
         $this->flushCache();
     }
 
@@ -65,10 +65,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;
@@ -85,7 +85,7 @@ 
      */
     public function getOperands()
     {
-        return array_values( $this->operands );
+        return array_values($this->operands);
     }
 
     /**
@@ -129,7 +129,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(
@@ -141,18 +141,18 @@ 
         if ( ! $force && null !== $this->current_simplification_step) {
             $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
                 );
             }
         }
@@ -189,8 +189,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;
     }
@@ -216,7 +216,7 @@ 
                 }
 
                 if ($operands[$i] instanceof AbstractOperationRule) {
-                    $operands[$i]->removeNegations( $contextual_options );
+                    $operands[$i]->removeNegations($contextual_options);
                 }
             }
 
@@ -239,11 +239,11 @@ 
      *
      * @return AbstractOperationRule
      */
-    public function cleanOperations(array $simplification_options, $recurse=true)
+    public function cleanOperations(array $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
@@ -316,7 +316,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);
@@ -352,7 +352,7 @@ 
                 catch (\Exception $e) {
                     VisibilityViolator::setHiddenProperty(
                         $e, 'message',
-                        $e->getMessage() . "\n" . var_export($operandsByOperator, true)
+                        $e->getMessage()."\n".var_export($operandsByOperator, true)
                     );
 
                     throw $e;
@@ -360,7 +360,7 @@ 
             }
         }
 
-        return $this->setOperandsOrReplaceByOperation( $unifiedOperands, $contextual_options );
+        return $this->setOperandsOrReplaceByOperation($unifiedOperands, $contextual_options);
     }
 
     private static $simplification_cache = [];
@@ -376,10 +376,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)) {
@@ -417,7 +417,7 @@ 
         // $instance->dump(true);
 
         if (self::remove_negations == $step_to_stop_after ||
-            self::rootify_disjunctions == $step_to_stop_before ) {
+            self::rootify_disjunctions == $step_to_stop_before) {
             return $instance;
         }
 
@@ -429,7 +429,7 @@ 
         // $instance->dump(true);
 
         if (self::rootify_disjunctions == $step_to_stop_after ||
-            self::unify_atomic_operands == $step_to_stop_before ) {
+            self::unify_atomic_operands == $step_to_stop_before) {
             return $instance;
         }
 
@@ -440,7 +440,7 @@ 
             // $instance->dump(true);
 
             if (self::unify_atomic_operands == $step_to_stop_after ||
-                self::remove_invalid_branches == $step_to_stop_before ) {
+                self::remove_invalid_branches == $step_to_stop_before) {
                 return $instance;
             }
 
@@ -457,7 +457,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;
             }
@@ -478,7 +478,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();
@@ -501,15 +501,15 @@ 
             // 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;
@@ -532,15 +532,15 @@ 
             // 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;
@@ -578,7 +578,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])) {