leandrogehlen / yii2-querybuilder

OptionTrait.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
         {
             $key = (strpos($prop, "on") !== 0) ? Inflector::underscore($prop) : $prop;
 
-            if ($value instanceof Optionable){
+            if ($value instanceof Optionable) {
                 $value = $value->toOptions();
             } elseif (is_array($value)) {
                 foreach ($value as $k => $v) {

Translator.php

Spacing +9 added lines, -9 removed lines

@@ -58,19 +58,19 @@ 
         $this->_operators = [
             'equal' =>            '= ?',
             'not_equal' =>        '<> ?',
-            'in' =>               ['op' => 'IN (?)',     'list' => true, 'sep' => ', ' ],
+            'in' =>               ['op' => 'IN (?)', 'list' => true, 'sep' => ', '],
             'not_in' =>           ['op' => 'NOT IN (?)', 'list' => true, 'sep' => ', '],
             'less' =>             '< ?',
             'less_or_equal' =>    '<= ?',
             'greater' =>          '> ?',
             'greater_or_equal' => '>= ?',
-            'between' =>          ['op' => 'BETWEEN ?',   'list' => true, 'sep' => ' AND '],
-            'begins_with' =>      ['op' => 'LIKE ?',     'fn' => function($value){ return "$value%"; } ],
-            'not_begins_with' =>  ['op' => 'NOT LIKE ?', 'fn' => function($value){ return "$value%"; } ],
-            'contains' =>         ['op' => 'LIKE ?',     'fn' => function($value){ return "%$value%"; } ],
-            'not_contains' =>     ['op' => 'NOT LIKE ?', 'fn' => function($value){ return "%$value%"; } ],
-            'ends_with' =>        ['op' => 'LIKE ?',     'fn' => function($value){ return "%$value"; } ],
-            'not_ends_with' =>    ['op' => 'NOT LIKE ?', 'fn' => function($value){ return "%$value"; } ],
+            'between' =>          ['op' => 'BETWEEN ?', 'list' => true, 'sep' => ' AND '],
+            'begins_with' =>      ['op' => 'LIKE ?', 'fn' => function($value) { return "$value%"; }],
+            'not_begins_with' =>  ['op' => 'NOT LIKE ?', 'fn' => function($value) { return "$value%"; }],
+            'contains' =>         ['op' => 'LIKE ?', 'fn' => function($value) { return "%$value%"; }],
+            'not_contains' =>     ['op' => 'NOT LIKE ?', 'fn' => function($value) { return "%$value%"; }],
+            'ends_with' =>        ['op' => 'LIKE ?', 'fn' => function($value) { return "%$value"; }],
+            'not_ends_with' =>    ['op' => 'NOT LIKE ?', 'fn' => function($value) { return "%$value"; }],
             'is_empty' =>         '= ""',
             'is_not_empty' =>     '<> ""',
             'is_null' =>          'IS NULL',
@@ -96,7 +96,7 @@ 
         } else {
             $op = ArrayHelper::getValue($pattern, 'op');
             $list = ArrayHelper::getValue($pattern, 'list');
-            if ($list){
+            if ($list) {
                 $sep = ArrayHelper::getValue($pattern, 'sep');
                 $replacement = implode($sep, $keys);
             } else {

tests/unit/TranslatorTest.php

Spacing +25 added lines, -25 removed lines

@@ -13,82 +13,82 @@
         return [
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'joe'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'not_equal', 'value' => 'bruce']
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'joe'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'not_equal', 'value' => 'bruce']
                 ]],
                 ['(name = :p0 and name <> :p1)', [':p0' => 'joe', ':p1' => 'bruce']]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'in', 'value' => [1,2,3]],
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'not_in', 'value' => [4,5]]
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'in', 'value' => [1, 2, 3]],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'not_in', 'value' => [4, 5]]
                 ]],
                 ['(id IN (:p0, :p1, :p2) and id NOT IN (:p3, :p4))', [':p0'=>1, ':p1'=>2, ':p2'=>3, ':p3'=>4, ':p4'=>5]]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'less', 'value' => 100],
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'less_or_equal', 'value' => 50],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'less', 'value' => 100],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'less_or_equal', 'value' => 50],
                 ]],
                 ['(id < :p0 and id <= :p1)', [':p0'=>100, ':p1'=>50]]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'greater', 'value' => 10],
