@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | $tableMap = $this->getTableMap(); |
174 | 174 | try { |
175 | 175 | $column = $tableMap->getColumnByPhpName($field); |
176 | - } catch(\Exception $e) { |
|
176 | + }catch (\Exception $e) { |
|
177 | 177 | Logger::log($e->getMessage(), LOG_ERR); |
178 | 178 | $column = null; |
179 | 179 | } |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | * |
186 | 186 | * @param ModelCriteria $query |
187 | 187 | */ |
188 | - private function addOrders(ModelCriteria &$query) |
|
188 | + private function addOrders(ModelCriteria & $query) |
|
189 | 189 | { |
190 | 190 | $orderAdded = FALSE; |
191 | 191 | foreach ($this->order->getOrders() as $field => $direction) { |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | $orderAdded = TRUE; |
194 | 194 | if ($direction === Order::ASC) { |
195 | 195 | $query->addAscendingOrderByColumn($column->getPhpName()); |
196 | - } else { |
|
196 | + }else { |
|
197 | 197 | $query->addDescendingOrderByColumn($column->getPhpName()); |
198 | 198 | } |
199 | 199 | } |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | * |
209 | 209 | * @param ModelCriteria $query |
210 | 210 | */ |
211 | - private function addExtraColumns(ModelCriteria &$query) |
|
211 | + private function addExtraColumns(ModelCriteria & $query) |
|
212 | 212 | { |
213 | 213 | if (!empty($this->extraColumns)) { |
214 | 214 | foreach ($this->extraColumns as $expression => $columnName) { |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | * |
223 | 223 | * @param ModelCriteria $query |
224 | 224 | */ |
225 | - protected function joinTables(ModelCriteria &$query) |
|
225 | + protected function joinTables(ModelCriteria & $query) |
|
226 | 226 | { |
227 | 227 | //TODO for specific implementations |
228 | 228 | } |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | */ |
233 | 233 | protected function parseExtraColumns() { |
234 | 234 | $columns = []; |
235 | - foreach($this->extraColumns as $key => $columnName) { |
|
235 | + foreach ($this->extraColumns as $key => $columnName) { |
|
236 | 236 | $columns[$columnName] = strtolower($columnName); |
237 | 237 | } |
238 | 238 | return $columns; |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | * |
244 | 244 | * @param ModelCriteria $query |
245 | 245 | */ |
246 | - private function addFilters(ModelCriteria &$query) |
|
246 | + private function addFilters(ModelCriteria & $query) |
|
247 | 247 | { |
248 | 248 | if (count($this->query) > 0) { |
249 | 249 | foreach ($this->query as $field => $value) { |
@@ -261,26 +261,26 @@ discard block |
||
261 | 261 | $text = preg_replace('/(\'|\")/', '', $value); |
262 | 262 | $text = preg_replace('/\ /', '%', $text); |
263 | 263 | $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE); |
264 | - } else { |
|
264 | + }else { |
|
265 | 265 | $query->filterBy($tableField, $value, Criteria::EQUAL); |
266 | 266 | } |
267 | - } elseif(self::API_COMBO_FILTER === $field) { |
|
267 | + } elseif (self::API_COMBO_FILTER === $field) { |
|
268 | 268 | $exp = 'CONCAT('; |
269 | 269 | $sep = ''; |
270 | 270 | $tablemap = $this->getTableMap(); |
271 | - foreach($tablemap->getColumns() as $column) { |
|
272 | - if($column->isText()) { |
|
273 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
271 | + foreach ($tablemap->getColumns() as $column) { |
|
272 | + if ($column->isText()) { |
|
273 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
274 | 274 | $sep = ', " ", '; |
275 | 275 | } |
276 | 276 | } |
277 | - foreach($this->extraColumns as $extra => $name) { |
|
278 | - $exp .= $sep . $extra; |
|
277 | + foreach ($this->extraColumns as $extra => $name) { |
|
278 | + $exp .= $sep.$extra; |
|
279 | 279 | $sep = ', " ", '; |
280 | 280 | } |
281 | 281 | $exp .= ")"; |
282 | - $query->where($exp . Criteria::LIKE . '"'.$value.'"'); |
|
283 | - } else { |
|
282 | + $query->where($exp.Criteria::LIKE.'"'.$value.'"'); |
|
283 | + }else { |
|
284 | 284 | $tableField = null; |
285 | 285 | } |
286 | 286 | } |
@@ -302,10 +302,10 @@ discard block |
||
302 | 302 | list($page, $limit) = $this->extractPagination(); |
303 | 303 | if ($limit == -1) { |
304 | 304 | $this->list = $query->find($this->con); |
305 | - } else { |
|
305 | + }else { |
|
306 | 306 | $this->list = $query->paginate($page, $limit, $this->con); |
307 | 307 | } |
308 | - } catch (\Exception $e) { |
|
308 | + }catch (\Exception $e) { |
|
309 | 309 | Logger::log($e->getMessage(), LOG_ERR); |
310 | 310 | } |
311 | 311 | } |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | $this->joinTables($query); |
323 | 323 | $this->addExtraColumns($query); |
324 | 324 | $this->model = $query->findPk($pk); |
325 | - } catch (\Exception $e) { |
|
325 | + }catch (\Exception $e) { |
|
326 | 326 | Logger::getInstance(get_class($this))->errorLog($e->getMessage()); |
327 | 327 | } |
328 | 328 | } |
@@ -410,7 +410,7 @@ discard block |
||
410 | 410 | $saved = TRUE; |
411 | 411 | $model = $this->model->toArray(); |
412 | 412 | } |
413 | - } catch (\Exception $e) { |
|
413 | + }catch (\Exception $e) { |
|
414 | 414 | Logger::log($e->getMessage(), LOG_ERR); |
415 | 415 | } |
416 | 416 | |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | $this->model->delete($this->con); |
439 | 439 | $deleted = TRUE; |
440 | 440 | } |
441 | - } catch (\Exception $e) { |
|
441 | + }catch (\Exception $e) { |
|
442 | 442 | Logger::getInstance(get_class($this->model))->errorLog($e->getMessage()); |
443 | 443 | } |
444 | 444 | } |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | */ |
483 | 483 | private function extractQuery() |
484 | 484 | { |
485 | - $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query"); |
|
485 | + $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query"); |
|
486 | 486 | /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */ |
487 | 487 | $query = $queryReflector->getMethod('create')->invoke($this->con); |
488 | 488 | |
@@ -526,7 +526,7 @@ discard block |
||
526 | 526 | if (null !== $this->con && $this->con->inTransaction()) { |
527 | 527 | if ($status === 200) { |
528 | 528 | $this->con->commit(); |
529 | - } else { |
|
529 | + }else { |
|
530 | 530 | $this->con->rollBack(); |
531 | 531 | } |
532 | 532 | } |
@@ -570,7 +570,7 @@ discard block |
||
570 | 570 | return $this->render('api.admin.html.twig', array( |
571 | 571 | "api" => $this->getApi(), |
572 | 572 | "domain" => $this->domain, |
573 | - "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)), |
|
573 | + "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)), |
|
574 | 574 | ), [], ''); |
575 | 575 | } |
576 | 576 | |
@@ -604,12 +604,12 @@ discard block |
||
604 | 604 | $pages = 0; |
605 | 605 | try { |
606 | 606 | $this->paginate(); |
607 | - if(null !== $this->list) { |
|
607 | + if (null !== $this->list) { |
|
608 | 608 | $return = $this->list->toArray(); |
609 | 609 | $total = $this->list->getNbResults(); |
610 | 610 | $pages = $this->list->getLastPage(); |
611 | 611 | } |
612 | - } catch (\Exception $e) { |
|
612 | + }catch (\Exception $e) { |
|
613 | 613 | Logger::getInstance(get_class($this))->errorLog($e->getMessage()); |
614 | 614 | } |
615 | 615 | |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | $return = array(); |
629 | 629 | if (NULL === $model && method_exists($model, 'toArray')) { |
630 | 630 | $code = 404; |
631 | - } else { |
|
631 | + }else { |
|
632 | 632 | $return = $model->toArray(); |
633 | 633 | } |
634 | 634 |