@@ -39,8 +39,8 @@ |
||
39 | 39 | "domain" => $this->getDomain(), |
40 | 40 | "listLabel" => Api::API_LIST_NAME_FIELD, |
41 | 41 | 'modelId' => Api::API_MODEL_KEY_FIELD, |
42 | - 'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-' . $this->getDomain() . '-' . $this->getApi()), TRUE)), |
|
43 | - "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain() . '-' . 'api-' . $this->getApi() . "-pk"), TRUE)), |
|
42 | + 'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-'.$this->getDomain().'-'.$this->getApi()), TRUE)), |
|
43 | + "url" => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain().'-'.'api-'.$this->getApi()."-pk"), TRUE)), |
|
44 | 44 | ), [], ''); |
45 | 45 | } |
46 | 46 |
@@ -41,11 +41,11 @@ discard block |
||
41 | 41 | public function render($template, array $vars = array(), $cookies = array(), $domain = null) |
42 | 42 | { |
43 | 43 | $vars['__menu__'] = $this->getMenu(); |
44 | - if(Config::getParam('profiling.enable')) { |
|
44 | + if (Config::getParam('profiling.enable')) { |
|
45 | 45 | $vars['__profiling__'] = Inspector::getStats(); |
46 | 46 | } |
47 | 47 | $domain = (null === $domain) ? $this->getDomain() : $domain; |
48 | - return $this->tpl->render($domain . $template, $vars, $cookies); |
|
48 | + return $this->tpl->render($domain.$template, $vars, $cookies); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | { |
77 | 77 | $vars['__menu__'] = $this->getMenu(); |
78 | 78 | $domain = $domain ?: $this->getDomain(); |
79 | - return $this->tpl->dump($domain . $template, $vars); |
|
79 | + return $this->tpl->dump($domain.$template, $vars); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
@@ -82,9 +82,9 @@ |
||
82 | 82 | "class" => "btn-warning md-default", |
83 | 83 | "icon" => "fa-plus", |
84 | 84 | ]; |
85 | - if(Config::getParam('admin.version', 'v1') === 'v1') { |
|
86 | - $add["onclick"] = "javascript:addNewField(document.getElementById('" . $this->getName() . "'));"; |
|
87 | - } else { |
|
85 | + if (Config::getParam('admin.version', 'v1') === 'v1') { |
|
86 | + $add["onclick"] = "javascript:addNewField(document.getElementById('".$this->getName()."'));"; |
|
87 | + }else { |
|
88 | 88 | $add["ng-click"] = "addNewField()"; |
89 | 89 | } |
90 | 90 | $this->addButton('submit', _("Guardar configuración"), "submit", array( |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | protected static function calculateStats(array $stats, $ts, $mem = 0, $files = 0) { |
29 | 29 | return [ |
30 | 30 | 'ts' => round($stats['ts'] - $ts, 4), |
31 | - 'mem' => round(($stats['mem'] - $mem) / 1024 / 1024, 4), |
|
31 | + 'mem' => round(($stats['mem'] - $mem)/1024/1024, 4), |
|
32 | 32 | 'files' => $stats['files'] - $files, |
33 | 33 | 'name' => $stats['name'], |
34 | 34 | ]; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | $ts = defined('PSFS_START_TS') ? PSFS_START_TS : 0; |
43 | 43 | $mem = defined('PSFS_START_MEM') ? PSFS_START_MEM : 0; |
44 | 44 | $files = 0; |
45 | - foreach(self::$profiling as $key => &$value) { |
|
45 | + foreach (self::$profiling as $key => &$value) { |
|
46 | 46 | $value = self::calculateStats($value, $ts, $mem, $files); |
47 | 47 | } |
48 | 48 | self::$profiling[] = self::calculateStats(self::collect('Profiling collect ends'), $ts, $mem, $files); |
@@ -73,18 +73,18 @@ |
||
73 | 73 | if (!Request::getInstance()->isFile()) { |
74 | 74 | return $this->router->execute($this->actualUri); |
75 | 75 | } |
76 | - } else { |
|
76 | + }else { |
|
77 | 77 | return ConfigController::getInstance()->config(); |
78 | 78 | } |
79 | - } catch (AdminCredentialsException $a) { |
|
79 | + }catch (AdminCredentialsException $a) { |
|
80 | 80 | return UserController::showAdminManager(); |
81 | - } catch (SecurityException $s) { |
|
81 | + }catch (SecurityException $s) { |
|
82 | 82 | return $this->security->notAuthorized($this->actualUri); |
83 | - } catch (RouterException $r) { |
|
83 | + }catch (RouterException $r) { |
|
84 | 84 | return $this->router->httpNotFound($r); |
85 | - } catch(ApiException $a) { |
|
85 | + }catch (ApiException $a) { |
|
86 | 86 | return $this->router->httpNotFound($a, true); |
87 | - } catch (\Exception $e) { |
|
87 | + }catch (\Exception $e) { |
|
88 | 88 | return $this->dumpException($e); |
89 | 89 | } |
90 | 90 | } |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | public function __construct($hydrate = true) |
19 | 19 | { |
20 | 20 | parent::__construct(); |
21 | - if($hydrate) { |
|
21 | + if ($hydrate) { |
|
22 | 22 | $this->fromArray(Request::getInstance()->getData()); |
23 | 23 | } |
24 | 24 | } |
@@ -46,15 +46,15 @@ discard block |
||
46 | 46 | /** @var \ReflectionProperty $property */ |
47 | 47 | foreach ($properties as $property) { |
48 | 48 | $value = $property->getValue($this); |
49 | - if(is_object($value) && method_exists($value, 'toArray')) { |
|
49 | + if (is_object($value) && method_exists($value, 'toArray')) { |
|
50 | 50 | $dto[$property->getName()] = $value->toArray(); |
51 | - } else { |
|
51 | + }else { |
|
52 | 52 | $dto[$property->getName()] = $property->getValue($this); |
53 | 53 | } |
54 | 54 | } |
55 | 55 | } |
56 | - } catch (\Exception $e) { |
|
57 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
56 | + }catch (\Exception $e) { |
|
57 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
58 | 58 | } |
59 | 59 | return $dto; |
60 | 60 | } |
@@ -76,32 +76,32 @@ discard block |
||
76 | 76 | protected function parseDtoField(array $properties, $key, $value = null) { |
77 | 77 | $type = 'string'; |
78 | 78 | $is_array = false; |
79 | - if(array_key_exists($key, $properties)) { |
|
79 | + if (array_key_exists($key, $properties)) { |
|
80 | 80 | $type = $properties[$key]; |
81 | - if(preg_match('/(\[\]|Array)/i', $type)) { |
|
81 | + if (preg_match('/(\[\]|Array)/i', $type)) { |
|
82 | 82 | $type = preg_replace('/(\[\]|Array)/i', '', $type); |
83 | 83 | $is_array = true; |
84 | 84 | } |
85 | 85 | } |
86 | 86 | $reflector = (class_exists($type)) ? new \ReflectionClass($type) : null; |
87 | - if(null !== $reflector && $reflector->isSubclassOf(Dto::class)) { |
|
88 | - if(null !== $value && is_array($value)) { |
|
89 | - if($is_array) { |
|
87 | + if (null !== $reflector && $reflector->isSubclassOf(Dto::class)) { |
|
88 | + if (null !== $value && is_array($value)) { |
|
89 | + if ($is_array) { |
|
90 | 90 | $this->$key = []; |
91 | - foreach($value as $data) { |
|
92 | - if(null !== $data && is_array($data)) { |
|
91 | + foreach ($value as $data) { |
|
92 | + if (null !== $data && is_array($data)) { |
|
93 | 93 | $dto = new $type(false); |
94 | 94 | $dto->fromArray($data); |
95 | 95 | array_push($this->$key, $dto); |
96 | 96 | } |
97 | 97 | } |
98 | - } else { |
|
98 | + }else { |
|
99 | 99 | $this->$key = new $type(false); |
100 | 100 | $this->$key->fromArray($value); |
101 | 101 | } |
102 | 102 | } |
103 | - } else { |
|
104 | - switch($type) { |
|
103 | + }else { |
|
104 | + switch ($type) { |
|
105 | 105 | default: |
106 | 106 | case 'string': |
107 | 107 | $this->$key = $value; |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | if (!Config::getInstance()->checkTryToSaveConfig() |
30 | 30 | && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false)) |
31 | 31 | ) { |
32 | - if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) { |
|
32 | + if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) { |
|
33 | 33 | throw new AdminCredentialsException(); |
34 | 34 | } |
35 | 35 | if (!Security::getInstance()->checkAdmin()) { |
@@ -49,8 +49,8 @@ discard block |
||
49 | 49 | $token = ''; |
50 | 50 | $ct = strlen($ts); |
51 | 51 | for ($i = 0; $i < $ct; $i++) { |
52 | - $token = substr($hash, $i, 1) . |
|
53 | - substr($ts, $i, 1) . |
|
52 | + $token = substr($hash, $i, 1). |
|
53 | + substr($ts, $i, 1). |
|
54 | 54 | $token; |
55 | 55 | } |
56 | 56 | return $token; |
@@ -68,16 +68,16 @@ discard block |
||
68 | 68 | $charsLength = strlen(self::RAND_SEP) - 1; |
69 | 69 | $tsLength = strlen($ts); |
70 | 70 | $i = 0; |
71 | - $ct = ceil($hashRest / 4); |
|
72 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
73 | - while(false !== $part) { |
|
74 | - $mixedToken .= $part . |
|
75 | - substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) . |
|
71 | + $ct = ceil($hashRest/4); |
|
72 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
73 | + while (false !== $part) { |
|
74 | + $mixedToken .= $part. |
|
75 | + substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1). |
|
76 | 76 | substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1); |
77 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
77 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
78 | 78 | $i++; |
79 | 79 | } |
80 | - return $mixedToken . $token; |
|
80 | + return $mixedToken.$token; |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -86,10 +86,10 @@ discard block |
||
86 | 86 | */ |
87 | 87 | private static function getTs($isOdd = null) { |
88 | 88 | $ts = time(); |
89 | - $tsIsOdd = (bool)((int)substr($ts, -1) % 2); |
|
90 | - if(false === $isOdd && !$tsIsOdd) { |
|
89 | + $tsIsOdd = (bool)((int)substr($ts, -1)%2); |
|
90 | + if (false === $isOdd && !$tsIsOdd) { |
|
91 | 91 | $ts--; |
92 | - } elseif(true === $isOdd && !$tsIsOdd) { |
|
92 | + } elseif (true === $isOdd && !$tsIsOdd) { |
|
93 | 93 | $ts--; |
94 | 94 | } |
95 | 95 | return $ts; |
@@ -121,10 +121,10 @@ discard block |
||
121 | 121 | $partToken = ''; |
122 | 122 | $ts = ''; |
123 | 123 | $part = strrev($part); |
124 | - for($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
125 | - if($i % 2 == 0) { |
|
124 | + for ($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
125 | + if ($i%2 == 0) { |
|
126 | 126 | $ts .= substr($part, $i, 1); |
127 | - } else { |
|
127 | + }else { |
|
128 | 128 | $partToken .= substr($part, $i, 1); |
129 | 129 | } |
130 | 130 | } |
@@ -139,11 +139,11 @@ discard block |
||
139 | 139 | private static function parseTokenParts(array $parts) { |
140 | 140 | $token = ''; |
141 | 141 | list($partToken, $ts) = self::extractTs(array_pop($parts)); |
142 | - if($ts > 0) { |
|
143 | - foreach($parts as $part) { |
|
142 | + if ($ts > 0) { |
|
143 | + foreach ($parts as $part) { |
|
144 | 144 | $token .= $part; |
145 | 145 | } |
146 | - $token = $partToken . $token; |
|
146 | + $token = $partToken.$token; |
|
147 | 147 | } |
148 | 148 | return [$token, $ts]; |
149 | 149 | } |
@@ -171,8 +171,8 @@ discard block |
||
171 | 171 | * @return array |
172 | 172 | */ |
173 | 173 | private static function extractTokenParts($token) { |
174 | - for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
175 | - $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token); |
|
174 | + for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
175 | + $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token); |
|
176 | 176 | } |
177 | 177 | return array_unique(explode('||', $token)); |
178 | 178 | } |
@@ -14,9 +14,9 @@ discard block |
||
14 | 14 | */ |
15 | 15 | private static function searchPayloadParam($params, $variable) { |
16 | 16 | $exists = false; |
17 | - if(null !== $params && count($params)) { |
|
18 | - foreach($params as $param) { |
|
19 | - if($param['name'] === $variable) { |
|
17 | + if (null !== $params && count($params)) { |
|
18 | + foreach ($params as $param) { |
|
19 | + if ($param['name'] === $variable) { |
|
20 | 20 | $exists = true; |
21 | 21 | break; |
22 | 22 | } |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | ]; |
41 | 41 | if ($endpoint['payload']['is_array']) { |
42 | 42 | $schema['items'] = [ |
43 | - '$ref' => '#/definitions/' . $endpoint['payload']['type'], |
|
43 | + '$ref' => '#/definitions/'.$endpoint['payload']['type'], |
|
44 | 44 | ]; |
45 | - } else { |
|
46 | - $schema['$ref'] = '#/definitions/' . $endpoint['payload']['type']; |
|
45 | + }else { |
|
46 | + $schema['$ref'] = '#/definitions/'.$endpoint['payload']['type']; |
|
47 | 47 | } |
48 | - if(!self::searchPayloadParam($paths[$url][$method]['parameters'], $endpoint['payload']['type'])) { |
|
48 | + if (!self::searchPayloadParam($paths[$url][$method]['parameters'], $endpoint['payload']['type'])) { |
|
49 | 49 | $paths[$url][$method]['parameters'][] = [ |
50 | 50 | 'in' => 'body', |
51 | 51 | 'name' => $endpoint['payload']['type'], |
@@ -74,18 +74,18 @@ discard block |
||
74 | 74 | if (array_key_exists('data', $endpoint['return']) && count(array_keys($object)) === count(array_keys($endpoint['return']['data']))) { |
75 | 75 | $classDefinition = [ |
76 | 76 | 'type' => 'object', |
77 | - '$ref' => '#/definitions/' . $class, |
|
77 | + '$ref' => '#/definitions/'.$class, |
|
78 | 78 | ]; |
79 | - } else { |
|
79 | + }else { |
|
80 | 80 | $classDefinition = [ |
81 | 81 | 'type' => 'array', |
82 | 82 | 'items' => [ |
83 | - '$ref' => '#/definitions/' . $class, |
|
83 | + '$ref' => '#/definitions/'.$class, |
|
84 | 84 | ], |
85 | 85 | ]; |
86 | 86 | } |
87 | 87 | |
88 | - if($paths[$url][$method]['responses'][200]['schema']['properties']['data']['type'] === 'boolean') { |
|
88 | + if ($paths[$url][$method]['responses'][200]['schema']['properties']['data']['type'] === 'boolean') { |
|
89 | 89 | $paths[$url][$method]['responses'][200]['schema']['properties']['data'] = $classDefinition; |
90 | 90 | } |
91 | 91 | $dtos += self::extractSwaggerDefinition($class, $object); |
@@ -163,18 +163,18 @@ discard block |
||
163 | 163 | ], |
164 | 164 | ]; |
165 | 165 | foreach ($fields as $field => $info) { |
166 | - if(array_key_exists('type', $info) || in_array($info['type'], ['array', 'object'])) { |
|
166 | + if (array_key_exists('type', $info) || in_array($info['type'], ['array', 'object'])) { |
|
167 | 167 | $definition[$name]['properties'][$field] = $info; |
168 | - } else { |
|
168 | + }else { |
|
169 | 169 | list($type, $format) = self::translateSwaggerFormats($info['type']); |
170 | 170 | $fieldData = [ |
171 | 171 | "type" => $type, |
172 | 172 | "required" => $info['required'], |
173 | 173 | ]; |
174 | - if(array_key_exists('description', $info)) { |
|
174 | + if (array_key_exists('description', $info)) { |
|
175 | 175 | $fieldData['description'] = $info['description']; |
176 | 176 | } |
177 | - if(array_key_exists('format', $info)) { |
|
177 | + if (array_key_exists('format', $info)) { |
|
178 | 178 | $fieldData['format'] = $info['format']; |
179 | 179 | } |
180 | 180 | $dto['properties'][$field] = $fieldData; |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | */ |
24 | 24 | public static function readFile($path) { |
25 | 25 | $data = false; |
26 | - if(file_exists($path)) { |
|
26 | + if (file_exists($path)) { |
|
27 | 27 | $data = @file_get_contents($path); |
28 | 28 | } |
29 | 29 | return $data; |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * @return string |
37 | 37 | */ |
38 | 38 | public static function generateHashFilename($verb, $slug, array $query = []) { |
39 | - return sha1(strtolower($verb) . ' ' . $slug . ' ' . strtolower(http_build_query($query))); |
|
39 | + return sha1(strtolower($verb).' '.$slug.' '.strtolower(http_build_query($query))); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | /** |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | public static function generateCachePath(array $action, array $query = []) { |
48 | 48 | $class = GeneratorHelper::extractClassFromNamespace($action['class']); |
49 | 49 | $filename = self::generateHashFilename($action['http'], $action['slug'], $query); |
50 | - $subPath = substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2); |
|
51 | - return $action['module'] . DIRECTORY_SEPARATOR . $class . DIRECTORY_SEPARATOR . $action['method'] . DIRECTORY_SEPARATOR . $subPath . DIRECTORY_SEPARATOR; |
|
50 | + $subPath = substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2); |
|
51 | + return $action['module'].DIRECTORY_SEPARATOR.$class.DIRECTORY_SEPARATOR.$action['method'].DIRECTORY_SEPARATOR.$subPath.DIRECTORY_SEPARATOR; |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |