@@ -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 |
@@ -37,7 +37,7 @@ |
||
37 | 37 | )) |
38 | 38 | ->addButton('submit', t("Acceder como {{username}}")) |
39 | 39 | ->addButton("cancel", t("Cancelar"), "button", array( |
40 | - "onclick" => "javacript:location.href = \"" . Router::getInstance()->getRoute('') . "\";", |
|
40 | + "onclick" => "javacript:location.href = \"".Router::getInstance()->getRoute('')."\";", |
|
41 | 41 | "class" => "btn-link", |
42 | 42 | )); |
43 | 43 | } |
@@ -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', t('Guardar configuración'), 'submit', array( |
@@ -55,7 +55,7 @@ |
||
55 | 55 | $router->simpatize(); |
56 | 56 | Security::getInstance()->setFlash("callback_message", t("Rutas generadas correctamente")); |
57 | 57 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true)); |
58 | - } catch (\Exception $e) { |
|
58 | + }catch (\Exception $e) { |
|
59 | 59 | Logger::log($e->getMessage(), LOG_ERR); |
60 | 60 | Security::getInstance()->setFlash("callback_message", t("Algo no ha salido bien, revisa los logs")); |
61 | 61 | Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true)); |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | Logger::log('Configuration saved successful'); |
64 | 64 | Security::getInstance()->setFlash("callback_message", t("Usuario agregado correctamente")); |
65 | 65 | Security::getInstance()->setFlash("callback_route", Router::getInstance()->getRoute("admin", true)); |
66 | - } else { |
|
66 | + }else { |
|
67 | 67 | throw new ConfigException(t('Error al guardar los administradores, prueba a cambiar los permisos')); |
68 | 68 | } |
69 | 69 | } |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | { |
100 | 100 | if ($this->isAdmin()) { |
101 | 101 | return $this->redirect('admin'); |
102 | - } else { |
|
102 | + }else { |
|
103 | 103 | return Admin::staticAdminLogon($route); |
104 | 104 | } |
105 | 105 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | $cookies = array( |
132 | 132 | array( |
133 | 133 | "name" => Security::getInstance()->getHash(), |
134 | - "value" => base64_encode($form->getFieldValue("user") . ":" . $form->getFieldValue("pass")), |
|
134 | + "value" => base64_encode($form->getFieldValue("user").":".$form->getFieldValue("pass")), |
|
135 | 135 | "expire" => time() + 3600, |
136 | 136 | "http" => true, |
137 | 137 | ) |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | 'status_message' => t("Acceso permitido... redirigiendo!!"), |
143 | 143 | 'delay' => 1, |
144 | 144 | ); |
145 | - } else { |
|
145 | + }else { |
|
146 | 146 | $form->setError("user", t("El usuario no tiene acceso a la web")); |
147 | 147 | } |
148 | 148 | } |
@@ -27,10 +27,10 @@ discard block |
||
27 | 27 | $label = self::getLabel($property->getDocComment()); |
28 | 28 | $values = self::getValues($property->getDocComment()); |
29 | 29 | $isArray = (bool)preg_match('/\[\]$/', $instanceType); |
30 | - if($isArray) { |
|
30 | + if ($isArray) { |
|
31 | 31 | $instanceType = str_replace('[]', '', $instanceType); |
32 | 32 | } |
33 | - if($instanceType === '\\DateTime' || !Router::exists($instanceType)) { |
|
33 | + if ($instanceType === '\\DateTime' || !Router::exists($instanceType)) { |
|
34 | 34 | list($type, $format) = DocumentorHelper::translateSwaggerFormats($instanceType); |
35 | 35 | $variables[$property->getName()] = [ |
36 | 36 | 'type' => $type, |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | 'required' => $isRequired, |
39 | 39 | 'description' => $label, |
40 | 40 | ]; |
41 | - } else { |
|
41 | + }else { |
|
42 | 42 | $instance = new \ReflectionClass($instanceType); |
43 | 43 | $variables[$property->getName()] = [ |
44 | 44 | 'is_array' => $isArray, |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | 'properties' => self::extractVariables($instance), |
48 | 48 | ]; |
49 | 49 | } |
50 | - if(!empty($values)){ |
|
50 | + if (!empty($values)) { |
|
51 | 51 | $variables[$property->getName()]['enum'] = $values; |
52 | 52 | } |
53 | 53 | } |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | { |
115 | 115 | $visible = false; |
116 | 116 | if (false !== preg_match('/@visible\s+([^\s]+)/', $doc, $matches)) { |
117 | - $visible = count($matches) < 2 || 'false' !== strtolower($matches[1]); |
|
117 | + $visible = count($matches) < 2 || 'false' !== strtolower($matches[1]); |
|
118 | 118 | } |
119 | 119 | return $visible; |
120 | 120 | } |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | // Extract description |
128 | 128 | $label = null; |
129 | 129 | preg_match('/@label\ (.*)\n/i', $doc, $matches); |
130 | - if(count($matches) > 1) { |
|
130 | + if (count($matches) > 1) { |
|
131 | 131 | $label = t($matches[1]); |
132 | 132 | } |
133 | 133 | return $label; |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | // Extract description |
142 | 142 | $label = null; |
143 | 143 | preg_match('/@values\ (.*)\n/i', $doc, $matches); |
144 | - if(count($matches) > 1) { |
|
144 | + if (count($matches) > 1) { |
|
145 | 145 | $label = t($matches[1]); |
146 | 146 | } |
147 | 147 | return false !== strpos($label, '|') ? explode('|', $label) : $label; |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | public static function getDefaultValue($doc) { |
155 | 155 | $default = null; |
156 | 156 | preg_match('/@default\ (.*)\n/i', $doc, $matches); |
157 | - if(count($matches) > 1) { |
|
157 | + if (count($matches) > 1) { |
|
158 | 158 | $default = $matches[1]; |
159 | 159 | } |
160 | 160 | return $default; |
@@ -169,13 +169,13 @@ discard block |
||
169 | 169 | */ |
170 | 170 | public static function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass) |
171 | 171 | { |
172 | - Logger::log('Create inyectable instance for ' . $classNameSpace); |
|
172 | + Logger::log('Create inyectable instance for '.$classNameSpace); |
|
173 | 173 | $reflector = new \ReflectionClass($calledClass); |
174 | 174 | $property = $reflector->getProperty($variable); |
175 | 175 | $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace; |
176 | 176 | if (true === $singleton && method_exists($varInstanceType, 'getInstance')) { |
177 | 177 | $instance = $varInstanceType::getInstance(); |
178 | - } else { |
|
178 | + }else { |
|
179 | 179 | $instance = new $varInstanceType(); |
180 | 180 | } |
181 | 181 | return $instance; |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | public static function getClassProperties($class) |
190 | 190 | { |
191 | 191 | $properties = []; |
192 | - Logger::log('Extracting annotations properties from class ' . $class); |
|
192 | + Logger::log('Extracting annotations properties from class '.$class); |
|
193 | 193 | $selfReflector = new \ReflectionClass($class); |
194 | 194 | if (false !== $selfReflector->getParentClass()) { |
195 | 195 | $properties = self::getClassProperties($selfReflector->getParentClass()->getName()); |
@@ -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 | - } elseif(array_key_exists('type', $info)) { |
|
168 | + } elseif (array_key_exists('type', $info)) { |
|
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; |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | $dump = ''; |
118 | 118 | try { |
119 | 119 | $dump = $this->tpl->render($tpl, $vars); |
120 | - } catch (\Exception $e) { |
|
120 | + }catch (\Exception $e) { |
|
121 | 121 | Logger::log($e->getMessage(), LOG_ERR); |
122 | 122 | } |
123 | 123 | return $dump; |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | public function regenerateTemplates() |
145 | 145 | { |
146 | 146 | $this->generateTemplatesCache(); |
147 | - $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true); |
|
147 | + $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true); |
|
148 | 148 | $translations = []; |
149 | 149 | if (is_array($domains)) { |
150 | 150 | $translations = $this->parsePathTranslations($domains); |
@@ -166,8 +166,8 @@ discard block |
||
166 | 166 | // force compilation |
167 | 167 | if ($file->isFile()) { |
168 | 168 | try { |
169 | - $this->tpl->load(str_replace($tplDir . '/', '', $file)); |
|
170 | - } catch (\Exception $e) { |
|
169 | + $this->tpl->load(str_replace($tplDir.'/', '', $file)); |
|
170 | + }catch (\Exception $e) { |
|
171 | 171 | Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]); |
172 | 172 | } |
173 | 173 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | 'getFlash' => TemplateFunctions::GET_FLASH_FUNCTION, |
229 | 229 | 'getQuery' => TemplateFunctions::GET_QUERY_FUNCTION, |
230 | 230 | ]; |
231 | - foreach($functions as $name => $function) { |
|
231 | + foreach ($functions as $name => $function) { |
|
232 | 232 | $this->addTemplateFunction($name, $function); |
233 | 233 | } |
234 | 234 | } |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | */ |
248 | 248 | private function loadDomains() |
249 | 249 | { |
250 | - $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true); |
|
250 | + $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true); |
|
251 | 251 | if (null !== $domains) { |
252 | 252 | foreach ($domains as $domain => $paths) { |
253 | 253 | $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain)); |
@@ -262,7 +262,7 @@ discard block |
||
262 | 262 | { |
263 | 263 | $loader = new FilesystemLoader(GeneratorHelper::getTemplatePath()); |
264 | 264 | $this->tpl = new Environment($loader, array( |
265 | - 'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig', |
|
265 | + 'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig', |
|
266 | 266 | 'debug' => (bool)$this->debug, |
267 | 267 | 'auto_reload' => Config::getParam('twig.autoreload', TRUE), |
268 | 268 | )); |