@@ -73,7 +73,7 @@ |
||
73 | 73 | if($item == 'and') |
74 | 74 | $where = $where->and; |
75 | 75 | else if ($item == 'or') |
76 | - $where = $where->or; |
|
76 | + $where = $where->or; |
|
77 | 77 | else if ($item == 'nest') |
78 | 78 | $where = $where->nest(); |
79 | 79 | else if ($item == 'unnest') |
@@ -59,18 +59,18 @@ |
||
59 | 59 | { |
60 | 60 | $where = new Where(); |
61 | 61 | |
62 | - foreach($jWhere as $item){ |
|
63 | - if(is_array($item)){ |
|
64 | - if(!in_array($item[0], $this->allowed)) { |
|
62 | + foreach ($jWhere as $item) { |
|
63 | + if (is_array($item)) { |
|
64 | + if (!in_array($item[0], $this->allowed)) { |
|
65 | 65 | throw new InvalidCommandException(); |
66 | 66 | } |
67 | 67 | $method = $item[0]; |
68 | 68 | unset($item[0]); |
69 | 69 | $where = call_user_func_array([$where, $method], $item); |
70 | 70 | } |
71 | - if(is_string($item)){ |
|
72 | - if(in_array($item, $this->allowed)) |
|
73 | - if($item == 'and') |
|
71 | + if (is_string($item)) { |
|
72 | + if (in_array($item, $this->allowed)) |
|
73 | + if ($item == 'and') |
|
74 | 74 | $where = $where->and; |
75 | 75 | else if ($item == 'or') |
76 | 76 | $where = $where->or; |
@@ -69,15 +69,16 @@ |
||
69 | 69 | $where = call_user_func_array([$where, $method], $item); |
70 | 70 | } |
71 | 71 | if(is_string($item)){ |
72 | - if(in_array($item, $this->allowed)) |
|
73 | - if($item == 'and') |
|
72 | + if(in_array($item, $this->allowed)) { |
|
73 | + if($item == 'and') |
|
74 | 74 | $where = $where->and; |
75 | - else if ($item == 'or') |
|
76 | - $where = $where->or; |
|
77 | - else if ($item == 'nest') |
|
78 | - $where = $where->nest(); |
|
79 | - else if ($item == 'unnest') |
|
80 | - $where = $where->unnest(); |
|
75 | + } else if ($item == 'or') { |
|
76 | + $where = $where->or; |
|
77 | + } else if ($item == 'nest') { |
|
78 | + $where = $where->nest(); |
|
79 | + } else if ($item == 'unnest') { |
|
80 | + $where = $where->unnest(); |
|
81 | + } |
|
81 | 82 | } |
82 | 83 | } |
83 | 84 | return $where; |