psfs / core

src/services/GeneratorService.php

Spacing +42 added lines, -42 removed lines

@@ -5,7 +5,7 @@ 
     use PSFS\base\config\Config;
     use PSFS\base\Service;
 
-    class GeneratorService extends Service{
+    class GeneratorService extends Service {
         /**
          * @Inyectable
          * @var \PSFS\base\config\Config Servicio de configuración
@@ -30,25 +30,25 @@ 
          */
         public static function findTranslations($path, $locale)
         {
-            $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+            $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
             $translations = array();
-            if(file_exists($path))
+            if (file_exists($path))
             {
                 $d = dir($path);
-                while(false !== ($dir = $d->read()))
+                while (false !== ($dir = $d->read()))
                 {
                     Config::createDir($locale_path);
-                    if(!file_exists($locale_path . 'translations.po')) {
-                        file_put_contents($locale_path . 'translations.po', '');
+                    if (!file_exists($locale_path.'translations.po')) {
+                        file_put_contents($locale_path.'translations.po', '');
                     }
                     $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir);
-                    $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ". $inspect_path . DIRECTORY_SEPARATOR ."*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po";
-                    if(is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./',$dir) == 0)
+                    $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ".$inspect_path.DIRECTORY_SEPARATOR."*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po";
+                    if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0)
                     {
-                        $res = _('Revisando directorio: ') . $inspect_path;
-                        $res .= _('Comando ejecutado: '). $cmd_php;
+                        $res = _('Revisando directorio: ').$inspect_path;
+                        $res .= _('Comando ejecutado: ').$cmd_php;
                         $res .= shell_exec($cmd_php);
                         usleep(10);
                         $translations[] = $res;
@@ -68,7 +68,7 @@ 
          */
         public function createStructureModule($module, $force = false, $type = "")
         {
-            $mod_path = CORE_DIR . DIRECTORY_SEPARATOR;
+            $mod_path = CORE_DIR.DIRECTORY_SEPARATOR;
             $module = ucfirst($module);
             $this->createModulePath($module, $mod_path);
             $this->createModulePathTree($module, $mod_path);
@@ -89,7 +89,7 @@ 
             //Creamos el directorio base de los módulos
             Config::createDir($mod_path);
             //Creamos la carpeta del módulo
-            Config::createDir($mod_path . $module);
+            Config::createDir($mod_path.$module);
         }
 
         /**
@@ -102,13 +102,13 @@ 
             //Creamos las carpetas CORE del módulo
             $this->log->infoLog("Generamos la estructura");
             $paths = array("Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test");
-            foreach($paths as $path) {
-                Config::createDir($mod_path . $module . DIRECTORY_SEPARATOR . $path);
+            foreach ($paths as $path) {
+                Config::createDir($mod_path.$module.DIRECTORY_SEPARATOR.$path);
             }
             //Creamos las carpetas de los assets
             $htmlPaths = array("css", "js", "img", "media", "font");
-            foreach($htmlPaths as $path) {
-                Config::createDir($mod_path . $module . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            foreach ($htmlPaths as $path) {
+                Config::createDir($mod_path.$module.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
             }
         }
 
@@ -138,15 +138,15 @@ 
         private function createModuleModels($module)
         {
             //Generamos las clases de propel y la configuración
-            $exec = "export PATH=\$PATH:/opt/local/bin; " . BASE_DIR . DIRECTORY_SEPARATOR . "vendor" . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "propel ";
-            $schemaOpt = " --schema-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Config";
-            $opt = " --config-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Config --output-dir=" . CORE_DIR . " --verbose";
-            $ret = shell_exec($exec . "build" . $opt . $schemaOpt);
+            $exec = "export PATH=\$PATH:/opt/local/bin; ".BASE_DIR.DIRECTORY_SEPARATOR."vendor".DIRECTORY_SEPARATOR."bin".DIRECTORY_SEPARATOR."propel ";
+            $schemaOpt = " --schema-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Config";
+            $opt = " --config-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Config --output-dir=".CORE_DIR." --verbose";
+            $ret = shell_exec($exec."build".$opt.$schemaOpt);
 
             $this->log->infoLog("Generamos clases invocando a propel:\n $ret");
-            $ret = shell_exec($exec . "sql:build" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Config" . $schemaOpt);
+            $ret = shell_exec($exec."sql:build".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Config".$schemaOpt);
             $this->log->infoLog("Generamos sql invocando a propel:\n $ret");
-            $ret = shell_exec($exec . "config:convert" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Config");
+            $ret = shell_exec($exec."config:convert".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Config");
             $this->log->infoLog("Generamos configuración invocando a propel:\n $ret");
         }
 
@@ -165,7 +165,7 @@ 
                 "module" => $module,
                 "controllerType" => $controllerType,
             ));
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Controller" . DIRECTORY_SEPARATOR . "{$module}Controller.php", $force);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Controller".DIRECTORY_SEPARATOR."{$module}Controller.php", $force);
         }
 
         /**
@@ -178,11 +178,11 @@ 
         private function generateBaseApiTemplate($module, $mod_path, $force = false, $controllerType = "")
         {
             $created = true;
-            $modelPath = $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
-            if(file_exists($modelPath)) {
+            $modelPath = $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
+            if (file_exists($modelPath)) {
                 $dir = dir($modelPath);
-                while($file = $dir->read()) {
-                    if(!in_array($file, array('.', '..')) && !preg_match('/Query\.php$/i', $file) && preg_match('/\.php$/i', $file)) {
+                while ($file = $dir->read()) {
+                    if (!in_array($file, array('.', '..')) && !preg_match('/Query\.php$/i', $file) && preg_match('/\.php$/i', $file)) {
                         $filename = str_replace(".php", "", $file);
                         $this->log->infoLog("Generamos Api BASES para {$filename}");
                         $this->createApiBaseFile($module, $mod_path, $filename);
@@ -203,7 +203,7 @@ 
         {
             //Generamos el fichero de configuración
             $this->log->infoLog("Generamos fichero vacío de configuración");
-            return $this->writeTemplateToFile("<?php\n\t", $mod_path . $module . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php", $force);
+            return $this->writeTemplateToFile("<?php\n\t", $mod_path.$module.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php", $force);
         }
 
         /**
@@ -216,8 +216,8 @@ 
         {
             //Generamos el fichero de configuración
             $this->log->infoLog("Generamos ficheros para assets base");
-            $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", $mod_path . $module . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css", false);
-            $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", $mod_path . $module . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js", false);
+            $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n", $mod_path.$module.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css", false);
+            $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();", $mod_path.$module.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js", false);
             return ($css && $js);
         }
 
@@ -234,7 +234,7 @@ 
             $controller = $this->tpl->dump("generator/service.template.twig", array(
                 "module" => $module,
             ));
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$module}Service.php", $force);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$module}Service.php", $force);
         }
 
         /**
@@ -250,7 +250,7 @@ 
             $autoloader = $this->tpl->dump("generator/autoloader.template.twig", array(
                 "module" => $module,
             ));
-            return $this->writeTemplateToFile($autoloader, $mod_path . $module . DIRECTORY_SEPARATOR . "autoload.php", $force);
+            return $this->writeTemplateToFile($autoloader, $mod_path.$module.DIRECTORY_SEPARATOR."autoload.php", $force);
         }
 
         /**
@@ -267,7 +267,7 @@ 
                 "module" => $module,
                 "db"     => $this->config->get("db_name"),
             ));
-            return $this->writeTemplateToFile($schema, $mod_path . $module . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml", $force);
+            return $this->writeTemplateToFile($schema, $mod_path.$module.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml", $force);
         }
 
         /**
@@ -287,7 +287,7 @@ 
                 "pass"   => $this->config->get("db_password"),
                 "db"     => $this->config->get("db_name"),
             ));
-            return $this->writeTemplateToFile($build_properties, $mod_path . $module . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml", $force);
+            return $this->writeTemplateToFile($build_properties, $mod_path.$module.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml", $force);
         }
 
         /**
@@ -303,7 +303,7 @@ 
             $index = $this->tpl->dump("generator/index.template.twig", array(
                 "module" => $module,
             ));
-            return $this->writeTemplateToFile($index, $mod_path . $module . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig", $force);
+            return $this->writeTemplateToFile($index, $mod_path.$module.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig", $force);
         }
 
         /**
@@ -317,13 +317,13 @@ 
             $created = false;
             if ($force || !file_exists($filename)) {
                 try {
-                    $this->cache->storeData($filename, $fileContent, Cache::TEXT,true);
+                    $this->cache->storeData($filename, $fileContent, Cache::TEXT, true);
                     $created = true;
-                } catch(\Exception $e) {
+                }catch (\Exception $e) {
                     $this->log->errorLog($e->getMessage());
                 }
-            } else{
-                $this->log->errorLog($filename . _(' not exists or cant write'));
+            }else {
+                $this->log->errorLog($filename._(' not exists or cant write'));
             }
             return $created;
         }
@@ -343,7 +343,7 @@ 
                 "api"            => $api
             ));
 
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Api" . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Api".DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
         }
 
         /**
@@ -362,6 +362,6 @@ 
                 "api"            => $api
             ));
 
-            return $this->writeTemplateToFile($controller, $mod_path . $module . DIRECTORY_SEPARATOR . "Api" . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+            return $this->writeTemplateToFile($controller, $mod_path.$module.DIRECTORY_SEPARATOR."Api".DIRECTORY_SEPARATOR."{$api}.php", $force);
         }
     }

src/Dispatcher.php

Spacing +11 added lines, -11 removed lines

@@ -12,7 +12,7 @@ 
     use PSFS\base\exception\SecurityException;
     use PSFS\base\Singleton;
 
-    require_once __DIR__ . DIRECTORY_SEPARATOR . "bootstrap.php";
+    require_once __DIR__.DIRECTORY_SEPARATOR."bootstrap.php";
 
     /**
      * Class Dispatcher
@@ -82,10 +82,10 @@ 
         {
             $this->locale = $this->config->get("default_language");
             // Load translations
-            putenv("LC_ALL=" . $this->locale);
+            putenv("LC_ALL=".$this->locale);
             setlocale(LC_ALL, $this->locale);
             // Load the locale path
-            $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
+            $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
             Config::createDir($locale_path);
             bindtextdomain('translations', $locale_path);
             textdomain('translations');
@@ -99,23 +99,23 @@ 
          */
         public function run()
         {
-            $this->log->infoLog("Begin request " . $this->parser->getRequestUri());
+            $this->log->infoLog("Begin request ".$this->parser->getRequestUri());
             //
             try {
                 if ($this->config->isConfigured()) {
                     if (!$this->parser->isFile()) {
                         return $this->router->execute($this->actualUri);
                     }
-                } else {
+                }else {
                     return $this->router->getAdmin()->config();
                 }
-            } catch (ConfigException $c) {
+            }catch (ConfigException $c) {
                 return $this->dumpException($c);
-            } catch (SecurityException $s) {
+            }catch (SecurityException $s) {
                 return $this->security->notAuthorized($this->actualUri);
-            } catch (RouterException $r) {
+            }catch (RouterException $r) {
                 return $this->router->httpNotFound($r);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 return $this->dumpException($e);
             }
         }
@@ -156,7 +156,7 @@ 
                     $use /= 1024;
                     break;
                 case "MBytes":
-                    $use /= (1024 * 1024);
+                    $use /= (1024*1024);
                     break;
                 case "Bytes":
                 default:
@@ -181,7 +181,7 @@ 
         {
             if ($this->config->getDebugMode()) {
                 //Warning & Notice handler
-                set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+                set_error_handler(function($errno, $errstr, $errfile, $errline) {
                     throw new \ErrorException($errstr, 500, $errno, $errfile, $errline);
                 });
             }

src/controller/Admin.php

Spacing +17 added lines, -17 removed lines

@@ -20,7 +20,7 @@ 
  * @package PSFS\controller
  * @domain ROOT
  */
-class Admin extends AuthAdminController{
+class Admin extends AuthAdminController {
 
     const DOMAIN = 'ROOT';
 
@@ -84,7 +84,7 @@ 
                 Logger::getInstance()->infoLog("Configuración guardada correctamente");
                 $this->security->setFlash("callback_message", _("Usuario agregado correctamente"));
                 $this->security->setFlash("callback_route", $this->getRoute("admin"), true);
-            } else {
+            }else {
                 throw new \HttpException('Error al guardar los administradores, prueba a cambiar los permisos', 403);
             }
         }
@@ -150,7 +150,7 @@ 
                 $cookies = array(
                     array(
                         "name" => Security::getInstance()->getHash(),
-                        "value" => base64_encode($form->getFieldValue("user") . ":" . $form->getFieldValue("pass")),
+                        "value" => base64_encode($form->getFieldValue("user").":".$form->getFieldValue("pass")),
                         "expire" => time() + 3600,
                         "http" => true,
                     )
@@ -161,7 +161,7 @@ 
                     'status_message' => _("Acceso permitido... redirigiendo!!"),
                     'delay' => 1,
                 );
-            } else {
+            }else {
                 $form->setError("user", _("El usuario no tiene acceso a la web"));
             }
         }
@@ -177,13 +177,13 @@ 
      */
     public function getTranslations($locale = '') {
         //Idioma por defecto
-        if(empty($locale)) $locale = $this->config->get("default_language");
+        if (empty($locale)) $locale = $this->config->get("default_language");
 
         //Generamos las traducciones de las plantillas
         $translations = $this->tpl->regenerateTemplates();
 
-        $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-        $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+        $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+        $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
         //Localizamos xgettext
         $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale));
@@ -230,18 +230,18 @@ 
         $form = new ConfigForm();
         $form->build();
         $form->hydrate();
-        if($form->isValid()) {
+        if ($form->isValid()) {
             $debug = Config::getInstance()->getDebugMode();
             $newDebug = $form->getFieldValue("debug");
-            if(Config::save($form->getData(), $form->getExtraData())) {
+            if (Config::save($form->getData(), $form->getExtraData())) {
                 Logger::getInstance()->infoLog(_('Configuración guardada correctamente'));
                 //Verificamos si tenemos que limpiar la cache del DocumentRoot
-                if(boolval($debug) !== boolval($newDebug)) {
+                if (boolval($debug) !== boolval($newDebug)) {
                     Config::clearDocumentRoot();
                 }
                 $this->security->setFlash("callback_message", _("Configuración actualizada correctamente"));
                 $this->security->setFlash("callback_route", $this->getRoute("admin-config", true));
-            } else {
+            }else {
                 throw new \HttpException(_('Error al guardar la configuración, prueba a cambiar los permisos'), 403);
             }
         }
@@ -300,10 +300,10 @@ 
             $type = $form->getFieldValue("controllerType");
             try {
                 $this->gen->createStructureModule($module, $force, $type);
-                $this->security->setFlash("callback_message", str_replace("%s",$module, _("Módulo %s generado correctamente")));
+                $this->security->setFlash("callback_message", str_replace("%s", $module, _("Módulo %s generado correctamente")));
                 $this->security->setFlash("callback_route", $this->getRoute("admin-module", true));
-            } catch(\Exception $e) {
-                Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+            }catch (\Exception $e) {
+                Logger::getInstance()->infoLog($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 throw new ConfigException('Error al generar el módulo, prueba a cambiar los permisos', 403);
             }
         }
@@ -325,10 +325,10 @@ 
     public function getConfigParams() {
         $response = array_merge(Config::$required, Config::$optional);
         $domains = Router::getInstance()->getDomains();
-        foreach($domains as $domain => $routes) {
+        foreach ($domains as $domain => $routes) {
             $pDomain = str_replace('@', '', $domain);
             $pDomain = str_replace('/', '', $pDomain);
-            $response[] = strtolower($pDomain) . '.api.secret';
+            $response[] = strtolower($pDomain).'.api.secret';
         }
         return $this->json($response);
     }
@@ -370,7 +370,7 @@ 
 
         $selected = '';
         $monthOpen = null;
-        if($this->getRequest()->getMethod() == 'POST')
+        if ($this->getRequest()->getMethod() == 'POST')
         {
             $selected = $this->getRequest()->get("log");
             list($log, $monthOpen) = $this->srv->formatLogFile($selected);