@@ -52,8 +52,9 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function getProtectedColumns() |
| 54 | 54 | { |
| 55 | - if(is_null($this->protectedColumns)) |
|
| 56 | - $this->protectedColumns = []; |
|
| 55 | + if(is_null($this->protectedColumns)) { |
|
| 56 | + $this->protectedColumns = []; |
|
| 57 | + } |
|
| 57 | 58 | |
| 58 | 59 | return $this->protectedColumns; |
| 59 | 60 | } |
@@ -80,8 +81,9 @@ discard block |
||
| 80 | 81 | // Adapta o payload ao padrão do zend |
| 81 | 82 | $select = new Select(); |
| 82 | 83 | |
| 83 | - if(!is_null($this->getSelectPayload()->getOrder())) |
|
| 84 | - $select->order($this->getSelectPayload()->getOrder()); |
|
| 84 | + if(!is_null($this->getSelectPayload()->getOrder())) { |
|
| 85 | + $select->order($this->getSelectPayload()->getOrder()); |
|
| 86 | + } |
|
| 85 | 87 | |
| 86 | 88 | $select->columns($columns); |
| 87 | 89 | $select->where($this->getSelectPayload()->getWhere()); |
@@ -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; |
@@ -38,22 +38,25 @@ discard block |
||
| 38 | 38 | public function getColumns() |
| 39 | 39 | { |
| 40 | 40 | // Se nenhuma coluna foi definida todas serão retornadas |
| 41 | - if(!isset($this->payload['columns']) || !is_array($this->payload['columns'])) |
|
| 42 | - return ['*']; |
|
| 41 | + if(!isset($this->payload['columns']) || !is_array($this->payload['columns'])) { |
|
| 42 | + return ['*']; |
|
| 43 | + } |
|
| 43 | 44 | |
| 44 | 45 | $regex = '/^[a-zA-Z_][a-zA-Z0-9_]*$/'; |
| 45 | 46 | $columns = array(); |
| 46 | 47 | |
| 47 | 48 | foreach ($this->payload['columns'] as $column){ |
| 48 | 49 | // Valida o nome da coluna |
| 49 | - if(!is_string($column) || !preg_match($regex, $column)) |
|
| 50 | - throw new InvalidColumnNameException(); |
|
| 50 | + if(!is_string($column) || !preg_match($regex, $column)) { |
|
| 51 | + throw new InvalidColumnNameException(); |
|
| 52 | + } |
|
| 51 | 53 | |
| 52 | 54 | $columns[] = $column; |
| 53 | 55 | } |
| 54 | 56 | |
| 55 | - if(count($columns) == 0) |
|
| 56 | - return ['*']; |
|
| 57 | + if(count($columns) == 0) { |
|
| 58 | + return ['*']; |
|
| 59 | + } |
|
| 57 | 60 | |
| 58 | 61 | return $columns; |
| 59 | 62 | } |
@@ -65,11 +68,13 @@ discard block |
||
| 65 | 68 | */ |
| 66 | 69 | public function getLimit() |
| 67 | 70 | { |
| 68 | - if(!isset($this->payload['limit'])) |
|
| 69 | - return null; |
|
| 71 | + if(!isset($this->payload['limit'])) { |
|
| 72 | + return null; |
|
| 73 | + } |
|
| 70 | 74 | |
| 71 | - if(!is_numeric($this->payload['limit'])) |
|
| 72 | - return null; |
|
| 75 | + if(!is_numeric($this->payload['limit'])) { |
|
| 76 | + return null; |
|
| 77 | + } |
|
| 73 | 78 | |
| 74 | 79 | return (int) $this->payload['limit']; |
| 75 | 80 | } |
@@ -81,11 +86,13 @@ discard block |
||
| 81 | 86 | */ |
| 82 | 87 | public function getOffset() |
| 83 | 88 | { |
| 84 | - if(!isset($this->payload['offset'])) |
|
| 85 | - return 1; |
|
| 89 | + if(!isset($this->payload['offset'])) { |
|
| 90 | + return 1; |
|
| 91 | + } |
|
| 86 | 92 | |
| 87 | - if(!is_numeric($this->payload['offset'])) |
|
| 88 | - return 1; |
|
| 93 | + if(!is_numeric($this->payload['offset'])) { |
|
| 94 | + return 1; |
|
| 95 | + } |
|
| 89 | 96 | |
| 90 | 97 | return (int) $this->payload['offset']; |
| 91 | 98 | } |
@@ -99,8 +106,9 @@ discard block |
||
| 99 | 106 | { |
| 100 | 107 | $allowed = ['ASC', 'DESC']; |
| 101 | 108 | |
| 102 | - if(!isset($this->payload['order']) || !is_array($this->payload['order'])) |
|
| 103 | - return null; |
|
| 109 | + if(!isset($this->payload['order']) || !is_array($this->payload['order'])) { |
|
| 110 | + return null; |
|
| 111 | + } |
|
| 104 | 112 | |
| 105 | 113 | $orders = array(); |
| 106 | 114 | |
@@ -121,8 +129,9 @@ discard block |
||
| 121 | 129 | */ |
| 122 | 130 | public function getWhere() |
| 123 | 131 | { |
| 124 | - if(!is_array($this->payload['where'])) |
|
| 125 | - return []; |
|
| 132 | + if(!is_array($this->payload['where'])) { |
|
| 133 | + return []; |
|
| 134 | + } |
|
| 126 | 135 | |
| 127 | 136 | $adapter = new WhereAdapter(); |
| 128 | 137 | $where = $adapter->fromArray($this->payload['where']); |