jclaveau / php-logical-filter

src/Filterer/FiltererInterface.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      * @param LogicalFilter $filter
      * @param Iterable      $data_to_filter
      */
-    public function apply( LogicalFilter $filter, $tree_to_filter, $options=[] );
+    public function apply(LogicalFilter $filter, $tree_to_filter, $options = []);
 
     public function validateRule($field, $operator, $value, $row, array $path, $all_operands, $options);
 

Doc Comments +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 {
     /**
      * @param LogicalFilter $filter
-     * @param Iterable      $data_to_filter
+     * @param Iterable      $tree_to_filter
      */
     public function apply( LogicalFilter $filter, $tree_to_filter, $options=[] );
 

Unused Use Statements +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
  * @author  Jean Claveau
  */
 namespace JClaveau\LogicalFilter\Filterer;
-use       JClaveau\LogicalFilter\LogicalFilter;
+use JClaveau\LogicalFilter\LogicalFilter;
 
 /**
  */

src/Filterer/CustomizableFilterer.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 
     /**
      */
-    public function __construct( callable $rule_validator )
+    public function __construct(callable $rule_validator)
     {
         $this->rule_validator = $rule_validator;
     }
@@ -25,7 +25,7 @@ 
      */
     public function validateRule($field, $operator, $value, $row, array $path, $all_operands, $options)
     {
-        return call_user_func_array( $this->rule_validator, get_defined_vars() );
+        return call_user_func_array($this->rule_validator, get_defined_vars());
     }
 
     /**/

src/Converter/ConverterInterface.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     /**
      * @param LogicalFilter $filter
      */
-    public function convert( LogicalFilter $filter );
+    public function convert(LogicalFilter $filter);
 
     /**/
 }

src/Converter/CustomizableMinimalConverter.php

Spacing +3 added lines, -3 removed lines

@@ -30,14 +30,14 @@ 
      */
     public function onOpenOr()
     {
-        call_user_func( $this->callbacks[ __FUNCTION__ ] );
+        call_user_func($this->callbacks[__FUNCTION__]);
     }
 
     /**
      */
     public function onCloseOr()
     {
-        call_user_func( $this->callbacks[ __FUNCTION__ ] );
+        call_user_func($this->callbacks[__FUNCTION__]);
     }
 
     /**
@@ -47,7 +47,7 @@ 
     public function onAndPossibility($field, $operator, $operand, array $allOperandsByField)
     {
         call_user_func(
-            $this->callbacks[ __FUNCTION__ ],
+            $this->callbacks[__FUNCTION__],
             $field,
             $operator,
             $operand,

src/Rule/BetweenOrEqualBothRule.php

Spacing +3 added lines, -3 removed lines

@@ -14,10 +14,10 @@
 
     /**
      */
-    public function __construct( $field, array $limits )
+    public function __construct($field, array $limits)
     {
-        $this->addOperand( new AboveOrEqualRule($field, $limits[0]) );
-        $this->addOperand( new BelowOrEqualRule($field, $limits[1]) );
+        $this->addOperand(new AboveOrEqualRule($field, $limits[0]));
+        $this->addOperand(new BelowOrEqualRule($field, $limits[1]));
     }
 
     /**

src/Rule/Trait_RuleWithOptions.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 
     /**
      */
