@@ -230,7 +230,7 @@ |
||
230 | 230 | $defaultSort = $data['column_name']; |
231 | 231 | if (count($matches == 3)){ |
232 | 232 | $defaultSortDirection = $matches[2]; |
233 | - }else{ |
|
233 | + } else{ |
|
234 | 234 | $defaultSortDirection = 'ASC'; |
235 | 235 | } |
236 | 236 | } |
@@ -27,12 +27,10 @@ |
||
27 | 27 | public function __construct($iterator, callable $callable) { |
28 | 28 | if (is_array($iterator)) { |
29 | 29 | $this->iterator = new \ArrayIterator($iterator); |
30 | - } |
|
31 | - elseif (!($iterator instanceof Iterator)) |
|
30 | + } elseif (!($iterator instanceof Iterator)) |
|
32 | 31 | { |
33 | 32 | throw new TDBMException("\$iterator parameter must be an instance of Iterator"); |
34 | - } |
|
35 | - else |
|
33 | + } else |
|
36 | 34 | { |
37 | 35 | $this->iterator = $iterator; |
38 | 36 | } |
@@ -693,8 +693,9 @@ |
||
693 | 693 | // Fourth, let's apply the same steps to the orderby_bag |
694 | 694 | // 4-1 orderby_bag should be an array, if it is a singleton, let's put it in an array. |
695 | 695 | |
696 | - if (!is_array($orderby_bag)) |
|
697 | - $orderby_bag = array($orderby_bag); |
|
696 | + if (!is_array($orderby_bag)) { |
|
697 | + $orderby_bag = array($orderby_bag); |
|
698 | + } |
|
698 | 699 | |
699 | 700 | // 4-2, let's take all the objects out of the orderby bag, and let's make objects from them |
700 | 701 | $orderby_bag2 = array(); |