@@ -16,7 +16,7 @@ |
||
| 16 | 16 | * @param LogicalFilter $filter |
| 17 | 17 | * @param Iterable $data_to_filter |
| 18 | 18 | */ |
| 19 | - public function apply( LogicalFilter $filter, $tree_to_filter, $options=[] ); |
|
| 19 | + public function apply(LogicalFilter $filter, $tree_to_filter, $options = []); |
|
| 20 | 20 | |
| 21 | 21 | public function validateRule($field, $operator, $value, $row, array $path, $all_operands, $options); |
| 22 | 22 | |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | { |
| 15 | 15 | /** |
| 16 | 16 | * @param LogicalFilter $filter |
| 17 | - * @param Iterable $data_to_filter |
|
| 17 | + * @param Iterable $tree_to_filter |
|
| 18 | 18 | */ |
| 19 | 19 | public function apply( LogicalFilter $filter, $tree_to_filter, $options=[] ); |
| 20 | 20 | |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | * @author Jean Claveau |
| 7 | 7 | */ |
| 8 | 8 | namespace JClaveau\LogicalFilter\Filterer; |
| 9 | -use JClaveau\LogicalFilter\LogicalFilter; |
|
| 9 | +use JClaveau\LogicalFilter\LogicalFilter; |
|
| 10 | 10 | |
| 11 | 11 | /** |
| 12 | 12 | */ |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | */ |
| 19 | - public function __construct( callable $rule_validator ) |
|
| 19 | + public function __construct(callable $rule_validator) |
|
| 20 | 20 | { |
| 21 | 21 | $this->rule_validator = $rule_validator; |
| 22 | 22 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | public function validateRule($field, $operator, $value, $row, array $path, $all_operands, $options) |
| 27 | 27 | { |
| 28 | - return call_user_func_array( $this->rule_validator, get_defined_vars() ); |
|
| 28 | + return call_user_func_array($this->rule_validator, get_defined_vars()); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /**/ |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | /** |
| 35 | 35 | * @param LogicalFilter $filter |
| 36 | 36 | */ |
| 37 | - public function convert( LogicalFilter $filter ); |
|
| 37 | + public function convert(LogicalFilter $filter); |
|
| 38 | 38 | |
| 39 | 39 | /**/ |
| 40 | 40 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * @param LogicalFilter $filter |
| 20 | 20 | */ |
| 21 | - public function convert( LogicalFilter $filter ) |
|
| 21 | + public function convert(LogicalFilter $filter) |
|
| 22 | 22 | { |
| 23 | 23 | $rootOr = $filter->simplify(['force_logical_core' => true])->getRules(); |
| 24 | 24 | |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | ); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - $operandsByFields[ $field ][ $operator ] = $operandsOfOperator[0]; |
|
| 47 | + $operandsByFields[$field][$operator] = $operandsOfOperator[0]; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | foreach ($operandsByOperator as $operator => $operandsOfOperator) { |
| 40 | 40 | if (1 != count($operandsOfOperator)) { |
| 41 | 41 | throw new \RuntimeException( |
| 42 | - "Once a logical filter is simplified, there MUST be " |
|
| 42 | + "Once a logical filter is simplified, there MUST be " |
|
| 43 | 43 | ."no more than one operand by operator instead of for '$field' / '$operator': " |
| 44 | 44 | .var_export($operandsOfOperator, true) |
| 45 | 45 | ); |
@@ -6,8 +6,8 @@ |
||
| 6 | 6 | * @author Jean Claveau |
| 7 | 7 | */ |
| 8 | 8 | namespace JClaveau\LogicalFilter\Converter; |
| 9 | -use JClaveau\LogicalFilter\Converter\ConverterInterface; |
|
| 10 | -use JClaveau\LogicalFilter\LogicalFilter; |
|
| 9 | +use JClaveau\LogicalFilter\Converter\ConverterInterface; |
|
| 10 | +use JClaveau\LogicalFilter\LogicalFilter; |
|
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * Basic tools to implements minimal converters: Converters that can |
@@ -30,14 +30,14 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function onOpenOr() |
| 32 | 32 | { |
| 33 | - call_user_func( $this->callbacks[ __FUNCTION__ ] ); |
|
| 33 | + call_user_func($this->callbacks[__FUNCTION__]); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | /** |
| 37 | 37 | */ |
| 38 | 38 | public function onCloseOr() |
| 39 | 39 | { |
| 40 | - call_user_func( $this->callbacks[ __FUNCTION__ ] ); |
|
| 40 | + call_user_func($this->callbacks[__FUNCTION__]); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | /** |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | public function onAndPossibility($field, $operator, $operand, array $allOperandsByField) |
| 48 | 48 | { |
| 49 | 49 | call_user_func( |
| 50 | - $this->callbacks[ __FUNCTION__ ], |
|
| 50 | + $this->callbacks[__FUNCTION__], |
|
| 51 | 51 | $field, |
| 52 | 52 | $operator, |
| 53 | 53 | $operand, |
@@ -14,10 +14,10 @@ |
||
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | */ |
| 17 | - public function __construct( $field, array $limits ) |
|
| 17 | + public function __construct($field, array $limits) |
|
| 18 | 18 | { |
| 19 | - $this->addOperand( new AboveOrEqualRule($field, $limits[0]) ); |
|
| 20 | - $this->addOperand( new BelowOrEqualRule($field, $limits[1]) ); |
|
| 19 | + $this->addOperand(new AboveOrEqualRule($field, $limits[0])); |
|
| 20 | + $this->addOperand(new BelowOrEqualRule($field, $limits[1])); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | 31 | */ |
| 32 | - public function getOption($name, array $contextual_options=[]) |
|
| 32 | + public function getOption($name, array $contextual_options = []) |
|
| 33 | 33 | { |
| 34 | 34 | $options = $this->getOptions($contextual_options); |
| 35 | 35 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | /** |
| 40 | 40 | * @param $contextual_options |
| 41 | 41 | */ |
| 42 | - public function getOptions(array $contextual_options=[]) |
|
| 42 | + public function getOptions(array $contextual_options = []) |
|
| 43 | 43 | { |
| 44 | 44 | $default_options = LogicalFilter::getDefaultOptions(); |
| 45 | 45 | |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | * @param string $field The field to apply the rule on. |
| 17 | 17 | * @param array $value The value the field can equal to. |
| 18 | 18 | */ |
| 19 | - public function __construct( $field, $value ) |
|
| 19 | + public function __construct($field, $value) |
|
| 20 | 20 | { |
| 21 | 21 | $this->field = $field; |
| 22 | 22 | $this->value = $value; |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * |
| 43 | 43 | * @return bool |
| 44 | 44 | */ |
| 45 | - public function hasSolution(array $contextual_options=[]) |
|
| 45 | + public function hasSolution(array $contextual_options = []) |
|
| 46 | 46 | { |
| 47 | 47 | return true; |
| 48 | 48 | } |
@@ -14,17 +14,17 @@ |
||
| 14 | 14 | |
| 15 | 15 | /** |
| 16 | 16 | */ |
| 17 | - public function __construct( $field, array $limits ) |
|
| 17 | + public function __construct($field, array $limits) |
|
| 18 | 18 | { |
| 19 | 19 | if ($limits[0] == $limits[1]) { |
| 20 | 20 | // A > 1 && (A = 1 || A < 1) <=> no sens |
| 21 | 21 | // So if the two limits are equal we only consider the equality |
| 22 | - $this->addOperand( new EqualRule($field, $limits[0]) ); |
|
| 23 | - $this->addOperand( new EqualRule($field, $limits[0]) ); |
|
| 22 | + $this->addOperand(new EqualRule($field, $limits[0])); |
|
| 23 | + $this->addOperand(new EqualRule($field, $limits[0])); |
|
| 24 | 24 | } |
| 25 | 25 | else { |
| 26 | - $this->addOperand( new AboveRule($field, $limits[0]) ); |
|
| 27 | - $this->addOperand( new BelowOrEqualRule($field, $limits[1]) ); |
|
| 26 | + $this->addOperand(new AboveRule($field, $limits[0])); |
|
| 27 | + $this->addOperand(new BelowOrEqualRule($field, $limits[1])); |
|
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | 30 | |