@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | foreach ($domains as $domain => $routes) { |
32 | 32 | $pDomain = str_replace('@', '', $domain); |
33 | 33 | $pDomain = str_replace('/', '', $pDomain); |
34 | - $response[] = strtolower($pDomain) . '.api.secret'; |
|
34 | + $response[] = strtolower($pDomain).'.api.secret'; |
|
35 | 35 | } |
36 | 36 | return $this->json($response); |
37 | 37 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function config() |
47 | 47 | { |
48 | - Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri()); |
|
48 | + Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri()); |
|
49 | 49 | /* @var $form \PSFS\base\config\ConfigForm */ |
50 | 50 | $form = new ConfigForm(Router::getInstance()->getRoute('admin-config'), Config::$required, Config::$optional, Config::getInstance()->dumpConfig()); |
51 | 51 | $form->build(); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | } |
83 | 83 | Security::getInstance()->setFlash("callback_message", t("Configuración actualizada correctamente")); |
84 | 84 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true)); |
85 | - } else { |
|
85 | + }else { |
|
86 | 86 | throw new \HttpException(t('Error al guardar la configuración, prueba a cambiar los permisos'), 403); |
87 | 87 | } |
88 | 88 | } |
@@ -12,7 +12,7 @@ |
||
12 | 12 | |
13 | 13 | public function init() |
14 | 14 | { |
15 | - if(!Security::getInstance()->isLogged()) { |
|
15 | + if (!Security::getInstance()->isLogged()) { |
|
16 | 16 | throw new ApiException(t('Resource not authorized'), 401); |
17 | 17 | } |
18 | 18 | parent::init(); |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | { |
33 | 33 | $this->con = Propel::getConnection($tableMap::DATABASE_NAME); |
34 | 34 | $this->con->beginTransaction(); |
35 | - if(method_exists($this->con, 'useDebug')) { |
|
35 | + if (method_exists($this->con, 'useDebug')) { |
|
36 | 36 | Logger::log('Enabling debug queries mode', LOG_INFO); |
37 | 37 | $this->con->useDebug(Config::getParam('debug')); |
38 | 38 | } |
@@ -45,12 +45,12 @@ discard block |
||
45 | 45 | */ |
46 | 46 | protected function closeTransaction($status) |
47 | 47 | { |
48 | - if(null !== $this->con) { |
|
48 | + if (null !== $this->con) { |
|
49 | 49 | $this->traceDebugQuery(); |
50 | 50 | if (null !== $this->con && $this->con->inTransaction()) { |
51 | 51 | if ($status === 200) { |
52 | 52 | $this->con->commit(); |
53 | - } else { |
|
53 | + }else { |
|
54 | 54 | $this->con->rollBack(); |
55 | 55 | } |
56 | 56 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | protected function traceDebugQuery() |
65 | 65 | { |
66 | 66 | if (Config::getParam('debug')) { |
67 | - Logger::log($this->con->getLastExecutedQuery()?: 'Empty Query', LOG_DEBUG); |
|
67 | + Logger::log($this->con->getLastExecutedQuery() ?: 'Empty Query', LOG_DEBUG); |
|
68 | 68 | } |
69 | 69 | } |
70 | 70 | |
@@ -72,13 +72,13 @@ discard block |
||
72 | 72 | * Checks if the connection has a transaction initialized |
73 | 73 | */ |
74 | 74 | protected function checkTransaction() { |
75 | - if(null !== $this->con && !$this->con->inTransaction()) { |
|
75 | + if (null !== $this->con && !$this->con->inTransaction()) { |
|
76 | 76 | $this->con->beginTransaction(); |
77 | 77 | } |
78 | - if(null !== $this->con && $this->con->inTransaction()) { |
|
78 | + if (null !== $this->con && $this->con->inTransaction()) { |
|
79 | 79 | $this->items++; |
80 | 80 | } |
81 | - if($this->items >= Config::getParam('api.block.limit', 1000)) { |
|
81 | + if ($this->items >= Config::getParam('api.block.limit', 1000)) { |
|
82 | 82 | $this->con->commit(); |
83 | 83 | $this->items = 0; |
84 | 84 | } |
@@ -83,20 +83,20 @@ discard block |
||
83 | 83 | public function init() |
84 | 84 | { |
85 | 85 | parent::init(); |
86 | - Logger::log(static::class . ' init', LOG_DEBUG); |
|
86 | + Logger::log(static::class.' init', LOG_DEBUG); |
|
87 | 87 | $this->domain = $this->getDomain(); |
88 | 88 | $this->hydrateRequestData(); |
89 | 89 | $this->hydrateOrders(); |
90 | - if($this instanceof CustomApi === false) { |
|
90 | + if ($this instanceof CustomApi === false) { |
|
91 | 91 | $this->createConnection($this->getTableMap()); |
92 | 92 | } |
93 | 93 | $this->checkFieldType(); |
94 | 94 | $this->setLoaded(true); |
95 | - Logger::log(static::class . ' loaded', LOG_DEBUG); |
|
95 | + Logger::log(static::class.' loaded', LOG_DEBUG); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | private function checkActions($method) { |
99 | - switch($method) { |
|
99 | + switch ($method) { |
|
100 | 100 | default: |
101 | 101 | case 'modelList': $this->action = self::API_ACTION_LIST; break; |
102 | 102 | case 'get': $this->action = self::API_ACTION_GET; break; |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | protected function hydrateOrders() |
114 | 114 | { |
115 | 115 | if (count($this->query)) { |
116 | - Logger::log(static::class . ' gathering query string', LOG_DEBUG); |
|
116 | + Logger::log(static::class.' gathering query string', LOG_DEBUG); |
|
117 | 117 | foreach ($this->query as $key => $value) { |
118 | 118 | if ($key === self::API_ORDER_FIELD && is_array($value)) { |
119 | 119 | foreach ($value as $field => $direction) { |
@@ -130,10 +130,10 @@ discard block |
||
130 | 130 | */ |
131 | 131 | protected function extractPagination() |
132 | 132 | { |
133 | - Logger::log(static::class . ' extract pagination start', LOG_DEBUG); |
|
133 | + Logger::log(static::class.' extract pagination start', LOG_DEBUG); |
|
134 | 134 | $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1; |
135 | 135 | $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100; |
136 | - Logger::log(static::class . ' extract pagination end', LOG_DEBUG); |
|
136 | + Logger::log(static::class.' extract pagination end', LOG_DEBUG); |
|
137 | 137 | return array($page, $limit); |
138 | 138 | } |
139 | 139 | |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | */ |
145 | 145 | private function addOrders(ModelCriteria &$query) |
146 | 146 | { |
147 | - Logger::log(static::class . ' extract orders start ', LOG_DEBUG); |
|
147 | + Logger::log(static::class.' extract orders start ', LOG_DEBUG); |
|
148 | 148 | $orderAdded = FALSE; |
149 | 149 | $tableMap = $this->getTableMap(); |
150 | 150 | foreach ($this->order->getOrders() as $field => $direction) { |
@@ -152,17 +152,17 @@ discard block |
||
152 | 152 | $orderAdded = TRUE; |
153 | 153 | if ($direction === Order::ASC) { |
154 | 154 | $query->addAscendingOrderByColumn($column->getPhpName()); |
155 | - } else { |
|
155 | + }else { |
|
156 | 156 | $query->addDescendingOrderByColumn($column->getPhpName()); |
157 | 157 | } |
158 | 158 | } |
159 | 159 | } |
160 | 160 | if (!$orderAdded) { |
161 | - foreach($this->getPkDbName() as $pk => $phpName) { |
|
161 | + foreach ($this->getPkDbName() as $pk => $phpName) { |
|
162 | 162 | $query->addAscendingOrderByColumn($pk); |
163 | 163 | } |
164 | 164 | } |
165 | - Logger::log(static::class . ' extract orders end', LOG_DEBUG); |
|
165 | + Logger::log(static::class.' extract orders end', LOG_DEBUG); |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | /** |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | foreach ($this->query as $field => $value) { |
178 | 178 | if (self::API_COMBO_FIELD === $field) { |
179 | 179 | ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value); |
180 | - } elseif(!preg_match('/^__/', $field)) { |
|
180 | + } elseif (!preg_match('/^__/', $field)) { |
|
181 | 181 | ApiHelper::addModelField($tableMap, $query, $field, $value); |
182 | 182 | } |
183 | 183 | } |
@@ -198,10 +198,10 @@ discard block |
||
198 | 198 | list($page, $limit) = $this->extractPagination(); |
199 | 199 | if ($limit == -1) { |
200 | 200 | $this->list = $query->find($this->con); |
201 | - } else { |
|
201 | + }else { |
|
202 | 202 | $this->list = $query->paginate($page, $limit, $this->con); |
203 | 203 | } |
204 | - } catch (\Exception $e) { |
|
204 | + }catch (\Exception $e) { |
|
205 | 205 | Logger::log($e->getMessage(), LOG_ERR); |
206 | 206 | } |
207 | 207 | } |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | $code = 200; |
221 | 221 | list($return, $total, $pages) = $this->getList(); |
222 | 222 | $message = null; |
223 | - if(!$total) { |
|
223 | + if (!$total) { |
|
224 | 224 | $message = i18n::_('No se han encontrado elementos para la búsqueda'); |
225 | 225 | } |
226 | 226 | |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | $pages = 1; |
247 | 247 | $message = null; |
248 | 248 | list($code, $return) = $this->getSingleResult($pk); |
249 | - if($code !== 200) { |
|
249 | + if ($code !== 200) { |
|
250 | 250 | $message = i18n::_('No se ha encontrado el elemento solicitado'); |
251 | 251 | } |
252 | 252 | |
@@ -275,13 +275,13 @@ discard block |
||
275 | 275 | $status = 200; |
276 | 276 | $saved = TRUE; |
277 | 277 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
278 | - } else { |
|
278 | + }else { |
|
279 | 279 | $message = i18n::_('No se ha podido guardar el modelo seleccionado'); |
280 | 280 | } |
281 | - } catch (\Exception $e) { |
|
282 | - $message = i18n::_('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage(); |
|
281 | + }catch (\Exception $e) { |
|
282 | + $message = i18n::_('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage(); |
|
283 | 283 | $context = []; |
284 | - if(null !== $e->getPrevious()) { |
|
284 | + if (null !== $e->getPrevious()) { |
|
285 | 285 | $context[] = $e->getPrevious()->getMessage(); |
286 | 286 | } |
287 | 287 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -317,18 +317,18 @@ discard block |
||
317 | 317 | $updated = TRUE; |
318 | 318 | $status = 200; |
319 | 319 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
320 | - } else { |
|
320 | + }else { |
|
321 | 321 | $message = i18n::_('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
322 | 322 | } |
323 | - } catch (\Exception $e) { |
|
323 | + }catch (\Exception $e) { |
|
324 | 324 | $message = i18n::_('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
325 | 325 | $context = []; |
326 | - if(null !== $e->getPrevious()) { |
|
326 | + if (null !== $e->getPrevious()) { |
|
327 | 327 | $context[] = $e->getPrevious()->getMessage(); |
328 | 328 | } |
329 | 329 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
330 | 330 | } |
331 | - } else { |
|
331 | + }else { |
|
332 | 332 | $message = i18n::_('No se ha encontrado el modelo al que se hace referencia para actualizar'); |
333 | 333 | } |
334 | 334 | |
@@ -356,15 +356,15 @@ discard block |
||
356 | 356 | $this->con->beginTransaction(); |
357 | 357 | $this->hydrateModel($pk); |
358 | 358 | if (NULL !== $this->model) { |
359 | - if(method_exists('clearAllReferences', $this->model)) { |
|
359 | + if (method_exists('clearAllReferences', $this->model)) { |
|
360 | 360 | $this->model->clearAllReferences(true); |
361 | 361 | } |
362 | 362 | $this->model->delete($this->con); |
363 | 363 | $deleted = TRUE; |
364 | 364 | } |
365 | - } catch (\Exception $e) { |
|
365 | + }catch (\Exception $e) { |
|
366 | 366 | $context = []; |
367 | - if(null !== $e->getPrevious()) { |
|
367 | + if (null !== $e->getPrevious()) { |
|
368 | 368 | $context[] = $e->getPrevious()->getMessage(); |
369 | 369 | } |
370 | 370 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | $this->saveBulk(); |
395 | 395 | $saved = true; |
396 | 396 | $status = 200; |
397 | - } catch(\Exception $e) { |
|
397 | + }catch (\Exception $e) { |
|
398 | 398 | Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData()); |
399 | 399 | $message = i18n::_('Bulk insert rolled back'); |
400 | 400 | } |
@@ -416,7 +416,7 @@ discard block |
||
416 | 416 | |
417 | 417 | /** @var CustomerTableMap $tableMap */ |
418 | 418 | $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap()); |
419 | - foreach($this->list->getData() as $data) { |
|
419 | + foreach ($this->list->getData() as $data) { |
|
420 | 420 | $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data); |
421 | 421 | } |
422 | 422 | return $return; |
@@ -433,23 +433,23 @@ discard block |
||
433 | 433 | try { |
434 | 434 | $this->paginate(); |
435 | 435 | if (null !== $this->list) { |
436 | - if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
436 | + if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
437 | 437 | $return = $this->extractDataWithFormat(); |
438 | - } else { |
|
438 | + }else { |
|
439 | 439 | $return = $this->list->toArray(null, false, $this->fieldType ?: TableMap::TYPE_PHPNAME, false); |
440 | 440 | } |
441 | 441 | $total = 0; |
442 | 442 | $pages = 0; |
443 | - if($this->list instanceof PropelModelPager) { |
|
443 | + if ($this->list instanceof PropelModelPager) { |
|
444 | 444 | $total = $this->list->getNbResults(); |
445 | 445 | $pages = $this->list->getLastPage(); |
446 | - } elseif($this->list instanceof ArrayCollection) { |
|
446 | + } elseif ($this->list instanceof ArrayCollection) { |
|
447 | 447 | $total = count($return); |
448 | 448 | $pages = 1; |
449 | 449 | } |
450 | 450 | } |
451 | - } catch (\Exception $e) { |
|
452 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
451 | + }catch (\Exception $e) { |
|
452 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
453 | 453 | } |
454 | 454 | |
455 | 455 | return array($return, $total, $pages); |
@@ -467,7 +467,7 @@ discard block |
||
467 | 467 | $return = array(); |
468 | 468 | if (NULL === $model || !method_exists($model, 'toArray')) { |
469 | 469 | $code = 404; |
470 | - } else { |
|
470 | + }else { |
|
471 | 471 | $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
472 | 472 | } |
473 | 473 |
@@ -15,7 +15,7 @@ |
||
15 | 15 | } |
16 | 16 | |
17 | 17 | public static function parseRawData($type, array $params = []) { |
18 | - switch($type) { |
|
18 | + switch ($type) { |
|
19 | 19 | default: |
20 | 20 | case self::TYPE_HTTP: |
21 | 21 | $parsedParams = http_build_query($params); |
@@ -75,21 +75,21 @@ discard block |
||
75 | 75 | if (count($pks) == 1) { |
76 | 76 | $pks = array_keys($pks); |
77 | 77 | return [ |
78 | - $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD |
|
78 | + $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD |
|
79 | 79 | ]; |
80 | 80 | } elseif (count($pks) > 1) { |
81 | 81 | $apiPks = []; |
82 | 82 | $principal = ''; |
83 | 83 | $sep = 'CONCAT('; |
84 | 84 | foreach ($pks as $pk) { |
85 | - $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName(); |
|
86 | - $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName(); |
|
87 | - $sep = ', "' . Api::API_PK_SEPARATOR . '", '; |
|
85 | + $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName(); |
|
86 | + $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName(); |
|
87 | + $sep = ', "'.Api::API_PK_SEPARATOR.'", '; |
|
88 | 88 | } |
89 | 89 | $principal .= ')'; |
90 | 90 | $apiPks[$principal] = Api::API_MODEL_KEY_FIELD; |
91 | 91 | return $apiPks; |
92 | - } else { |
|
92 | + }else { |
|
93 | 93 | throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta')); |
94 | 94 | } |
95 | 95 | } |
@@ -112,10 +112,10 @@ discard block |
||
112 | 112 | $pks = ''; |
113 | 113 | $sep = ''; |
114 | 114 | foreach ($tableMap->getPrimaryKeys() as $pk) { |
115 | - $pks .= $sep . $pk->getFullyQualifiedName(); |
|
115 | + $pks .= $sep.$pk->getFullyQualifiedName(); |
|
116 | 116 | $sep = ', "|", '; |
117 | 117 | } |
118 | - $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD; |
|
118 | + $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD; |
|
119 | 119 | } |
120 | 120 | |
121 | 121 | /** |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | } |
138 | 138 | if (null !== $column) { |
139 | 139 | $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD; |
140 | - } else { |
|
140 | + }else { |
|
141 | 141 | $this->addClassListName($tableMap); |
142 | 142 | } |
143 | 143 | } |
@@ -156,15 +156,15 @@ discard block |
||
156 | 156 | $this->addPkToList(); |
157 | 157 | } |
158 | 158 | if (!empty($this->extraColumns)) { |
159 | - if(Config::getParam('api.extrafields.compat', true)) { |
|
159 | + if (Config::getParam('api.extrafields.compat', true)) { |
|
160 | 160 | $fields = array_values($this->extraColumns); |
161 | - } else { |
|
161 | + }else { |
|
162 | 162 | $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD); |
163 | 163 | $fields = explode(',', $returnFields ?: ''); |
164 | 164 | $fields[] = self::API_MODEL_KEY_FIELD; |
165 | 165 | } |
166 | 166 | foreach ($this->extraColumns as $expression => $columnName) { |
167 | - if(empty($fields) || in_array($columnName, $fields)) { |
|
167 | + if (empty($fields) || in_array($columnName, $fields)) { |
|
168 | 168 | $query->withColumn($expression, $columnName); |
169 | 169 | } |
170 | 170 | } |
@@ -196,17 +196,17 @@ discard block |
||
196 | 196 | { |
197 | 197 | $this->extractApiLang(); |
198 | 198 | $model = $this->getModelNamespace(); |
199 | - $modelI18n = $model . 'I18n'; |
|
199 | + $modelI18n = $model.'I18n'; |
|
200 | 200 | if (method_exists($query, 'useI18nQuery')) { |
201 | 201 | $query->useI18nQuery($this->lang); |
202 | - $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap'; |
|
202 | + $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap'; |
|
203 | 203 | /** @var TableMap $modelI18nTableMap */ |
204 | 204 | $modelI18nTableMap = $modelI18nTableMapClass::getTableMap(); |
205 | - foreach($modelI18nTableMap->getColumns() as $columnMap) { |
|
206 | - if(!$columnMap->isPrimaryKey()) { |
|
207 | - $query->withColumn($modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName(), $columnMap->getPhpName()); |
|
208 | - } elseif(!$columnMap->isForeignKey()) { |
|
209 | - $query->withColumn('IFNULL(' . $modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName() . ', "'.$this->lang.'")', $columnMap->getPhpName()); |
|
205 | + foreach ($modelI18nTableMap->getColumns() as $columnMap) { |
|
206 | + if (!$columnMap->isPrimaryKey()) { |
|
207 | + $query->withColumn($modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName(), $columnMap->getPhpName()); |
|
208 | + } elseif (!$columnMap->isForeignKey()) { |
|
209 | + $query->withColumn('IFNULL('.$modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName().', "'.$this->lang.'")', $columnMap->getPhpName()); |
|
210 | 210 | } |
211 | 211 | } |
212 | 212 | } |
@@ -220,20 +220,20 @@ discard block |
||
220 | 220 | $model->fromArray($data); |
221 | 221 | $tableMap = $this->getTableMap(); |
222 | 222 | try { |
223 | - if($tableMap->hasRelation($tableMap->getPhpName() . 'I18n')) |
|
223 | + if ($tableMap->hasRelation($tableMap->getPhpName().'I18n')) |
|
224 | 224 | { |
225 | - $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n'); |
|
225 | + $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n'); |
|
226 | 226 | $i18NTableMap = $relateI18n->getLocalTable(); |
227 | - foreach($i18NTableMap->getColumns() as $columnMap) { |
|
228 | - $method = 'set' . $columnMap->getPhpName(); |
|
229 | - if(!($columnMap->isPrimaryKey() && $columnMap->isForeignKey()) |
|
227 | + foreach ($i18NTableMap->getColumns() as $columnMap) { |
|
228 | + $method = 'set'.$columnMap->getPhpName(); |
|
229 | + if (!($columnMap->isPrimaryKey() && $columnMap->isForeignKey()) |
|
230 | 230 | &&array_key_exists($columnMap->getPhpName(), $data) |
231 | 231 | && method_exists($model, $method)) { |
232 | 232 | $model->$method($data[$columnMap->getPhpName()]); |
233 | 233 | } |
234 | 234 | } |
235 | 235 | } |
236 | - } catch(\Exception $e) { |
|
236 | + }catch (\Exception $e) { |
|
237 | 237 | Logger::log($e->getMessage(), LOG_DEBUG); |
238 | 238 | } |
239 | 239 | } |
@@ -243,7 +243,7 @@ discard block |
||
243 | 243 | */ |
244 | 244 | protected function checkFieldType() { |
245 | 245 | $configType = Config::getParam('api.field.type'); |
246 | - switch($configType) { |
|
246 | + switch ($configType) { |
|
247 | 247 | case 'UpperCamelCase': |
248 | 248 | case TableMap::TYPE_PHPNAME: |
249 | 249 | $this->fieldType = TableMap::TYPE_PHPNAME; |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | protected $isMultipart = false; |
71 | 71 | |
72 | 72 | private function closeConnection() { |
73 | - if(null !== $this->con) { |
|
73 | + if (null !== $this->con) { |
|
74 | 74 | curl_close($this->con); |
75 | 75 | } |
76 | 76 | } |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | */ |
234 | 234 | public function setIsJson($isJson = true) { |
235 | 235 | $this->isJson = $isJson; |
236 | - if($isJson) { |
|
236 | + if ($isJson) { |
|
237 | 237 | $this->setIsMultipart(false); |
238 | 238 | } |
239 | 239 | } |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | */ |
252 | 252 | public function setIsMultipart($isMultipart = true) { |
253 | 253 | $this->isMultipart = $isMultipart; |
254 | - if($isMultipart) { |
|
254 | + if ($isMultipart) { |
|
255 | 255 | $this->setIsJson(false); |
256 | 256 | } |
257 | 257 | } |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | $this->url = NULL; |
272 | 272 | $this->params = array(); |
273 | 273 | $this->headers = array(); |
274 | - Logger::log('Context service for ' . static::class . ' cleared!'); |
|
274 | + Logger::log('Context service for '.static::class.' cleared!'); |
|
275 | 275 | $this->closeConnection(); |
276 | 276 | } |
277 | 277 | |
@@ -314,18 +314,18 @@ discard block |
||
314 | 314 | } |
315 | 315 | |
316 | 316 | protected function applyOptions() { |
317 | - if(count($this->options)) { |
|
317 | + if (count($this->options)) { |
|
318 | 318 | curl_setopt_array($this->con, $this->options); |
319 | 319 | } |
320 | 320 | } |
321 | 321 | |
322 | 322 | protected function applyHeaders() { |
323 | 323 | $headers = []; |
324 | - foreach($this->headers as $key => $value) { |
|
325 | - $headers[] = $key . ': ' . $value; |
|
324 | + foreach ($this->headers as $key => $value) { |
|
325 | + $headers[] = $key.': '.$value; |
|
326 | 326 | } |
327 | 327 | $headers[self::PSFS_TRACK_HEADER] = Logger::getUid(); |
328 | - if(count($headers)) { |
|
328 | + if (count($headers)) { |
|
329 | 329 | curl_setopt($this->con, CURLOPT_HTTPHEADER, $headers); |
330 | 330 | } |
331 | 331 | } |
@@ -334,10 +334,10 @@ discard block |
||
334 | 334 | * @return int |
335 | 335 | */ |
336 | 336 | private function parseServiceType() { |
337 | - if($this->getIsJson()) { |
|
337 | + if ($this->getIsJson()) { |
|
338 | 338 | return ServiceHelper::TYPE_JSON; |
339 | 339 | } |
340 | - if($this->getIsMultipart()) { |
|
340 | + if ($this->getIsMultipart()) { |
|
341 | 341 | return ServiceHelper::TYPE_MULTIPART; |
342 | 342 | } |
343 | 343 | return ServiceHelper::TYPE_HTTP; |
@@ -350,9 +350,9 @@ discard block |
||
350 | 350 | case Request::VERB_GET: |
351 | 351 | default: |
352 | 352 | $this->addOption(CURLOPT_CUSTOMREQUEST, Request::VERB_GET); |
353 | - if(!empty($this->params)) { |
|
353 | + if (!empty($this->params)) { |
|
354 | 354 | $sep = false !== strpos($this->getUrl(), '?') ? '?' : ''; |
355 | - $this->url = $this->url . $sep . http_build_query($this->params); |
|
355 | + $this->url = $this->url.$sep.http_build_query($this->params); |
|
356 | 356 | } |
357 | 357 | break; |
358 | 358 | case Request::VERB_POST: |
@@ -384,14 +384,14 @@ discard block |
||
384 | 384 | $this->applyOptions(); |
385 | 385 | $this->applyHeaders(); |
386 | 386 | $verbose = null; |
387 | - if('debug' === Config::getParam('log.level')) { |
|
387 | + if ('debug' === Config::getParam('log.level')) { |
|
388 | 388 | curl_setopt($this->con, CURLOPT_VERBOSE, true); |
389 | 389 | $verbose = fopen('php://temp', 'wb+'); |
390 | 390 | curl_setopt($this->con, CURLOPT_STDERR, $verbose); |
391 | 391 | } |
392 | 392 | $result = curl_exec($this->con); |
393 | 393 | $this->result = $this->isJson ? json_decode($result, true) : $result; |
394 | - if('debug' === Config::getParam('log.level')) { |
|
394 | + if ('debug' === Config::getParam('log.level')) { |
|
395 | 395 | rewind($verbose); |
396 | 396 | $verboseLog = stream_get_contents($verbose); |
397 | 397 | Logger::log($verboseLog, LOG_DEBUG, [ |
@@ -401,7 +401,7 @@ discard block |
||
401 | 401 | ]); |
402 | 402 | $this->info['verbose'] = $verboseLog; |
403 | 403 | } |
404 | - Logger::log($this->url . ' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]); |
|
404 | + Logger::log($this->url.' response: ', LOG_DEBUG, is_array($this->result) ? $this->result : [$this->result]); |
|
405 | 405 | $this->info = array_merge($this->info, curl_getinfo($this->con)); |
406 | 406 | } |
407 | 407 |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | */ |
146 | 146 | public static function header($name, $default = null) |
147 | 147 | { |
148 | - return self::getInstance()->getHeader($name, $default); |
|
148 | + return self::getInstance()->getHeader($name, $default); |
|
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
@@ -158,10 +158,10 @@ discard block |
||
158 | 158 | $header = null; |
159 | 159 | if ($this->hasHeader($name)) { |
160 | 160 | $header = $this->header[$name]; |
161 | - } else if(array_key_exists('h_' . strtolower($name), $this->query)) { |
|
162 | - $header = $this->query['h_' . strtolower($name)]; |
|
163 | - } else if(array_key_exists('HTTP_' . strtoupper(str_replace('-', '_', $name)), $this->server)) { |
|
164 | - $header = $this->server['HTTP_' . strtoupper(str_replace('-', '_', $name))]; |
|
161 | + }else if (array_key_exists('h_'.strtolower($name), $this->query)) { |
|
162 | + $header = $this->query['h_'.strtolower($name)]; |
|
163 | + }else if (array_key_exists('HTTP_'.strtoupper(str_replace('-', '_', $name)), $this->server)) { |
|
164 | + $header = $this->server['HTTP_'.strtoupper(str_replace('-', '_', $name))]; |
|
165 | 165 | } |
166 | 166 | return $header ?: $default; |
167 | 167 | } |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | $url = $this->getServer('HTTP_ORIGIN'); |
261 | 261 | } |
262 | 262 | ob_start(); |
263 | - header('Location: ' . $url); |
|
263 | + header('Location: '.$url); |
|
264 | 264 | ob_end_clean(); |
265 | 265 | Security::getInstance()->updateSession(); |
266 | 266 | exit(t('Redireccionando...')); |
@@ -305,10 +305,10 @@ discard block |
||
305 | 305 | $url = $this->getServerName(); |
306 | 306 | $protocol = $hasProtocol ? $this->getProtocol() : ''; |
307 | 307 | if (!empty($protocol)) { |
308 | - $url = $protocol . $url; |
|
308 | + $url = $protocol.$url; |
|
309 | 309 | } |
310 | 310 | if (!in_array($this->getServer('SERVER_PORT'), [80, 443], true)) { |
311 | - $url .= ':' . $this->getServer('SERVER_PORT'); |
|
311 | + $url .= ':'.$this->getServer('SERVER_PORT'); |
|
312 | 312 | } |
313 | 313 | return $url; |
314 | 314 | } |
@@ -39,13 +39,13 @@ discard block |
||
39 | 39 | |
40 | 40 | $filePath = ''; |
41 | 41 | if (!file_exists($filePath)) { |
42 | - $filePath = BASE_DIR . $string; |
|
42 | + $filePath = BASE_DIR.$string; |
|
43 | 43 | } |
44 | 44 | $filenamePath = AssetsParser::findDomainPath($string, $filePath); |
45 | 45 | |
46 | 46 | $filePath = self::processAsset($string, $name, $return, $filenamePath); |
47 | 47 | $basePath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl()); |
48 | - $returnPath = empty($name) ? $basePath . '/' . $filePath : $name; |
|
48 | + $returnPath = empty($name) ? $basePath.'/'.$filePath : $name; |
|
49 | 49 | return $return ? $returnPath : ''; |
50 | 50 | } |
51 | 51 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $router = Router::getInstance(); |
63 | 63 | try { |
64 | 64 | return $router->getRoute($path, $absolute, $params); |
65 | - } catch (\Exception $e) { |
|
65 | + }catch (\Exception $e) { |
|
66 | 66 | return $router->getRoute('', $absolute, $params); |
67 | 67 | } |
68 | 68 | } |
@@ -205,9 +205,9 @@ discard block |
||
205 | 205 | { |
206 | 206 | $data = file_get_contents($filenamePath); |
207 | 207 | if (!empty($name)) { |
208 | - file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
|
208 | + file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data); |
|
209 | 209 | }else { |
210 | - file_put_contents($base . $filePath, $data); |
|
210 | + file_put_contents($base.$filePath, $data); |
|
211 | 211 | } |
212 | 212 | } |
213 | 213 | |
@@ -226,9 +226,9 @@ discard block |
||
226 | 226 | if (file_exists($filenamePath)) { |
227 | 227 | list($base, $htmlBase, $filePath) = AssetsParser::calculateAssetPath($string, $name, $return, $filenamePath); |
228 | 228 | //Creamos el directorio si no existe |
229 | - GeneratorHelper::createDir($base . $htmlBase); |
|
229 | + GeneratorHelper::createDir($base.$htmlBase); |
|
230 | 230 | //Si se ha modificado |
231 | - if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($filenamePath)) { |
|
231 | + if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($filenamePath)) { |
|
232 | 232 | if ($htmlBase === 'css') { |
233 | 233 | self::processCssLines($filenamePath); |
234 | 234 | } |
@@ -206,7 +206,7 @@ |
||
206 | 206 | $data = file_get_contents($filenamePath); |
207 | 207 | if (!empty($name)) { |
208 | 208 | file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
209 | - }else { |
|
209 | + } else { |
|
210 | 210 | file_put_contents($base . $filePath, $data); |
211 | 211 | } |
212 | 212 | } |