@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | protected function hydrateOrders() |
| 38 | 38 | { |
| 39 | 39 | if (count($this->query)) { |
| 40 | - Logger::log(static::class . ' gathering query string', LOG_DEBUG); |
|
| 40 | + Logger::log(static::class.' gathering query string', LOG_DEBUG); |
|
| 41 | 41 | foreach ($this->query as $key => $value) { |
| 42 | 42 | if ($key === self::API_ORDER_FIELD) { |
| 43 | 43 | $orders = json_decode($value, true); |
@@ -55,10 +55,10 @@ discard block |
||
| 55 | 55 | */ |
| 56 | 56 | protected function extractPagination() |
| 57 | 57 | { |
| 58 | - Logger::log(static::class . ' extract pagination start', LOG_DEBUG); |
|
| 58 | + Logger::log(static::class.' extract pagination start', LOG_DEBUG); |
|
| 59 | 59 | $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1; |
| 60 | 60 | $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100; |
| 61 | - Logger::log(static::class . ' extract pagination end', LOG_DEBUG); |
|
| 61 | + Logger::log(static::class.' extract pagination end', LOG_DEBUG); |
|
| 62 | 62 | return array($page, (int)$limit); |
| 63 | 63 | } |
| 64 | 64 | |
@@ -67,9 +67,9 @@ discard block |
||
| 67 | 67 | * @param ModelCriteria $query |
| 68 | 68 | * @throws \PSFS\base\exception\ApiException |
| 69 | 69 | */ |
| 70 | - protected function addOrders(ModelCriteria &$query) |
|
| 70 | + protected function addOrders(ModelCriteria & $query) |
|
| 71 | 71 | { |
| 72 | - Logger::log(static::class . ' extract orders start ', LOG_DEBUG); |
|
| 72 | + Logger::log(static::class.' extract orders start ', LOG_DEBUG); |
|
| 73 | 73 | $orderAdded = FALSE; |
| 74 | 74 | $tableMap = $this->getTableMap(); |
| 75 | 75 | foreach ($this->order->getOrders() as $field => $direction) { |
@@ -77,18 +77,18 @@ discard block |
||
| 77 | 77 | $orderAdded = TRUE; |
| 78 | 78 | if ($direction === Order::ASC) { |
| 79 | 79 | $query->addAscendingOrderByColumn($column->getPhpName()); |
| 80 | - } else { |
|
| 80 | + }else { |
|
| 81 | 81 | $query->addDescendingOrderByColumn($column->getPhpName()); |
| 82 | 82 | } |
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | if (!$orderAdded) { |
| 86 | 86 | $pks = $this->getPkDbName(); |
| 87 | - foreach(array_keys($pks) as $key) { |
|
| 87 | + foreach (array_keys($pks) as $key) { |
|
| 88 | 88 | $query->addAscendingOrderByColumn($key); |
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | - Logger::log(static::class . ' extract orders end', LOG_DEBUG); |
|
| 91 | + Logger::log(static::class.' extract orders end', LOG_DEBUG); |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | /** |
@@ -96,14 +96,14 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * @param ModelCriteria $query |
| 98 | 98 | */ |
| 99 | - protected function addFilters(ModelCriteria &$query) |
|
| 99 | + protected function addFilters(ModelCriteria & $query) |
|
| 100 | 100 | { |
| 101 | 101 | if (count($this->query) > 0) { |
| 102 | 102 | $tableMap = $this->getTableMap(); |
| 103 | 103 | foreach ($this->query as $field => $value) { |
| 104 | 104 | if (self::API_COMBO_FIELD === $field) { |
| 105 | 105 | ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value); |
| 106 | - } elseif(!preg_match('/^__/', $field)) { |
|
| 106 | + } elseif (!preg_match('/^__/', $field)) { |
|
| 107 | 107 | ApiHelper::addModelField($tableMap, $query, $field, $value); |
| 108 | 108 | } |
| 109 | 109 | } |
@@ -124,10 +124,10 @@ discard block |
||
| 124 | 124 | list($page, $limit) = $this->extractPagination(); |
| 125 | 125 | if ($limit === -1) { |
| 126 | 126 | $this->list = $query->find($this->con); |
| 127 | - } else { |
|
| 127 | + }else { |
|
| 128 | 128 | $this->list = $query->paginate($page, $limit, $this->con); |
| 129 | 129 | } |
| 130 | - } catch (\Exception $e) { |
|
| 130 | + }catch (\Exception $e) { |
|
| 131 | 131 | Logger::log($e->getMessage(), LOG_ERR); |
| 132 | 132 | } |
| 133 | 133 | } |
@@ -56,20 +56,20 @@ discard block |
||
| 56 | 56 | public function init() |
| 57 | 57 | { |
| 58 | 58 | parent::init(); |
| 59 | - Logger::log(static::class . ' init', LOG_DEBUG); |
|
| 59 | + Logger::log(static::class.' init', LOG_DEBUG); |
|
| 60 | 60 | $this->domain = $this->getDomain(); |
| 61 | 61 | $this->hydrateRequestData(); |
| 62 | 62 | $this->hydrateOrders(); |
| 63 | - if($this instanceof CustomApi === false) { |
|
| 63 | + if ($this instanceof CustomApi === false) { |
|
| 64 | 64 | $this->createConnection($this->getTableMap()); |
| 65 | 65 | } |
| 66 | 66 | $this->checkFieldType(); |
| 67 | 67 | $this->setLoaded(true); |
| 68 | - Logger::log(static::class . ' loaded', LOG_DEBUG); |
|
| 68 | + Logger::log(static::class.' loaded', LOG_DEBUG); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | private function checkActions($method) { |
| 72 | - switch($method) { |
|
| 72 | + switch ($method) { |
|
| 73 | 73 | default: |
| 74 | 74 | case 'modelList': $this->action = self::API_ACTION_LIST; break; |
| 75 | 75 | case 'get': $this->action = self::API_ACTION_GET; break; |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $code = 200; |
| 95 | 95 | list($return, $total, $pages) = $this->getList(); |
| 96 | 96 | $message = null; |
| 97 | - if(!$total) { |
|
| 97 | + if (!$total) { |
|
| 98 | 98 | $message = t('No se han encontrado elementos para la búsqueda'); |
| 99 | 99 | } |
| 100 | 100 | |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | $pages = 1; |
| 120 | 120 | $message = null; |
| 121 | 121 | list($code, $return) = $this->getSingleResult($pk); |
| 122 | - if($code !== 200) { |
|
| 122 | + if ($code !== 200) { |
|
| 123 | 123 | $message = t('No se ha encontrado el elemento solicitado'); |
| 124 | 124 | } |
| 125 | 125 | |
@@ -148,13 +148,13 @@ discard block |
||
| 148 | 148 | $status = 200; |
| 149 | 149 | $saved = TRUE; |
| 150 | 150 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
| 151 | - } else { |
|
| 151 | + }else { |
|
| 152 | 152 | $message = t('No se ha podido guardar el modelo seleccionado'); |
| 153 | 153 | } |
| 154 | - } catch (\Exception $e) { |
|
| 155 | - $message = t('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage(); |
|
| 154 | + }catch (\Exception $e) { |
|
| 155 | + $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage(); |
|
| 156 | 156 | $context = []; |
| 157 | - if(null !== $e->getPrevious()) { |
|
| 157 | + if (null !== $e->getPrevious()) { |
|
| 158 | 158 | $context[] = $e->getPrevious()->getMessage(); |
| 159 | 159 | } |
| 160 | 160 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -190,18 +190,18 @@ discard block |
||
| 190 | 190 | $updated = TRUE; |
| 191 | 191 | $status = 200; |
| 192 | 192 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
| 193 | - } else { |
|
| 193 | + }else { |
|
| 194 | 194 | $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
| 195 | 195 | } |
| 196 | - } catch (\Exception $e) { |
|
| 196 | + }catch (\Exception $e) { |
|
| 197 | 197 | $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
| 198 | 198 | $context = []; |
| 199 | - if(null !== $e->getPrevious()) { |
|
| 199 | + if (null !== $e->getPrevious()) { |
|
| 200 | 200 | $context[] = $e->getPrevious()->getMessage(); |
| 201 | 201 | } |
| 202 | 202 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
| 203 | 203 | } |
| 204 | - } else { |
|
| 204 | + }else { |
|
| 205 | 205 | $message = t('No se ha encontrado el modelo al que se hace referencia para actualizar'); |
| 206 | 206 | } |
| 207 | 207 | |
@@ -229,15 +229,15 @@ discard block |
||
| 229 | 229 | $this->con->beginTransaction(); |
| 230 | 230 | $this->hydrateModel($pk); |
| 231 | 231 | if (NULL !== $this->model) { |
| 232 | - if(method_exists('clearAllReferences', $this->model)) { |
|
| 232 | + if (method_exists('clearAllReferences', $this->model)) { |
|
| 233 | 233 | $this->model->clearAllReferences(true); |
| 234 | 234 | } |
| 235 | 235 | $this->model->delete($this->con); |
| 236 | 236 | $deleted = TRUE; |
| 237 | 237 | } |
| 238 | - } catch (\Exception $e) { |
|
| 238 | + }catch (\Exception $e) { |
|
| 239 | 239 | $context = []; |
| 240 | - if(null !== $e->getPrevious()) { |
|
| 240 | + if (null !== $e->getPrevious()) { |
|
| 241 | 241 | $context[] = $e->getPrevious()->getMessage(); |
| 242 | 242 | } |
| 243 | 243 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | $this->saveBulk(); |
| 267 | 267 | $saved = true; |
| 268 | 268 | $status = 200; |
| 269 | - } catch(\Exception $e) { |
|
| 269 | + }catch (\Exception $e) { |
|
| 270 | 270 | Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData()); |
| 271 | 271 | $message = t('Bulk insert rolled back'); |
| 272 | 272 | } |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | |
| 279 | 279 | /** @var CustomerTableMap $tableMap */ |
| 280 | 280 | $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap()); |
| 281 | - foreach($this->list->getData() as $data) { |
|
| 281 | + foreach ($this->list->getData() as $data) { |
|
| 282 | 282 | $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data); |
| 283 | 283 | } |
| 284 | 284 | return $return; |
@@ -295,23 +295,23 @@ discard block |
||
| 295 | 295 | try { |
| 296 | 296 | $this->paginate(); |
| 297 | 297 | if (null !== $this->list) { |
| 298 | - if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
| 298 | + if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
| 299 | 299 | $return = $this->extractDataWithFormat(); |
| 300 | - } else { |
|
| 300 | + }else { |
|
| 301 | 301 | $return = $this->list->toArray(null, false, $this->fieldType ?: TableMap::TYPE_PHPNAME, false); |
| 302 | 302 | } |
| 303 | 303 | $total = 0; |
| 304 | 304 | $pages = 0; |
| 305 | - if($this->list instanceof PropelModelPager) { |
|
| 305 | + if ($this->list instanceof PropelModelPager) { |
|
| 306 | 306 | $total = $this->list->getNbResults(); |
| 307 | 307 | $pages = $this->list->getLastPage(); |
| 308 | - } elseif($this->list instanceof ArrayCollection) { |
|
| 308 | + } elseif ($this->list instanceof ArrayCollection) { |
|
| 309 | 309 | $total = count($return); |
| 310 | 310 | $pages = 1; |
| 311 | 311 | } |
| 312 | 312 | } |
| 313 | - } catch (\Exception $e) { |
|
| 314 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
| 313 | + }catch (\Exception $e) { |
|
| 314 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
| 315 | 315 | } |
| 316 | 316 | |
| 317 | 317 | return array($return, $total, $pages); |
@@ -329,7 +329,7 @@ discard block |
||
| 329 | 329 | $return = array(); |
| 330 | 330 | if (NULL === $model || !method_exists($model, 'toArray')) { |
| 331 | 331 | $code = 404; |
| 332 | - } else { |
|
| 332 | + }else { |
|
| 333 | 333 | $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
| 334 | 334 | } |
| 335 | 335 | |