psfs / core

src/base/types/Controller.php

Spacing +7 added lines, -7 removed lines

@@ -35,8 +35,8 @@ 
     public function render($template, array $vars = array(), $cookies = array(), $domain = null)
     {
         $vars['__menu__'] = $this->getMenu();
-        $domain = (null ===$domain) ? $this->getDomain() : $domain;
-        return $this->tpl->render($domain . $template, $vars, $cookies);
+        $domain = (null === $domain) ? $this->getDomain() : $domain;
+        return $this->tpl->render($domain.$template, $vars, $cookies);
     }
 
     /**
@@ -67,7 +67,7 @@ 
     {
         $vars['__menu__'] = $this->getMenu();
         $domain = $domain ?: $this->getDomain();
-        return $this->tpl->dump($domain . $template, $vars);
+        return $this->tpl->dump($domain.$template, $vars);
     }
 
     /**
@@ -96,15 +96,15 @@ 
         /////////////////////////////////////////////////////////////
         // Date in the past sets the value to already have been expired.
         header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
         header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
         header("Pragma: no-cache");
         header("Expires: 0");
         header('Content-Transfer-Encoding: none');
-        header("Content-type: " . $content);
-        header("Content-length: " . strlen($data));
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        header("Content-type: ".$content);
+        header("Content-length: ".strlen($data));
+        header('Content-Disposition: attachment; filename="'.$filename.'"');
         echo $data;
         ob_flush();
         ob_end_clean();

src/controller/base/Admin.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
  * @package PSFS\controller
  * @domain ROOT
  */
-abstract class Admin extends AuthAdminController{
+abstract class Admin extends AuthAdminController {
 
     const DOMAIN = 'ROOT';
 
@@ -45,10 +45,10 @@ 
      * @throws \PSFS\base\exception\FormException
      */
     public static function staticAdminLogon($route = null) {
-        if(file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
-            if('login' !== Config::getInstance()->get('admin_login')) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
+            if ('login' !== Config::getInstance()->get('admin_login')) {
                 return AdminServices::getInstance()->setAdminHeaders();
-            } else {
+            }else {
                 $form = new LoginForm();
                 $form->setData(array("route" => $route));
                 $form->build();
@@ -58,7 +58,7 @@ 
                     'form' => $form,
                 ));
             }
-        } else {
+        }else {
             return UserController::showAdminManager();
         }
     }

src/services/GeneratorService.php

Doc Comments +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
 
     /**
      * Método que revisa las traducciones directorio a directorio
-     * @param $path
+     * @param string $path
      * @param $locale
      * @return array
      */
@@ -102,7 +102,7 @@ 
      * @param string $module
      * @param boolean $mod_path
      * @param boolean $isModule
-     * @return boolean
+     * @return boolean|null
      */
     private function createModulePathTree($module, $mod_path, $isModule = false)
     {
@@ -474,7 +474,7 @@ 
      * Method that copy resources recursively
      * @param string $dest
      * @param boolean $force
-     * @param $filename_path
+     * @param string $filename_path
      * @param boolean $debug
      */
     public static function copyResources($dest, $force, $filename_path, $debug)

Spacing +65 added lines, -67 removed lines

@@ -32,24 +32,24 @@ 
      */
     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)) {
             $d = dir($path);
             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 .
+                $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) {
-                    $res = _('Revisando directorio: ') . $inspect_path;
-                    $res .= _('Comando ejecutado: ') . $cmd_php;
+                if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) {
+                    $res = _('Revisando directorio: ').$inspect_path;
+                    $res .= _('Comando ejecutado: ').$cmd_php;
                     $res .= shell_exec($cmd_php);
                     usleep(10);
                     $translations[] = $res;
@@ -70,7 +70,7 @@ 
      */
     public function createStructureModule($module, $force = false, $type = "", $isModule = false)
     {
-        $mod_path = CORE_DIR . DIRECTORY_SEPARATOR;
+        $mod_path = CORE_DIR.DIRECTORY_SEPARATOR;
         $module = ucfirst($module);
         $this->createModulePath($module, $mod_path, $isModule);
         $this->createModulePathTree($module, $mod_path, $isModule);
@@ -93,7 +93,7 @@ 
         Config::createDir($mod_path);
         // Create module path
         if (false === $isModule) {
-            Config::createDir($mod_path . $module);
+            Config::createDir($mod_path.$module);
         }
     }
 
@@ -111,20 +111,20 @@ 
         $paths = [
             "Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test"
         ];
-        $module_path = $isModule ? $mod_path : $mod_path . $module;
+        $module_path = $isModule ? $mod_path : $mod_path.$module;
         foreach ($paths as $path) {
-            Config::createDir($module_path . DIRECTORY_SEPARATOR . $path);
+            Config::createDir($module_path.DIRECTORY_SEPARATOR.$path);
         }
         //Creamos las carpetas de los assets
         $htmlPaths = array("css", "js", "img", "media", "font");
         foreach ($htmlPaths as $path) {
-            Config::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
+            Config::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
         }
 
         if ($isModule) {
             return $this->writeTemplateToFile(json_encode([
-                "module" => "\\" . preg_replace('/(\\\|\/)/', '\\\\', $module),
-            ], JSON_PRETTY_PRINT), $mod_path . DIRECTORY_SEPARATOR . "module.json", true);
+                "module" => "\\".preg_replace('/(\\\|\/)/', '\\\\', $module),
+            ], JSON_PRETTY_PRINT), $mod_path.DIRECTORY_SEPARATOR."module.json", true);
         }
     }
 
