@@ -2,8 +2,6 @@ |
||
| 2 | 2 | namespace PSFS\base\types\traits; |
| 3 | 3 | |
| 4 | 4 | use PSFS\base\Logger; |
| 5 | -use PSFS\base\Request; |
|
| 6 | -use PSFS\base\Router; |
|
| 7 | 5 | |
| 8 | 6 | /** |
| 9 | 7 | * Class SystemTrait |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | $use /= 1024; |
| 37 | 37 | break; |
| 38 | 38 | case "MBytes": |
| 39 | - $use /= (1024 * 1024); |
|
| 39 | + $use /= (1024*1024); |
|
| 40 | 40 | break; |
| 41 | 41 | case "Bytes": |
| 42 | 42 | default: |
@@ -61,14 +61,14 @@ discard block |
||
| 61 | 61 | { |
| 62 | 62 | Logger::log('Added handlers for errors'); |
| 63 | 63 | //Warning & Notice handler |
| 64 | - set_error_handler(function ($errno, $errstr, $errfile, $errline) { |
|
| 64 | + set_error_handler(function($errno, $errstr, $errfile, $errline) { |
|
| 65 | 65 | Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]); |
| 66 | 66 | return true; |
| 67 | 67 | }, E_ALL | E_STRICT); |
| 68 | 68 | |
| 69 | - register_shutdown_function(function () { |
|
| 69 | + register_shutdown_function(function() { |
|
| 70 | 70 | $error = error_get_last(); |
| 71 | - if( $error !== NULL) { |
|
| 71 | + if ($error !== NULL) { |
|
| 72 | 72 | $errno = $error["type"]; |
| 73 | 73 | $errfile = $error["file"]; |
| 74 | 74 | $errline = $error["line"]; |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | Logger::log('Initializing stats (mem + ts)'); |
| 89 | 89 | if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) { |
| 90 | 90 | $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT']; |
| 91 | - } else { |
|
| 91 | + }else { |
|
| 92 | 92 | $this->ts = PSFS_START_TS; |
| 93 | 93 | } |
| 94 | 94 | $this->mem = PSFS_START_MEM; |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | |
| 40 | 40 | /** |
| 41 | 41 | * Método que revisa las traducciones directorio a directorio |
| 42 | - * @param $path |
|
| 42 | + * @param string $path |
|
| 43 | 43 | * @param $locale |
| 44 | 44 | * @return array |
| 45 | 45 | */ |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | * Servicio que genera la estructura base |
| 112 | 112 | * @param string $module |
| 113 | 113 | * @param boolean $mod_path |
| 114 | - * @return boolean |
|
| 114 | + * @return boolean|null |
|
| 115 | 115 | */ |
| 116 | 116 | private function createModulePathTree($module, $mod_path) |
| 117 | 117 | { |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | * Method that copy resources recursively |
| 468 | 468 | * @param string $dest |
| 469 | 469 | * @param boolean $force |
| 470 | - * @param $filename_path |
|
| 470 | + * @param string $filename_path |
|
| 471 | 471 | * @param boolean $debug |
| 472 | 472 | */ |
| 473 | 473 | public static function copyResources($dest, $force, $filename_path, $debug) |
@@ -509,7 +509,7 @@ discard block |
||
| 509 | 509 | } |
| 510 | 510 | |
| 511 | 511 | /** |
| 512 | - * @param $module_path |
|
| 512 | + * @param string $module_path |
|
| 513 | 513 | * @return array |
| 514 | 514 | */ |
| 515 | 515 | private function getPropelPaths($module_path) |
@@ -1,16 +1,10 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace PSFS\Services; |
| 3 | 3 | |
| 4 | -use Propel\Common\Config\ConfigurationManager; |
|
| 5 | 4 | use Propel\Generator\Config\GeneratorConfig; |
| 6 | 5 | use Propel\Generator\Manager\AbstractManager; |
| 7 | -use Propel\Generator\Manager\MigrationManager; |
|
| 8 | 6 | use Propel\Generator\Manager\ModelManager; |
| 9 | 7 | use Propel\Generator\Manager\SqlManager; |
| 10 | -use Propel\Generator\Model\Database; |
|
| 11 | -use Propel\Generator\Model\Diff\DatabaseComparator; |
|
| 12 | -use Propel\Generator\Model\IdMethod; |
|
| 13 | -use Propel\Generator\Model\Schema; |
|
| 14 | 8 | use PSFS\base\Cache; |
| 15 | 9 | use PSFS\base\config\Config; |
| 16 | 10 | use PSFS\base\exception\ConfigException; |
@@ -45,24 +45,24 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | public static function findTranslations($path, $locale) |
| 47 | 47 | { |
| 48 | - $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 49 | - $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR; |
|
| 48 | + $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 49 | + $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR; |
|
| 50 | 50 | |
| 51 | 51 | $translations = array(); |
| 52 | 52 | if (file_exists($path)) { |
| 53 | 53 | $d = dir($path); |
| 54 | 54 | while (false !== ($dir = $d->read())) { |
| 55 | 55 | GeneratorHelper::createDir($locale_path); |
| 56 | - if (!file_exists($locale_path . 'translations.po')) { |
|
| 57 | - file_put_contents($locale_path . 'translations.po', ''); |
|
| 56 | + if (!file_exists($locale_path.'translations.po')) { |
|
| 57 | + file_put_contents($locale_path.'translations.po', ''); |
|
| 58 | 58 | } |
| 59 | - $inspect_path = realpath($path . DIRECTORY_SEPARATOR . $dir); |
|
| 60 | - $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext " . |
|
| 61 | - $inspect_path . DIRECTORY_SEPARATOR . |
|
| 59 | + $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir); |
|
| 60 | + $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ". |
|
| 61 | + $inspect_path.DIRECTORY_SEPARATOR. |
|
| 62 | 62 | "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po"; |
| 63 | - if (is_dir($path . DIRECTORY_SEPARATOR . $dir) && preg_match('/^\./', $dir) == 0) { |
|
| 64 | - $res = _('Revisando directorio: ') . $inspect_path; |
|
| 65 | - $res .= _('Comando ejecutado: ') . $cmd_php; |
|
| 63 | + if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) { |
|
| 64 | + $res = _('Revisando directorio: ').$inspect_path; |
|
| 65 | + $res .= _('Comando ejecutado: ').$cmd_php; |
|
| 66 | 66 | $res .= shell_exec($cmd_php); |
| 67 | 67 | usleep(10); |
| 68 | 68 | $translations[] = $res; |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | */ |
| 84 | 84 | public function createStructureModule($module, $force = false, $type = "", $apiClass = "") |
| 85 | 85 | { |
| 86 | - $mod_path = CORE_DIR . DIRECTORY_SEPARATOR; |
|
| 86 | + $mod_path = CORE_DIR.DIRECTORY_SEPARATOR; |
|
| 87 | 87 | $module = ucfirst($module); |
| 88 | 88 | $this->createModulePath($module, $mod_path); |
| 89 | 89 | $this->createModulePathTree($module, $mod_path); |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | // Creates the src folder |
| 105 | 105 | GeneratorHelper::createDir($mod_path); |
| 106 | 106 | // Create module path |
| 107 | - GeneratorHelper::createDir($mod_path . $module); |
|
| 107 | + GeneratorHelper::createDir($mod_path.$module); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -119,16 +119,16 @@ discard block |
||
| 119 | 119 | $this->log->infoLog("Generamos la estructura"); |
| 120 | 120 | $paths = [ |
| 121 | 121 | "Api", "Api/base", "Config", "Controller", "Models", "Public", "Templates", "Services", "Test", "Doc", |
| 122 | - "Locale", "Locale/" . Config::getParam('default.locale', 'es_ES'), "Locale/" . Config::getParam('default.locale', 'es_ES') . "/LC_MESSAGES" |
|
| 122 | + "Locale", "Locale/".Config::getParam('default.locale', 'es_ES'), "Locale/".Config::getParam('default.locale', 'es_ES')."/LC_MESSAGES" |
|
| 123 | 123 | ]; |
| 124 | - $module_path = $mod_path . $module; |
|
| 124 | + $module_path = $mod_path.$module; |
|
| 125 | 125 | foreach ($paths as $path) { |
| 126 | - GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . $path); |
|
| 126 | + GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR.$path); |
|
| 127 | 127 | } |
| 128 | 128 | //Creamos las carpetas de los assets |
| 129 | 129 | $htmlPaths = array("css", "js", "img", "media", "font"); |
| 130 | 130 | foreach ($htmlPaths as $path) { |
| 131 | - GeneratorHelper::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path); |
|
| 131 | + GeneratorHelper::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '') |
| 143 | 143 | { |
| 144 | - $module_path = $mod_path . $module; |
|
| 144 | + $module_path = $mod_path.$module; |
|
| 145 | 145 | $this->generateControllerTemplate($module, $module_path, $force, $controllerType); |
| 146 | 146 | $this->generateServiceTemplate($module, $module_path, $force); |
| 147 | 147 | $this->genereateAutoloaderTemplate($module, $module_path, $force); |
@@ -159,8 +159,8 @@ discard block |
||
| 159 | 159 | */ |
| 160 | 160 | private function createModuleModels($module, $path) |
| 161 | 161 | { |
| 162 | - $module_path = $path . $module; |
|
| 163 | - $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path); |
|
| 162 | + $module_path = $path.$module; |
|
| 163 | + $module_path = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $module_path); |
|
| 164 | 164 | |
| 165 | 165 | $configGenerator = $this->getConfigGenerator($module_path); |
| 166 | 166 | |
@@ -170,8 +170,8 @@ discard block |
||
| 170 | 170 | $configTemplate = $this->tpl->dump("generator/config.propel.template.twig", array( |
| 171 | 171 | "module" => $module, |
| 172 | 172 | )); |
| 173 | - $this->writeTemplateToFile($configTemplate, CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR . "Config" . |
|
| 174 | - DIRECTORY_SEPARATOR . "config.php", true); |
|
| 173 | + $this->writeTemplateToFile($configTemplate, CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR."Config". |
|
| 174 | + DIRECTORY_SEPARATOR."config.php", true); |
|
| 175 | 175 | $this->log->infoLog("Generado config genérico para propel"); |
| 176 | 176 | } |
| 177 | 177 | |
@@ -193,28 +193,28 @@ discard block |
||
| 193 | 193 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
| 194 | 194 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
| 195 | 195 | "class" => $class, |
| 196 | - "controllerType" => $class . "Base", |
|
| 196 | + "controllerType" => $class."Base", |
|
| 197 | 197 | "is_base" => false |
| 198 | 198 | )); |
| 199 | - $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" . |
|
| 200 | - DIRECTORY_SEPARATOR . "{$class}Controller.php", $force); |
|
| 199 | + $controller = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller". |
|
| 200 | + DIRECTORY_SEPARATOR."{$class}Controller.php", $force); |
|
| 201 | 201 | |
| 202 | 202 | $controllerBody = $this->tpl->dump("generator/controller.template.twig", array( |
| 203 | 203 | "module" => $module, |
| 204 | 204 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
| 205 | 205 | "url" => preg_replace('/(\\\|\/)/', '/', $module), |
| 206 | - "class" => $class . "Base", |
|
| 206 | + "class" => $class."Base", |
|
| 207 | 207 | "service" => $class, |
| 208 | 208 | "controllerType" => $controllerType, |
| 209 | 209 | "is_base" => true, |
| 210 | 210 | "domain" => $class, |
| 211 | 211 | )); |
| 212 | - $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" . |
|
| 213 | - DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true); |
|
| 212 | + $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller". |
|
| 213 | + DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true); |
|
| 214 | 214 | |
| 215 | - $filename = $mod_path . DIRECTORY_SEPARATOR . "Test" . DIRECTORY_SEPARATOR . "{$class}Test.php"; |
|
| 215 | + $filename = $mod_path.DIRECTORY_SEPARATOR."Test".DIRECTORY_SEPARATOR."{$class}Test.php"; |
|
| 216 | 216 | $test = true; |
| 217 | - if(!file_exists($filename)) { |
|
| 217 | + if (!file_exists($filename)) { |
|
| 218 | 218 | $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array( |
| 219 | 219 | "module" => $module, |
| 220 | 220 | "namespace" => preg_replace('/(\\\|\/)/', '\\', $module), |
@@ -235,8 +235,8 @@ discard block |
||
| 235 | 235 | private function generateBaseApiTemplate($module, $mod_path, $force = false, $apiClass = "") |
| 236 | 236 | { |
| 237 | 237 | $created = true; |
| 238 | - $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models'; |
|
| 239 | - $api_path = $mod_path . $module . DIRECTORY_SEPARATOR . 'Api'; |
|
| 238 | + $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models'; |
|
| 239 | + $api_path = $mod_path.$module.DIRECTORY_SEPARATOR.'Api'; |
|
| 240 | 240 | if (file_exists($modelPath)) { |
| 241 | 241 | $dir = dir($modelPath); |
| 242 | 242 | while ($file = $dir->read()) { |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | //Generamos el fichero de configuración |
| 265 | 265 | $this->log->infoLog("Generamos fichero vacío de configuración"); |
| 266 | 266 | return $this->writeTemplateToFile("<?php\n\t", |
| 267 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php", |
|
| 267 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php", |
|
| 268 | 268 | $force); |
| 269 | 269 | } |
| 270 | 270 | |
@@ -279,10 +279,10 @@ discard block |
||
| 279 | 279 | //Generamos el fichero de configuración |
| 280 | 280 | $this->log->infoLog("Generamos ficheros para assets base"); |
| 281 | 281 | $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", |
| 282 | - $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css", |
|
| 282 | + $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css", |
|
| 283 | 283 | $force); |
| 284 | 284 | $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", |
| 285 | - $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js", |
|
| 285 | + $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js", |
|
| 286 | 286 | $force); |
| 287 | 287 | return ($css && $js); |
| 288 | 288 | } |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | "class" => $class, |
| 305 | 305 | )); |
| 306 | 306 | return $this->writeTemplateToFile($controller, |
| 307 | - $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php", |
|
| 307 | + $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php", |
|
| 308 | 308 | $force); |
| 309 | 309 | } |
| 310 | 310 | |
@@ -323,13 +323,13 @@ discard block |
||
| 323 | 323 | "autoloader" => preg_replace('/(\\\|\/)/', '_', $module), |
| 324 | 324 | "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module), |
| 325 | 325 | )); |
| 326 | - $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force); |
|
| 326 | + $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force); |
|
| 327 | 327 | |
| 328 | 328 | $this->log->infoLog("Generamos el phpunit"); |
| 329 | 329 | $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array( |
| 330 | 330 | "module" => $module, |
| 331 | 331 | )); |
| 332 | - $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force); |
|
| 332 | + $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force); |
|
| 333 | 333 | return $autoload && $phpunit; |
| 334 | 334 | } |
| 335 | 335 | |
@@ -350,7 +350,7 @@ discard block |
||
| 350 | 350 | "db" => $this->config->get("db_name"), |
| 351 | 351 | )); |
| 352 | 352 | return $this->writeTemplateToFile($schema, |
| 353 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml", |
|
| 353 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml", |
|
| 354 | 354 | $force); |
| 355 | 355 | } |
| 356 | 356 | |
@@ -368,7 +368,7 @@ discard block |
||
| 368 | 368 | "namespace" => preg_replace('/(\\\|\/)/', '', $module), |
| 369 | 369 | )); |
| 370 | 370 | return $this->writeTemplateToFile($build_properties, |
| 371 | - $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml", |
|
| 371 | + $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml", |
|
| 372 | 372 | $force); |
| 373 | 373 | } |
| 374 | 374 | |
@@ -386,7 +386,7 @@ discard block |
||
| 386 | 386 | "module" => $module, |
| 387 | 387 | )); |
| 388 | 388 | return $this->writeTemplateToFile($index, |
| 389 | - $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig", |
|
| 389 | + $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig", |
|
| 390 | 390 | $force); |
| 391 | 391 | } |
| 392 | 392 | |
@@ -404,11 +404,11 @@ discard block |
||
| 404 | 404 | try { |
| 405 | 405 | $this->cache->storeData($filename, $fileContent, Cache::TEXT, true); |
| 406 | 406 | $created = true; |
| 407 | - } catch (\Exception $e) { |
|
| 407 | + }catch (\Exception $e) { |
|
| 408 | 408 | $this->log->errorLog($e->getMessage()); |
| 409 | 409 | } |
| 410 | - } else { |
|
| 411 | - $this->log->errorLog($filename . _(' not exists or cant write')); |
|
| 410 | + }else { |
|
| 411 | + $this->log->errorLog($filename._(' not exists or cant write')); |
|
| 412 | 412 | } |
| 413 | 413 | return $created; |
| 414 | 414 | } |
@@ -437,7 +437,7 @@ discard block |
||
| 437 | 437 | )); |
| 438 | 438 | |
| 439 | 439 | return $this->writeTemplateToFile($controller, |
| 440 | - $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true); |
|
| 440 | + $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true); |
|
| 441 | 441 | } |
| 442 | 442 | |
| 443 | 443 | /** |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | "class" => $class, |
| 461 | 461 | )); |
| 462 | 462 | |
| 463 | - return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force); |
|
| 463 | + return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force); |
|
| 464 | 464 | } |
| 465 | 465 | |
| 466 | 466 | /** |
@@ -474,12 +474,12 @@ discard block |
||
| 474 | 474 | { |
| 475 | 475 | if (file_exists($filename_path)) { |
| 476 | 476 | $destfolder = basename($filename_path); |
| 477 | - if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) { |
|
| 477 | + if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) { |
|
| 478 | 478 | if (is_dir($filename_path)) { |
| 479 | - self::copyr($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder); |
|
| 480 | - } else { |
|
| 481 | - if (@copy($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) { |
|
| 482 | - throw new ConfigException("Can't copy " . $filename_path . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder); |
|
| 479 | + self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder); |
|
| 480 | + }else { |
|
| 481 | + if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) { |
|
| 482 | + throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder); |
|
| 483 | 483 | } |
| 484 | 484 | } |
| 485 | 485 | } |
@@ -498,10 +498,10 @@ discard block |
||
| 498 | 498 | GeneratorHelper::createDir($dst); |
| 499 | 499 | while (false !== ($file = readdir($dir))) { |
| 500 | 500 | if (($file != '.') && ($file != '..')) { |
| 501 | - if (is_dir($src . '/' . $file)) { |
|
| 502 | - self::copyr($src . '/' . $file, $dst . '/' . $file); |
|
| 503 | - } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) { |
|
| 504 | - throw new ConfigException("Can't copy " . $src . " to " . $dst); |
|
| 501 | + if (is_dir($src.'/'.$file)) { |
|
| 502 | + self::copyr($src.'/'.$file, $dst.'/'.$file); |
|
| 503 | + } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) { |
|
| 504 | + throw new ConfigException("Can't copy ".$src." to ".$dst); |
|
| 505 | 505 | } |
| 506 | 506 | } |
| 507 | 507 | } |
@@ -514,12 +514,12 @@ discard block |
||
| 514 | 514 | */ |
| 515 | 515 | private function getPropelPaths($module_path) |
| 516 | 516 | { |
| 517 | - $moduleDir = CORE_DIR . DIRECTORY_SEPARATOR . $module_path; |
|
| 517 | + $moduleDir = CORE_DIR.DIRECTORY_SEPARATOR.$module_path; |
|
| 518 | 518 | GeneratorHelper::createDir($moduleDir); |
| 519 | 519 | $moduleDir = realpath($moduleDir); |
| 520 | - $configDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config'; |
|
| 521 | - $sqlDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Sql'; |
|
| 522 | - $migrationDir = $moduleDir . DIRECTORY_SEPARATOR . 'Config' . DIRECTORY_SEPARATOR . 'Migrations'; |
|
| 520 | + $configDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'; |
|
| 521 | + $sqlDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Sql'; |
|
| 522 | + $migrationDir = $moduleDir.DIRECTORY_SEPARATOR.'Config'.DIRECTORY_SEPARATOR.'Migrations'; |
|
| 523 | 523 | $paths = [ |
| 524 | 524 | 'projectDir' => $moduleDir, |
| 525 | 525 | 'outputDir' => $moduleDir, |
@@ -581,12 +581,12 @@ discard block |
||
| 581 | 581 | * @param AbstractManager $manager |
| 582 | 582 | * @param string $workingDir |
| 583 | 583 | */ |
| 584 | - private function setupManager(GeneratorConfig $configGenerator, AbstractManager &$manager, $workingDir = CORE_DIR) |
|
| 584 | + private function setupManager(GeneratorConfig $configGenerator, AbstractManager & $manager, $workingDir = CORE_DIR) |
|
| 585 | 585 | { |
| 586 | 586 | $manager->setGeneratorConfig($configGenerator); |
| 587 | - $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'] . DIRECTORY_SEPARATOR . 'schema.xml'); |
|
| 587 | + $schemaFile = new \SplFileInfo($configGenerator->getSection('paths')['schemaDir'].DIRECTORY_SEPARATOR.'schema.xml'); |
|
| 588 | 588 | $manager->setSchemas([$schemaFile]); |
| 589 | - $manager->setLoggerClosure(function ($message) { |
|
| 589 | + $manager->setLoggerClosure(function($message) { |
|
| 590 | 590 | Logger::log($message, LOG_INFO); |
| 591 | 591 | }); |
| 592 | 592 | $manager->setWorkingDirectory($workingDir); |
@@ -64,7 +64,7 @@ |
||
| 64 | 64 | GeneratorHelper::checkCustomNamespaceApi($apiClass); |
| 65 | 65 | $this->gen->createStructureModule($module, false, $type, $apiClass); |
| 66 | 66 | Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, _("Módulo %s generado correctamente"))); |
| 67 | - // Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
|
| 67 | + // Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
|
| 68 | 68 | } catch (\Exception $e) { |
| 69 | 69 | Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]"); |
| 70 | 70 | Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage())); |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | */ |
| 35 | 35 | public function generateModule() |
| 36 | 36 | { |
| 37 | - Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri()); |
|
| 37 | + Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri()); |
|
| 38 | 38 | /* @var $form \PSFS\base\config\ConfigForm */ |
| 39 | 39 | $form = new ModuleForm(); |
| 40 | 40 | $form->build(); |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | $this->gen->createStructureModule($module, false, $type, $apiClass); |
| 66 | 66 | Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, _("Módulo %s generado correctamente"))); |
| 67 | 67 | // Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true)); |
| 68 | - } catch (\Exception $e) { |
|
| 69 | - Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]"); |
|
| 68 | + }catch (\Exception $e) { |
|
| 69 | + Logger::getInstance()->infoLog($e->getMessage()." [".$e->getFile().":".$e->getLine()."]"); |
|
| 70 | 70 | Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage())); |
| 71 | 71 | } |
| 72 | 72 | } |
@@ -77,14 +77,14 @@ discard block |
||
| 77 | 77 | |
| 78 | 78 | public static function createRoot($path = WEB_DIR, OutputInterface $output = null) { |
| 79 | 79 | |
| 80 | - if(null === $output) { |
|
| 80 | + if (null === $output) { |
|
| 81 | 81 | $output = new ConsoleOutput(); |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | GeneratorHelper::createDir($path); |
| 85 | 85 | $paths = array("js", "css", "img", "media", "font"); |
| 86 | 86 | foreach ($paths as $htmlPath) { |
| 87 | - GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath); |
|
| 87 | + GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath); |
|
| 88 | 88 | } |
| 89 | 89 | |
| 90 | 90 | // Generates the root needed files |
@@ -96,18 +96,18 @@ discard block |
||
| 96 | 96 | 'robots' => 'robots.txt', |
| 97 | 97 | ]; |
| 98 | 98 | foreach ($files as $templates => $filename) { |
| 99 | - $text = Template::getInstance()->dump("generator/html/" . $templates . '.html.twig'); |
|
| 100 | - if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) { |
|
| 101 | - $output->writeln('Can\t create the file ' . $filename); |
|
| 102 | - } else { |
|
| 103 | - $output->writeln($filename . ' created successfully'); |
|
| 99 | + $text = Template::getInstance()->dump("generator/html/".$templates.'.html.twig'); |
|
| 100 | + if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) { |
|
| 101 | + $output->writeln('Can\t create the file '.$filename); |
|
| 102 | + }else { |
|
| 103 | + $output->writeln($filename.' created successfully'); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | //Export base locale translations |
| 108 | - if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) { |
|
| 109 | - GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 110 | - GeneratorService::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale'); |
|
| 108 | + if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) { |
|
| 109 | + GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 110 | + GeneratorService::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale'); |
|
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 | } |
| 114 | 114 | \ No newline at end of file |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | */ |
| 73 | 73 | protected function init() |
| 74 | 74 | { |
| 75 | - if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) { |
|
| 75 | + if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) { |
|
| 76 | 76 | $this->loadConfigData(); |
| 77 | 77 | } |
| 78 | 78 | return $this; |
@@ -188,10 +188,10 @@ discard block |
||
| 188 | 188 | $final_data = array_filter($final_data, function($key, $value) { |
| 189 | 189 | return in_array($key, Config::$required) || !empty($value); |
| 190 | 190 | }, ARRAY_FILTER_USE_BOTH); |
| 191 | - $saved = (false !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, json_encode($final_data, JSON_PRETTY_PRINT))); |
|
| 191 | + $saved = (false !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, json_encode($final_data, JSON_PRETTY_PRINT))); |
|
| 192 | 192 | Config::getInstance()->loadConfigData(); |
| 193 | 193 | $saved = true; |
| 194 | - } catch (ConfigException $e) { |
|
| 194 | + }catch (ConfigException $e) { |
|
| 195 | 195 | Logger::log($e->getMessage(), LOG_ERR); |
| 196 | 196 | } |
| 197 | 197 | return $saved; |
@@ -223,7 +223,7 @@ discard block |
||
| 223 | 223 | */ |
| 224 | 224 | public function loadConfigData() |
| 225 | 225 | { |
| 226 | - $this->config = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE), true) ?: []; |
|
| 226 | + $this->config = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE), true) ?: []; |
|
| 227 | 227 | $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : FALSE; |
| 228 | 228 | } |
| 229 | 229 | |
@@ -244,9 +244,9 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | public static function getParam($key, $defaultValue = null, $module = null) |
| 246 | 246 | { |
| 247 | - if(null !== $module) { |
|
| 248 | - return self::getParam(strtolower($module) . '.' . $key, self::getParam($key, $defaultValue)); |
|
| 249 | - } else { |
|
| 247 | + if (null !== $module) { |
|
| 248 | + return self::getParam(strtolower($module).'.'.$key, self::getParam($key, $defaultValue)); |
|
| 249 | + }else { |
|
| 250 | 250 | $param = Config::getInstance()->get($key); |
| 251 | 251 | return (null !== $param) ? $param : $defaultValue; |
| 252 | 252 | } |