@@ -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 | } |
@@ -19,11 +19,11 @@ discard block |
||
19 | 19 | public static function getClassToCall(array $action) |
20 | 20 | { |
21 | 21 | Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action); |
22 | - $actionClass = class_exists($action['class']) ? $action['class'] : "\\" . $action['class']; |
|
22 | + $actionClass = class_exists($action['class']) ? $action['class'] : "\\".$action['class']; |
|
23 | 23 | $reflectionClass = new \ReflectionClass($actionClass); |
24 | - if($reflectionClass->hasMethod('getInstance')) { |
|
24 | + if ($reflectionClass->hasMethod('getInstance')) { |
|
25 | 25 | $class = $reflectionClass->getMethod('getInstance')->invoke(null, $action['method']); |
26 | - } else { |
|
26 | + }else { |
|
27 | 27 | $class = new $actionClass; |
28 | 28 | } |
29 | 29 | return $class; |
@@ -112,7 +112,7 @@ discard block |
||
112 | 112 | $expr = preg_quote($expr, '/'); |
113 | 113 | $expr = str_replace('###', '(.*)', $expr); |
114 | 114 | $expr2 = preg_replace('/\(\.\*\)$/', '', $expr); |
115 | - $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path); |
|
115 | + $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path); |
|
116 | 116 | return $matched; |
117 | 117 | } |
118 | 118 | |
@@ -123,8 +123,8 @@ discard block |
||
123 | 123 | */ |
124 | 124 | public static function extractDomainInfo(\ReflectionClass $class, $domain) |
125 | 125 | { |
126 | - $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR; |
|
127 | - $path = realpath($path) . DIRECTORY_SEPARATOR; |
|
126 | + $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR; |
|
127 | + $path = realpath($path).DIRECTORY_SEPARATOR; |
|
128 | 128 | $templatesPath = 'templates'; |
129 | 129 | $publicPath = 'public'; |
130 | 130 | $modelsPath = 'models'; |
@@ -134,13 +134,13 @@ discard block |
||
134 | 134 | $modelsPath = ucfirst($modelsPath); |
135 | 135 | } |
136 | 136 | if ($class->hasConstant('TPL')) { |
137 | - $templatesPath .= DIRECTORY_SEPARATOR . $class->getConstant('TPL'); |
|
137 | + $templatesPath .= DIRECTORY_SEPARATOR.$class->getConstant('TPL'); |
|
138 | 138 | } |
139 | 139 | return [ |
140 | 140 | 'base' => $path, |
141 | - 'template' => $path . $templatesPath, |
|
142 | - 'model' => $path . $modelsPath, |
|
143 | - 'public' => $path . $publicPath, |
|
141 | + 'template' => $path.$templatesPath, |
|
142 | + 'model' => $path.$modelsPath, |
|
143 | + 'public' => $path.$publicPath, |
|
144 | 144 | ]; |
145 | 145 | } |
146 | 146 | |
@@ -164,12 +164,12 @@ discard block |
||
164 | 164 | foreach ($parameters as $param) { |
165 | 165 | if ($param->isOptional() && !is_array($param->getDefaultValue())) { |
166 | 166 | $params[$param->getName()] = $param->getDefaultValue(); |
167 | - $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex); |
|
168 | - } elseif(!$param->isOptional()) { |
|
167 | + $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex); |
|
168 | + } elseif (!$param->isOptional()) { |
|
169 | 169 | $requirements[] = $param->getName(); |
170 | 170 | } |
171 | 171 | } |
172 | - } else { |
|
172 | + }else { |
|
173 | 173 | $default = $regex; |
174 | 174 | } |
175 | 175 | |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | $default = str_replace('{__DOMAIN__}', $module, $default); |
252 | 252 | $httpMethod = self::extractReflectionHttpMethod($docComments); |
253 | 253 | $label = self::extractReflectionLabel(str_replace('{__API__}', $api, $docComments)); |
254 | - $route = $httpMethod . "#|#" . $regex; |
|
254 | + $route = $httpMethod."#|#".$regex; |
|
255 | 255 | $route = preg_replace('/(\\r|\\f|\\t|\\n)/', '', $route); |
256 | 256 | $info = [ |
257 | 257 | 'method' => $method->getName(), |
@@ -45,10 +45,10 @@ discard block |
||
45 | 45 | if (!headers_sent()) { |
46 | 46 | // TODO include this headers in Template class output method |
47 | 47 | header('Access-Control-Allow-Credentials: true'); |
48 | - header('Access-Control-Allow-Origin: ' . Request::getInstance()->getServer('HTTP_ORIGIN', '*')); |
|
48 | + header('Access-Control-Allow-Origin: '.Request::getInstance()->getServer('HTTP_ORIGIN', '*')); |
|
49 | 49 | header('Vary: Origin'); |
50 | 50 | header('Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS'); |
51 | - header('Access-Control-Allow-Headers: ' . implode(', ', self::getCorsHeaders())); |
|
51 | + header('Access-Control-Allow-Headers: '.implode(', ', self::getCorsHeaders())); |
|
52 | 52 | } |
53 | 53 | if (Request::getInstance()->getMethod() === Request::VERB_OPTIONS) { |
54 | 54 | Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests', LOG_DEBUG); |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | return $ip; |
79 | 79 | } |
80 | 80 | } |
81 | - } else { |
|
81 | + }else { |
|
82 | 82 | if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR'])) { |
83 | 83 | return $_SERVER['HTTP_X_FORWARDED_FOR']; |
84 | 84 | } |
@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | public function add($name, array $value = array()) |
70 | 70 | { |
71 | 71 | $this->fields[$name] = $value; |
72 | - $this->fields[$name]['name'] = $this->getName() . '[{$name}]'; |
|
73 | - $this->fields[$name]['id'] = $this->getName() . '_' . $name; |
|
72 | + $this->fields[$name]['name'] = $this->getName().'[{$name}]'; |
|
73 | + $this->fields[$name]['id'] = $this->getName().'_'.$name; |
|
74 | 74 | $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name; |
75 | 75 | $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true; |
76 | 76 | return $this; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | if ('' !== $hashOrig) { |
135 | 135 | $this->crfs = sha1($hashOrig); |
136 | - $this->add($this->getName() . '_token', array( |
|
136 | + $this->add($this->getName().'_token', array( |
|
137 | 137 | 'type' => 'hidden', |
138 | 138 | 'value' => $this->crfs, |
139 | 139 | )); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | public function isValid() |
203 | 203 | { |
204 | 204 | $valid = true; |
205 | - $tokenField = $this->getName() . '_token'; |
|
205 | + $tokenField = $this->getName().'_token'; |
|
206 | 206 | //Controlamos CSRF token |
207 | 207 | if (!$this->existsFormToken($tokenField)) { |
208 | 208 | $this->errors[$tokenField] = t('Formulario no válido'); |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | $data = array(); |
277 | 277 | if (count($this->fields) > 0) { |
278 | 278 | foreach ($this->fields as $key => $field) { |
279 | - if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) { |
|
279 | + if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) { |
|
280 | 280 | $data[$key] = array_key_exists('value', $field) ? $field['value'] : null; |
281 | 281 | } |
282 | 282 | } |
@@ -390,8 +390,8 @@ discard block |
||
390 | 390 | $model = $this->getHydratedModel(); |
391 | 391 | $model->save(); |
392 | 392 | $save = true; |
393 | - Logger::log(get_class($this->model) . ' guardado con id ' . $this->model->getPrimaryKey(), LOG_INFO); |
|
394 | - } catch (\Exception $e) { |
|
393 | + Logger::log(get_class($this->model).' guardado con id '.$this->model->getPrimaryKey(), LOG_INFO); |
|
394 | + }catch (\Exception $e) { |
|
395 | 395 | Logger::log($e->getMessage(), LOG_ERR); |
396 | 396 | throw new FormException($e->getMessage(), $e->getCode(), $e); |
397 | 397 | } |
@@ -410,10 +410,10 @@ discard block |
||
410 | 410 | if (null === $value) { |
411 | 411 | $isEmpty = true; |
412 | 412 | // Empty Array check |
413 | - } else if (is_array($value) && 0 === count($value)) { |
|
413 | + }else if (is_array($value) && 0 === count($value)) { |
|
414 | 414 | $isEmpty = true; |
415 | 415 | // Empty string check |
416 | - } else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
416 | + }else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) { |
|
417 | 417 | $isEmpty = true; |
418 | 418 | } |
419 | 419 | |
@@ -440,7 +440,7 @@ discard block |
||
440 | 440 | && array_key_exists($key, $field) |
441 | 441 | && !array_key_exists('error', $field[$key]) |
442 | 442 | && !empty($field['value']) |
443 | - && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0 |
|
443 | + && preg_match('/'.$field['pattern'].'/', $field['value']) === 0 |
|
444 | 444 | ) { |
445 | 445 | $this->setError($key, str_replace('%s', '<strong>{$key}</strong>', t('El campo %s no tiene un formato válido'))); |
446 | 446 | $field['error'] = $this->getError($key); |
@@ -462,10 +462,10 @@ discard block |
||
462 | 462 | if (array_key_exists($key, $data[$formName])) { |
463 | 463 | if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) { |
464 | 464 | $field['value'] = null; |
465 | - } else { |
|
465 | + }else { |
|
466 | 466 | $field['value'] = $data[$formName][$key]; |
467 | 467 | } |
468 | - } else { |
|
468 | + }else { |
|
469 | 469 | unset($field['value']); |
470 | 470 | } |
471 | 471 | return array($data, $field); |
@@ -479,8 +479,8 @@ discard block |
||
479 | 479 | */ |
480 | 480 | private function hydrateModelField($key, $value) |
481 | 481 | { |
482 | - $setter = 'set' . ucfirst($key); |
|
483 | - $getter = 'get' . ucfirst($key); |
|
482 | + $setter = 'set'.ucfirst($key); |
|
483 | + $getter = 'get'.ucfirst($key); |
|
484 | 484 | if (method_exists($this->model, $setter)) { |
485 | 485 | if (method_exists($this->model, $getter)) { |
486 | 486 | $tmp = $this->model->$getter(); |
@@ -505,16 +505,16 @@ discard block |
||
505 | 505 | { |
506 | 506 | //Extraemos el dato del modelo relacionado si existe el getter |
507 | 507 | $method = null; |
508 | - if (array_key_exists('class_data', $field) && method_exists($val, 'get' . $field['class_data'])) { |
|
509 | - $classMethod = 'get' . $field['class_data']; |
|
508 | + if (array_key_exists('class_data', $field) && method_exists($val, 'get'.$field['class_data'])) { |
|
509 | + $classMethod = 'get'.$field['class_data']; |
|
510 | 510 | $class = $val->$classMethod(); |
511 | - if (array_key_exists('class_id', $field) && method_exists($class, 'get' . $field['class_id'])) { |
|
512 | - $method = 'get' . $field['class_id']; |
|
511 | + if (array_key_exists('class_id', $field) && method_exists($class, 'get'.$field['class_id'])) { |
|
512 | + $method = 'get'.$field['class_id']; |
|
513 | 513 | $data[] = $class->$method(); |
514 | - } else { |
|
514 | + }else { |
|
515 | 515 | $data[] = $class->getPrimaryKey(); |
516 | 516 | } |
517 | - } else { |
|
517 | + }else { |
|
518 | 518 | $data[] = $val; |
519 | 519 | } |
520 | 520 | |
@@ -530,7 +530,7 @@ discard block |
||
530 | 530 | private function extractModelFieldValue($key, $field) |
531 | 531 | { |
532 | 532 | //Extraemos el valor del campo del modelo |
533 | - $method = 'get' . ucfirst($key); |
|
533 | + $method = 'get'.ucfirst($key); |
|
534 | 534 | $type = (array_key_exists('type', $field)) ? $field['type'] : 'text'; |
535 | 535 | //Extraemos los campos del modelo |
536 | 536 | if (method_exists($this->model, $method)) { |
@@ -540,16 +540,16 @@ discard block |
||
540 | 540 | //Si es una relación múltiple |
541 | 541 | if ($value instanceof ObjectCollection) { |
542 | 542 | $field = $this->computeModelFieldValue($field, $value, $type); |
543 | - } else { //O una relación unitaria |
|
543 | + }else { //O una relación unitaria |
|
544 | 544 | if (method_exists($value, '__toString')) { |
545 | 545 | $field['value'] = $value; |
546 | 546 | } elseif ($value instanceof \DateTime) { |
547 | 547 | $field['value'] = $value->format('Y-m-d H:i:s'); |
548 | - } else { |
|
548 | + }else { |
|
549 | 549 | $field['value'] = $value->getPrimaryKey(); |
550 | 550 | } |
551 | 551 | } |
552 | - } else { |
|
552 | + }else { |
|
553 | 553 | $field['value'] = $value; |
554 | 554 | } |
555 | 555 | } |
@@ -96,15 +96,15 @@ discard block |
||
96 | 96 | protected function hydrateBulkRequest() { |
97 | 97 | $class = new \ReflectionClass($this->getModelNamespace()); |
98 | 98 | $this->list = []; |
99 | - foreach($this->data as $item) { |
|
100 | - if(is_array($item)) { |
|
101 | - if(count($this->list) < Config::getParam('api.block.limit', 1000)) { |
|
99 | + foreach ($this->data as $item) { |
|
100 | + if (is_array($item)) { |
|
101 | + if (count($this->list) < Config::getParam('api.block.limit', 1000)) { |
|
102 | 102 | /** @var ActiveRecordInterface $model */ |
103 | 103 | $model = $class->newInstance(); |
104 | 104 | $this->hydrateModelFromRequest($model, $item); |
105 | 105 | $this->list[] = $model; |
106 | - } else { |
|
107 | - Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data) . t('items')); |
|
106 | + }else { |
|
107 | + Logger::log(t('Max items per bulk insert raised'), LOG_WARNING, count($this->data).t('items')); |
|
108 | 108 | } |
109 | 109 | } |
110 | 110 | } |
@@ -115,12 +115,12 @@ discard block |
||
115 | 115 | */ |
116 | 116 | protected function saveBulk() { |
117 | 117 | $tablemap = $this->getTableMap(); |
118 | - foreach($this->list as &$model) { |
|
118 | + foreach ($this->list as &$model) { |
|
119 | 119 | $con = Propel::getWriteConnection($tablemap::DATABASE_NAME); |
120 | 120 | try { |
121 | 121 | $model->save($con); |
122 | 122 | $con->commit(); |
123 | - } catch(\Exception $e) { |
|
123 | + }catch (\Exception $e) { |
|
124 | 124 | Logger::log($e->getMessage(), LOG_ERR, $model->toArray()); |
125 | 125 | $con->rollBack(); |
126 | 126 | } |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | protected function exportList() { |
134 | 134 | $list = []; |
135 | 135 | /** @var ActiveRecordInterface $item */ |
136 | - foreach($this->list as $item) { |
|
136 | + foreach ($this->list as $item) { |
|
137 | 137 | $list[] = $item->toArray(); |
138 | 138 | } |
139 | 139 | return $list; |
@@ -157,18 +157,18 @@ discard block |
||
157 | 157 | */ |
158 | 158 | protected function findPk(ModelCriteria $query, $primaryKey) { |
159 | 159 | $pks = explode(Api::API_PK_SEPARATOR, urldecode($primaryKey)); |
160 | - if(count($pks) === 1 && !empty($pks[0])) { |
|
160 | + if (count($pks) === 1 && !empty($pks[0])) { |
|
161 | 161 | $query->filterByPrimaryKey($pks[0]); |
162 | - } else { |
|
162 | + }else { |
|
163 | 163 | $item = 0; |
164 | - foreach($this->getPkDbName() as $phpName) { |
|
164 | + foreach ($this->getPkDbName() as $phpName) { |
|
165 | 165 | try { |
166 | 166 | $query->filterBy($phpName, $pks[$item]); |
167 | 167 | $item++; |
168 | - if($item >= count($pks)) { |
|
168 | + if ($item >= count($pks)) { |
|
169 | 169 | break; |
170 | 170 | } |
171 | - } catch(\Exception $e) { |
|
171 | + }catch (\Exception $e) { |
|
172 | 172 | Logger::log($e->getMessage(), LOG_DEBUG); |
173 | 173 | } |
174 | 174 | } |
@@ -198,8 +198,8 @@ discard block |
||
198 | 198 | try { |
199 | 199 | $query = $this->prepareQuery(); |
200 | 200 | $this->model = $this->findPk($query, $primaryKey); |
201 | - } catch (\Exception $e) { |
|
202 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
201 | + }catch (\Exception $e) { |
|
202 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
203 | 203 | } |
204 | 204 | } |
205 | 205 |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | //Generating the templates translations |
43 | 43 | $translations = $this->tpl->regenerateTemplates(); |
44 | 44 | |
45 | - $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
46 | - $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
45 | + $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
46 | + $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
47 | 47 | |
48 | 48 | //xgettext localizations |
49 | 49 | $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale)); |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $translations = array_merge($translations, GeneratorService::findTranslations(CACHE_DIR, $locale)); |
52 | 52 | |
53 | 53 | $translations[] = 'msgfmt {$locale_path}translations.po -o {$locale_path}translations.mo'; |
54 | - $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '. $localePath . 'translations.po -o ' . $localePath . 'translations.mo'); |
|
54 | + $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '.$localePath.'translations.po -o '.$localePath.'translations.mo'); |
|
55 | 55 | return $this->render('translations.html.twig', array( |
56 | 56 | 'translations' => $translations, |
57 | 57 | )); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | { |
34 | 34 | $platform = trim(Config::getInstance()->get('platform.name')); |
35 | 35 | header('HTTP/1.1 401 Unauthorized'); |
36 | - header('WWW-Authenticate: Basic Realm="' . $platform . '"'); |
|
36 | + header('WWW-Authenticate: Basic Realm="'.$platform.'"'); |
|
37 | 37 | echo t('Zona restringida'); |
38 | 38 | exit(); |
39 | 39 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $admin['class'] = 'primary'; |
76 | 76 | break; |
77 | 77 | } |
78 | - } else { |
|
78 | + }else { |
|
79 | 79 | $admin['class'] = 'primary'; |
80 | 80 | } |
81 | 81 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $logs = array(); |
94 | 94 | /** @var \SplFileInfo $file */ |
95 | 95 | foreach ($files as $file) { |
96 | - $size = $file->getSize() / 8 / 1024; |
|
96 | + $size = $file->getSize()/8/1024; |
|
97 | 97 | $time = date('c', $file->getMTime()); |
98 | 98 | $dateTime = new \DateTime($time); |
99 | 99 | if (!isset($logs[$dateTime->format('Y')])) { |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | $files->files()->in(LOG_DIR)->name($selectedLog); |
123 | 123 | $file = $match = null; |
124 | 124 | $log = array(); |
125 | - foreach($files as $item) { |
|
125 | + foreach ($files as $item) { |
|
126 | 126 | $file = $item; |
127 | 127 | $match = $item; |
128 | 128 | break; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | $time = date('c', $file->getMTime()); |
133 | 133 | $dateTime = new \DateTime($time); |
134 | 134 | $monthOpen = $dateTime->format('m'); |
135 | - $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename()); |
|
135 | + $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename()); |
|
136 | 136 | krsort($content); |
137 | 137 | $detailLog = array(); |
138 | 138 | foreach ($content as &$line) { |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | break; |
191 | 191 | } |
192 | 192 | |
193 | - } catch (\Exception $e) { |
|
193 | + }catch (\Exception $e) { |
|
194 | 194 | $detail = [ |
195 | 195 | 'type' => 'danger', |
196 | 196 | ]; |
@@ -55,10 +55,10 @@ discard block |
||
55 | 55 | if ($module === $requestModule && 0 === stripos($module, 'ROOT')) { |
56 | 56 | $modules = [ |
57 | 57 | 'name' => $module, |
58 | - 'path' => dirname($info['template'] . DIRECTORY_SEPARATOR . '..'), |
|
58 | + 'path' => dirname($info['template'].DIRECTORY_SEPARATOR.'..'), |
|
59 | 59 | ]; |
60 | 60 | } |
61 | - } catch (\Exception $e) { |
|
61 | + }catch (\Exception $e) { |
|
62 | 62 | $modules[] = $e->getMessage(); |
63 | 63 | } |
64 | 64 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public function extractApiEndpoints(array $module) |
78 | 78 | { |
79 | - $modulePath = $module['path'] . DIRECTORY_SEPARATOR . 'Api'; |
|
79 | + $modulePath = $module['path'].DIRECTORY_SEPARATOR.'Api'; |
|
80 | 80 | $moduleName = $module['name']; |
81 | 81 | $endpoints = []; |
82 | 82 | if (file_exists($modulePath)) { |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | if (count($finder)) { |
86 | 86 | /** @var \SplFileInfo $file */ |
87 | 87 | foreach ($finder as $file) { |
88 | - $namespace = "\\{$moduleName}\\Api\\" . str_replace('.php', '', $file->getFilename()); |
|
88 | + $namespace = "\\{$moduleName}\\Api\\".str_replace('.php', '', $file->getFilename()); |
|
89 | 89 | $info = $this->extractApiInfo($namespace, $moduleName); |
90 | 90 | if (!empty($info)) { |
91 | 91 | $endpoints[$namespace] = $info; |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | if (Router::exists($namespace) && !I18nHelper::checkI18Class($namespace)) { |
109 | 109 | $reflection = new \ReflectionClass($namespace); |
110 | 110 | $visible = InjectorHelper::checkIsVisible($reflection->getDocComment()); |
111 | - if($visible) { |
|
111 | + if ($visible) { |
|
112 | 112 | foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { |
113 | 113 | try { |
114 | 114 | $mInfo = $this->extractMethodInfo($namespace, $method, $reflection, $module); |
115 | 115 | if (NULL !== $mInfo) { |
116 | 116 | $info[] = $mInfo; |
117 | 117 | } |
118 | - } catch (\Exception $e) { |
|
118 | + }catch (\Exception $e) { |
|
119 | 119 | Logger::log($e->getMessage(), LOG_ERR); |
120 | 120 | } |
121 | 121 | } |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | $payload = $this->extractModelFields($namespace); |
249 | 249 | $reflector = new \ReflectionClass($namespace); |
250 | 250 | $shortName = $reflector->getShortName(); |
251 | - } else { |
|
251 | + }else { |
|
252 | 252 | $namespace = $model; |
253 | 253 | $shortName = $model; |
254 | 254 | } |
@@ -337,13 +337,13 @@ discard block |
||
337 | 337 | "required" => $field->isNotNull(), |
338 | 338 | 'format' => $format, |
339 | 339 | ]; |
340 | - if(count($field->getValueSet())) { |
|
340 | + if (count($field->getValueSet())) { |
|
341 | 341 | $info['enum'] = array_values($field->getValueSet()); |
342 | 342 | } |
343 | - if(null !== $field->getDefaultValue()) { |
|
343 | + if (null !== $field->getDefaultValue()) { |
|
344 | 344 | $info['default'] = $field->getDefaultValue(); |
345 | 345 | } |
346 | - switch(Config::getParam('api.field.type', TableMap::TYPE_PHPNAME)) { |
|
346 | + switch (Config::getParam('api.field.type', TableMap::TYPE_PHPNAME)) { |
|
347 | 347 | case 'UpperCamelCase': |
348 | 348 | case TableMap::TYPE_PHPNAME: |
349 | 349 | $payload[$field->getPhpName()] = $info; |
@@ -365,7 +365,7 @@ discard block |
||
365 | 365 | } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) { |
366 | 366 | $payload = $this->extractDtoProperties($namespace); |
367 | 367 | } |
368 | - } catch (\Exception $e) { |
|
368 | + }catch (\Exception $e) { |
|
369 | 369 | Logger::log($e->getMessage(), LOG_ERR); |
370 | 370 | } |
371 | 371 | |
@@ -396,7 +396,7 @@ discard block |
||
396 | 396 | $return = $this->extractReturn($modelNamespace, $docComments); |
397 | 397 | $url = array_pop($route); |
398 | 398 | $methodInfo = [ |
399 | - 'url' => str_replace('/' . $module . '/api', '', $url), |
|
399 | + 'url' => str_replace('/'.$module.'/api', '', $url), |
|
400 | 400 | 'method' => $info['http'], |
401 | 401 | 'description' => $info['label'], |
402 | 402 | 'return' => $return, |
@@ -407,7 +407,7 @@ discard block |
||
407 | 407 | $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments); |
408 | 408 | $this->setQueryParams($method, $methodInfo); |
409 | 409 | $this->setRequestHeaders($reflection, $methodInfo); |
410 | - } catch (\Exception $e) { |
|
410 | + }catch (\Exception $e) { |
|
411 | 411 | Logger::log($e->getMessage(), LOG_ERR); |
412 | 412 | } |
413 | 413 | } |
@@ -476,10 +476,10 @@ discard block |
||
476 | 476 | $formatted = [ |
477 | 477 | "swagger" => "2.0", |
478 | 478 | "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)), |
479 | - "basePath" => '/' . $module['name'] . '/api', |
|
479 | + "basePath" => '/'.$module['name'].'/api', |
|
480 | 480 | "schemes" => [Request::getInstance()->getServer('HTTPS') === 'on' ? 'https' : 'http'], |
481 | 481 | "info" => [ |
482 | - "title" => t('Documentación API módulo ') . $module['name'], |
|
482 | + "title" => t('Documentación API módulo ').$module['name'], |
|
483 | 483 | "version" => Config::getParam('api.version', '1.0.0'), |
484 | 484 | "contact" => [ |
485 | 485 | "name" => Config::getParam("author", "Fran López"), |
@@ -492,7 +492,7 @@ discard block |
||
492 | 492 | foreach ($endpoints as $model) { |
493 | 493 | foreach ($model as $endpoint) { |
494 | 494 | if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) { |
495 | - $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']); |
|
495 | + $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']); |
|
496 | 496 | $description = $endpoint['description']; |
497 | 497 | $method = strtolower($endpoint['method']); |
498 | 498 | $paths[$url][$method] = [ |
@@ -553,7 +553,7 @@ discard block |
||
553 | 553 | protected function extractDtoName($dto, $isArray = false) |
554 | 554 | { |
555 | 555 | $dto = explode('\\', $dto); |
556 | - $modelDto = array_pop($dto) . "Dto"; |
|
556 | + $modelDto = array_pop($dto)."Dto"; |
|
557 | 557 | if ($isArray) { |
558 | 558 | $modelDto .= "List"; |
559 | 559 | } |
@@ -603,10 +603,10 @@ discard block |
||
603 | 603 | { |
604 | 604 | |
605 | 605 | $methodInfo['headers'] = []; |
606 | - foreach($reflection->getProperties() as $property) { |
|
606 | + foreach ($reflection->getProperties() as $property) { |
|
607 | 607 | $doc = $property->getDocComment(); |
608 | 608 | preg_match('/@header\ (.*)\n/i', $doc, $headers); |
609 | - if(count($headers)) { |
|
609 | + if (count($headers)) { |
|
610 | 610 | $header = [ |
611 | 611 | "name" => $headers[1], |
612 | 612 | "in" => "header", |
@@ -651,7 +651,7 @@ discard block |
||
651 | 651 | foreach ($method->getParameters() as $parameter) { |
652 | 652 | $parameterName = $parameter->getName(); |
653 | 653 | $types = []; |
654 | - preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types); |
|
654 | + preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types); |
|
655 | 655 | if (count($types) > 1 && count($types[1]) > 0) { |
656 | 656 | $methodInfo['parameters'][$parameterName] = $types[1][0]; |
657 | 657 | } |
@@ -673,21 +673,21 @@ discard block |
||
673 | 673 | $modelDto['objects'][$dtoName][$param] = [ |
674 | 674 | 'type' => 'array', |
675 | 675 | 'items' => [ |
676 | - '$ref' => '#/definitions/' . $info['type'], |
|
676 | + '$ref' => '#/definitions/'.$info['type'], |
|
677 | 677 | ] |
678 | 678 | ]; |
679 | - } else { |
|
679 | + }else { |
|
680 | 680 | $modelDto['objects'][$dtoName][$param] = [ |
681 | 681 | 'type' => 'object', |
682 | - '$ref' => '#/definitions/' . $info['type'], |
|
682 | + '$ref' => '#/definitions/'.$info['type'], |
|
683 | 683 | ]; |
684 | 684 | } |
685 | 685 | $modelDto['objects'][$info['class']] = $info['properties']; |
686 | 686 | $paramDto = $this->checkDtoAttributes($info['properties'], $info['properties'], $info['class']); |
687 | - if(array_key_exists('objects', $paramDto)) { |
|
687 | + if (array_key_exists('objects', $paramDto)) { |
|
688 | 688 | $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']); |
689 | 689 | } |
690 | - } else { |
|
690 | + }else { |
|
691 | 691 | $modelDto['objects'][$dtoName][$param] = $info; |
692 | 692 | } |
693 | 693 | } |