@@ -138,7 +138,7 @@ 
      */
     private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '', $isModule = false)
     {
-        $module_path = $isModule ? $mod_path : $mod_path . $module;
+        $module_path = $isModule ? $mod_path : $mod_path.$module;
         $this->generateControllerTemplate($module, $module_path, $force, $controllerType);
         $this->generateServiceTemplate($module, $module_path, $force);
         $this->genereateAutoloaderTemplate($module, $module_path, $force, $isModule);
@@ -157,24 +157,24 @@ 
      */
     private function createModuleModels($module, $path, $isModule = false)
     {
-        $module_path = $isModule ? $path : $path . $module;
-        $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path);
+        $module_path = $isModule ? $path : $path.$module;
+        $module_path = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $module_path);
         //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_path .
-            DIRECTORY_SEPARATOR . "Config";
-        $opt = " --config-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR .
-            "Config --output-dir=" . CORE_DIR . " --verbose";
-        $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n" . $exec . "build" . $opt . $schemaOpt);
-        $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_path.
+            DIRECTORY_SEPARATOR."Config";
+        $opt = " --config-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR.
+            "Config --output-dir=".CORE_DIR." --verbose";
+        $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n".$exec."build".$opt.$schemaOpt);
+        $ret = shell_exec($exec."build".$opt.$schemaOpt);
 
         $this->log->infoLog("[GENERATOR] Generamos clases invocando a propel:\n $ret");
-        $ret = shell_exec($exec . "sql:build" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR .
-            $module_path . DIRECTORY_SEPARATOR . "Config" . $schemaOpt);
+        $ret = shell_exec($exec."sql:build".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.
+            $module_path.DIRECTORY_SEPARATOR."Config".$schemaOpt);
         $this->log->infoLog("[GENERATOR] Generamos sql invocando a propel:\n $ret");
-        $ret = shell_exec($exec . "config:convert" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR .
-            $module_path . DIRECTORY_SEPARATOR . "Config");
+        $ret = shell_exec($exec."config:convert".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.
+            $module_path.DIRECTORY_SEPARATOR."Config");
         $this->log->infoLog("[GENERATOR] Generamos configuración invocando a propel:\n $ret");
     }
 
@@ -195,32 +195,32 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
             "class" => $class,
-            "controllerType" => $class . "Base",
+            "controllerType" => $class."Base",
             "is_base" => false
         ));
-        $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
+        $controller = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."{$class}Controller.php", $force);
 
         $controllerBody = $this->tpl->dump("generator/controller.template.twig", array(
             "module" => $module,
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
-            "class" => $class . "Base",
+            "class" => $class."Base",
             "service" => $class,
             "controllerType" => $controllerType,
             "is_base" => true,
             "domain" => $class,
         ));
