@@ -17,11 +17,11 @@ |
||
17 | 17 | return $response->withJson($exception, 400); |
18 | 18 | } |
19 | 19 | if (php_sapi_name() !== "cli") { |
20 | - error_log($exception->__toString()); |
|
20 | + error_log($exception->__toString()); |
|
21 | 21 | } |
22 | 22 | return $response |
23 | 23 | ->withStatus(500) |
24 | 24 | ->withHeader('Content-Type', 'text/html') |
25 | 25 | ->write($exception->__toString()); |
26 | - } |
|
26 | + } |
|
27 | 27 | } |
@@ -16,7 +16,7 @@ |
||
16 | 16 | { |
17 | 17 | return $response->withJson($exception, 400); |
18 | 18 | } |
19 | - if (php_sapi_name() !== "cli") { |
|
19 | + if(php_sapi_name() !== "cli") { |
|
20 | 20 | error_log($exception->__toString()); |
21 | 21 | } |
22 | 22 | return $response |
@@ -16,7 +16,8 @@ |
||
16 | 16 | { |
17 | 17 | return $response->withJson($exception, 400); |
18 | 18 | } |
19 | - if (php_sapi_name() !== "cli") { |
|
19 | + if (php_sapi_name() !== "cli") |
|
20 | + { |
|
20 | 21 | error_log($exception->__toString()); |
21 | 22 | } |
22 | 23 | return $response |
@@ -142,47 +142,47 @@ |
||
142 | 142 | { |
143 | 143 | $res = array(); |
144 | 144 | $count = count($this->children); |
145 | - for($i = 0; $i < $count; $i++) |
|
146 | - { |
|
145 | + for($i = 0; $i < $count; $i++) |
|
146 | + { |
|
147 | 147 | if($this->children[$i] === 'and' || $this->children[$i] === 'or') |
148 | - { |
|
148 | + { |
|
149 | 149 | array_push($res, $this->children[$i]); |
150 | - } |
|
151 | - else |
|
152 | - { |
|
150 | + } |
|
151 | + else |
|
152 | + { |
|
153 | 153 | $tmp = $this->children[$i]->php_compare($element); |
154 | - array_push($res, $tmp); |
|
155 | - } |
|
156 | - } |
|
157 | - if($count === 1) |
|
158 | - { |
|
154 | + array_push($res, $tmp); |
|
155 | + } |
|
156 | + } |
|
157 | + if($count === 1) |
|
158 | + { |
|
159 | 159 | return $res[0]; |
160 | - } |
|
161 | - while($count >= 3) |
|
162 | - { |
|
163 | - if($res[1] === 'and') |
|
160 | + } |
|
161 | + while($count >= 3) |
|
162 | + { |
|
163 | + if($res[1] === 'and') |
|
164 | 164 | { |
165 | 165 | $var1 = array_shift($res); |
166 | 166 | array_shift($res); |
167 | 167 | $var2 = array_shift($res); |
168 | - $res = array_merge(array($var1 && $var2), $res); |
|
168 | + $res = array_merge(array($var1 && $var2), $res); |
|
169 | 169 | } |
170 | - else if($res[1] === 'or') |
|
170 | + else if($res[1] === 'or') |
|
171 | 171 | { |
172 | 172 | $var1 = array_shift($res); |
173 | 173 | array_shift($res); |
174 | 174 | $var2 = array_shift($res); |
175 | 175 | $res = array_merge(array($var1 || $var2), $res); |
176 | - } |
|
177 | - $count = count($res); |
|
178 | - } |
|
176 | + } |
|
177 | + $count = count($res); |
|
178 | + } |
|
179 | 179 | return $res[0]; |
180 | 180 | } |
181 | 181 | |
182 | 182 | public function filter_array(&$array) |
183 | 183 | { |
184 | 184 | if(is_array($array)) |
185 | - { |
|
185 | + { |
|
186 | 186 | return array_filter($array, array($this, 'filterElement')); |
187 | 187 | } |
188 | 188 | return array(); |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | for($i = 0; $i < $count; $i++) |
146 | 146 | { |
147 | 147 | if($this->children[$i] === 'and' || $this->children[$i] === 'or') |
148 | - { |
|
148 | + { |
|
149 | 149 | array_push($res, $this->children[$i]); |
150 | 150 | } |
151 | 151 | else |
@@ -161,14 +161,14 @@ discard block |
||
161 | 161 | while($count >= 3) |
162 | 162 | { |
163 | 163 | if($res[1] === 'and') |
164 | - { |
|
164 | + { |
|
165 | 165 | $var1 = array_shift($res); |
166 | 166 | array_shift($res); |
167 | 167 | $var2 = array_shift($res); |
168 | 168 | $res = array_merge(array($var1 && $var2), $res); |
169 | 169 | } |
170 | - else if($res[1] === 'or') |
|
171 | - { |
|
170 | + else if($res[1] === 'or') |
|
171 | + { |
|
172 | 172 | $var1 = array_shift($res); |
173 | 173 | array_shift($res); |
174 | 174 | $var2 = array_shift($res); |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | public function filter_array(&$array) |
183 | 183 | { |
184 | 184 | if(is_array($array)) |
185 | - { |
|
185 | + { |
|
186 | 186 | return array_filter($array, array($this, 'filterElement')); |
187 | 187 | } |
188 | 188 | return array(); |
@@ -222,15 +222,15 @@ |
||
222 | 222 | |
223 | 223 | public function php_compare($value) |
224 | 224 | { |
225 | - if(is_array($value)) |
|
226 | - { |
|
225 | + if(is_array($value)) |
|
226 | + { |
|
227 | 227 | return $this->php_compare($value[$this->var1]); |
228 | - } |
|
228 | + } |
|
229 | 229 | switch($this->op) |
230 | 230 | { |
231 | 231 | case '!=': |
232 | 232 | return $value != $this->var2; |
233 | - case '=': |
|
233 | + case '=': |
|
234 | 234 | return $value == $this->var2; |
235 | 235 | case '<': |
236 | 236 | return $value < $this->var2; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | return $this->dataTable->create($data); |
35 | 35 | } |
36 | 36 | |
37 | - public function read($filter=false, $select=false, $count=false, $skip=false, $sort=false, $params=false) |
|
37 | + public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false) |
|
38 | 38 | { |
39 | 39 | $res = $this->dataTable->read($filter, $select, $count, $skip, $sort, $params); |
40 | 40 | if($res === false) |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | return $this->dataTable->delete($filter); |
68 | 68 | } |
69 | 69 | |
70 | - public function count($filter=false) |
|
70 | + public function count($filter = false) |
|
71 | 71 | { |
72 | 72 | return $this->dataTable->count($filter); |
73 | 73 | } |
@@ -9,33 +9,33 @@ |
||
9 | 9 | public function __construct($file) |
10 | 10 | { |
11 | 11 | $this->data = array_map('str_getcsv', file($file)); |
12 | - $titles = array_shift($this->data); |
|
13 | - $count = count($this->data); |
|
14 | - for($i = 0; $i < $count; $i++) |
|
15 | - { |
|
12 | + $titles = array_shift($this->data); |
|
13 | + $count = count($this->data); |
|
14 | + for($i = 0; $i < $count; $i++) |
|
15 | + { |
|
16 | 16 | $this->data[$i] = array_combine($titles, $this->data[$i]); |
17 | - } |
|
17 | + } |
|
18 | 18 | } |
19 | 19 | |
20 | 20 | public function count($filter = false) |
21 | 21 | { |
22 | 22 | if($filter) |
23 | - { |
|
23 | + { |
|
24 | 24 | $res = $this->data; |
25 | - $res = $filter->filter_array($res); |
|
26 | - return count($res); |
|
27 | - } |
|
28 | - return count($this->data); |
|
25 | + $res = $filter->filter_array($res); |
|
26 | + return count($res); |
|
27 | + } |
|
28 | + return count($this->data); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | public function read($filter = false, $select = false, $count = false, $skip = false, $sort = false, $params = false) |
32 | 32 | { |
33 | 33 | $res = $this->data; |
34 | - if($filter !== false) |
|
35 | - { |
|
34 | + if($filter !== false) |
|
35 | + { |
|
36 | 36 | $res = $filter->filter_array($res); |
37 | - } |
|
38 | - return $res; |
|
37 | + } |
|
38 | + return $res; |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function create($data) |
@@ -20,7 +20,7 @@ |
||
20 | 20 | public function count($filter = false) |
21 | 21 | { |
22 | 22 | if($filter) |
23 | - { |
|
23 | + { |
|
24 | 24 | $res = $this->data; |
25 | 25 | $res = $filter->filter_array($res); |
26 | 26 | return count($res); |
@@ -39,11 +39,11 @@ discard block |
||
39 | 39 | { |
40 | 40 | if(isset($this->params['user'])) |
41 | 41 | { |
42 | - $this->pdo = new \PDO($this->params['dsn'], $this->params['user'], $this->params['pass']); |
|
43 | - } |
|
44 | - else |
|
45 | - { |
|
46 | - $this->pdo = new \PDO($this->params['dsn']); |
|
42 | + $this->pdo = new \PDO($this->params['dsn'], $this->params['user'], $this->params['pass']); |
|
43 | + } |
|
44 | + else |
|
45 | + { |
|
46 | + $this->pdo = new \PDO($this->params['dsn']); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | if($this->pdo->exec($sql) === false) |
248 | 248 | { |
249 | 249 | if (php_sapi_name() !== "cli") { |
250 | - error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
|
250 | + error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
|
251 | 251 | } |
252 | 252 | return false; |
253 | 253 | } |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | $sql = "UPDATE $tablename SET $set WHERE $where"; |
247 | 247 | if($this->pdo->exec($sql) === false) |
248 | 248 | { |
249 | - if (php_sapi_name() !== "cli") { |
|
249 | + if(php_sapi_name() !== "cli") { |
|
250 | 250 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
251 | 251 | } |
252 | 252 | return false; |
@@ -287,7 +287,7 @@ discard block |
||
287 | 287 | $sql = "INSERT INTO $tablename ($cols) VALUES ($set);"; |
288 | 288 | if($this->pdo->exec($sql) === false) |
289 | 289 | { |
290 | - if (php_sapi_name() !== "cli") { |
|
290 | + if(php_sapi_name() !== "cli") { |
|
291 | 291 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
292 | 292 | } |
293 | 293 | return false; |
@@ -246,7 +246,8 @@ discard block |
||
246 | 246 | $sql = "UPDATE $tablename SET $set WHERE $where"; |
247 | 247 | if($this->pdo->exec($sql) === false) |
248 | 248 | { |
249 | - if (php_sapi_name() !== "cli") { |
|
249 | + if (php_sapi_name() !== "cli") |
|
250 | + { |
|
250 | 251 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
251 | 252 | } |
252 | 253 | return false; |
@@ -287,7 +288,8 @@ discard block |
||
287 | 288 | $sql = "INSERT INTO $tablename ($cols) VALUES ($set);"; |
288 | 289 | if($this->pdo->exec($sql) === false) |
289 | 290 | { |
290 | - if (php_sapi_name() !== "cli") { |
|
291 | + if (php_sapi_name() !== "cli") |
|
292 | + { |
|
291 | 293 | error_log('DB query failed. '.print_r($this->pdo->errorInfo(), true)); |
292 | 294 | } |
293 | 295 | return false; |