jclaveau / php-logical-filter

src/polyfills.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! function_exists('spl_object_id')) {
+if (!function_exists('spl_object_id')) {
     /**
      * @see https://secure.php.net/manual/en/function.spl-object-id.php
      * This method doesn't exist before PHP 7.2.0
@@ -12,7 +12,7 @@ 
     }
 }
 
-if ( ! function_exists('is_iterable')) {
+if (!function_exists('is_iterable')) {
     /**
      * @see https://github.com/symfony/polyfill-php71/commit/36004d119352f4506398032259a08e4ca9607285
      * This method doesn't exist before PHP 7.1.0

src/Converter/MinimalConverter.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
     /**
      * @param LogicalFilter $filter
      */
-    public function convert( LogicalFilter $filter )
+    public function convert(LogicalFilter $filter)
     {
         $rootOr = $filter->simplify(['force_logical_core' => true])->getRules();
 
@@ -27,7 +27,7 @@ 
             return $this;
         }
 
-        if ( ! $rootOr->hasSolution()) {
+        if (!$rootOr->hasSolution()) {
             return $this;
         }
 
@@ -45,7 +45,7 @@ 
                         );
                     }
 
-                    $operandsByFields[ $field ][ $operator ] = $operandsOfOperator[0];
+                    $operandsByFields[$field][$operator] = $operandsOfOperator[0];
                 }
             }
 

src/Rule/Trait_RuleWithField.php

Spacing +5 added lines, -5 removed lines

@@ -23,9 +23,9 @@ 
     /**
      * @return string $field
      */
-    final public function setField( $field )
+    final public function setField($field)
     {
-        if ( ! is_scalar($field)) {
+        if (!is_scalar($field)) {
             throw new \InvalidArgumentEXception(
                 "\$field property of a logical rule must be a scalar contrary to: "
                 .var_export($field, true)
@@ -49,17 +49,17 @@ 
     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/AbstractRule.php

Spacing +21 added lines, -21 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;
@@ -46,8 +46,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;
@@ -65,16 +65,16 @@ 
      *
      * @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);
     }
 
     /**
@@ -91,7 +91,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."
@@ -120,7 +120,7 @@ 
      *
      * @return $this
      */
-    final public function dump($exit=false, array $options=[])
+    final public function dump($exit = false, array $options = [])
     {
         $default_options = [
             'callstack_depth' => 2,
@@ -128,18 +128,18 @@ 
             // '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'] = "    ";
             }
 
@@ -157,10 +157,10 @@ 
             }
         }
         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");
             }
 
@@ -180,7 +180,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";
@@ -262,9 +262,9 @@ 
         }
 
         // 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))
               ;
     }
 
@@ -296,7 +296,7 @@ 
         }
         elseif ($this instanceof OrRule) {
             foreach ($this->operands as $i => $operand) {
-                if ( ! $operand instanceof AndRule) {
+                if (!$operand instanceof AndRule) {
                     $this->operands[$i] = new AndRule([$operand]);
                 }
             }

Braces +7 added lines, -14 removed lines

@@ -144,8 +144,7 @@ 
             }
 
             echo ($this->toString($options));
-        }
-        elseif ($mode == 'dump') {
+        } elseif ($mode == 'dump') {
             if ($xdebug_enabled = ini_get('xdebug.overload_var_dump')) {
                 ini_set('xdebug.overload_var_dump', 0);
             }
@@ -155,8 +154,7 @@ 
             if ($xdebug_enabled) {
                 ini_set('xdebug.overload_var_dump', 1);
             }
-        }
-        elseif ($mode == 'xdebug') {
+        } elseif ($mode == 'xdebug') {
             if ( ! function_exists('xdebug_is_enabled')) {
                 throw new \RuntimeException("Xdebug is not installed");
             }
@@ -173,11 +171,9 @@ 
             if ($xdebug_enabled) {
                 ini_set('xdebug.overload_var_dump', 0);
             }
-        }
-        elseif ($mode == 'export') {
+        } 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)
@@ -288,21 +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]);
                 }
             }
             $ruleTree = $this;
-        }
-        else {
+        } else {
             throw new \LogicException(
                 "Unhandled type of simplified rules provided for conversion: "
                 .$this

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 array  $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;
     }

Braces +1 added lines, -2 removed lines

@@ -81,8 +81,7 @@
 
         if ( ! $options['show_instance']) {
             return $this->cache['array'] = $array;
-        }
-        else {
+        } else {
             return $array;
         }
     }

src/Rule/AbstractOperationRule.php