-        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
-            DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true);
+        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
+            DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true);
 
         $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
             "module" => $module,
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
             "class" => $class,
         ));
-        $test = $this->writeTemplateToFile($testTemplate, $mod_path . DIRECTORY_SEPARATOR . "Test" .
-            DIRECTORY_SEPARATOR . "{$class}Test.php", true);
+        $test = $this->writeTemplateToFile($testTemplate, $mod_path.DIRECTORY_SEPARATOR."Test".
+            DIRECTORY_SEPARATOR."{$class}Test.php", true);
         return ($controller && $controllerBase && $test);
     }
 
@@ -235,11 +235,9 @@ 
     {
         $created = true;
         $modelPath = $isModule ?
-            $mod_path . DIRECTORY_SEPARATOR . 'Models' :
-            $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
+            $mod_path.DIRECTORY_SEPARATOR.'Models' : $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
         $api_path = $isModule ?
-            $mod_path . DIRECTORY_SEPARATOR . 'Api' :
-            $mod_path . $module . DIRECTORY_SEPARATOR . 'Api';
+            $mod_path.DIRECTORY_SEPARATOR.'Api' : $mod_path.$module.DIRECTORY_SEPARATOR.'Api';
         if (file_exists($modelPath)) {
             $dir = dir($modelPath);
             while ($file = $dir->read()) {
@@ -267,7 +265,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 . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php",
             $force);
     }
 
@@ -282,10 +280,10 @@ 
         //Generamos el fichero de configuración
         $this->log->infoLog("Generamos ficheros para assets base");
         $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n",
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css",
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css",
             $force);
         $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();",
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js",
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js",
             $force);
         return ($css && $js);
     }
@@ -307,7 +305,7 @@ 
             "class" => $class,
         ));
         return $this->writeTemplateToFile($controller,
-            $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php",
+            $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php",
             $force);
     }
 
@@ -328,14 +326,14 @@ 
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
             "is_module" => $isModule,
         ));
-        $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force);
+        $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force);
 
         $this->log->infoLog("Generamos el phpunit");
         $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array(
             "module" => $module,
             "is_module" => $isModule,
         ));
-        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force);
+        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force);
         return $autoload && $phpunit;
     }
 
@@ -356,7 +354,7 @@ 
             "db" => $this->config->get("db_name"),
         ));
         return $this->writeTemplateToFile($schema,
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml",
             $force);
     }
 
@@ -379,7 +377,7 @@ 
             "namespace" => preg_replace('/(\\\|\/)/', '', $module),
         ));
         return $this->writeTemplateToFile($build_properties,
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml",
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml",
             $force);
     }
 
@@ -397,7 +395,7 @@ 
             "module" => $module,
         ));
         return $this->writeTemplateToFile($index,
-            $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig",
+            $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig",
             $force);
     }
 
@@ -415,11 +413,11 @@ 
             try {
                 $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;
     }
@@ -444,7 +442,7 @@ 
         ));
 
         return $this->writeTemplateToFile($controller,
-            $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
+            $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
     }
 
     /**
@@ -467,7 +465,7 @@ 
             "class" => $class,
         ));
 
-        return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force);
+        return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force);
     }
 
     /**
@@ -481,12 +479,12 @@ 
     {
         if (file_exists($filename_path)) {
             $destfolder = basename($filename_path);
-            if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) {
+            if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) {
                 if (is_dir($filename_path)) {
-                    self::copyr($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
-                } else {
-                    if (@copy($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) {
-                        throw new ConfigException("Can't copy " . $filename_path . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
+                    self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
+                }else {
+                    if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
+                        throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
                     }
                 }
             }
@@ -505,10 +503,10 @@ 
         Config::createDir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::copyr($src . '/' . $file, $dst . '/' . $file);
-                } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) {
-                    throw new ConfigException("Can't copy " . $src . " to " . $dst);
+                if (is_dir($src.'/'.$file)) {
+                    self::copyr($src.'/'.$file, $dst.'/'.$file);
+                } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) {
+                    throw new ConfigException("Can't copy ".$src." to ".$dst);
                 }
             }
         }

src/base/types/interfaces/ControllerInterface.php

Doc Comments +8 added lines

@@ -7,6 +7,14 @@
  * @package PSFS\base\types\interfaces
  */
 interface ControllerInterface {
+
+    /**
+     * @return string|null
+     */
     public function render($template, array $vars = [], $cookies = []);
+
+    /**
+     * @return void
+     */
     public function response($response, $type = 'text/html');
 }