-    public function getOption($name, array $contextual_options=[])
+    public function getOption($name, array $contextual_options = [])
     {
         $options = $this->getOptions($contextual_options);
 
@@ -39,7 +39,7 @@ 
     /**
      * @param $contextual_options
      */
-    public function getOptions(array $contextual_options=[])
+    public function getOptions(array $contextual_options = [])
     {
         $default_options = LogicalFilter::getDefaultOptions();
 

src/Rule/EqualRule.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,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 )
+    public function __construct($field, $value)
     {
         $this->field = $field;
         $this->value = $value;
@@ -42,7 +42,7 @@ 
      *
      * @return bool
      */
-    public function hasSolution(array $contextual_options=[])
+    public function hasSolution(array $contextual_options = [])
     {
         return true;
     }

src/Rule/AbstractRule.php

Indentation +4 added lines, -4 removed lines

@@ -170,7 +170,7 @@ 
         }
         else {
             throw new \InvalidArgumentException(
-                 "'mode' option must belong to ['string', 'export', 'dump'] "
+                    "'mode' option must belong to ['string', 'export', 'dump'] "
                 ."instead of " . var_export($mode, true)
             );
         }
@@ -251,9 +251,9 @@ 
 
         // return hash('crc32b', serialize( $this->toArray() ));
         return hash('md4', serialize( $this->toArray(['semantic' => true]) ))  // faster but longer
-              .'-'
-              .hash('md4', serialize( $this->options ))
-              ;
+                .'-'
+                .hash('md4', serialize( $this->options ))
+                ;
     }
 
     /**

Braces +7 added lines, -14 removed lines

@@ -144,8 +144,7 @@ 
             }
 
             echo ($this->toString($options));
-        }
-        elseif ('dump' == $mode) {
+        } elseif ('dump' == $mode) {
             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 ('xdebug' == $mode) {
+        } elseif ('xdebug' == $mode) {
             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 ('export' == $mode) {
+        } elseif ('export' == $mode) {
             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

Doc Comments +2 added lines

@@ -42,6 +42,8 @@
     }
 
     /**
+     * @param string $symbolic_operator
+     * @return string
      */
     public static function findEnglishOperator($symbolic_operator)
     {

Spacing +23 added lines, -23 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;
@@ -66,16 +66,16 @@ 
      *
      * @return AbstractRule
      */
-    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);
     }
 
     /**
@@ -92,7 +92,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."
@@ -121,7 +121,7 @@ 
      *
      * @return $this
      */
-    final public function dump($exit=false, array $options=[])
+    final public function dump($exit = false, array $options = [])
     {
         $default_options = [
             'callstack_depth' => 2,
@@ -129,18 +129,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 ('string' == $mode) {
-            if ( ! isset($options['indent_unit'])) {
+            if (!isset($options['indent_unit'])) {
                 $options['indent_unit'] = "    ";
             }
 
@@ -158,10 +158,10 @@ 
             }
         }
         elseif ('xdebug' == $mode) {
-            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");
             }
 
@@ -181,7 +181,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";
@@ -236,12 +236,12 @@ 
     /**
      * @return string
      */
-    abstract public function toString(array $options=[]);
+    abstract public function toString(array $options = []);
 
     /**
      * @return array
      */
-    abstract public function toArray(array $options=[]);
+    abstract public function toArray(array $options = []);
 
     protected $instance_id;
 
@@ -273,9 +273,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))
               ;
     }
 
@@ -307,7 +307,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]);
                 }
             }

src/Rule/Trait_RuleWithField.php

Braces +2 added lines, -4 removed lines

@@ -50,13 +50,11 @@
     {
         if (is_callable($renamings)) {
             $this->setField( call_user_func($renamings, $this->field) );
-        }
-        elseif (is_array($renamings)) {
+        } elseif (is_array($renamings)) {
             if (isset($renamings[$this->field])) {
                 $this->setField( $renamings[$this->field] );
             }
-        }
-        else {
+        } else {
             throw new \InvalidArgumentException(
                 "\$renamings MUST be a callable or an associative array "
                 ."instead of: " . var_export($renamings, true)

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)
             );
         }
 

Doc Comments +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     }
 
     /**
-     * @return string $field
+     * @return Trait_RuleWithField $field
      */
     final public function setField( $field )
     {
@@ -44,7 +44,7 @@ 
      * @param  array|callable Associative array of renamings or callable
      *                        that would rename the fields.
      *
-     * @return AbstractAtomicRule $this
+     * @return Trait_RuleWithField $this
      */
     final public function renameField($renamings)
     {