-                    [ 'field' => 'id', 'type' => 'integer', 'operator' => 'greater_or_equal', 'value' => 20],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'greater', 'value' => 10],
+                    ['field' => 'id', 'type' => 'integer', 'operator' => 'greater_or_equal', 'value' => 20],
                 ]],
                 ['(id > :p0 and id >= :p1)', [':p0'=>10, ':p1'=>20]]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'date', 'type' => 'date', 'operator' => 'between', 'value' => ['2015-01-01','2015-01-30']],
+                    ['field' => 'date', 'type' => 'date', 'operator' => 'between', 'value' => ['2015-01-01', '2015-01-30']],
                 ]],
                 ['(date BETWEEN :p0 AND :p1)', [':p0'=>'2015-01-01', ':p1'=>'2015-01-30']]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'begins_with', 'value' => 'joe'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'not_begins_with', 'value' => 'bruce'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'begins_with', 'value' => 'joe'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'not_begins_with', 'value' => 'bruce'],
                 ]],
                 ['(name LIKE :p0 and name NOT LIKE :p1)', [':p0'=>'joe%', ':p1'=> 'bruce%']]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'contains', 'value' => 'thomas'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'not_contains', 'value' => 'paul'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'contains', 'value' => 'thomas'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'not_contains', 'value' => 'paul'],
                 ]],
                 ['(name LIKE :p0 and name NOT LIKE :p1)', [':p0'=>'%thomas%', ':p1'=> '%paul%']]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'ends_with', 'value' => 'brian'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'not_ends_with', 'value' => 'david'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'ends_with', 'value' => 'brian'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'not_ends_with', 'value' => 'david'],
                 ]],
                 ['(name LIKE :p0 and name NOT LIKE :p1)', [':p0'=>'%brian', ':p1'=> '%david']]
             ],
             [
                 ['condition' => "or", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'is_empty'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'is_not_empty'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'is_null'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'is_not_null'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'is_empty'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'is_not_empty'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'is_null'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'is_not_null'],
                 ]],
                 ['(name = "" or name <> "" or name IS NULL or name IS NOT NULL)', []]
             ],
             [
                 ['condition' => "and", 'rules' => [
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'begins_with', 'value' => 'kurt'],
-                    [ 'field' => 'name', 'type' => 'string', 'operator' => 'ends_with', 'value' => 'cobain'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'begins_with', 'value' => 'kurt'],
+                    ['field' => 'name', 'type' => 'string', 'operator' => 'ends_with', 'value' => 'cobain'],
                     ['condition' => 'or', 'rules'=>[
-                        [ 'field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'joe'],
-                        [ 'field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'paul'],
+                        ['field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'joe'],
+                        ['field' => 'name', 'type' => 'string', 'operator' => 'equal', 'value' => 'paul'],
                         ['condition' => 'and', 'rules'=>[
-                            [ 'field' => 'id', 'type' => 'integer', 'operator' => 'equal', 'value' => 10],
+                            ['field' => 'id', 'type' => 'integer', 'operator' => 'equal', 'value' => 10],
                         ]]
                     ]]
                 ]],
                 ['(name LIKE :p0 and name LIKE :p1 and (name = :p2 or name = :p3 or (id = :p4)))', [
-                    ':p0'=>'kurt%',':p1' =>'%cobain', ':p2' => 'joe', ':p3' => 'paul', ':p4' => 10
+                    ':p0'=>'kurt%', ':p1' =>'%cobain', ':p2' => 'joe', ':p3' => 'paul', ':p4' => 10
                 ]]
             ]