Spacing +58 added lines, -58 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;
@@ -84,7 +84,7 @@ 
      */
     public function getOperands()
     {
-        return array_values( $this->operands );
+        return array_values($this->operands);
     }
 
     /**
@@ -128,30 +128,30 @@ 
      * @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)) {
+        if (!in_array($step_to_go_to, self::simplification_steps)) {
             throw new \InvalidArgumentException(
                 "Invalid simplification step to go to: ".$step_to_go_to
             );
         }
 
         // if ($this->isNormalizationAllowed($simplification_options) && !$force && $this->current_simplification_step != null) {
-        if ( ! $force && $this->current_simplification_step !== null) {
+        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
                 );
             }
         }
@@ -168,7 +168,7 @@ 
      */
     public function simplicationStepReached($step)
     {
-        if ( ! in_array($step, self::simplification_steps)) {
+        if (!in_array($step, self::simplification_steps)) {
             throw new \InvalidArgumentException(
                 "Invalid simplification step: ".$step
             );
@@ -180,8 +180,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;
     }
@@ -193,7 +193,7 @@ 
      */
     public function removeNegations(array $contextual_options)
     {
-        if ( ! $this->isNormalizationAllowed($contextual_options)) {
+        if (!$this->isNormalizationAllowed($contextual_options)) {
             return $this;
         }
 
@@ -207,7 +207,7 @@ 
                 }
 
                 if ($operands[$i] instanceof AbstractOperationRule) {
-                    $operands[$i]->removeNegations( $contextual_options );
+                    $operands[$i]->removeNegations($contextual_options);
                 }
             }
 
@@ -227,14 +227,14 @@ 
      *
      * @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
-                && ! $operand instanceof InRule
-                && ! $operand instanceof NotEqualRule
-                && ! $operand instanceof NotInRule
+                if ($operand instanceof AbstractOperationRule
+                && !$operand instanceof InRule
+                && !$operand instanceof NotEqualRule
+                && !$operand instanceof NotInRule
             ) {
                     $this->operands[$i] = $operand->cleanOperations($simplification_options);
                 }
@@ -273,11 +273,11 @@ 
     public function removeMonooperandOperationsOperands(array $simplification_options)
     {
         foreach ($this->operands as $i => $operand) {
-            if ( ! $operand instanceof AbstractOperationRule || $operand instanceof NotRule) {
+            if (!$operand instanceof AbstractOperationRule || $operand instanceof NotRule) {
                 continue;
             }
 
-            if ($operand instanceof InRule && ! $operand->isNormalizationAllowed($simplification_options)) {
+            if ($operand instanceof InRule && !$operand->isNormalizationAllowed($simplification_options)) {
                 $count = count($operand->getPossibilities());
             }
             else {
@@ -294,7 +294,7 @@ 
             }
         }
 
-        return ! empty($has_been_changed);
+        return !empty($has_been_changed);
     }
 
     /**
@@ -305,12 +305,12 @@ 
     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);
 
-        if ( ! $this->isNormalizationAllowed($contextual_options)) {
+        if (!$this->isNormalizationAllowed($contextual_options)) {
             return $this;
         }
 
@@ -341,7 +341,7 @@ 
                 catch (\Exception $e) {
                     VisibilityViolator::setHiddenProperty(
                         $e, 'message',
-                        $e->getMessage() . "\n" . var_export($operandsByOperator, true)
+                        $e->getMessage()."\n".var_export($operandsByOperator, true)
                     );
 
                     throw $e;
@@ -349,7 +349,7 @@ 
             }
         }
 
-        return $this->setOperandsOrReplaceByOperation( $unifiedOperands, $contextual_options );
+        return $this->setOperandsOrReplaceByOperation($unifiedOperands, $contextual_options);
     }
 
     private static $simplification_cache = [];
@@ -365,13 +365,13 @@ 
      *
      * @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;
-        $force_logical_core  = ! empty($options['force_logical_core']) ? $options['force_logical_core'] : false;
+        $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)) {
+        if ($step_to_stop_before && !in_array($step_to_stop_before, self::simplification_steps)) {
             throw new \InvalidArgumentException(
                 "Invalid simplification step to stop at: ".$step_to_stop_before
             );
@@ -406,7 +406,7 @@ 
         // $instance->dump(true);
 
         if ($step_to_stop_after == self::remove_negations ||
-            $step_to_stop_before == self::rootify_disjunctions ) {
+            $step_to_stop_before == self::rootify_disjunctions) {
             return $instance;
         }
 
@@ -418,18 +418,18 @@ 
         // $instance->dump(true);
 
         if ($step_to_stop_after == self::rootify_disjunctions ||
-            $step_to_stop_before == self::unify_atomic_operands ) {
+            $step_to_stop_before == self::unify_atomic_operands) {
             return $instance;
         }
 
-        if ( ! $instance instanceof AbstractAtomicRule) {
+        if (!$instance instanceof AbstractAtomicRule) {
             $instance->cleanOperations($options);
             $instance->unifyAtomicOperands(true, $options);
 
             // $instance->dump(true);
 
             if ($step_to_stop_after == self::unify_atomic_operands ||
-                $step_to_stop_before == self::remove_invalid_branches ) {
+                $step_to_stop_before == self::remove_invalid_branches) {
                 return $instance;
             }
 
@@ -446,8 +446,8 @@ 
         // 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->getOperands()) {
+        if ($instance instanceof AndRule || $instance instanceof OrRule) {
+            if (!$instance->getOperands()) {
                 return $instance;
             }
 
@@ -466,7 +466,7 @@ 
             $instance = $instance->forceLogicalCore();
             // for the simplification status at
             foreach ($operands = $instance->getOperands() as $andOperand) {
-                if ( ! $andOperand instanceof AndRule) {
+                if (!$andOperand instanceof AndRule) {
                     throw new \LogicException(
                         "A rule is intended to be an and case: \n"
                         .$andOperand
@@ -486,7 +486,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();
@@ -509,15 +509,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;
@@ -540,15 +540,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;
@@ -586,7 +586,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 +4 added lines, -8 removed lines

@@ -111,8 +111,7 @@ 
         foreach ($this->operands as $operand) {
             if (method_exists($operand, 'renameField')) {
                 $operand->renameField($renamings);
-            }
-            else {
+            } else {
                 $operand->renameFields($renamings);
             }
         }
@@ -146,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
@@ -279,8 +277,7 @@ 
 
             if ($operand instanceof InRule && ! $operand->isNormalizationAllowed($simplification_options)) {
                 $count = count($operand->getPossibilities());
-            }
-            else {
+            } else {
                 $count = count($operand->getOperands());
             }
 
@@ -337,8 +334,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)

src/Rule/BelowRule.php

Spacing +7 added lines, -7 removed lines

@@ -16,10 +16,10 @@ 
      * @param string $field The field to apply the rule on.
      * @param array  $value The value the field can below to.
      */
-    public function __construct( $field, $maximum )
+    public function __construct($field, $maximum)
     {
-        if (   ! is_scalar($maximum)
-            && ! $maximum instanceof \DateTimeInterface
+        if (!is_scalar($maximum)
+            && !$maximum instanceof \DateTimeInterface
             && null !== $maximum
         ) {
             throw new \InvalidArgumentException(
@@ -38,15 +38,15 @@ 
      *
      * @return bool
      */
-    public function hasSolution(array $contextual_options=[])
+    public function hasSolution(array $contextual_options = [])
     {
         // if minimum is null, the rule is equivalent to true
-        if (is_numeric( $this->maximum )) {
-            if (is_nan( $this->maximum )) {
+        if (is_numeric($this->maximum)) {
+            if (is_nan($this->maximum)) {
                 return false;
             }
 
-            if (is_infinite( $this->maximum ) && $this->maximum < 0) {
+            if (is_infinite($this->maximum) && $this->maximum < 0) {
                 return false;
             }
         }

src/Rule/RegexpRule.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
      *
      * @todo  Support Posix?
      */
-    public function __construct( $field, $pattern )
+    public function __construct($field, $pattern)
     {
         $this->field   = $field;
         $this->pattern = $pattern;
@@ -49,7 +49,7 @@ 
      *
      * @return bool
      */
-    public function hasSolution(array $simplification_options=[])
+    public function hasSolution(array $simplification_options = [])
     {
         return true;
     }
@@ -68,7 +68,7 @@ 
         $delimiter        = substr($php_regexp, 0, 1);
         $quoted_delimiter = preg_quote($delimiter, '#');
 
-        if ( ! preg_match("#^$quoted_delimiter(.*)$quoted_delimiter([^$quoted_delimiter]*)$#", $php_regexp, $matches)) {
+        if (!preg_match("#^$quoted_delimiter(.*)$quoted_delimiter([^$quoted_delimiter]*)$#", $php_regexp, $matches)) {
             throw new \InvalidArgumentException(
                 "The provided PCRE regular expression (with the delimiter '$delimiter') cannot be parsed: "
                 .var_export($php_regexp, true)
@@ -78,7 +78,7 @@ 
         $pattern = $matches[1];
         $options = $matches[2];
 
-        return ($options ? "(?$options)" : '') . $pattern;
+        return ($options ? "(?$options)" : '').$pattern;
     }
 
     /**/

src/Rule/AbstractAtomicRule.php

Spacing +7 added lines, -7 removed lines

@@ -21,19 +21,19 @@ 
      *
      * @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'] && ! empty($this->cache['array'])) {
+        if (!$options['show_instance'] && !empty($this->cache['array'])) {
             return $this->cache['array'];
         }
 
@@ -45,7 +45,7 @@ 
             $this->getValues(),
         ];
 
-        if ( ! $options['show_instance']) {
+        if (!$options['show_instance']) {
             return $this->cache['array'] = $array;
         }
         else {
@@ -55,9 +55,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'];
         }
 

Braces +3 added lines, -6 removed lines

@@ -47,8 +47,7 @@ 
 
         if ( ! $options['show_instance']) {
             return $this->cache['array'] = $array;
-        }
-        else {
+        } else {
             return $array;
         }
     }
@@ -70,11 +69,9 @@ 
 
         if ($field instanceof FilteredValue || $field instanceof FilteredKey) {
             $field = "$field";
-        }
-        elseif ($field instanceof \Closure) {
+        } elseif ($field instanceof \Closure) {
             throw new \Exception("Closures dump not implemented");
-        }
-        else {
+        } else {
             $field = "'$field'";
         }