jclaveau / php-logical-filter

src/Rule/NotRule.php

Braces +12 added lines, -24 removed lines

@@ -59,30 +59,25 @@ 
                     new BelowRule($field, $operand->getLowerLimit()),
                     new EqualRule($field, $operand->getLowerLimit()),
                 ]);
-            }
-            elseif ($operand instanceof BelowRule) {
+            } elseif ($operand instanceof BelowRule) {
                 // ! (v >  a) : v <= a : (v < a || a = v)
                 $new_rule = new OrRule([
                     new AboveRule($field, $operand->getUpperLimit()),
                     new EqualRule($field, $operand->getUpperLimit()),
                 ]);
-            }
-            elseif ($operand instanceof EqualRule && null === $operand->getValue()) {
+            } elseif ($operand instanceof EqualRule && null === $operand->getValue()) {
                 $new_rule = new NotEqualRule($field, null);
-            }
-            elseif ($operand instanceof EqualRule) {
+            } elseif ($operand instanceof EqualRule) {
                 // ! (v =  a) : (v < a) || (v > a)
                 if ($this->getOption('not_equal.normalization', $current_simplification_options)) {
                     $new_rule = new OrRule([
                         new AboveRule($field, $operand->getValue()),
                         new BelowRule($field, $operand->getValue()),
                     ]);
-                }
-                else {
+                } else {
                     $new_rule = new NotEqualRule( $field, $operand->getValue() );
                 }
-            }
-            elseif ($operand instanceof NotEqualRule) {
+            } elseif ($operand instanceof NotEqualRule) {
                 $new_rule = new EqualRule( $field, $operand->getValue() );
             }
         }
@@ -135,8 +130,7 @@ 
             $new_rule->setOperands( $combinations )
                 // ->dump(true)
                 ;
-        }
-        elseif ($operand instanceof OrRule) {
+        } elseif ($operand instanceof OrRule) {
 
             // $operand->dump(true);
             if (     $operand instanceof InRule
@@ -147,8 +141,7 @@ 
                     $operand->getField(),
                     $operand->getPossibilities()
                 );
-            }
-            else {
+            } else {
                 // ! (A || B) : !A && !B
                 // ! (A || B || C || D) : !A && !B && !C && !D
                 $new_rule = new AndRule;
@@ -162,8 +155,7 @@ 
                 }
             }
             // $new_rule->dump(!true);
-        }
-        elseif ($operand instanceof NotRule) {
+        } elseif ($operand instanceof NotRule) {
             // ! (  !  a) : a
             $new_rule = $operand->getOperandAt(0);
         }
@@ -252,8 +244,7 @@ 
         // TODO make a dedicated cache entry for semantic array?
         if ( ! $options['show_instance'] && ! $options['semantic']) {
             return $this->cache['array'] = $array;
-        }
-        else {
+        } else {
             return $array;
         }
     }
@@ -309,19 +300,16 @@ 
         if ($new_operand instanceof NotRule) {
             $operands = $new_operand->getOperands();
             return reset( $operands );
-        }
-        elseif ($new_operand instanceof EqualRule && ! $this->getOption('not_equal.normalization', $contextual_options)) {
+        } elseif ($new_operand instanceof EqualRule && ! $this->getOption('not_equal.normalization', $contextual_options)) {
             return new NotEqualRule( $new_operand->getField(), $new_operand->getValue(), $this->options );
-        }
-        elseif ($new_operand instanceof InRule && ! $this->getOption('not_in.normalization', $contextual_options)) {
+        } elseif ($new_operand instanceof InRule && ! $this->getOption('not_in.normalization', $contextual_options)) {
             return new NotInRule( $new_operand->getField(), $new_operand->getPossibilities(), $this->options );
         }
 
         try {
             // Don't use addOperand here to allow inheritance for optimizations (e.g. NotInRule)
             $out = $this->setOperands( $new_operands );
-        }
-        catch (\LogicException $e) {
+        } catch (\LogicException $e) {
             $out = new NotRule( $new_operand );
         }
 

src/Rule/NotEqualRule.php

Spacing +10 added lines, -10 removed lines

@@ -18,7 +18,7 @@ 
      * @param string $field The field to apply the rule on.
      * @param mixed  $value The value the field can equal to.
      */
-    public function __construct( $field, $value, array $options=[] )
+    public function __construct($field, $value, array $options = [])
     {
         $this->field = $field;
         $this->value = $value;
@@ -29,7 +29,7 @@ 
 
     /**
      */
-    public function isNormalizationAllowed(array $contextual_options=[])
+    public function isNormalizationAllowed(array $contextual_options = [])
     {
         $operand = $this->getOperandAt(0);
 
@@ -58,18 +58,18 @@ 
      *
      * @return array
      */
-    public function toArray(array $options=[])
+    public function toArray(array $options = [])
     {
         $default_options = [
             '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;
             }
         }
 
-        if ( ! $options['show_instance'] && isset($this->cache['array'])) {
+        if (!$options['show_instance'] && isset($this->cache['array'])) {
             return $this->cache['array'];
         }
 
@@ -79,7 +79,7 @@ 
             $this->getValue(),
         ];
 
-        if ( ! $options['show_instance']) {
+        if (!$options['show_instance']) {
             return $this->cache['array'] = $array;
         }
         else {
@@ -89,9 +89,9 @@ 
 
     /**
      */
-    public function toString(array $options=[])
+    public function toString(array $options = [])
     {
-        if ( ! empty($this->cache['string'])) {
+        if (!empty($this->cache['string'])) {
             return $this->cache['string'];
         }
 
@@ -108,7 +108,7 @@ 
      *
      * @return bool
      */
-    public function hasSolution(array $simplification_options=[])
+    public function hasSolution(array $simplification_options = [])
     {
         return true;
     }