@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $translations = array(); |
25 | 25 | if (file_exists($absoluteTranslationFileName)) { |
26 | 26 | @include($absoluteTranslationFileName); |
27 | - } else { |
|
27 | + }else { |
|
28 | 28 | Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE); |
29 | 29 | } |
30 | 30 | |
@@ -36,13 +36,13 @@ discard block |
||
36 | 36 | */ |
37 | 37 | public static function setLocale() { |
38 | 38 | $locale = Config::getParam("default.language", 'es_ES'); |
39 | - Logger::log('Set locale to project [' . $locale . ']'); |
|
39 | + Logger::log('Set locale to project ['.$locale.']'); |
|
40 | 40 | // Load translations |
41 | - putenv("LC_ALL=" . $locale); |
|
41 | + putenv("LC_ALL=".$locale); |
|
42 | 42 | setlocale(LC_ALL, $locale); |
43 | 43 | // Load the locale path |
44 | - $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale'; |
|
45 | - Logger::log('Set locale dir ' . $locale_path); |
|
44 | + $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale'; |
|
45 | + Logger::log('Set locale dir '.$locale_path); |
|
46 | 46 | GeneratorHelper::createDir($locale_path); |
47 | 47 | bindtextdomain('translations', $locale_path); |
48 | 48 | textdomain('translations'); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $dump = ''; |
112 | 112 | try { |
113 | 113 | $dump = $this->tpl->render($tpl, $vars); |
114 | - } catch (\Exception $e) { |
|
114 | + }catch (\Exception $e) { |
|
115 | 115 | Logger::log($e->getMessage(), LOG_ERR); |
116 | 116 | } |
117 | 117 | return $dump; |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | public function regenerateTemplates() |
139 | 139 | { |
140 | 140 | $this->generateTemplatesCache(); |
141 | - $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, true); |
|
141 | + $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, true); |
|
142 | 142 | $translations = []; |
143 | 143 | if (is_array($domains)) { |
144 | 144 | $translations = $this->parsePathTranslations($domains); |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | // force compilation |
161 | 161 | if ($file->isFile()) { |
162 | 162 | try { |
163 | - $this->tpl->load(str_replace($tplDir . '/', '', $file)); |
|
164 | - } catch (\Exception $e) { |
|
163 | + $this->tpl->load(str_replace($tplDir.'/', '', $file)); |
|
164 | + }catch (\Exception $e) { |
|
165 | 165 | Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]); |
166 | 166 | } |
167 | 167 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | 'existsFlash' => TemplateFunctions::EXISTS_FLASH_FUNCTION, |
222 | 222 | 'getFlash' => TemplateFunctions::GET_FLASH_FUNCTION, |
223 | 223 | ]; |
224 | - foreach($functions as $name => $function) { |
|
224 | + foreach ($functions as $name => $function) { |
|
225 | 225 | $this->addTemplateFunction($name, $function); |
226 | 226 | } |
227 | 227 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | */ |
241 | 241 | private function loadDomains() |
242 | 242 | { |
243 | - $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true); |
|
243 | + $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true); |
|
244 | 244 | if (null !== $domains) { |
245 | 245 | foreach ($domains as $domain => $paths) { |
246 | 246 | $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain)); |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | { |
256 | 256 | $loader = new \Twig_Loader_Filesystem(GeneratorHelper::getTemplatePath()); |
257 | 257 | $this->tpl = new \Twig_Environment($loader, array( |
258 | - 'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig', |
|
258 | + 'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig', |
|
259 | 259 | 'debug' => (bool)$this->debug, |
260 | 260 | 'auto_reload' => Config::getParam('twig.autoreload', TRUE), |
261 | 261 | )); |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | } elseif ($mappedColumn->isText()) { |
42 | 42 | if ($mappedColumn->getSize() > 100) { |
43 | 43 | $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required); |
44 | - } else { |
|
44 | + }else { |
|
45 | 45 | $fDto = self::generateStringField($field, $required); |
46 | 46 | } |
47 | 47 | } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) { |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $fDto->entity = $relatedModel; |
86 | 86 | $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName()); |
87 | 87 | $fDto->relatedField = $relatedField->getPhpName(); |
88 | - $fDto->url = Router::getInstance()->getRoute(strtolower($domain) . '-api-' . $relatedModel); |
|
88 | + $fDto->url = Router::getInstance()->getRoute(strtolower($domain).'-api-'.$relatedModel); |
|
89 | 89 | return $fDto; |
90 | 90 | } |
91 | 91 | |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | { |
193 | 193 | try { |
194 | 194 | $column = $tableMap->getColumnByPhpName($field); |
195 | - } catch (\Exception $e) { |
|
195 | + }catch (\Exception $e) { |
|
196 | 196 | Logger::log($e->getMessage(), LOG_ERR); |
197 | 197 | $column = null; |
198 | 198 | } |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | * @param ModelCriteria $query |
205 | 205 | * @param mixed $value |
206 | 206 | */ |
207 | - private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) |
|
207 | + private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null) |
|
208 | 208 | { |
209 | 209 | $tableField = $column->getPhpName(); |
210 | 210 | if (preg_match('/^<=/', $value)) { |
@@ -218,8 +218,8 @@ discard block |
||
218 | 218 | } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) { |
219 | 219 | $text = preg_replace('/(\'|\")/', '', $value); |
220 | 220 | $text = preg_replace('/\ /', '%', $text); |
221 | - $query->filterBy($tableField, '%' . $text . '%', Criteria::LIKE); |
|
222 | - } else { |
|
221 | + $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE); |
|
222 | + }else { |
|
223 | 223 | $query->filterBy($tableField, $value, Criteria::EQUAL); |
224 | 224 | } |
225 | 225 | } |
@@ -230,24 +230,24 @@ discard block |
||
230 | 230 | * @param array $extraColumns |
231 | 231 | * @param mixed $value |
232 | 232 | */ |
233 | - public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null) |
|
233 | + public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null) |
|
234 | 234 | { |
235 | 235 | $exp = 'CONCAT('; |
236 | 236 | $sep = ''; |
237 | 237 | foreach ($tableMap->getColumns() as $column) { |
238 | 238 | if ($column->isText()) { |
239 | - $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")'; |
|
239 | + $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")'; |
|
240 | 240 | $sep = ', " ", '; |
241 | 241 | } |
242 | 242 | } |
243 | 243 | foreach ($extraColumns as $extra => $name) { |
244 | - $exp .= $sep . $extra; |
|
244 | + $exp .= $sep.$extra; |
|
245 | 245 | $sep = ', " ", '; |
246 | 246 | } |
247 | 247 | $exp .= ")"; |
248 | 248 | $text = preg_replace('/(\'|\")/', '', $value); |
249 | 249 | $text = preg_replace('/\ /', '%', $text); |
250 | - $query->where($exp . Criteria::LIKE . '"%' . $text . '%"'); |
|
250 | + $query->where($exp.Criteria::LIKE.'"%'.$text.'%"'); |
|
251 | 251 | } |
252 | 252 | |
253 | 253 | /** |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | * @param string $field |
258 | 258 | * @param mixed $value |
259 | 259 | */ |
260 | - public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null) |
|
260 | + public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null) |
|
261 | 261 | { |
262 | 262 | if ($column = self::checkFieldExists($tableMap, $field)) { |
263 | 263 | self::addQueryFilter($column, $query, $value); |