src/Dispatcher.php

Spacing +14 added lines, -14 removed lines

@@ -16,7 +16,7 @@ 
 use PSFS\base\Singleton;
 use PSFS\controller\ConfigController;
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . "bootstrap.php";
+require_once __DIR__.DIRECTORY_SEPARATOR."bootstrap.php";
 
 /**
  * Class Dispatcher
@@ -77,13 +77,13 @@ 
     private function setLocale()
     {
         $this->locale = $this->config->get("default_language");
-        Logger::log('Set locale to project [' . $this->locale . ']');
+        Logger::log('Set locale to project ['.$this->locale.']');
         // 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';
-        Logger::log('Set locale dir ' . $locale_path);
+        $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+        Logger::log('Set locale dir '.$locale_path);
         Config::createDir($locale_path);
         bindtextdomain('translations', $locale_path);
         textdomain('translations');
@@ -104,18 +104,18 @@ 
                 if (!$this->parser->isFile()) {
                     return $this->router->execute($this->actualUri);
                 }
-            } else {
+            }else {
                 return ConfigController::getInstance()->config();
             }
-        } catch (ConfigException $c) {
+        }catch (ConfigException $c) {
             return $this->dumpException($c);
-        } catch (SecurityException $s) {
+        }catch (SecurityException $s) {
             return $this->security->notAuthorized($this->actualUri);
-        } catch (UserAuthException $u) {
+        }catch (UserAuthException $u) {
             $this->redirectToHome();
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             return $this->router->httpNotFound($r);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $this->dumpException($e);
         }
     }
@@ -162,7 +162,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -188,7 +188,7 @@ 
         if ($this->config->getDebugMode() && $this->config->get('errors.strict', false)) {
             Logger::log('Added handlers for errors');
             //Warning & Notice handler
-            set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+            set_error_handler(function($errno, $errstr, $errfile, $errline) {
                 Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline]);
                 throw new \Exception($errstr, 500);
             });
@@ -203,7 +203,7 @@ 
         Logger::log('Initializing stats (mem + ts)');
         if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
             $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT'];
-        } else {
+        }else {
             $this->ts = $this->parser->getTs();
         }
         $this->mem = memory_get_usage();

src/base/types/helpers/SecurityHelper.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
         if (!Config::getInstance()->checkTryToSaveConfig()
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || NULL !== Config::getInstance()->get('restricted'))
         ) {
-            if(!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
+            if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
                 //Si no hay fichero de usuarios redirigimos directamente al gestor
                 return UserController::showAdminManager();
             }

src/base/types/Api.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
     namespace PSFS\base\types;
 
-    use Propel\Runtime\ActiveQuery\Criteria;
     use Propel\Runtime\ActiveQuery\ModelCriteria;
     use Propel\Runtime\ActiveRecord\ActiveRecordInterface;
     use Propel\Runtime\Connection\ConnectionInterface;

Spacing +40 added lines, -40 removed lines

@@ -180,7 +180,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             $tableMap = $this->getTableMap();
@@ -189,7 +189,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($column->getPhpName());
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($column->getPhpName());
                     }
                 }
@@ -205,10 +205,10 @@ 
         private function addPkToList() {
             $tableMap = $this->getTableMap();
             $pks = $tableMap->getPrimaryKeys();
-            if(count($pks) == 1) {
+            if (count($pks) == 1) {
                 $pks = array_keys($pks);
                 $this->extraColumns[$pks[0]] = self::API_MODEL_KEY_FIELD;
-            } else {
+            }else {
                 throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta'));
             }
         }
@@ -217,19 +217,19 @@ 
          * Method that add a new field with the Label of the row
          */
         private function addDefaultListField() {
-            if(!in_array(self::API_LIST_NAME_FIELD, $this->extraColumns)) {
+            if (!in_array(self::API_LIST_NAME_FIELD, $this->extraColumns)) {
                 $tableMap = $this->getTableMap();
                 $column = null;
-                if($tableMap->hasColumn('NAME')) {
+                if ($tableMap->hasColumn('NAME')) {
                     $column = $tableMap->getColumn('NAME');
-                } elseif($tableMap->hasColumn('TITLE')) {
+                } elseif ($tableMap->hasColumn('TITLE')) {
                     $column = $tableMap->getColumn('TITLE');
-                } elseif($tableMap->hasColumn('LABEL')) {
+                } elseif ($tableMap->hasColumn('LABEL')) {
                     $column = $tableMap->getColumn('LABEL');
                 }
-                if(null !== $column) {
+                if (null !== $column) {
                     $this->extraColumns[$column->getFullyQualifiedName()] = self::API_LIST_NAME_FIELD;
-                } else {
+                }else {
                     $this->addClassListName($tableMap);
                 }
             }
@@ -241,9 +241,9 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addExtraColumns(ModelCriteria &$query)
+        private function addExtraColumns(ModelCriteria & $query)
         {
-            if(self::API_ACTION_LIST === $this->action) {
+            if (self::API_ACTION_LIST === $this->action) {
                 $this->addDefaultListField();
                 $this->addPkToList();
             }
@@ -259,7 +259,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        protected function joinTables(ModelCriteria &$query)
+        protected function joinTables(ModelCriteria & $query)
         {
             //TODO for specific implementations
         }
@@ -269,7 +269,7 @@ 
          */
         protected function parseExtraColumns() {
             $columns = [];
-            foreach($this->extraColumns as $key => $columnName) {
+            foreach ($this->extraColumns as $key => $columnName) {
                 $columns[$columnName] = strtolower($columnName);
             }
             return $columns;
@@ -280,14 +280,14 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addFilters(ModelCriteria &$query)
+        private function addFilters(ModelCriteria & $query)
         {
             if (count($this->query) > 0) {
                 $tableMap = $this->getTableMap();
                 foreach ($this->query as $field => $value) {
-                    if(self::API_COMBO_FIELD === $field) {
+                    if (self::API_COMBO_FIELD === $field) {
                         ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value);
-                    } else {
+                    }else {
                         ApiHelper::addModelField($tableMap, $query, $field, $value);
                     }
                 }
@@ -297,20 +297,20 @@ 
         /**
          * @param ModelCriteria $query
          */
-        private function checkReturnFields(ModelCriteria &$query) {
+        private function checkReturnFields(ModelCriteria & $query) {
             $returnFields = $this->getRequest()->getQuery('__fields');
-            if(null !== $returnFields) {
+            if (null !== $returnFields) {
                 $fields = explode(',', $returnFields);
                 $select = [];
                 $tablemap = $this->getTableMap();
                 foreach ($fields as $field) {
-                    if(in_array($field, $this->extraColumns)) {
+                    if (in_array($field, $this->extraColumns)) {
                         $select[] = $field;
-                    } elseif($tablemap->hasColumnByPhpName($field)) {
+                    } elseif ($tablemap->hasColumnByPhpName($field)) {
                         $select[] = $field;
                     }
                 }
-                if(count($select) > 0) {
+                if (count($select) > 0) {
                     $query->select($select);
                 }
             }
@@ -332,10 +332,10 @@ 
                 list($page, $limit) = $this->extractPagination();
                 if ($limit == -1) {
                     $this->list = $query->find($this->con);
-                } else {
+                }else {
                     $this->list = $query->paginate($page, $limit, $this->con);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
             }
         }
@@ -352,7 +352,7 @@ 
                 $this->joinTables($query);
                 $this->addExtraColumns($query);
                 $this->model = $query->findPk($pk);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -443,8 +443,8 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
-                $model = _('Ha ocurrido un error intentando guardar el elemento: ') . $e->getMessage();
+            }catch (\Exception $e) {
+                $model = _('Ha ocurrido un error intentando guardar el elemento: ').$e->getMessage();
                 Logger::log($e->getMessage(), LOG_ERR);
             }
 
@@ -474,7 +474,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     $message = _('Ha ocurrido un error intentando eliminar el elemento, por favor verifica que no tenga otros elementos relacionados');
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
@@ -509,14 +509,14 @@ 
                         $updated = TRUE;
                         $status = 200;
                         $model = $this->model->toArray();
-                    } else {
+                    }else {
                         $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                     }
-                } catch(\Exception $e) {
+                }catch (\Exception $e) {
                     $model = $e->getMessage();
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
-            } else {
+            }else {
                 $model = _('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
             }
 
@@ -528,7 +528,7 @@ 
          */
         private function extractQuery()
         {
-            $queryReflector = new \ReflectionClass($this->getModelNamespace() . "Query");
+            $queryReflector = new \ReflectionClass($this->getModelNamespace()."Query");
             /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
             $query = $queryReflector->getMethod('create')->invoke($this->con);
 
@@ -572,7 +572,7 @@ 
             if (null !== $this->con && $this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -624,8 +624,8 @@ 
                 "domain" => $this->getDomain(),
                 "listLabel" => self::API_LIST_NAME_FIELD,
                 'modelId' => self::API_MODEL_KEY_FIELD,
-                'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-' . $this->getDomain() . '-' . $this->getApi()), TRUE)),
-                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain() . '-' . 'api-' . $this->getApi() . "-pk"), TRUE)),
+                'formUrl' => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('admin-api-form-'.$this->getDomain().'-'.$this->getApi()), TRUE)),
+                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower($this->getDomain().'-'.'api-'.$this->getApi()."-pk"), TRUE)),
             ), [], '');
         }
 
@@ -659,12 +659,12 @@ 
             $pages = 0;
             try {
                 $this->paginate();
-                if(null !== $this->list) {
+                if (null !== $this->list) {
                     $return = $this->list->toArray();
                     $total = $this->list->getNbResults();
                     $pages = $this->list->getLastPage();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
 
@@ -683,7 +683,7 @@ 
             $return = array();
             if (NULL === $model && method_exists($model, 'toArray')) {
                 $code = 404;
-            } else {
+            }else {
                 $return = $model->toArray();
             }
 
@@ -698,10 +698,10 @@ 
             $pks = '';
             $sep = '';
             foreach ($tableMap->getPrimaryKeys() as $pk) {
-                $pks .= $sep . $pk->getFullyQualifiedName();
+                $pks .= $sep.$pk->getFullyQualifiedName();
                 $sep = ', "|", ';
             }
-            $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = self::API_LIST_NAME_FIELD;
+            $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = self::API_LIST_NAME_FIELD;
         }
 
         /**

src/base/types/helpers/ApiHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -192,7 +192,7 @@
 
     /**
      * @param ColumnMap $column
-     * @param ModelCriteria $quwuery
+     * @param ModelCriteria $query
      * @param mixed $value
      */
     private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) {

Spacing +17 added lines, -17 removed lines

@@ -38,9 +38,9 @@ 
             } elseif ($mappedColumn->isNumeric()) {
                 $fDto = self::generateNumericField($field, $required);
             } elseif ($mappedColumn->isText()) {
-                if($mappedColumn->getSize() > 100) {
+                if ($mappedColumn->getSize() > 100) {
                     $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required);
-                } else {
+                }else {
                     $fDto = self::generateStringField($field, $required);
                 }
             } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) {
@@ -49,9 +49,9 @@ 
                 $fDto = self::generatePasswordField($field, $required);
             } elseif (in_array($mappedColumn->getType(), [PropelTypes::TIMESTAMP, PropelTypes::DATE, PropelTypes::BU_DATE, PropelTypes::BU_TIMESTAMP])) {
                 $fDto = self::createField($field, $mappedColumn->getType() == PropelTypes::TIMESTAMP ? Field::TEXT_TYPE : Field::DATE, $required);
-            } elseif(in_array($mappedColumn->getType(), [PropelTypes::ENUM, PropelTypes::SET])) {
+            } elseif (in_array($mappedColumn->getType(), [PropelTypes::ENUM, PropelTypes::SET])) {
                 $fDto = self::generateEnumField($field, $required);
-                foreach($mappedColumn->getValueSet() as $value) {
+                foreach ($mappedColumn->getValueSet() as $value) {
                     $fDto->data[] = [
                         $field => $value,
                         "Label" => _($value),
@@ -59,7 +59,7 @@ 
                 }
             }
 
-            if(null !== $fDto) {
+            if (null !== $fDto) {
                 $fDto->size = $mappedColumn->getSize();
                 $form->addField($fDto);
             }
@@ -83,7 +83,7 @@ 
         $fDto->entity = $relatedModel;
         $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName());
         $fDto->relatedField = $relatedField->getPhpName();
-        $fDto->url = Router::getInstance()->getRoute('api-' . $relatedModel);
+        $fDto->url = Router::getInstance()->getRoute('api-'.$relatedModel);
         return $fDto;
     }
 
@@ -188,7 +188,7 @@ 
     public static function checkFieldExists(TableMap $tableMap, $field) {
         try {
             $column = $tableMap->getColumnByPhpName($field);
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             $column = null;
         }
@@ -200,7 +200,7 @@ 
      * @param ModelCriteria $quwuery
      * @param mixed $value
      */
-    private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null) {
+    private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null) {
         $tableField = $column->getPhpName();
         if (preg_match('/^<=/', $value)) {
             $query->filterBy($tableField, substr($value, 2, strlen($value)), Criteria::LESS_EQUAL);
@@ -214,7 +214,7 @@ 
             $text = preg_replace('/(\'|\")/', '', $value);
             $text = preg_replace('/\ /', '%', $text);
             $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE);
-        } else {
+        }else {
             $query->filterBy($tableField, $value, Criteria::EQUAL);
         }
     }
@@ -225,23 +225,23 @@ 
      * @param array $extraColumns
      * @param mixed $value
      */
-    public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null) {
+    public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null) {
         $exp = 'CONCAT(';
         $sep = '';
-        foreach($tableMap->getColumns() as $column) {
-            if($column->isText()) {
-                $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+        foreach ($tableMap->getColumns() as $column) {
+            if ($column->isText()) {
+                $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                 $sep = ', " ", ';
             }
         }
-        foreach($extraColumns as $extra => $name) {
-            $exp .= $sep . $extra;
+        foreach ($extraColumns as $extra => $name) {
+            $exp .= $sep.$extra;
             $sep = ', " ", ';
         }
         $exp .= ")";
         $text = preg_replace('/(\'|\")/', '', $value);
         $text = preg_replace('/\ /', '%', $text);
-        $query->where($exp . Criteria::LIKE . '"%' . $text . '%"');
+        $query->where($exp.Criteria::LIKE.'"%'.$text.'%"');
     }
 
     /**
@@ -251,7 +251,7 @@ 
      * @param string $field
      * @param mixed $value
      */
-    public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null) {
+    public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null) {
         if ($column = self::checkFieldExists($tableMap, $field)) {
             self::addQueryFilter($column, $query, $value);
         }

src/bootstrap.php

Spacing +10 added lines, -10 removed lines

@@ -4,17 +4,17 @@
 
 if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+}else {
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
 }
-if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'vendor');
+if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
 
 //Cargamos en memoria la función de desarrollo PRE
 if (!function_exists('pre')) {

Braces +35 added lines, -13 removed lines

@@ -1,20 +1,42 @@
 <?php
-if (defined('PSFS_BOOTSTRAP_LOADED')) return;
+if (defined('PSFS_BOOTSTRAP_LOADED')) {
+    return;
+}
 use Symfony\Component\Finder\Finder;
 
-if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
+if (!defined('SOURCE_DIR')) {
+    define('SOURCE_DIR', __DIR__);
+}
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
-}
-if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
+    }
+    } else {
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    }
+    }
+if (!defined('VENDOR_DIR')) {
+    define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
+}
+if (!defined('LOG_DIR')) {
+    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+}
+if (!defined('CACHE_DIR')) {
+    define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
+}
+if (!defined('CONFIG_DIR')) {
+    define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
+}
+if (!defined('WEB_DIR')) {
+    define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+}
 
 //Cargamos en memoria la función de desarrollo PRE
 if (!function_exists('pre')) {