@@ -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 | } |
@@ -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 | } |
@@ -43,13 +43,13 @@ discard block |
||
43 | 43 | |
44 | 44 | $filePath = ''; |
45 | 45 | if (!file_exists($filePath)) { |
46 | - $filePath = BASE_DIR . $string; |
|
46 | + $filePath = BASE_DIR.$string; |
|
47 | 47 | } |
48 | 48 | $filenamePath = AssetsHelper::findDomainPath($string, $filePath); |
49 | 49 | |
50 | 50 | $filePath = self::processAsset($string, $name, $return, $filenamePath); |
51 | 51 | $basePath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl()); |
52 | - $returnPath = empty($name) ? $basePath . '/' . $filePath : $name; |
|
52 | + $returnPath = empty($name) ? $basePath.'/'.$filePath : $name; |
|
53 | 53 | return $return ? $returnPath : ''; |
54 | 54 | } |
55 | 55 | |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $router = Router::getInstance(); |
67 | 67 | try { |
68 | 68 | return $router->getRoute($path, $absolute, $params); |
69 | - } catch (\Exception $e) { |
|
69 | + }catch (\Exception $e) { |
|
70 | 70 | return $router->getRoute('', $absolute, $params); |
71 | 71 | } |
72 | 72 | } |
@@ -213,9 +213,9 @@ discard block |
||
213 | 213 | { |
214 | 214 | $data = file_get_contents($filenamePath); |
215 | 215 | if (!empty($name)) { |
216 | - file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data); |
|
216 | + file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data); |
|
217 | 217 | }else { |
218 | - file_put_contents($base . $filePath, $data); |
|
218 | + file_put_contents($base.$filePath, $data); |
|
219 | 219 | } |
220 | 220 | } |
221 | 221 | |
@@ -234,9 +234,9 @@ discard block |
||
234 | 234 | if (file_exists($filenamePath)) { |
235 | 235 | list($base, $htmlBase, $filePath) = AssetsHelper::calculateAssetPath($string, $name, $return, $filenamePath); |
236 | 236 | //Creamos el directorio si no existe |
237 | - GeneratorHelper::createDir($base . $htmlBase); |
|
237 | + GeneratorHelper::createDir($base.$htmlBase); |
|
238 | 238 | //Si se ha modificado |
239 | - if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($filenamePath)) { |
|
239 | + if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($filenamePath)) { |
|
240 | 240 | if ($htmlBase === 'css') { |
241 | 241 | self::processCssLines($filenamePath); |
242 | 242 | } |
@@ -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 |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false)) |
34 | 34 | ) { |
35 | 35 | if (!self::isTest() && |
36 | - null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) { |
|
36 | + null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) { |
|
37 | 37 | throw new AdminCredentialsException(); |
38 | 38 | } |
39 | 39 | if (!Security::getInstance()->checkAdmin()) { |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | $token = ''; |
54 | 54 | $ct = strlen($ts); |
55 | 55 | for ($i = 0; $i < $ct; $i++) { |
56 | - $token = substr($hash, $i, 1) . |
|
57 | - substr($ts, $i, 1) . |
|
56 | + $token = substr($hash, $i, 1). |
|
57 | + substr($ts, $i, 1). |
|
58 | 58 | $token; |
59 | 59 | } |
60 | 60 | return $token; |
@@ -72,16 +72,16 @@ discard block |
||
72 | 72 | $charsLength = strlen(self::RAND_SEP) - 1; |
73 | 73 | $tsLength = strlen($ts); |
74 | 74 | $i = 0; |
75 | - $ct = ceil($hashRest / 4); |
|
76 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
77 | - while(false !== $part) { |
|
78 | - $mixedToken .= $part . |
|
79 | - substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) . |
|
75 | + $ct = ceil($hashRest/4); |
|
76 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
77 | + while (false !== $part) { |
|
78 | + $mixedToken .= $part. |
|
79 | + substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1). |
|
80 | 80 | substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1); |
81 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
81 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
82 | 82 | $i++; |
83 | 83 | } |
84 | - return $mixedToken . $token; |
|
84 | + return $mixedToken.$token; |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | /** |
@@ -90,10 +90,10 @@ discard block |
||
90 | 90 | */ |
91 | 91 | private static function getTs($isOdd = null) { |
92 | 92 | $ts = time(); |
93 | - $tsIsOdd = (bool)((int)substr($ts, -1) % 2); |
|
94 | - if(false === $isOdd && !$tsIsOdd) { |
|
93 | + $tsIsOdd = (bool)((int)substr($ts, -1)%2); |
|
94 | + if (false === $isOdd && !$tsIsOdd) { |
|
95 | 95 | $ts--; |
96 | - } elseif(true === $isOdd && !$tsIsOdd) { |
|
96 | + } elseif (true === $isOdd && !$tsIsOdd) { |
|
97 | 97 | $ts--; |
98 | 98 | } |
99 | 99 | return $ts; |
@@ -125,10 +125,10 @@ discard block |
||
125 | 125 | $partToken = ''; |
126 | 126 | $ts = ''; |
127 | 127 | $part = strrev($part); |
128 | - for($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
129 | - if($i % 2 == 0) { |
|
128 | + for ($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
129 | + if ($i%2 == 0) { |
|
130 | 130 | $ts .= substr($part, $i, 1); |
131 | - } else { |
|
131 | + }else { |
|
132 | 132 | $partToken .= substr($part, $i, 1); |
133 | 133 | } |
134 | 134 | } |
@@ -143,11 +143,11 @@ discard block |
||
143 | 143 | private static function parseTokenParts(array $parts) { |
144 | 144 | $token = ''; |
145 | 145 | list($partToken, $ts) = self::extractTs(array_pop($parts)); |
146 | - if($ts > 0) { |
|
147 | - foreach($parts as $part) { |
|
146 | + if ($ts > 0) { |
|
147 | + foreach ($parts as $part) { |
|
148 | 148 | $token .= $part; |
149 | 149 | } |
150 | - $token = $partToken . $token; |
|
150 | + $token = $partToken.$token; |
|
151 | 151 | } |
152 | 152 | return [$token, $ts]; |
153 | 153 | } |
@@ -175,8 +175,8 @@ discard block |
||
175 | 175 | * @return array |
176 | 176 | */ |
177 | 177 | private static function extractTokenParts($token) { |
178 | - for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
179 | - $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token); |
|
178 | + for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
179 | + $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token); |
|
180 | 180 | } |
181 | 181 | return array_unique(explode('||', $token)); |
182 | 182 | } |
@@ -73,18 +73,18 @@ |
||
73 | 73 | if (!Request::getInstance()->isFile()) { |
74 | 74 | return $this->router->execute($uri ?: $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 | } |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $this->setStatusCode(Template::STATUS_OK); |
122 | 122 | break; |
123 | 123 | default: |
124 | - $this->setStatusCode('HTTP/1.0 ' .($status ?: 200)); |
|
124 | + $this->setStatusCode('HTTP/1.0 '.($status ?: 200)); |
|
125 | 125 | break; |
126 | 126 | } |
127 | 127 | return $this; |
@@ -135,11 +135,11 @@ discard block |
||
135 | 135 | private function setReponseHeaders($contentType = 'text/html', array $cookies = array()) |
136 | 136 | { |
137 | 137 | $powered = Config::getParam('poweredBy', 'PSFS'); |
138 | - header('X-Powered-By: ' . $powered); |
|
138 | + header('X-Powered-By: '.$powered); |
|
139 | 139 | ResponseHelper::setStatusHeader($this->getStatusCode()); |
140 | 140 | ResponseHelper::setAuthHeaders($this->isPublicZone()); |
141 | 141 | ResponseHelper::setCookieHeaders($cookies); |
142 | - header('Content-type: ' . $contentType); |
|
142 | + header('Content-type: '.$contentType); |
|
143 | 143 | |
144 | 144 | } |
145 | 145 | |
@@ -152,20 +152,20 @@ discard block |
||
152 | 152 | */ |
153 | 153 | public function output($output = '', $contentType = 'text/html', array $cookies = array()) |
154 | 154 | { |
155 | - if(!self::isTest()) { |
|
155 | + if (!self::isTest()) { |
|
156 | 156 | Logger::log('Start output response'); |
157 | 157 | ob_start(); |
158 | 158 | $this->setReponseHeaders($contentType, $cookies); |
159 | - header('Content-length: ' . strlen($output)); |
|
160 | - header('CRC: ' . crc32($output)); |
|
159 | + header('Content-length: '.strlen($output)); |
|
160 | + header('CRC: '.crc32($output)); |
|
161 | 161 | |
162 | 162 | $needCache = Cache::needCache(); |
163 | 163 | $cache = Cache::getInstance(); |
164 | 164 | list($path, $cacheDataName) = $cache->getRequestCacheHash(); |
165 | 165 | if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) { |
166 | 166 | Logger::log('Saving output response into cache'); |
167 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output); |
|
168 | - $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON); |
|
167 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output); |
|
168 | + $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON); |
|
169 | 169 | } elseif (Request::getInstance()->getMethod() !== 'GET') { |
170 | 170 | $cache->flushCache(); |
171 | 171 | } |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | ob_end_clean(); |
176 | 176 | Logger::log('End output response'); |
177 | 177 | $this->closeRender(); |
178 | - } else { |
|
178 | + }else { |
|
179 | 179 | return $output; |
180 | 180 | } |
181 | 181 | } |
@@ -188,11 +188,11 @@ discard block |
||
188 | 188 | Logger::log('Close template render'); |
189 | 189 | $uri = Request::requestUri(); |
190 | 190 | Security::getInstance()->setSessionKey('lastRequest', array( |
191 | - 'url' => Request::getInstance()->getRootUrl() . $uri, |
|
191 | + 'url' => Request::getInstance()->getRootUrl().$uri, |
|
192 | 192 | 'ts' => microtime(true), |
193 | 193 | )); |
194 | 194 | Security::getInstance()->updateSession(); |
195 | - Logger::log('End request: ' . $uri, LOG_INFO); |
|
195 | + Logger::log('End request: '.$uri, LOG_INFO); |
|
196 | 196 | exit; |
197 | 197 | } |
198 | 198 | |
@@ -230,17 +230,17 @@ discard block |
||
230 | 230 | ///////////////////////////////////////////////////////////// |
231 | 231 | // Date in the past sets the value to already have been expired. |
232 | 232 | header('Expires: Sat, 26 Jul 1997 05:00:00 GMT'); |
233 | - header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); |
|
233 | + header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); |
|
234 | 234 | header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1 |
235 | 235 | header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 |
236 | 236 | header('Pragma: no-cache'); |
237 | 237 | header('Expires: 0'); |
238 | 238 | header('Content-Transfer-Encoding: binary'); |
239 | - header('Content-type: ' . $content); |
|
240 | - header('Content-length: ' . strlen($data)); |
|
241 | - header('Content-Disposition: attachment; filename="' . $filename . '"'); |
|
239 | + header('Content-type: '.$content); |
|
240 | + header('Content-length: '.strlen($data)); |
|
241 | + header('Content-Disposition: attachment; filename="'.$filename.'"'); |
|
242 | 242 | header('Access-Control-Expose-Headers: Filename'); |
243 | - header('Filename: ' . $filename); |
|
243 | + header('Filename: '.$filename); |
|
244 | 244 | echo $data; |
245 | 245 | ob_flush(); |
246 | 246 | ob_end_clean(); |
@@ -29,7 +29,7 @@ |
||
29 | 29 | 'attachments' => [ |
30 | 30 | [ |
31 | 31 | "author_name" => $request->getRootUrl(true), |
32 | - "text" => $file . (strlen($line) ? ' [' . $line . ']' : ''), |
|
32 | + "text" => $file.(strlen($line) ? ' ['.$line.']' : ''), |
|
33 | 33 | "color" => Config::getParam('debug', true) ? 'warning' : "danger", |
34 | 34 | "title" => $message, |
35 | 35 | 'fallback' => 'PSFS Error notifier', |
@@ -81,20 +81,20 @@ discard block |
||
81 | 81 | public function init() |
82 | 82 | { |
83 | 83 | parent::init(); |
84 | - Logger::log(static::class . ' init', LOG_DEBUG); |
|
84 | + Logger::log(static::class.' init', LOG_DEBUG); |
|
85 | 85 | $this->domain = $this->getDomain(); |
86 | 86 | $this->hydrateRequestData(); |
87 | 87 | $this->hydrateOrders(); |
88 | - if($this instanceof CustomApi === false) { |
|
88 | + if ($this instanceof CustomApi === false) { |
|
89 | 89 | $this->createConnection($this->getTableMap()); |
90 | 90 | } |
91 | 91 | $this->checkFieldType(); |
92 | 92 | $this->setLoaded(true); |
93 | - Logger::log(static::class . ' loaded', LOG_DEBUG); |
|
93 | + Logger::log(static::class.' loaded', LOG_DEBUG); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | private function checkActions($method) { |
97 | - switch($method) { |
|
97 | + switch ($method) { |
|
98 | 98 | default: |
99 | 99 | case 'modelList': $this->action = self::API_ACTION_LIST; break; |
100 | 100 | case 'get': $this->action = self::API_ACTION_GET; break; |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | protected function hydrateOrders() |
112 | 112 | { |
113 | 113 | if (count($this->query)) { |
114 | - Logger::log(static::class . ' gathering query string', LOG_DEBUG); |
|
114 | + Logger::log(static::class.' gathering query string', LOG_DEBUG); |
|
115 | 115 | foreach ($this->query as $key => $value) { |
116 | 116 | if ($key === self::API_ORDER_FIELD && is_array($value)) { |
117 | 117 | foreach ($value as $field => $direction) { |
@@ -128,10 +128,10 @@ discard block |
||
128 | 128 | */ |
129 | 129 | protected function extractPagination() |
130 | 130 | { |
131 | - Logger::log(static::class . ' extract pagination start', LOG_DEBUG); |
|
131 | + Logger::log(static::class.' extract pagination start', LOG_DEBUG); |
|
132 | 132 | $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1; |
133 | 133 | $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100; |
134 | - Logger::log(static::class . ' extract pagination end', LOG_DEBUG); |
|
134 | + Logger::log(static::class.' extract pagination end', LOG_DEBUG); |
|
135 | 135 | return array($page, (int)$limit); |
136 | 136 | } |
137 | 137 | |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | */ |
143 | 143 | private function addOrders(ModelCriteria &$query) |
144 | 144 | { |
145 | - Logger::log(static::class . ' extract orders start ', LOG_DEBUG); |
|
145 | + Logger::log(static::class.' extract orders start ', LOG_DEBUG); |
|
146 | 146 | $orderAdded = FALSE; |
147 | 147 | $tableMap = $this->getTableMap(); |
148 | 148 | foreach ($this->order->getOrders() as $field => $direction) { |
@@ -150,18 +150,18 @@ discard block |
||
150 | 150 | $orderAdded = TRUE; |
151 | 151 | if ($direction === Order::ASC) { |
152 | 152 | $query->addAscendingOrderByColumn($column->getPhpName()); |
153 | - } else { |
|
153 | + }else { |
|
154 | 154 | $query->addDescendingOrderByColumn($column->getPhpName()); |
155 | 155 | } |
156 | 156 | } |
157 | 157 | } |
158 | 158 | if (!$orderAdded) { |
159 | 159 | $pks = $this->getPkDbName(); |
160 | - foreach(array_keys($pks) as $key) { |
|
160 | + foreach (array_keys($pks) as $key) { |
|
161 | 161 | $query->addAscendingOrderByColumn($key); |
162 | 162 | } |
163 | 163 | } |
164 | - Logger::log(static::class . ' extract orders end', LOG_DEBUG); |
|
164 | + Logger::log(static::class.' extract orders end', LOG_DEBUG); |
|
165 | 165 | } |
166 | 166 | |
167 | 167 | /** |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | foreach ($this->query as $field => $value) { |
177 | 177 | if (self::API_COMBO_FIELD === $field) { |
178 | 178 | ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value); |
179 | - } elseif(!preg_match('/^__/', $field)) { |
|
179 | + } elseif (!preg_match('/^__/', $field)) { |
|
180 | 180 | ApiHelper::addModelField($tableMap, $query, $field, $value); |
181 | 181 | } |
182 | 182 | } |
@@ -197,10 +197,10 @@ discard block |
||
197 | 197 | list($page, $limit) = $this->extractPagination(); |
198 | 198 | if ($limit === -1) { |
199 | 199 | $this->list = $query->find($this->con); |
200 | - } else { |
|
200 | + }else { |
|
201 | 201 | $this->list = $query->paginate($page, $limit, $this->con); |
202 | 202 | } |
203 | - } catch (\Exception $e) { |
|
203 | + }catch (\Exception $e) { |
|
204 | 204 | Logger::log($e->getMessage(), LOG_ERR); |
205 | 205 | } |
206 | 206 | } |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | $code = 200; |
220 | 220 | list($return, $total, $pages) = $this->getList(); |
221 | 221 | $message = null; |
222 | - if(!$total) { |
|
222 | + if (!$total) { |
|
223 | 223 | $message = t('No se han encontrado elementos para la búsqueda'); |
224 | 224 | } |
225 | 225 | |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | $pages = 1; |
246 | 246 | $message = null; |
247 | 247 | list($code, $return) = $this->getSingleResult($pk); |
248 | - if($code !== 200) { |
|
248 | + if ($code !== 200) { |
|
249 | 249 | $message = t('No se ha encontrado el elemento solicitado'); |
250 | 250 | } |
251 | 251 | |
@@ -274,13 +274,13 @@ discard block |
||
274 | 274 | $status = 200; |
275 | 275 | $saved = TRUE; |
276 | 276 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
277 | - } else { |
|
277 | + }else { |
|
278 | 278 | $message = t('No se ha podido guardar el modelo seleccionado'); |
279 | 279 | } |
280 | - } catch (\Exception $e) { |
|
281 | - $message = t('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage(); |
|
280 | + }catch (\Exception $e) { |
|
281 | + $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage(); |
|
282 | 282 | $context = []; |
283 | - if(null !== $e->getPrevious()) { |
|
283 | + if (null !== $e->getPrevious()) { |
|
284 | 284 | $context[] = $e->getPrevious()->getMessage(); |
285 | 285 | } |
286 | 286 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -316,18 +316,18 @@ discard block |
||
316 | 316 | $updated = TRUE; |
317 | 317 | $status = 200; |
318 | 318 | $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
319 | - } else { |
|
319 | + }else { |
|
320 | 320 | $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
321 | 321 | } |
322 | - } catch (\Exception $e) { |
|
322 | + }catch (\Exception $e) { |
|
323 | 323 | $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs'); |
324 | 324 | $context = []; |
325 | - if(null !== $e->getPrevious()) { |
|
325 | + if (null !== $e->getPrevious()) { |
|
326 | 326 | $context[] = $e->getPrevious()->getMessage(); |
327 | 327 | } |
328 | 328 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
329 | 329 | } |
330 | - } else { |
|
330 | + }else { |
|
331 | 331 | $message = t('No se ha encontrado el modelo al que se hace referencia para actualizar'); |
332 | 332 | } |
333 | 333 | |
@@ -355,15 +355,15 @@ discard block |
||
355 | 355 | $this->con->beginTransaction(); |
356 | 356 | $this->hydrateModel($pk); |
357 | 357 | if (NULL !== $this->model) { |
358 | - if(method_exists('clearAllReferences', $this->model)) { |
|
358 | + if (method_exists('clearAllReferences', $this->model)) { |
|
359 | 359 | $this->model->clearAllReferences(true); |
360 | 360 | } |
361 | 361 | $this->model->delete($this->con); |
362 | 362 | $deleted = TRUE; |
363 | 363 | } |
364 | - } catch (\Exception $e) { |
|
364 | + }catch (\Exception $e) { |
|
365 | 365 | $context = []; |
366 | - if(null !== $e->getPrevious()) { |
|
366 | + if (null !== $e->getPrevious()) { |
|
367 | 367 | $context[] = $e->getPrevious()->getMessage(); |
368 | 368 | } |
369 | 369 | Logger::log($e->getMessage(), LOG_CRIT, $context); |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | $this->saveBulk(); |
393 | 393 | $saved = true; |
394 | 394 | $status = 200; |
395 | - } catch(\Exception $e) { |
|
395 | + }catch (\Exception $e) { |
|
396 | 396 | Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData()); |
397 | 397 | $message = t('Bulk insert rolled back'); |
398 | 398 | } |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | |
415 | 415 | /** @var CustomerTableMap $tableMap */ |
416 | 416 | $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap()); |
417 | - foreach($this->list->getData() as $data) { |
|
417 | + foreach ($this->list->getData() as $data) { |
|
418 | 418 | $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data); |
419 | 419 | } |
420 | 420 | return $return; |
@@ -431,23 +431,23 @@ discard block |
||
431 | 431 | try { |
432 | 432 | $this->paginate(); |
433 | 433 | if (null !== $this->list) { |
434 | - if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
434 | + if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) { |
|
435 | 435 | $return = $this->extractDataWithFormat(); |
436 | - } else { |
|
436 | + }else { |
|
437 | 437 | $return = $this->list->toArray(null, false, $this->fieldType ?: TableMap::TYPE_PHPNAME, false); |
438 | 438 | } |
439 | 439 | $total = 0; |
440 | 440 | $pages = 0; |
441 | - if($this->list instanceof PropelModelPager) { |
|
441 | + if ($this->list instanceof PropelModelPager) { |
|
442 | 442 | $total = $this->list->getNbResults(); |
443 | 443 | $pages = $this->list->getLastPage(); |
444 | - } elseif($this->list instanceof ArrayCollection) { |
|
444 | + } elseif ($this->list instanceof ArrayCollection) { |
|
445 | 445 | $total = count($return); |
446 | 446 | $pages = 1; |
447 | 447 | } |
448 | 448 | } |
449 | - } catch (\Exception $e) { |
|
450 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
449 | + }catch (\Exception $e) { |
|
450 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
451 | 451 | } |
452 | 452 | |
453 | 453 | return array($return, $total, $pages); |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | $return = array(); |
466 | 466 | if (NULL === $model || !method_exists($model, 'toArray')) { |
467 | 467 | $code = 404; |
468 | - } else { |
|
468 | + }else { |
|
469 | 469 | $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true); |
470 | 470 | } |
471 | 471 |