@@ -39,24 +39,24 @@ discard block |
||
39 | 39 | */ |
40 | 40 | public static function findTranslations($path, $locale) |
41 | 41 | { |
42 | - $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
43 | - $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
42 | + $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
43 | + $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
44 | 44 | |
45 | 45 | $translations = array(); |
46 | 46 | if (file_exists($path)) { |
47 | 47 | $d = dir($path); |
48 | 48 | while (false !== ($dir = $d->read())) { |
49 | 49 | GeneratorHelper::createDir($localePath); |
50 | - if (!file_exists($localePath . 'translations.po')) { |
|
51 | - file_put_contents($localePath . 'translations.po', ''); |
|
50 | + if (!file_exists($localePath.'translations.po')) { |
|
51 | + file_put_contents($localePath.'translations.po', ''); |
|
52 | 52 | } |
53 | - $inspect_path = realpath($path . DIRECTORY_SEPARATOR . $dir); |
|
54 | - $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext " . |
|
55 | - $inspect_path . DIRECTORY_SEPARATOR . |
|
53 | + $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir); |
|
54 | + $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ". |
|
55 | + $inspect_path.DIRECTORY_SEPARATOR. |
|
56 | 56 | "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$localePath}translations.po"; |
57 | - if (is_dir($path . DIRECTORY_SEPARATOR . $dir) && preg_match('/^\./', $dir) == 0) { |
|
58 | - $res = t('Revisando directorio: ') . $inspect_path; |
|
59 | - $res .= t('Comando ejecutado: ') . $cmd_php; |
|
57 | + if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) { |
|
58 | + $res = t('Revisando directorio: ').$inspect_path; |
|
59 | + $res .= t('Comando ejecutado: ').$cmd_php; |
|
60 | 60 | $res .= shell_exec($cmd_php); |
61 | 61 | usleep(10); |
62 | 62 | $translations[] = $res; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | */ |
78 | 78 | public function createStructureModule($module, $force = false, $type = "", $apiClass = "") |
79 | 79 | { |
80 | - $mod_path = CORE_DIR . DIRECTORY_SEPARATOR; |
|
80 | + $mod_path = CORE_DIR.DIRECTORY_SEPARATOR; |
|
81 | 81 | $module = ucfirst($module); |
82 | 82 | $this->createModulePath($module, $mod_path); |
83 | 83 | $this->createModulePathTree($module, $mod_path); |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | // Creates the src folder |
99 | 99 | GeneratorHelper::createDir($mod_path); |
100 | 100 | // Create module path |
101 | - GeneratorHelper::createDir($mod_path . $module); |
|
101 | + GeneratorHelper::createDir($mod_path.$module); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -113,16 +113,16 @@ discard block |
||
113 | 113 | $this->log->addLog("Generamos la estructura"); |
114 | 114 | $paths = [ |
115 | 115 | "Api", "Api/base", "Config", "Controller", "Models", "Public", "Templates", "Services", "Test", "Doc", |
116 | - "Locale", "Locale/" . Config::getParam('default.locale', 'es_ES'), "Locale/" . Config::getParam('default.locale', 'es_ES') . "/LC_MESSAGES" |
|
116 | + "Locale", "Locale/".Config::getParam('default.locale', 'es_ES'), "Locale/".Config::getParam('default.locale', 'es_ES')."/LC_MESSAGES" |
|
117 | 117 | ]; |
118 | - $module_path = $mod_path . $module; |
|
118 | + $module_path = $mod_path.$module; |
|
119 | 119 | foreach ($paths as $path) { |
120 | - GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . $path); |
|
120 | + GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR.$path); |
|
121 | 121 | } |
122 | 122 | //Creamos las carpetas de los assets |
123 | 123 | $htmlPaths = array("css", "js", "img", "media", "font"); |
124 | 124 | foreach ($htmlPaths as $path) { |
125 | - GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path); |
|
125 | + GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path); |
|
126 | 126 | } |
127 | 127 | } |
128 | 128 | |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | */ |
136 | 136 | private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '') |
137 | 137 | { |
138 | - $module_path = $mod_path . $module; |
|
138 | + $module_path = $mod_path.$module; |
|
139 | 139 | $this->generateControllerTemplate($module, $module_path, $force, $controllerType); |
140 | 140 | $this->generateServiceTemplate($module, $module_path, $force); |
141 | 141 | $this->genereateAutoloaderTemplate($module, $module_path, $force); |
@@ -153,8 +153,8 @@ discard block |
||
153 | 153 | */ |
154 | 154 | private function createModuleModels($module, $path) |
155 | 155 | { |
156 | - $module_path = $path . $module; |
|
157 | - $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path); |
|
156 | + $module_path = $path.$module; |
|
157 | + $module_path = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $module_path); |
|
158 | 158 | |
159 | 159 | $configGenerator = $this->getConfigGenerator($module_path); |
160 | 160 | |
@@ -164,8 +164,8 @@ discard block |
||
164 | 164 | $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array( |
165 | 165 | "module" => $module, |
166 | 166 | )); |
167 | - $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config" . |
|
168 | - DIRECTORY_SEPARATOR . "config.php", true); |
|
167 | + $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config". |
|
168 | + DIRECTORY_SEPARATOR."config.php", true); |
|
169 | 169 | $this->log->addLog("Generado config genérico para propel"); |
170 | 170 | } |
171 | 171 | |
@@ -187,28 +187,28 @@ discard block |
||
187 | 187 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
188 | 188 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
189 | 189 | "class" => $class, |
190 | - "controllerType" => $class . "Base", |
|
190 | + "controllerType" => $class."Base", |
|
191 | 191 | "is_base" => false |
192 | 192 | )); |
193 | - $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" . |
|
194 | - DIRECTORY_SEPARATOR . "{$class}Controller.php", $force); |
|
193 | + $controller = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller". |
|
194 | + DIRECTORY_SEPARATOR."{$class}Controller.php", $force); |
|
195 | 195 | |
196 | 196 | $controllerBody = $this->tpl->dump("generator/controller.template.twig", array( |
197 | 197 | "module" => $module, |
198 | 198 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
199 | 199 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
200 | - "class" => $class . "Base", |
|
200 | + "class" => $class."Base", |
|
201 | 201 | "service" => $class, |
202 | 202 | "controllerType" => $controllerType, |
203 | 203 | "is_base" => true, |
204 | 204 | "domain" => $class, |
205 | 205 | )); |
206 | - $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" . |
|
207 | - DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true); |
|
206 | + $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller". |
|
207 | + DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true); |
|
208 | 208 | |
209 | - $filename = $mod_path . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php"; |
|
209 | + $filename = $mod_path.DIRECTORY_SEPARATOR."Test".DIRECTORY_SEPARATOR."{$class}Test.php"; |
|
210 | 210 | $test = true; |
211 | - if(!file_exists($filename)) { |
|
211 | + if (!file_exists($filename)) { |
|
212 | 212 | $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array( |
213 | 213 | "module" => $module, |
214 | 214 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
@@ -229,8 +229,8 @@ discard block |
||
229 | 229 | private function generateBaseApiTemplate($module, $mod_path, $force = false, $apiClass = "") |
230 | 230 | { |
231 | 231 | $created = true; |
232 | - $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models'; |
|
233 | - $api_path = $mod_path . $module . DIRECTORY_SEPARATOR . 'Api'; |
|
232 | + $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models'; |
|
233 | + $api_path = $mod_path.$module.DIRECTORY_SEPARATOR.'Api'; |
|
234 | 234 | if (file_exists($modelPath)) { |
235 | 235 | $dir = dir($modelPath); |
236 | 236 | while ($file = $dir->read()) { |
@@ -258,7 +258,7 @@ discard block |
||
258 | 258 | //Generamos el fichero de configuración |
259 | 259 | $this->log->addLog("Generamos fichero vacío de configuración"); |
260 | 260 | return $this->writeTemplateToFile("<?php\n\t", |
261 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php", |
|
261 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php", |
|
262 | 262 | $force); |
263 | 263 | } |
264 | 264 | |
@@ -273,10 +273,10 @@ discard block |
||
273 | 273 | //Generamos el fichero de configuración |
274 | 274 | $this->log->addLog("Generamos ficheros para assets base"); |
275 | 275 | $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", |
276 | - $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css", |
|
276 | + $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css", |
|
277 | 277 | $force); |
278 | 278 | $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", |
279 | - $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js", |
|
279 | + $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js", |
|
280 | 280 | $force); |
281 | 281 | return ($css && $js); |
282 | 282 | } |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | "class" => $class, |
299 | 299 | )); |
300 | 300 | return $this->writeTemplateToFile($controller, |
301 | - $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php", |
|
301 | + $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php", |
|
302 | 302 | $force); |
303 | 303 | } |
304 | 304 | |
@@ -317,13 +317,13 @@ discard block |
||
317 | 317 | "autoloader" => preg_replace('/(\\\|\/)/', '_', $module), |
318 | 318 | "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module), |
319 | 319 | )); |
320 | - $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force); |
|
320 | + $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force); |
|
321 | 321 | |
322 | 322 | $this->log->addLog("Generamos el phpunit"); |
323 | 323 | $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array( |
324 | 324 | "module" => $module, |
325 | 325 | )); |
326 | - $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force); |
|
326 | + $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force); |
|
327 | 327 | return $autoload && $phpunit; |
328 | 328 | } |
329 | 329 | |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | "db" => $this->config->get("db_name"), |
345 | 345 | )); |
346 | 346 | return $this->writeTemplateToFile($schema, |
347 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml", |
|
347 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml", |
|
348 | 348 | $force); |
349 | 349 | } |
350 | 350 | |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | "namespace" => preg_replace('/(\\\|\/)/', '', $module), |
363 | 363 | )); |
364 | 364 | return $this->writeTemplateToFile($build_properties, |
365 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml", |
|
365 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml", |
|
366 | 366 | $force); |
367 | 367 | } |
368 | 368 | |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | "module" => $module, |
381 | 381 | )); |
382 | 382 | return $this->writeTemplateToFile($index, |
383 | - $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig", |
|
383 | + $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig", |
|
384 | 384 | $force); |
385 | 385 | } |
386 | 386 | |
@@ -398,11 +398,11 @@ discard block |
||
398 | 398 | try { |
399 | 399 | $this->cache->storeData($filename, $fileContent, Cache::TEXT, true); |
400 | 400 | $created = true; |
401 | - } catch (\Exception $e) { |
|
401 | + }catch (\Exception $e) { |
|
402 | 402 | Logger::log($e->getMessage(), LOG_ERR); |
403 | 403 | } |
404 | - } else { |
|
405 | - Logger::log($filename . t(' not exists or cant write'), LOG_ERR); |
|
404 | + }else { |
|
405 | + Logger::log($filename.t(' not exists or cant write'), LOG_ERR); |
|
406 | 406 | } |
407 | 407 | return $created; |
408 | 408 | } |
@@ -431,7 +431,7 @@ discard block |
||
431 | 431 | )); |
432 | 432 | |
433 | 433 | return $this->writeTemplateToFile($controller, |
434 | - $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true); |
|
434 | + $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true); |
|
435 | 435 | } |
436 | 436 | |
437 | 437 | /** |
@@ -454,7 +454,7 @@ discard block |
||
454 | 454 | "class" => $class, |
455 | 455 | )); |
456 | 456 | |
457 | - return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force); |
|
457 | + return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force); |
|
458 | 458 | } |
459 | 459 | |
460 | 460 | /** |
@@ -468,12 +468,12 @@ discard block |
||
468 | 468 | { |
469 | 469 | if (file_exists($filename_path)) { |
470 | 470 | $destfolder = basename($filename_path); |
471 | - if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) { |
|
471 | + if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) { |
|
472 | 472 | if (is_dir($filename_path)) { |
473 | - self::copyr($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder); |
|
474 | - } else { |
|
475 | - if (@copy($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) { |
|
476 | - throw new ConfigException("Can't copy " . $filename_path . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder); |
|
473 | + self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder); |
|
474 | + }else { |
|
475 | + if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) { |
|
476 | + throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder); |
|
477 | 477 | } |
478 | 478 | } |
479 | 479 | } |
@@ -492,10 +492,10 @@ discard block |
||
492 | 492 | GeneratorHelper::createDir($dst); |
493 | 493 | while (false !== ($file = readdir($dir))) { |
494 | 494 | if (($file != '.') && ($file != '..')) { |
495 | - if (is_dir($src . '/' . $file)) { |
|
496 | - self::copyr($src . '/' . $file, $dst . '/' . $file); |
|
497 | - } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) { |
|
498 | - throw new ConfigException("Can't copy " . $src . " to " . $dst); |
|
495 | + if (is_dir($src.'/'.$file)) { |
|
496 | + self::copyr($src.'/'.$file, $dst.'/'.$file); |
|
497 | + } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) { |
|
498 | + throw new ConfigException("Can't copy ".$src." to ".$dst); |
|
499 | 499 | } |
500 | 500 | } |
501 | 501 | } |
@@ -508,12 +508,12 @@ discard block |
||
508 | 508 | */ |
509 | 509 | private function getPropelPaths($module_path) |
510 | 510 | { |
511 | - $moduleDir = CORE_DIR . DIRECTORY_SEPARATOR . $module_path; |
|
511 | + $moduleDir = CORE_DIR.DIRECTORY_SEPARATOR.$module_path; |
|
512 | 512 | GeneratorHelper::createDir($moduleDir); |
513 | 513 | $moduleDir = realpath($moduleDir); |
514 | - $configDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config'; |
|
515 | - $sqlDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql'; |
|
516 | - $migrationDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Migrations'; |
|
514 | + $configDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'; |
|
515 | + $sqlDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql'; |
|
516 | + $migrationDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Migrations'; |
|
517 | 517 | $paths = [ |
518 | 518 | 'projectDir' => $moduleDir, |
519 | 519 | 'outputDir' => $moduleDir, |
@@ -578,9 +578,9 @@ discard block |
||
578 | 578 | private function setupManager(GeneratorConfig $configGenerator, AbstractManager &$manager, $workingDir = CORE_DIR) |
579 | 579 | { |
580 | 580 | $manager->setGeneratorConfig($configGenerator); |
581 | - $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'] . DIRECTORY_SEPARATOR . 'schema.xml'); |
|
581 | + $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'].DIRECTORY_SEPARATOR.'schema.xml'); |
|
582 | 582 | $manager->setSchemas([$schemaFile]); |
583 | - $manager->setLoggerClosure(function ($message) { |
|
583 | + $manager->setLoggerClosure(function($message) { |
|
584 | 584 | Logger::log($message, LOG_INFO); |
585 | 585 | }); |
586 | 586 | $manager->setWorkingDirectory($workingDir); |
@@ -27,24 +27,24 @@ discard block |
||
27 | 27 | * @param bool $use_base |
28 | 28 | */ |
29 | 29 | protected static function checkLoad($custom_key = null, $force_reload = false, $use_base = false) { |
30 | - if($force_reload) { |
|
30 | + if ($force_reload) { |
|
31 | 31 | self::dropInstance(); |
32 | 32 | } |
33 | 33 | self::$locale = I18nHelper::extractLocale(Security::getInstance()->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY)); |
34 | 34 | self::$generate = (boolean)Config::getParam('i18n.autogenerate', false); |
35 | - if(!$use_base) { |
|
35 | + if (!$use_base) { |
|
36 | 36 | $custom_key = $custom_key ?: Security::getInstance()->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY); |
37 | 37 | } |
38 | - if(null !== $custom_key) { |
|
39 | - Logger::log('[' . self::class . '] Custom key detected: ' . $custom_key, LOG_INFO); |
|
40 | - self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $custom_key, self::$locale . '.json']); |
|
41 | - } else { |
|
42 | - self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale . '.json']); |
|
38 | + if (null !== $custom_key) { |
|
39 | + Logger::log('['.self::class.'] Custom key detected: '.$custom_key, LOG_INFO); |
|
40 | + self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $custom_key, self::$locale.'.json']); |
|
41 | + }else { |
|
42 | + self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale.'.json']); |
|
43 | 43 | } |
44 | - if(file_exists(self::$filename)) { |
|
45 | - Logger::log('[' . self::class . '] Custom locale detected: ' . $custom_key . ' [' . self::$locale . ']', LOG_INFO); |
|
44 | + if (file_exists(self::$filename)) { |
|
45 | + Logger::log('['.self::class.'] Custom locale detected: '.$custom_key.' ['.self::$locale.']', LOG_INFO); |
|
46 | 46 | self::$translations = json_decode(file_get_contents(self::$filename), true); |
47 | - } elseif(null !== $custom_key) { |
|
47 | + } elseif (null !== $custom_key) { |
|
48 | 48 | self::checkLoad(null, $force_reload, true); |
49 | 49 | } |
50 | 50 | } |
@@ -85,12 +85,12 @@ discard block |
||
85 | 85 | */ |
86 | 86 | public static function _($message, $custom_key = null, $force_reload = false) { |
87 | 87 | self::checkLoad($custom_key, $force_reload); |
88 | - if(array_key_exists($message, self::$translations)) { |
|
89 | - $translation = self::$translations[$message]; |
|
90 | - } else { |
|
88 | + if (array_key_exists($message, self::$translations)) { |
|
89 | + $translation = self::$translations[$message]; |
|
90 | + }else { |
|
91 | 91 | $translation = gettext($message); |
92 | 92 | } |
93 | - if(self::$generate) { |
|
93 | + if (self::$generate) { |
|
94 | 94 | self::generate($message, $translation); |
95 | 95 | } |
96 | 96 | return $translation; |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @param string $translation |
102 | 102 | */ |
103 | 103 | protected static function generate($message, $translation) { |
104 | - if(!array_key_exists($message, self::$translations)) { |
|
104 | + if (!array_key_exists($message, self::$translations)) { |
|
105 | 105 | self::$translations[$message] = $translation; |
106 | 106 | } |
107 | 107 | file_put_contents(self::$filename, json_encode(array_unique(self::$translations), JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT)); |
@@ -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 | } |
@@ -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()); |