psfs /
core
@@ -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 |
@@ -9,7 +9,6 @@ |
||
| 9 | 9 | use PSFS\base\Router; |
| 10 | 10 | use PSFS\base\Service; |
| 11 | 11 | use PSFS\base\types\helpers\DocumentorHelper; |
| 12 | -use PSFS\base\types\helpers\GeneratorHelper; |
|
| 13 | 12 | use PSFS\base\types\helpers\I18nHelper; |
| 14 | 13 | use PSFS\base\types\helpers\InjectorHelper; |
| 15 | 14 | use PSFS\base\types\helpers\RouterHelper; |
@@ -57,10 +57,10 @@ discard block |
||
| 57 | 57 | if (!preg_match('/^ROOT/i', $module) && $module == $requestModule) { |
| 58 | 58 | $modules = [ |
| 59 | 59 | 'name' => $module, |
| 60 | - 'path' => realpath($info['template'] . DIRECTORY_SEPARATOR . '..'), |
|
| 60 | + 'path' => realpath($info['template'].DIRECTORY_SEPARATOR.'..'), |
|
| 61 | 61 | ]; |
| 62 | 62 | } |
| 63 | - } catch (\Exception $e) { |
|
| 63 | + }catch (\Exception $e) { |
|
| 64 | 64 | $modules[] = $e->getMessage(); |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -78,7 +78,7 @@ discard block |
||
| 78 | 78 | */ |
| 79 | 79 | public function extractApiEndpoints(array $module) |
| 80 | 80 | { |
| 81 | - $module_path = $module['path'] . DIRECTORY_SEPARATOR . 'Api'; |
|
| 81 | + $module_path = $module['path'].DIRECTORY_SEPARATOR.'Api'; |
|
| 82 | 82 | $module_name = $module['name']; |
| 83 | 83 | $endpoints = []; |
| 84 | 84 | if (file_exists($module_path)) { |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | if (count($finder)) { |
| 88 | 88 | /** @var \SplFileInfo $file */ |
| 89 | 89 | foreach ($finder as $file) { |
| 90 | - $namespace = "\\{$module_name}\\Api\\" . str_replace('.php', '', $file->getFilename()); |
|
| 90 | + $namespace = "\\{$module_name}\\Api\\".str_replace('.php', '', $file->getFilename()); |
|
| 91 | 91 | $info = $this->extractApiInfo($namespace, $module_name); |
| 92 | 92 | if (!empty($info)) { |
| 93 | 93 | $endpoints[$namespace] = $info; |
@@ -111,14 +111,14 @@ discard block |
||
| 111 | 111 | if (Router::exists($namespace) && !I18nHelper::checkI18Class($namespace)) { |
| 112 | 112 | $reflection = new \ReflectionClass($namespace); |
| 113 | 113 | $visible = InjectorHelper::checkIsVisible($reflection->getDocComment()); |
| 114 | - if($visible) { |
|
| 114 | + if ($visible) { |
|
| 115 | 115 | foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { |
| 116 | 116 | try { |
| 117 | 117 | $mInfo = $this->extractMethodInfo($namespace, $method, $reflection, $module); |
| 118 | 118 | if (NULL !== $mInfo) { |
| 119 | 119 | $info[] = $mInfo; |
| 120 | 120 | } |
| 121 | - } catch (\Exception $e) { |
|
| 121 | + }catch (\Exception $e) { |
|
| 122 | 122 | Logger::getInstance()->errorLog($e->getMessage()); |
| 123 | 123 | } |
| 124 | 124 | } |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | $payload = $this->extractModelFields($namespace); |
| 252 | 252 | $reflector = new \ReflectionClass($namespace); |
| 253 | 253 | $shortName = $reflector->getShortName(); |
| 254 | - } else { |
|
| 254 | + }else { |
|
| 255 | 255 | $namespace = $model; |
| 256 | 256 | $shortName = $model; |
| 257 | 257 | } |
@@ -340,10 +340,10 @@ discard block |
||
| 340 | 340 | "required" => $field->isNotNull(), |
| 341 | 341 | 'format' => $format, |
| 342 | 342 | ]; |
| 343 | - if(count($field->getValueSet())) { |
|
| 343 | + if (count($field->getValueSet())) { |
|
| 344 | 344 | $info['enum'] = array_values($field->getValueSet()); |
| 345 | 345 | } |
| 346 | - if(null !== $field->getDefaultValue()) { |
|
| 346 | + if (null !== $field->getDefaultValue()) { |
|
| 347 | 347 | $info['default'] = $field->getDefaultValue(); |
| 348 | 348 | } |
| 349 | 349 | $payload[$field->getPhpName()] = $info; |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) { |
| 352 | 352 | $payload = $this->extractDtoProperties($namespace); |
| 353 | 353 | } |
| 354 | - } catch (\Exception $e) { |
|
| 354 | + }catch (\Exception $e) { |
|
| 355 | 355 | Logger::getInstance()->errorLog($e->getMessage()); |
| 356 | 356 | } |
| 357 | 357 | |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | $return = $this->extractReturn($modelNamespace, $docComments); |
| 383 | 383 | $url = array_pop($route); |
| 384 | 384 | $methodInfo = [ |
| 385 | - 'url' => str_replace("/" . $module . "/api", '', $url), |
|
| 385 | + 'url' => str_replace("/".$module."/api", '', $url), |
|
| 386 | 386 | 'method' => $info['http'], |
| 387 | 387 | 'description' => $info['label'], |
| 388 | 388 | 'return' => $return, |
@@ -393,7 +393,7 @@ discard block |
||
| 393 | 393 | $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments); |
| 394 | 394 | $this->setQueryParams($method, $methodInfo); |
| 395 | 395 | $this->setRequestHeaders($reflection, $methodInfo); |
| 396 | - } catch (\Exception $e) { |
|
| 396 | + }catch (\Exception $e) { |
|
| 397 | 397 | Logger::getInstance()->errorLog($e->getMessage()); |
| 398 | 398 | } |
| 399 | 399 | } |
@@ -462,10 +462,10 @@ discard block |
||
| 462 | 462 | $formatted = [ |
| 463 | 463 | "swagger" => "2.0", |
| 464 | 464 | "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)), |
| 465 | - "basePath" => '/' . $module['name'] . '/api', |
|
| 465 | + "basePath" => '/'.$module['name'].'/api', |
|
| 466 | 466 | "schemes" => [Request::getInstance()->getServer('HTTPS') == 'on' ? "https" : "http"], |
| 467 | 467 | "info" => [ |
| 468 | - "title" => _('Documentación API módulo ') . $module['name'], |
|
| 468 | + "title" => _('Documentación API módulo ').$module['name'], |
|
| 469 | 469 | "version" => Config::getParam('api.version', '1.0.0'), |
| 470 | 470 | "contact" => [ |
| 471 | 471 | "name" => Config::getParam("author", "Fran López"), |
@@ -478,7 +478,7 @@ discard block |
||
| 478 | 478 | foreach ($endpoints as $model) { |
| 479 | 479 | foreach ($model as $endpoint) { |
| 480 | 480 | if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) { |
| 481 | - $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']); |
|
| 481 | + $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']); |
|
| 482 | 482 | $description = $endpoint['description']; |
| 483 | 483 | $method = strtolower($endpoint['method']); |
| 484 | 484 | $paths[$url][$method] = [ |
@@ -539,7 +539,7 @@ discard block |
||
| 539 | 539 | protected function extractDtoName($dto, $isArray = false) |
| 540 | 540 | { |
| 541 | 541 | $dto = explode('\\', $dto); |
| 542 | - $modelDto = array_pop($dto) . "Dto"; |
|
| 542 | + $modelDto = array_pop($dto)."Dto"; |
|
| 543 | 543 | if ($isArray) { |
| 544 | 544 | $modelDto .= "List"; |
| 545 | 545 | } |
@@ -589,10 +589,10 @@ discard block |
||
| 589 | 589 | { |
| 590 | 590 | |
| 591 | 591 | $methodInfo['headers'] = []; |
| 592 | - foreach($reflection->getProperties() as $property) { |
|
| 592 | + foreach ($reflection->getProperties() as $property) { |
|
| 593 | 593 | $doc = $property->getDocComment(); |
| 594 | 594 | preg_match('/@header\ (.*)\n/i', $doc, $headers); |
| 595 | - if(count($headers)) { |
|
| 595 | + if (count($headers)) { |
|
| 596 | 596 | $header = [ |
| 597 | 597 | "name" => $headers[1], |
| 598 | 598 | "in" => "header", |
@@ -637,7 +637,7 @@ discard block |
||
| 637 | 637 | foreach ($method->getParameters() as $parameter) { |
| 638 | 638 | $parameterName = $parameter->getName(); |
| 639 | 639 | $types = []; |
| 640 | - preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types); |
|
| 640 | + preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types); |
|
| 641 | 641 | if (count($types) > 1) { |
| 642 | 642 | $methodInfo['parameters'][$parameterName] = $types[1][0]; |
| 643 | 643 | } |
@@ -659,21 +659,21 @@ discard block |
||
| 659 | 659 | $modelDto['objects'][$dtoName][$param] = [ |
| 660 | 660 | 'type' => 'array', |
| 661 | 661 | 'items' => [ |
| 662 | - '$ref' => '#/definitions/' . $info['type'], |
|
| 662 | + '$ref' => '#/definitions/'.$info['type'], |
|
| 663 | 663 | ] |
| 664 | 664 | ]; |
| 665 | - } else { |
|
| 665 | + }else { |
|
| 666 | 666 | $modelDto['objects'][$dtoName][$param] = [ |
| 667 | 667 | 'type' => 'object', |
| 668 | - '$ref' => '#/definitions/' . $info['type'], |
|
| 668 | + '$ref' => '#/definitions/'.$info['type'], |
|
| 669 | 669 | ]; |
| 670 | 670 | } |
| 671 | 671 | $modelDto['objects'][$info['class']] = $info['properties']; |
| 672 | 672 | $paramDto = $this->checkDtoAttributes($info['properties'], $info['properties'], $info['class']); |
| 673 | - if(array_key_exists('objects', $paramDto)) { |
|
| 673 | + if (array_key_exists('objects', $paramDto)) { |
|
| 674 | 674 | $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']); |
| 675 | 675 | } |
| 676 | - } else { |
|
| 676 | + }else { |
|
| 677 | 677 | $modelDto['objects'][$dtoName][$param] = $info; |
| 678 | 678 | } |
| 679 | 679 | } |
@@ -74,8 +74,8 @@ discard block |
||
| 74 | 74 | |
| 75 | 75 | /** |
| 76 | 76 | * Method extract if a variable is required |
| 77 | - * @param $doc |
|
| 78 | - * @return null|string |
|
| 77 | + * @param string $doc |
|
| 78 | + * @return boolean |
|
| 79 | 79 | */ |
| 80 | 80 | public static function checkIsRequired($doc) |
| 81 | 81 | { |
@@ -88,8 +88,8 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | /** |
| 90 | 90 | * Method extract if a class or variable is visible |
| 91 | - * @param $doc |
|
| 92 | - * @return null|string |
|
| 91 | + * @param string $doc |
|
| 92 | + * @return boolean |
|
| 93 | 93 | */ |
| 94 | 94 | public static function checkIsVisible($doc) |
| 95 | 95 | { |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | /** |
| 104 | - * @param $doc |
|
| 104 | + * @param string $doc |
|
| 105 | 105 | * @return null|string |
| 106 | 106 | */ |
| 107 | 107 | public static function getLabel($doc) { |
@@ -115,8 +115,8 @@ discard block |
||
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
| 118 | - * @param $doc |
|
| 119 | - * @return null |
|
| 118 | + * @param string $doc |
|
| 119 | + * @return string|null |
|
| 120 | 120 | */ |
| 121 | 121 | public static function getDefaultValue($doc) { |
| 122 | 122 | $default = null; |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | |
| 4 | 4 | use PSFS\base\Logger; |
| 5 | 5 | use PSFS\base\Router; |
| 6 | -use PSFS\services\DocumentorService; |
|
| 7 | 6 | |
| 8 | 7 | /** |
| 9 | 8 | * Class InjectorHelper |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | $isRequired = self::checkIsRequired($property->getDocComment()); |
| 28 | 28 | $label = self::getLabel($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(!Router::exists($instanceType) || $instanceType === '\\DateTime') { |
|
| 33 | + if (!Router::exists($instanceType) || $instanceType === '\\DateTime') { |
|
| 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, |
@@ -124,7 +124,7 @@ discard block |
||
| 124 | 124 | // Extract description |
| 125 | 125 | $label = null; |
| 126 | 126 | preg_match('/@label\ (.*)\n/i', $doc, $matches); |
| 127 | - if(count($matches)) { |
|
| 127 | + if (count($matches)) { |
|
| 128 | 128 | $label = _($matches[1]); |
| 129 | 129 | } |
| 130 | 130 | return $label; |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | public static function getDefaultValue($doc) { |
| 138 | 138 | $default = null; |
| 139 | 139 | preg_match('/@default\ (.*)\n/i', $doc, $matches); |
| 140 | - if(count($matches)) { |
|
| 140 | + if (count($matches)) { |
|
| 141 | 141 | $default = $matches[1]; |
| 142 | 142 | } |
| 143 | 143 | return $default; |
@@ -153,13 +153,13 @@ discard block |
||
| 153 | 153 | */ |
| 154 | 154 | public static function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass) |
| 155 | 155 | { |
| 156 | - Logger::log('Create inyectable instance for ' . $classNameSpace); |
|
| 156 | + Logger::log('Create inyectable instance for '.$classNameSpace); |
|
| 157 | 157 | $reflector = new \ReflectionClass($calledClass); |
| 158 | 158 | $property = $reflector->getProperty($variable); |
| 159 | 159 | $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace; |
| 160 | 160 | if (true === $singleton && method_exists($varInstanceType, "getInstance")) { |
| 161 | 161 | $instance = $varInstanceType::getInstance(); |
| 162 | - } else { |
|
| 162 | + }else { |
|
| 163 | 163 | $instance = new $varInstanceType(); |
| 164 | 164 | } |
| 165 | 165 | return $instance; |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | public static function getClassProperties($class) |
| 174 | 174 | { |
| 175 | 175 | $properties = []; |
| 176 | - Logger::log('Extracting annotations properties from class ' . $class); |
|
| 176 | + Logger::log('Extracting annotations properties from class '.$class); |
|
| 177 | 177 | $selfReflector = new \ReflectionClass($class); |
| 178 | 178 | if (false !== $selfReflector->getParentClass()) { |
| 179 | 179 | $properties = self::getClassProperties($selfReflector->getParentClass()->getName()); |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * @param $object |
| 48 | 48 | * @param $paths |
| 49 | 49 | * @param $url |
| 50 | - * @param $method |
|
| 50 | + * @param string $method |
|
| 51 | 51 | * @param $dtos |
| 52 | 52 | * @param $isReturn |
| 53 | 53 | * @return array |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | * Translator from php types to swagger types |
| 88 | 88 | * @param string $format |
| 89 | 89 | * |
| 90 | - * @return array |
|
| 90 | + * @return string[] |
|
| 91 | 91 | */ |
| 92 | 92 | public static function translateSwaggerFormats($format) |
| 93 | 93 | { |
@@ -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 | - } else { |
|
| 168 | + }else { |
|
| 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; |
@@ -73,18 +73,18 @@ |
||
| 73 | 73 | if (!Request::getInstance()->isFile()) { |
| 74 | 74 | return $this->router->execute($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 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | public function __construct($hydrate = true) |
| 19 | 19 | { |
| 20 | 20 | parent::__construct(); |
| 21 | - if($hydrate) { |
|
| 21 | + if ($hydrate) { |
|
| 22 | 22 | $this->fromArray(Request::getInstance()->getData()); |
| 23 | 23 | } |
| 24 | 24 | } |
@@ -46,15 +46,15 @@ discard block |
||
| 46 | 46 | /** @var \ReflectionProperty $property */ |
| 47 | 47 | foreach ($properties as $property) { |
| 48 | 48 | $value = $property->getValue($this); |
| 49 | - if(is_object($value) && method_exists($value, 'toArray')) { |
|
| 49 | + if (is_object($value) && method_exists($value, 'toArray')) { |
|
| 50 | 50 | $dto[$property->getName()] = $value->toArray(); |
| 51 | - } else { |
|
| 51 | + }else { |
|
| 52 | 52 | $dto[$property->getName()] = $property->getValue($this); |
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | - } catch (\Exception $e) { |
|
| 57 | - Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR); |
|
| 56 | + }catch (\Exception $e) { |
|
| 57 | + Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR); |
|
| 58 | 58 | } |
| 59 | 59 | return $dto; |
| 60 | 60 | } |
@@ -76,32 +76,32 @@ discard block |
||
| 76 | 76 | protected function parseDtoField(array $properties, $key, $value = null) { |
| 77 | 77 | $type = 'string'; |
| 78 | 78 | $is_array = false; |
| 79 | - if(array_key_exists($key, $properties)) { |
|
| 79 | + if (array_key_exists($key, $properties)) { |
|
| 80 | 80 | $type = $properties[$key]; |
| 81 | - if(preg_match('/(\[\]|Array)/i', $type)) { |
|
| 81 | + if (preg_match('/(\[\]|Array)/i', $type)) { |
|
| 82 | 82 | $type = preg_replace('/(\[\]|Array)/i', '', $type); |
| 83 | 83 | $is_array = true; |
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | $reflector = (class_exists($type)) ? new \ReflectionClass($type) : null; |
| 87 | - if(null !== $reflector && $reflector->isSubclassOf(Dto::class)) { |
|
| 88 | - if(null !== $value && is_array($value)) { |
|
| 89 | - if($is_array) { |
|
| 87 | + if (null !== $reflector && $reflector->isSubclassOf(Dto::class)) { |
|
| 88 | + if (null !== $value && is_array($value)) { |
|
| 89 | + if ($is_array) { |
|
| 90 | 90 | $this->$key = []; |
| 91 | - foreach($value as $data) { |
|
| 92 | - if(null !== $data && is_array($data)) { |
|
| 91 | + foreach ($value as $data) { |
|
| 92 | + if (null !== $data && is_array($data)) { |
|
| 93 | 93 | $dto = new $type(false); |
| 94 | 94 | $dto->fromArray($data); |
| 95 | 95 | array_push($this->$key, $dto); |
| 96 | 96 | } |
| 97 | 97 | } |
| 98 | - } else { |
|
| 98 | + }else { |
|
| 99 | 99 | $this->$key = new $type(false); |
| 100 | 100 | $this->$key->fromArray($value); |
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | - } else { |
|
| 104 | - switch($type) { |
|
| 103 | + }else { |
|
| 104 | + switch ($type) { |
|
| 105 | 105 | default: |
| 106 | 106 | case 'string': |
| 107 | 107 | $this->$key = $value; |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | if (!Config::getInstance()->checkTryToSaveConfig() |
| 30 | 30 | && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false)) |
| 31 | 31 | ) { |
| 32 | - if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) { |
|
| 32 | + if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) { |
|
| 33 | 33 | throw new AdminCredentialsException(); |
| 34 | 34 | } |
| 35 | 35 | if (!Security::getInstance()->checkAdmin()) { |
@@ -49,8 +49,8 @@ discard block |
||
| 49 | 49 | $token = ''; |
| 50 | 50 | $ct = strlen($ts); |
| 51 | 51 | for ($i = 0; $i < $ct; $i++) { |
| 52 | - $token = substr($hash, $i, 1) . |
|
| 53 | - substr($ts, $i, 1) . |
|
| 52 | + $token = substr($hash, $i, 1). |
|
| 53 | + substr($ts, $i, 1). |
|
| 54 | 54 | $token; |
| 55 | 55 | } |
| 56 | 56 | return $token; |
@@ -68,16 +68,16 @@ discard block |
||
| 68 | 68 | $charsLength = strlen(self::RAND_SEP) - 1; |
| 69 | 69 | $tsLength = strlen($ts); |
| 70 | 70 | $i = 0; |
| 71 | - $ct = ceil($hashRest / 4); |
|
| 72 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
| 73 | - while(false !== $part) { |
|
| 74 | - $mixedToken .= $part . |
|
| 75 | - substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) . |
|
| 71 | + $ct = ceil($hashRest/4); |
|
| 72 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
| 73 | + while (false !== $part) { |
|
| 74 | + $mixedToken .= $part. |
|
| 75 | + substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1). |
|
| 76 | 76 | substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1); |
| 77 | - $part = substr($hash, $tsLength + $ct * $i, $ct); |
|
| 77 | + $part = substr($hash, $tsLength + $ct*$i, $ct); |
|
| 78 | 78 | $i++; |
| 79 | 79 | } |
| 80 | - return $mixedToken . $token; |
|
| 80 | + return $mixedToken.$token; |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /** |
@@ -86,10 +86,10 @@ discard block |
||
| 86 | 86 | */ |
| 87 | 87 | private static function getTs($isOdd = null) { |
| 88 | 88 | $ts = time(); |
| 89 | - $tsIsOdd = (bool)((int)substr($ts, -1) % 2); |
|
| 90 | - if(false === $isOdd && !$tsIsOdd) { |
|
| 89 | + $tsIsOdd = (bool)((int)substr($ts, -1)%2); |
|
| 90 | + if (false === $isOdd && !$tsIsOdd) { |
|
| 91 | 91 | $ts--; |
| 92 | - } elseif(true === $isOdd && !$tsIsOdd) { |
|
| 92 | + } elseif (true === $isOdd && !$tsIsOdd) { |
|
| 93 | 93 | $ts--; |
| 94 | 94 | } |
| 95 | 95 | return $ts; |
@@ -121,10 +121,10 @@ discard block |
||
| 121 | 121 | $partToken = ''; |
| 122 | 122 | $ts = ''; |
| 123 | 123 | $part = strrev($part); |
| 124 | - for($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
| 125 | - if($i % 2 == 0) { |
|
| 124 | + for ($i = 0, $ct = strlen($part); $i < $ct; $i++) { |
|
| 125 | + if ($i%2 == 0) { |
|
| 126 | 126 | $ts .= substr($part, $i, 1); |
| 127 | - } else { |
|
| 127 | + }else { |
|
| 128 | 128 | $partToken .= substr($part, $i, 1); |
| 129 | 129 | } |
| 130 | 130 | } |
@@ -139,11 +139,11 @@ discard block |
||
| 139 | 139 | private static function parseTokenParts(array $parts) { |
| 140 | 140 | $token = ''; |
| 141 | 141 | list($partToken, $ts) = self::extractTs(array_pop($parts)); |
| 142 | - if($ts > 0) { |
|
| 143 | - foreach($parts as $part) { |
|
| 142 | + if ($ts > 0) { |
|
| 143 | + foreach ($parts as $part) { |
|
| 144 | 144 | $token .= $part; |
| 145 | 145 | } |
| 146 | - $token = $partToken . $token; |
|
| 146 | + $token = $partToken.$token; |
|
| 147 | 147 | } |
| 148 | 148 | return [$token, $ts]; |
| 149 | 149 | } |
@@ -171,8 +171,8 @@ discard block |
||
| 171 | 171 | * @return array |
| 172 | 172 | */ |
| 173 | 173 | private static function extractTokenParts($token) { |
| 174 | - for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
| 175 | - $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token); |
|
| 174 | + for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) { |
|
| 175 | + $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token); |
|
| 176 | 176 | } |
| 177 | 177 | return array_unique(explode('||', $token)); |
| 178 | 178 | } |
