@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | $tableMap = $this->getTableMap(); |
| 175 | 175 | try { |
| 176 | 176 | $column = $tableMap->getColumnByPhpName($field); |
| 177 | - } catch(\Exception $e) { |
|
| 177 | + }catch (\Exception $e) { |
|
| 178 | 178 | Logger::log($e->getMessage(), LOG_ERR); |
| 179 | 179 | $column = null; |
| 180 | 180 | } |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | * |
| 187 | 187 | * @param ModelCriteria $query |
| 188 | 188 | */ |
| 189 | - private function addOrders(ModelCriteria &$query) |
|
| 189 | + private function addOrders(ModelCriteria & $query) |
|
| 190 | 190 | { |
| 191 | 191 | $orderAdded = FALSE; |
| 192 | 192 | foreach ($this->order->getOrders() as $field => $direction) { |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | $orderAdded = TRUE; |
| 195 | 195 | if ($direction === Order::ASC) { |
| 196 | 196 | $query->addAscendingOrderByColumn($column->getPhpName()); |
| 197 | - } else { |
|
| 197 | + }else { |
|
| 198 | 198 | $query->addDescendingOrderByColumn($column->getPhpName()); |
| 199 | 199 | } |
| 200 | 200 | } |
@@ -208,19 +208,19 @@ discard block |
||
| 208 | 208 | * Method that add a new field with the Label of the row |
| 209 | 209 | */ |
| 210 | 210 | private function addDefaultListField() { |
| 211 | - if(!in_array(self::API_LIST_NAME_FIELD, $this->extraColumns)) { |
|
| 211 | + if (!in_array(self::API_LIST_NAME_FIELD, $this->extraColumns)) { |
|
| 212 | 212 | $tableMap = $this->getTableMap(); |
| 213 | 213 | $column = null; |
| 214 | - if($tableMap->hasColumn('NAME')) { |
|
| 214 | + if ($tableMap->hasColumn('NAME')) { |
|
| 215 | 215 | $column = $tableMap->getColumn('NAME'); |
| 216 | - } elseif($tableMap->hasColumn('TITLE')) { |
|
| 216 | + } elseif ($tableMap->hasColumn('TITLE')) { |
|
| 217 | 217 | $column = $tableMap->getColumn('TITLE'); |
| 218 | - } elseif($tableMap->hasColumn('LABEL')) { |
|
| 218 | + } elseif ($tableMap->hasColumn('LABEL')) { |
|
| 219 | 219 | $column = $tableMap->getColumn('LABEL'); |
| 220 | 220 | } |
| 221 | - if(null !== $column) { |
|
| 221 | + if (null !== $column) { |
|
| 222 | 222 | $this->extraColumns[$column->getFullyQualifiedName()] = self::API_LIST_NAME_FIELD; |
| 223 | - } else { |
|
| 223 | + }else { |
|
| 224 | 224 | $this->addClassListName($tableMap); |
| 225 | 225 | } |
| 226 | 226 | } |
@@ -231,7 +231,7 @@ discard block |
||
| 231 | 231 | * |
| 232 | 232 | * @param ModelCriteria $query |
| 233 | 233 | */ |
| 234 | - private function addExtraColumns(ModelCriteria &$query) |
|
| 234 | + private function addExtraColumns(ModelCriteria & $query) |
|
| 235 | 235 | { |
| 236 | 236 | $this->addDefaultListField(); |
| 237 | 237 | if (!empty($this->extraColumns)) { |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | * |
| 247 | 247 | * @param ModelCriteria $query |
| 248 | 248 | */ |
| 249 | - protected function joinTables(ModelCriteria &$query) |
|
| 249 | + protected function joinTables(ModelCriteria & $query) |
|
| 250 | 250 | { |
| 251 | 251 | //TODO for specific implementations |
| 252 | 252 | } |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | */ |
| 257 | 257 | protected function parseExtraColumns() { |
| 258 | 258 | $columns = []; |
| 259 | - foreach($this->extraColumns as $key => $columnName) { |
|
| 259 | + foreach ($this->extraColumns as $key => $columnName) { |
|
| 260 | 260 | $columns[$columnName] = strtolower($columnName); |
| 261 | 261 | } |
| 262 | 262 | return $columns; |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | * |
| 268 | 268 | * @param ModelCriteria $query |
| 269 | 269 | */ |
| 270 | - private function addFilters(ModelCriteria &$query) |
|
| 270 | + private function addFilters(ModelCriteria & $query) |
|
| 271 | 271 | { |
| 272 | 272 | if (count($this->query) > 0) { |
| 273 | 273 | foreach ($this->query as $field => $value) { |
@@ -285,26 +285,26 @@ discard block |
||
| 285 | 285 | $text = preg_replace('/(\'|\")/', '', $value); |
| 286 | 286 | $text = preg_replace('/\ /', '%', $text); |
| 287 | 287 | $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE); |
| 288 | - } else { |
|
| 288 | + }else { |
|
| 289 | 289 | $query->filterBy($tableField, $value, Criteria::EQUAL); |
| 290 | 290 | } |
| 291 | - } elseif(self::API_COMBO_FIELD === $field) { |
|
| 291 | + } elseif (self::API_COMBO_FIELD === $field) { |
|
| 292 | 292 | $exp = 'CONCAT('; |
| 293 | 293 | $sep = ''; |
| 294 | 294 | $tablemap = $this->getTableMap(); |
| 295 | - foreach($tablemap->getColumns() as $column) { |
|
| 296 | - if($column->isText()) { |
|
| 297 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
| 295 | + foreach ($tablemap->getColumns() as $column) { |
|
| 296 | + if ($column->isText()) { |
|
| 297 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
| 298 | 298 | $sep = ', " ", '; |
| 299 | 299 | } |
| 300 | 300 | } |
| 301 | - foreach($this->extraColumns as $extra => $name) { |
|
| 302 | - $exp .= $sep . $extra; |
|
| 301 | + foreach ($this->extraColumns as $extra => $name) { |
|
| 302 | + $exp .= $sep.$extra; |
|
| 303 | 303 | $sep = ', " ", '; |
| 304 | 304 | } |
| 305 | 305 | $exp .= ")"; |
| 306 | - $query->where($exp . Criteria::LIKE . '"'.$value.'"'); |
|
| 307 | - } else { |
|
| 306 | + $query->where($exp.Criteria::LIKE.'"'.$value.'"'); |
|
| 307 | + }else { |
|
| 308 | 308 | $tableField = null; |
| 309 | 309 | } |
| 310 | 310 | } |
@@ -326,10 +326,10 @@ discard block |
||
| 326 | 326 | list($page, $limit) = $this->extractPagination(); |
| 327 | 327 | if ($limit == -1) { |
| 328 | 328 | $this->list = $query->find($this->con); |
| 329 | - } else { |
|
| 329 | + }else { |
|
| 330 | 330 | $this->list = $query->paginate($page, $limit, $this->con); |
| 331 | 331 | } |
| 332 | - } catch (\Exception $e) { |
|
| 332 | + }catch (\Exception $e) { |
|
| 333 | 333 | Logger::log($e->getMessage(), LOG_ERR); |
| 334 | 334 | } |
| 335 | 335 | } |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $this->joinTables($query); |
| 347 | 347 | $this->addExtraColumns($query); |
| 348 | 348 | $this->model = $query->findPk($pk); |
| 349 | - } catch (\Exception $e) { |
|
| 349 | + }catch (\Exception $e) { |
|
| 350 | 350 | Logger::getInstance(get_class($this))->errorLog($e->getMessage()); |
| 351 | 351 | } |
| 352 | 352 | } |
@@ -434,8 +434,8 @@ discard block |
||
| 434 | 434 | $saved = TRUE; |
| 435 | 435 | $model = $this->model->toArray(); |
| 436 | 436 | } |
| 437 | - } catch (\Exception $e) { |
|
| 438 | - $model = _('Ha ocurrido un error intentando guardar el elemento: ') . $e->getMessage(); |
|
| 437 | + }catch (\Exception $e) { |
|
| 438 | + $model = _('Ha ocurrido un error intentando guardar el elemento: ').$e->getMessage(); |
|
| 439 | 439 | Logger::log($e->getMessage(), LOG_ERR); |
| 440 | 440 | } |
| 441 | 441 | |
@@ -464,7 +464,7 @@ discard block |
||
| 464 | 464 | $this->model->delete($this->con); |
| 465 | 465 | $deleted = TRUE; |
| 466 | 466 | } |
| 467 | - } catch (\Exception $e) { |
|
| 467 | + }catch (\Exception $e) { |
|
| 468 | 468 | $message = _('Ha ocurrido un error intentando eliminar el elemento, por favor verifica que no tenga otros elementos relacionados'); |
| 469 | 469 | Logger::getInstance(get_class($this->model))->errorLog($e->getMessage()); |
| 470 | 470 | } |
@@ -498,14 +498,14 @@ discard block |
||
| 498 | 498 | $updated = TRUE; |
| 499 | 499 | $status = 200; |
| 500 | 500 | $model = $this->model->toArray(); |
| 501 | - } else { |
|
| 501 | + }else { |
|
| 502 | 502 | $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
| 503 | 503 | } |
| 504 | - } catch(\Exception $e) { |
|
| 504 | + }catch (\Exception $e) { |
|
| 505 | 505 | $model = $e->getMessage(); |
| 506 | 506 | Logger::getInstance(get_class($this->model))->errorLog($e->getMessage()); |
| 507 | 507 | } |
| 508 | - } else { |
|
| 508 | + }else { |
|
| 509 | 509 | $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
| 510 | 510 | } |
| 511 | 511 | |
@@ -517,7 +517,7 @@ discard block |
||
| 517 | 517 | */ |
| 518 | 518 | private function extractQuery() |
| 519 | 519 | { |
| 520 | - $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query"); |
|
| 520 | + $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query"); |
|
| 521 | 521 | /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */ |
| 522 | 522 | $query = $queryReflector->getMethod('create')->invoke($this->con); |
| 523 | 523 | |
@@ -561,7 +561,7 @@ discard block |
||
| 561 | 561 | if (null !== $this->con && $this->con->inTransaction()) { |
| 562 | 562 | if ($status === 200) { |
| 563 | 563 | $this->con->commit(); |
| 564 | - } else { |
|
| 564 | + }else { |
|
| 565 | 565 | $this->con->rollBack(); |
| 566 | 566 | } |
| 567 | 567 | } |
@@ -605,7 +605,7 @@ discard block |
||
| 605 | 605 | return $this->render('api.admin.html.twig', array( |
| 606 | 606 | "api" => $this->getApi(), |
| 607 | 607 | "domain" => $this->domain, |
| 608 | - "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)), |
|
| 608 | + "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)), |
|
| 609 | 609 | ), [], ''); |
| 610 | 610 | } |
| 611 | 611 | |
@@ -639,12 +639,12 @@ discard block |
||
| 639 | 639 | $pages = 0; |
| 640 | 640 | try { |
| 641 | 641 | $this->paginate(); |
| 642 | - if(null !== $this->list) { |
|
| 642 | + if (null !== $this->list) { |
|
| 643 | 643 | $return = $this->list->toArray(); |
| 644 | 644 | $total = $this->list->getNbResults(); |
| 645 | 645 | $pages = $this->list->getLastPage(); |
| 646 | 646 | } |
| 647 | - } catch (\Exception $e) { |
|
| 647 | + }catch (\Exception $e) { |
|
| 648 | 648 | Logger::getInstance(get_class($this))->errorLog($e->getMessage()); |
| 649 | 649 | } |
| 650 | 650 | |
@@ -663,7 +663,7 @@ discard block |
||
| 663 | 663 | $return = array(); |
| 664 | 664 | if (NULL === $model && method_exists($model, 'toArray')) { |
| 665 | 665 | $code = 404; |
| 666 | - } else { |
|
| 666 | + }else { |
|
| 667 | 667 | $return = $model->toArray(); |
| 668 | 668 | } |
| 669 | 669 | |
@@ -678,9 +678,9 @@ discard block |
||
| 678 | 678 | $pks = ''; |
| 679 | 679 | $sep = ''; |
| 680 | 680 | foreach ($tableMap->getPrimaryKeys() as $pk) { |
| 681 | - $pks .= $sep . $pk->getFullyQualifiedName(); |
|
| 681 | + $pks .= $sep.$pk->getFullyQualifiedName(); |
|
| 682 | 682 | $sep = ', "|", '; |
| 683 | 683 | } |
| 684 | - $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = self::API_LIST_NAME_FIELD; |
|
| 684 | + $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = self::API_LIST_NAME_FIELD; |
|
| 685 | 685 | } |
| 686 | 686 | } |