@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace PSFS\base\types\traits; |
| 3 | 3 | |
| 4 | -if(!defined('PSFS_BOOSTRAP_TRAT_LOADED')) { |
|
| 4 | +if (!defined('PSFS_BOOSTRAP_TRAT_LOADED')) { |
|
| 5 | 5 | /** |
| 6 | 6 | * Class BoostrapTrait |
| 7 | 7 | * @package PSFS\base\types |
@@ -10,5 +10,5 @@ discard block |
||
| 10 | 10 | { |
| 11 | 11 | } |
| 12 | 12 | define('PSFS_BOOSTRAP_TRAT_LOADED', true); |
| 13 | - require_once __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'bootstrap.php'; |
|
| 13 | + require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'bootstrap.php'; |
|
| 14 | 14 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | { |
| 63 | 63 | if (preg_match('/^asc$/i', $direction)) { |
| 64 | 64 | return self::ASC; |
| 65 | - } else { |
|
| 65 | + }else { |
|
| 66 | 66 | return self::DESC; |
| 67 | 67 | } |
| 68 | 68 | } |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | */ |
| 82 | 82 | public function fromArray(array $object = []) |
| 83 | 83 | { |
| 84 | - foreach($object as $field => $order) { |
|
| 84 | + foreach ($object as $field => $order) { |
|
| 85 | 85 | $this->addOrder($field, $order); |
| 86 | 86 | } |
| 87 | 87 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | public function __construct($hydrate = true) |
| 20 | 20 | { |
| 21 | 21 | parent::__construct(); |
| 22 | - if($hydrate) { |
|
| 22 | + if ($hydrate) { |
|
| 23 | 23 | $this->fromArray(Request::getInstance()->getData()); |
| 24 | 24 | } |
| 25 | 25 | } |
@@ -47,23 +47,23 @@ discard block |
||
| 47 | 47 | /** @var \ReflectionProperty $property */ |
| 48 | 48 | foreach ($properties as $property) { |
| 49 | 49 | $value = $property->getValue($this); |
| 50 | - if(is_object($value) && method_exists($value, 'toArray')) { |
|
| 50 | + if (is_object($value) && method_exists($value, 'toArray')) { |
|
| 51 | 51 | $dto[$property->getName()] = $value->toArray(); |
| 52 | - } elseif(is_array($value)) { |
|
| 53 | - foreach($value as &$arrValue) { |
|
| 54 | - if($arrValue instanceof Dto) { |
|
| 52 | + } elseif (is_array($value)) { |
|
| 53 | + foreach ($value as &$arrValue) { |
|
| 54 | + if ($arrValue instanceof Dto) { |
|
| 55 | 55 | $arrValue = $arrValue->toArray(); |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | $dto[$property->getName()] = $value; |
| 59 | - } else { |
|
| 59 | + }else { |
|
| 60 | 60 | $type = InjectorHelper::extractVarType($property->getDocComment()); |
| 61 | 61 | $dto[$property->getName()] = $this->checkCastedValue($property->getValue($this), $type); |
| 62 | 62 | } |
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | - } catch (\Exception $e) { |
|
| 66 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
| 65 | + }catch (\Exception $e) { |
|
| 66 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
| 67 | 67 | } |
| 68 | 68 | return $dto; |
| 69 | 69 | } |
@@ -86,26 +86,26 @@ discard block |
||
| 86 | 86 | protected function parseDtoField(array $properties, $key, $value = null) { |
| 87 | 87 | list($type, $isArray) = $this->extractTypes($properties, $key); |
| 88 | 88 | $reflector = (class_exists($type)) ? new \ReflectionClass($type) : null; |
| 89 | - if(null !== $reflector && $reflector->isSubclassOf(Dto::class)) { |
|
| 90 | - if(null !== $value && is_array($value)) { |
|
| 91 | - if(!array_key_exists($type, $this->__cache)) { |
|
| 89 | + if (null !== $reflector && $reflector->isSubclassOf(Dto::class)) { |
|
| 90 | + if (null !== $value && is_array($value)) { |
|
| 91 | + if (!array_key_exists($type, $this->__cache)) { |
|
| 92 | 92 | $this->__cache[$type] = new $type(false); |
| 93 | 93 | } |
| 94 | - if($isArray) { |
|
| 94 | + if ($isArray) { |
|
| 95 | 95 | $this->$key = []; |
| 96 | - foreach($value as $data) { |
|
| 97 | - if(null !== $data && is_array($data)) { |
|
| 96 | + foreach ($value as $data) { |
|
| 97 | + if (null !== $data && is_array($data)) { |
|
| 98 | 98 | $dto = clone $this->__cache[$type]; |
| 99 | 99 | $dto->fromArray($data); |
| 100 | 100 | array_push($this->$key, $dto); |
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | - } else { |
|
| 103 | + }else { |
|
| 104 | 104 | $this->$key = clone $this->__cache[$type]; |
| 105 | 105 | $this->$key->fromArray($value); |
| 106 | 106 | } |
| 107 | 107 | } |
| 108 | - } else { |
|
| 108 | + }else { |
|
| 109 | 109 | $this->castValue($key, $value, $type); |
| 110 | 110 | } |
| 111 | 111 | } |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | $router->simpatize(); |
| 58 | 58 | Security::getInstance()->setFlash("callback_message", t("Rutas generadas correctamente")); |
| 59 | 59 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true)); |
| 60 | - } catch (Exception $e) { |
|
| 60 | + }catch (Exception $e) { |
|
| 61 | 61 | Logger::log($e->getMessage(), LOG_ERR); |
| 62 | 62 | Security::getInstance()->setFlash("callback_message", t("Algo no ha salido bien, revisa los logs")); |
| 63 | 63 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true)); |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | foreach ($domains as $domain => $routes) { |
| 34 | 34 | $pDomain = str_replace('@', '', $domain); |
| 35 | 35 | $pDomain = str_replace('/', '', $pDomain); |
| 36 | - $response[] = strtolower($pDomain) . '.api.secret'; |
|
| 36 | + $response[] = strtolower($pDomain).'.api.secret'; |
|
| 37 | 37 | } |
| 38 | 38 | return $this->json($response); |
| 39 | 39 | } |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function config() |
| 51 | 51 | { |
| 52 | - Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri()); |
|
| 52 | + Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri()); |
|
| 53 | 53 | /* @var $form ConfigForm */ |
| 54 | 54 | $form = new ConfigForm(Router::getInstance()->getRoute('admin-config'), Config::$required, Config::$optional, Config::getInstance()->dumpConfig()); |
| 55 | 55 | $form->build(); |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | Security::getInstance()->setFlash("callback_message", t("Configuración actualizada correctamente")); |
| 88 | 88 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true)); |
| 89 | - } else { |
|
| 89 | + }else { |
|
| 90 | 90 | throw new HttpException(t('Error al guardar la configuración, prueba a cambiar los permisos'), 403); |
| 91 | 91 | } |
| 92 | 92 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function generateModule() |
| 36 | 36 | { |
| 37 | - Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri()); |
|
| 37 | + Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri()); |
|
| 38 | 38 | /* @var $form ConfigForm */ |
| 39 | 39 | $form = new ModuleForm(); |
| 40 | 40 | $form->build(); |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | $this->gen->createStructureModule($module, false, $type, $apiClass); |
| 67 | 67 | Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente"))); |
| 68 | 68 | // Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
| 69 | - } catch (Exception $e) { |
|
| 70 | - Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]"); |
|
| 69 | + }catch (Exception $e) { |
|
| 70 | + Logger::log($e->getMessage()." [".$e->getFile().":".$e->getLine()."]"); |
|
| 71 | 71 | Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage())); |
| 72 | 72 | } |
| 73 | 73 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | */ |
| 27 | 27 | public function __construct() |
| 28 | 28 | { |
| 29 | - Logger::log(static::class . ' constructor invoked'); |
|
| 29 | + Logger::log(static::class.' constructor invoked'); |
|
| 30 | 30 | $this->init(); |
| 31 | 31 | } |
| 32 | 32 | |
@@ -85,14 +85,14 @@ discard block |
||
| 85 | 85 | $calledClass = static::class; |
| 86 | 86 | try { |
| 87 | 87 | $instance = InjectorHelper::constructInjectableInstance($variable, $singleton, $classNameSpace, $calledClass); |
| 88 | - $setter = 'set' . ucfirst($variable); |
|
| 88 | + $setter = 'set'.ucfirst($variable); |
|
| 89 | 89 | if (method_exists($calledClass, $setter)) { |
| 90 | 90 | $this->$setter($instance); |
| 91 | - } else { |
|
| 91 | + }else { |
|
| 92 | 92 | $this->$variable = $instance; |
| 93 | 93 | } |
| 94 | - } catch (Exception $e) { |
|
| 95 | - Logger::log($e->getMessage() . ': ' . $e->getFile() . ' [' . $e->getLine() . ']', LOG_ERR); |
|
| 94 | + }catch (Exception $e) { |
|
| 95 | + Logger::log($e->getMessage().': '.$e->getFile().' ['.$e->getLine().']', LOG_ERR); |
|
| 96 | 96 | throw $e; |
| 97 | 97 | } |
| 98 | 98 | return $this; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | { |
| 108 | 108 | if (!$this->isLoaded()) { |
| 109 | 109 | $filename = sha1(get_class($this)); |
| 110 | - $cacheFilename = 'reflections' . DIRECTORY_SEPARATOR . substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2) . DIRECTORY_SEPARATOR . $filename . '.json'; |
|
| 110 | + $cacheFilename = 'reflections'.DIRECTORY_SEPARATOR.substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2).DIRECTORY_SEPARATOR.$filename.'.json'; |
|
| 111 | 111 | /** @var Cache $cacheService */ |
| 112 | 112 | $cacheService = Cache::getInstance(); |
| 113 | 113 | /** @var Config $configService */ |
@@ -125,8 +125,8 @@ discard block |
||
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | $this->setLoaded(); |
| 128 | - } else { |
|
| 129 | - Logger::log(get_class($this) . ' already loaded', LOG_INFO); |
|
| 128 | + }else { |
|
| 129 | + Logger::log(get_class($this).' already loaded', LOG_INFO); |
|
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | } |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | */ |
| 123 | 123 | public static function header($name, $default = null) |
| 124 | 124 | { |
| 125 | - return self::getInstance()->getHeader($name, $default); |
|
| 125 | + return self::getInstance()->getHeader($name, $default); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | /** |
@@ -135,10 +135,10 @@ discard block |
||
| 135 | 135 | $header = null; |
| 136 | 136 | if ($this->hasHeader($name)) { |
| 137 | 137 | $header = $this->header[$name]; |
| 138 | - } else if(array_key_exists('h_' . strtolower($name), $this->query)) { |
|
| 139 | - $header = $this->query['h_' . strtolower($name)]; |
|
| 140 | - } else if(array_key_exists('HTTP_' . strtoupper(str_replace('-', '_', $name)), $this->server)) { |
|
| 141 | - $header = $this->getServer('HTTP_' . strtoupper(str_replace('-', '_', $name))); |
|
| 138 | + }else if (array_key_exists('h_'.strtolower($name), $this->query)) { |
|
| 139 | + $header = $this->query['h_'.strtolower($name)]; |
|
| 140 | + }else if (array_key_exists('HTTP_'.strtoupper(str_replace('-', '_', $name)), $this->server)) { |
|
| 141 | + $header = $this->getServer('HTTP_'.strtoupper(str_replace('-', '_', $name))); |
|
| 142 | 142 | } |
| 143 | 143 | return $header ?: $default; |
| 144 | 144 | } |
@@ -242,7 +242,7 @@ discard block |
||
| 242 | 242 | $url = $this->getServer('HTTP_ORIGIN'); |
| 243 | 243 | } |
| 244 | 244 | ob_start(); |
| 245 | - header('Location: ' . $url); |
|
| 245 | + header('Location: '.$url); |
|
| 246 | 246 | ob_end_clean(); |
| 247 | 247 | Security::getInstance()->updateSession(); |
| 248 | 248 | exit(t('Redirect...')); |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | $url = $this->getServerName(); |
| 259 | 259 | $protocol = $hasProtocol ? $this->getProtocol() : ''; |
| 260 | 260 | if (!empty($protocol)) { |
| 261 | - $url = $protocol . $url; |
|
| 261 | + $url = $protocol.$url; |
|
| 262 | 262 | } |
| 263 | 263 | $url = $this->checkServerPort($url); |
| 264 | 264 | return $url; |
@@ -272,15 +272,15 @@ discard block |
||
| 272 | 272 | { |
| 273 | 273 | $port = (integer)$this->getServer('SERVER_PORT'); |
| 274 | 274 | $host = $this->getServer('HTTP_HOST'); |
| 275 | - if(!empty($host)) { |
|
| 275 | + if (!empty($host)) { |
|
| 276 | 276 | $parts = explode(':', $host); |
| 277 | 277 | $hostPort = (integer)end($parts); |
| 278 | - if(count($parts) > 1 && $hostPort !== $port) { |
|
| 278 | + if (count($parts) > 1 && $hostPort !== $port) { |
|
| 279 | 279 | $port = $hostPort; |
| 280 | 280 | } |
| 281 | 281 | } |
| 282 | 282 | if (!in_array($port, [80, 443], true)) { |
| 283 | - $url .= ':' . $port; |
|
| 283 | + $url .= ':'.$port; |
|
| 284 | 284 | } |
| 285 | 285 | return $url; |
| 286 | 286 | } |
@@ -21,7 +21,7 @@ |
||
| 21 | 21 | public function getServer($key, $default = null) |
| 22 | 22 | { |
| 23 | 23 | $value = null; |
| 24 | - if(array_key_exists($key, $this->server)) { |
|
| 24 | + if (array_key_exists($key, $this->server)) { |
|
| 25 | 25 | $value = $this->server[$key]; |
| 26 | 26 | } |
| 27 | 27 | return $value ?: $default; |