@@ -83,9 +83,9 @@ |
||
83 | 83 | 'class' => 'btn-warning md-default', |
84 | 84 | 'icon' => 'fa-plus', |
85 | 85 | ]; |
86 | - if(Config::getParam('admin.version', 'v1') === 'v1') { |
|
87 | - $add['onclick'] = 'javascript:addNewField(document.getElementById("' . $this->getName() . '"));'; |
|
88 | - } else { |
|
86 | + if (Config::getParam('admin.version', 'v1') === 'v1') { |
|
87 | + $add['onclick'] = 'javascript:addNewField(document.getElementById("'.$this->getName().'"));'; |
|
88 | + }else { |
|
89 | 89 | $add['ng-click'] = 'addNewField()'; |
90 | 90 | } |
91 | 91 | $this->addButton('submit', _('Guardar configuración'), 'submit', array( |
@@ -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 | } |
@@ -55,10 +55,10 @@ discard block |
||
55 | 55 | if ($module === $requestModule && !preg_match('/^ROOT/i', $module)) { |
56 | 56 | $modules = [ |
57 | 57 | 'name' => $module, |
58 | - 'path' => dirname($info['base'] . DIRECTORY_SEPARATOR . '..'), |
|
58 | + 'path' => dirname($info['base'].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 | } |