Passed
Push — master ( 982d37...2f2bf0 )
by Fran
07:07
created
src/base/config/Config.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
     /**
199 199
      * Method that returns a config value
200 200
      * @param string $param
201
-     * @param mixed $defaultValue
201
+     * @param boolean $defaultValue
202 202
      *
203 203
      * @return mixed|null
204 204
      */
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
     /**
284 284
      * Static wrapper for extracting params
285 285
      * @param string $key
286
-     * @param mixed|null $defaultValue
286
+     * @param boolean $defaultValue
287 287
      * @return mixed|null
288 288
      */
289 289
     public static function getParam($key, $defaultValue = null) {
Please login to merge, or discard this patch.
src/services/GeneratorService.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 
27 27
     /**
28 28
      * Método que revisa las traducciones directorio a directorio
29
-     * @param $path
29
+     * @param string $path
30 30
      * @param $locale
31 31
      * @return array
32 32
      */
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
      * @param string $module
103 103
      * @param boolean $mod_path
104 104
      * @param boolean $isModule
105
-     * @return boolean
105
+     * @return boolean|null
106 106
      */
107 107
     private function createModulePathTree($module, $mod_path, $isModule = false)
108 108
     {
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
      * Method that copy resources recursively
475 475
      * @param string $dest
476 476
      * @param boolean $force
477
-     * @param $filename_path
477
+     * @param string $filename_path
478 478
      * @param boolean $debug
479 479
      */
480 480
     public static function copyResources($dest, $force, $filename_path, $debug)
Please login to merge, or discard this patch.
Spacing   +65 added lines, -67 removed lines patch added patch discarded remove patch
@@ -32,24 +32,24 @@  discard block
 block discarded – undo
32 32
      */
33 33
     public static function findTranslations($path, $locale)
34 34
     {
35
-        $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
36
-        $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
35
+        $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
36
+        $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
37 37
 
38 38
         $translations = array();
39 39
         if (file_exists($path)) {
40 40
             $d = dir($path);
41 41
             while (false !== ($dir = $d->read())) {
42 42
                 Config::createDir($locale_path);
43
-                if (!file_exists($locale_path . 'translations.po')) {
44
-                    file_put_contents($locale_path . 'translations.po', '');
43
+                if (!file_exists($locale_path.'translations.po')) {
44
+                    file_put_contents($locale_path.'translations.po', '');
45 45
                 }
46
-                $inspect_path = realpath($path . DIRECTORY_SEPARATOR . $dir);
47
-                $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext " .
48
-                    $inspect_path . DIRECTORY_SEPARATOR .
46
+                $inspect_path = realpath($path.DIRECTORY_SEPARATOR.$dir);
47
+                $cmd_php = "export PATH=\$PATH:/opt/local/bin; xgettext ".
48
+                    $inspect_path.DIRECTORY_SEPARATOR.
49 49
                     "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$locale_path}translations.po";
50
-                if (is_dir($path . DIRECTORY_SEPARATOR . $dir) && preg_match('/^\./', $dir) == 0) {
51
-                    $res = _('Revisando directorio: ') . $inspect_path;
52
-                    $res .= _('Comando ejecutado: ') . $cmd_php;
50
+                if (is_dir($path.DIRECTORY_SEPARATOR.$dir) && preg_match('/^\./', $dir) == 0) {
51
+                    $res = _('Revisando directorio: ').$inspect_path;
52
+                    $res .= _('Comando ejecutado: ').$cmd_php;
53 53
                     $res .= shell_exec($cmd_php);
54 54
                     usleep(10);
55 55
                     $translations[] = $res;
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
      */
71 71
     public function createStructureModule($module, $force = false, $type = "", $isModule = false)
72 72
     {
73
-        $mod_path = CORE_DIR . DIRECTORY_SEPARATOR;
73
+        $mod_path = CORE_DIR.DIRECTORY_SEPARATOR;
74 74
         $module = ucfirst($module);
75 75
         $this->createModulePath($module, $mod_path, $isModule);
76 76
         $this->createModulePathTree($module, $mod_path, $isModule);
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         Config::createDir($mod_path);
94 94
         // Create module path
95 95
         if (false === $isModule) {
96
-            Config::createDir($mod_path . $module);
96
+            Config::createDir($mod_path.$module);
97 97
         }
98 98
     }
99 99
 
@@ -111,20 +111,20 @@  discard block
 block discarded – undo
111 111
         $paths = [
112 112
             "Api", "Api/base", "Config", "Controller", "Form", "Models", "Public", "Templates", "Services", "Test"
113 113
         ];
114
-        $module_path = $isModule ? $mod_path : $mod_path . $module;
114
+        $module_path = $isModule ? $mod_path : $mod_path.$module;
115 115
         foreach ($paths as $path) {
116
-            Config::createDir($module_path . DIRECTORY_SEPARATOR . $path);
116
+            Config::createDir($module_path.DIRECTORY_SEPARATOR.$path);
117 117
         }
118 118
         //Creamos las carpetas de los assets
119 119
         $htmlPaths = array("css", "js", "img", "media", "font");
120 120
         foreach ($htmlPaths as $path) {
121
-            Config::createDir($module_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . $path);
121
+            Config::createDir($module_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR.$path);
122 122
         }
123 123
 
124 124
         if ($isModule) {
125 125
             return $this->writeTemplateToFile(json_encode([
126
-                "module" => "\\" . preg_replace('/(\\\|\/)/', '\\\\', $module),
127
-            ], JSON_PRETTY_PRINT), $mod_path . DIRECTORY_SEPARATOR . "module.json", true);
126
+                "module" => "\\".preg_replace('/(\\\|\/)/', '\\\\', $module),
127
+            ], JSON_PRETTY_PRINT), $mod_path.DIRECTORY_SEPARATOR."module.json", true);
128 128
         }
129 129
     }
130 130
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
      */
139 139
     private function createModuleBaseFiles($module, $mod_path, $force = false, $controllerType = '', $isModule = false)
140 140
     {
141
-        $module_path = $isModule ? $mod_path : $mod_path . $module;
141
+        $module_path = $isModule ? $mod_path : $mod_path.$module;
142 142
         $this->generateControllerTemplate($module, $module_path, $force, $controllerType);
143 143
         $this->generateServiceTemplate($module, $module_path, $force);
144 144
         $this->genereateAutoloaderTemplate($module, $module_path, $force, $isModule);
@@ -157,24 +157,24 @@  discard block
 block discarded – undo
157 157
      */
158 158
     private function createModuleModels($module, $path, $isModule = false)
159 159
     {
160
-        $module_path = $isModule ? $path : $path . $module;
161
-        $module_path = str_replace(CORE_DIR . DIRECTORY_SEPARATOR, '', $module_path);
160
+        $module_path = $isModule ? $path : $path.$module;
161
+        $module_path = str_replace(CORE_DIR.DIRECTORY_SEPARATOR, '', $module_path);
162 162
         //Generamos las clases de propel y la configuración
163
-        $exec = "export PATH=\$PATH:/opt/local/bin; " . BASE_DIR . DIRECTORY_SEPARATOR .
164
-            "vendor" . DIRECTORY_SEPARATOR . "bin" . DIRECTORY_SEPARATOR . "propel ";
165
-        $schemaOpt = " --schema-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path .
166
-            DIRECTORY_SEPARATOR . "Config";
167
-        $opt = " --config-dir=" . CORE_DIR . DIRECTORY_SEPARATOR . $module_path . DIRECTORY_SEPARATOR .
168
-            "Config --output-dir=" . CORE_DIR . " --verbose";
169
-        $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n" . $exec . "build" . $opt . $schemaOpt);
170
-        $ret = shell_exec($exec . "build" . $opt . $schemaOpt);
163
+        $exec = "export PATH=\$PATH:/opt/local/bin; ".BASE_DIR.DIRECTORY_SEPARATOR.
164
+            "vendor".DIRECTORY_SEPARATOR."bin".DIRECTORY_SEPARATOR."propel ";
165
+        $schemaOpt = " --schema-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path.
166
+            DIRECTORY_SEPARATOR."Config";
167
+        $opt = " --config-dir=".CORE_DIR.DIRECTORY_SEPARATOR.$module_path.DIRECTORY_SEPARATOR.
168
+            "Config --output-dir=".CORE_DIR." --verbose";
169
+        $this->log->infoLog("[GENERATOR] Ejecutamos propel:\n".$exec."build".$opt.$schemaOpt);
170
+        $ret = shell_exec($exec."build".$opt.$schemaOpt);
171 171
 
172 172
         $this->log->infoLog("[GENERATOR] Generamos clases invocando a propel:\n $ret");
173
-        $ret = shell_exec($exec . "sql:build" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR .
174
-            $module_path . DIRECTORY_SEPARATOR . "Config" . $schemaOpt);
173
+        $ret = shell_exec($exec."sql:build".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.
174
+            $module_path.DIRECTORY_SEPARATOR."Config".$schemaOpt);
175 175
         $this->log->infoLog("[GENERATOR] Generamos sql invocando a propel:\n $ret");
176
-        $ret = shell_exec($exec . "config:convert" . $opt . " --output-dir=" . CORE_DIR . DIRECTORY_SEPARATOR .
177
-            $module_path . DIRECTORY_SEPARATOR . "Config");
176
+        $ret = shell_exec($exec."config:convert".$opt." --output-dir=".CORE_DIR.DIRECTORY_SEPARATOR.
177
+            $module_path.DIRECTORY_SEPARATOR."Config");
178 178
         $this->log->infoLog("[GENERATOR] Generamos configuración invocando a propel:\n $ret");
179 179
     }
180 180
 
@@ -195,32 +195,32 @@  discard block
 block discarded – undo
195 195
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
196 196
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
197 197
             "class" => $class,
198
-            "controllerType" => $class . "Base",
198
+            "controllerType" => $class."Base",
199 199
             "is_base" => false
200 200
         ));
201
-        $controller = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
202
-            DIRECTORY_SEPARATOR . "{$class}Controller.php", $force);
201
+        $controller = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
202
+            DIRECTORY_SEPARATOR."{$class}Controller.php", $force);
203 203
 
204 204
         $controllerBody = $this->tpl->dump("generator/controller.template.twig", array(
205 205
             "module" => $module,
206 206
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
207 207
             "url" => preg_replace('/(\\\|\/)/', '/', $module),
208
-            "class" => $class . "Base",
208
+            "class" => $class."Base",
209 209
             "service" => $class,
210 210
             "controllerType" => $controllerType,
211 211
             "is_base" => true,
212 212
             "domain" => $class,
213 213
         ));
214
-        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path . DIRECTORY_SEPARATOR . "Controller" .
215
-            DIRECTORY_SEPARATOR . "base" . DIRECTORY_SEPARATOR . "{$class}BaseController.php", true);
214
+        $controllerBase = $this->writeTemplateToFile($controllerBody, $mod_path.DIRECTORY_SEPARATOR."Controller".
215
+            DIRECTORY_SEPARATOR."base".DIRECTORY_SEPARATOR."{$class}BaseController.php", true);
216 216
 
217 217
         $testTemplate = $this->tpl->dump("generator/testCase.template.twig", array(
218 218
             "module" => $module,
219 219
             "namespace" => preg_replace('/(\\\|\/)/', '\\', $module),
220 220
             "class" => $class,
221 221
         ));
222
-        $test = $this->writeTemplateToFile($testTemplate, $mod_path . DIRECTORY_SEPARATOR . "Test" .
223
-            DIRECTORY_SEPARATOR . "{$class}Test.php", true);
222
+        $test = $this->writeTemplateToFile($testTemplate, $mod_path.DIRECTORY_SEPARATOR."Test".
223
+            DIRECTORY_SEPARATOR."{$class}Test.php", true);
224 224
         return ($controller && $controllerBase && $test);
225 225
     }
226 226
 
@@ -235,11 +235,9 @@  discard block
 block discarded – undo
235 235
     {
236 236
         $created = true;
237 237
         $modelPath = $isModule ?
238
-            $mod_path . DIRECTORY_SEPARATOR . 'Models' :
239
-            $mod_path . $module . DIRECTORY_SEPARATOR . 'Models';
238
+            $mod_path.DIRECTORY_SEPARATOR.'Models' : $mod_path.$module.DIRECTORY_SEPARATOR.'Models';
240 239
         $api_path = $isModule ?
241
-            $mod_path . DIRECTORY_SEPARATOR . 'Api' :
242
-            $mod_path . $module . DIRECTORY_SEPARATOR . 'Api';
240
+            $mod_path.DIRECTORY_SEPARATOR.'Api' : $mod_path.$module.DIRECTORY_SEPARATOR.'Api';
243 241
         if (file_exists($modelPath)) {
244 242
             $dir = dir($modelPath);
245 243
             while ($file = $dir->read()) {
@@ -267,7 +265,7 @@  discard block
 block discarded – undo
267 265
         //Generamos el fichero de configuración
268 266
         $this->log->infoLog("Generamos fichero vacío de configuración");
269 267
         return $this->writeTemplateToFile("<?php\n\t",
270
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "config.php",
268
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."config.php",
271 269
             $force);
272 270
     }
273 271
 
@@ -282,10 +280,10 @@  discard block
 block discarded – undo
282 280
         //Generamos el fichero de configuración
283 281
         $this->log->infoLog("Generamos ficheros para assets base");
284 282
         $css = $this->writeTemplateToFile("/* CSS3 STYLES */\n\n",
285
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "css" . DIRECTORY_SEPARATOR . "styles.css",
283
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."css".DIRECTORY_SEPARATOR."styles.css",
286 284
             $force);
287 285
         $js = $this->writeTemplateToFile("/* APP MODULE JS */\n\n(function() {\n\t'use strict';\n})();",
288
-            $mod_path . DIRECTORY_SEPARATOR . "Public" . DIRECTORY_SEPARATOR . "js" . DIRECTORY_SEPARATOR . "app.js",
286
+            $mod_path.DIRECTORY_SEPARATOR."Public".DIRECTORY_SEPARATOR."js".DIRECTORY_SEPARATOR."app.js",
289 287
             $force);
290 288
         return ($css && $js);
291 289
     }
@@ -307,7 +305,7 @@  discard block
 block discarded – undo
307 305
             "class" => $class,
308 306
         ));
309 307
         return $this->writeTemplateToFile($controller,
310
-            $mod_path . DIRECTORY_SEPARATOR . "Services" . DIRECTORY_SEPARATOR . "{$class}Service.php",
308
+            $mod_path.DIRECTORY_SEPARATOR."Services".DIRECTORY_SEPARATOR."{$class}Service.php",
311 309
             $force);
312 310
     }
313 311
 
@@ -328,14 +326,14 @@  discard block
 block discarded – undo
328 326
             "regex" => preg_replace('/(\\\|\/)/m', '\\\\\\\\\\\\', $module),
329 327
             "is_module" => $isModule,
330 328
         ));
331
-        $autoload = $this->writeTemplateToFile($autoloader, $mod_path . DIRECTORY_SEPARATOR . "autoload.php", $force);
329
+        $autoload = $this->writeTemplateToFile($autoloader, $mod_path.DIRECTORY_SEPARATOR."autoload.php", $force);
332 330
 
333 331
         $this->log->infoLog("Generamos el phpunit");
334 332
         $phpUnitTemplate = $this->tpl->dump("generator/phpunit.template.twig", array(
335 333
             "module" => $module,
336 334
             "is_module" => $isModule,
337 335
         ));
338
-        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path . DIRECTORY_SEPARATOR . "phpunit.xml.dist", $force);
336
+        $phpunit = $this->writeTemplateToFile($phpUnitTemplate, $mod_path.DIRECTORY_SEPARATOR."phpunit.xml.dist", $force);
339 337
         return $autoload && $phpunit;
340 338
     }
341 339
 
@@ -356,7 +354,7 @@  discard block
 block discarded – undo
356 354
             "db" => $this->config->get("db_name"),
357 355
         ));
358 356
         return $this->writeTemplateToFile($schema,
359
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "schema.xml",
357
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."schema.xml",
360 358
             $force);
361 359
     }
362 360
 
@@ -379,7 +377,7 @@  discard block
 block discarded – undo
379 377
             "namespace" => preg_replace('/(\\\|\/)/', '', $module),
380 378
         ));
381 379
         return $this->writeTemplateToFile($build_properties,
382
-            $mod_path . DIRECTORY_SEPARATOR . "Config" . DIRECTORY_SEPARATOR . "propel.yml",
380
+            $mod_path.DIRECTORY_SEPARATOR."Config".DIRECTORY_SEPARATOR."propel.yml",
383 381
             $force);
384 382
     }
385 383
 
@@ -397,7 +395,7 @@  discard block
 block discarded – undo
397 395
             "module" => $module,
398 396
         ));
399 397
         return $this->writeTemplateToFile($index,
400
-            $mod_path . DIRECTORY_SEPARATOR . "Templates" . DIRECTORY_SEPARATOR . "index.html.twig",
398
+            $mod_path.DIRECTORY_SEPARATOR."Templates".DIRECTORY_SEPARATOR."index.html.twig",
401 399
             $force);
402 400
     }
403 401
 
@@ -415,11 +413,11 @@  discard block
 block discarded – undo
415 413
             try {
416 414
                 $this->cache->storeData($filename, $fileContent, Cache::TEXT, true);
417 415
                 $created = true;
418
-            } catch (\Exception $e) {
416
+            }catch (\Exception $e) {
419 417
                 $this->log->errorLog($e->getMessage());
420 418
             }
421
-        } else {
422
-            $this->log->errorLog($filename . _(' not exists or cant write'));
419
+        }else {
420
+            $this->log->errorLog($filename._(' not exists or cant write'));
423 421
         }
424 422
         return $created;
425 423
     }
@@ -444,7 +442,7 @@  discard block
 block discarded – undo
444 442
         ));
445 443
 
446 444
         return $this->writeTemplateToFile($controller,
447
-            $mod_path . DIRECTORY_SEPARATOR . 'base' . DIRECTORY_SEPARATOR . "{$api}BaseApi.php", true);
445
+            $mod_path.DIRECTORY_SEPARATOR.'base'.DIRECTORY_SEPARATOR."{$api}BaseApi.php", true);
448 446
     }
449 447
 
450 448
     /**
@@ -467,7 +465,7 @@  discard block
 block discarded – undo
467 465
             "class" => $class,
468 466
         ));
469 467
 
470
-        return $this->writeTemplateToFile($controller, $mod_path . DIRECTORY_SEPARATOR . "{$api}.php", $force);
468
+        return $this->writeTemplateToFile($controller, $mod_path.DIRECTORY_SEPARATOR."{$api}.php", $force);
471 469
     }
472 470
 
473 471
     /**
@@ -481,12 +479,12 @@  discard block
 block discarded – undo
481 479
     {
482 480
         if (file_exists($filename_path)) {
483 481
             $destfolder = basename($filename_path);
484
-            if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) {
482
+            if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) {
485 483
                 if (is_dir($filename_path)) {
486
-                    self::copyr($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
487
-                } else {
488
-                    if (@copy($filename_path, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) {
489
-                        throw new ConfigException("Can't copy " . $filename_path . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
484
+                    self::copyr($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
485
+                }else {
486
+                    if (@copy($filename_path, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
487
+                        throw new ConfigException("Can't copy ".$filename_path." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
490 488
                     }
491 489
                 }
492 490
             }
@@ -505,10 +503,10 @@  discard block
 block discarded – undo
505 503
         Config::createDir($dst);
506 504
         while (false !== ($file = readdir($dir))) {
507 505
             if (($file != '.') && ($file != '..')) {
508
-                if (is_dir($src . '/' . $file)) {
509
-                    self::copyr($src . '/' . $file, $dst . '/' . $file);
510
-                } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) {
511
-                    throw new ConfigException("Can't copy " . $src . " to " . $dst);
506
+                if (is_dir($src.'/'.$file)) {
507
+                    self::copyr($src.'/'.$file, $dst.'/'.$file);
508
+                } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) {
509
+                    throw new ConfigException("Can't copy ".$src." to ".$dst);
512 510
                 }
513 511
             }
514 512
         }
Please login to merge, or discard this patch.
src/base/Router.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -59,12 +59,12 @@  discard block
 block discarded – undo
59 59
      */
60 60
     public function init()
61 61
     {
62
-        if (!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json") || Config::getInstance()->getDebugMode()) {
62
+        if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json") || Config::getInstance()->getDebugMode()) {
63 63
             $this->hydrateRouting();
64 64
             $this->simpatize();
65
-        } else {
66
-            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", Cache::JSON, TRUE);
67
-            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, TRUE);
65
+        }else {
66
+            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", Cache::JSON, TRUE);
67
+            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, TRUE);
68 68
         }
69 69
     }
70 70
 
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
                 "success" => FALSE,
85 85
                 "error" => $e->getMessage(),
86 86
             )), 'application/json');
87
-        } else {
87
+        }else {
88 88
             if (NULL === $e) {
89 89
                 Logger::log('Not found page throwed without previous exception', LOG_WARNING);
90 90
                 $e = new \Exception(_('Page not found'), 404);
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
      */
114 114
     public function getAllRoutes() {
115 115
         $routes = [];
116
-        foreach($this->routing as $path => $route) {
117
-            if(array_key_exists('slug', $route)) {
116
+        foreach ($this->routing as $path => $route) {
117
+            if (array_key_exists('slug', $route)) {
118 118
                 $routes[$route['slug']] = $path;
119 119
             }
120 120
         }
@@ -139,15 +139,15 @@  discard block
 block discarded – undo
139 139
             SecurityHelper::checkRestrictedAccess($route);
140 140
             //Search action and execute
141 141
             $this->searchAction($route);
142
-        } catch (AccessDeniedException $e) {
142
+        }catch (AccessDeniedException $e) {
143 143
             Logger::log(_('Solicitamos credenciales de acceso a zona restringida'));
144 144
             return Admin::staticAdminLogon($route);
145
-        } catch (RouterException $r) {
146
-            if(null === RouterHelper::checkDefaultRoute($route)) {
145
+        }catch (RouterException $r) {
146
+            if (null === RouterHelper::checkDefaultRoute($route)) {
147 147
                 Logger::log($r->getMessage(), LOG_WARNING);
148 148
                 throw $r;
149 149
             }
150
-        } catch (\Exception $e) {
150
+        }catch (\Exception $e) {
151 151
             Logger::log($e->getMessage(), LOG_ERR);
152 152
             throw $e;
153 153
         }
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
      */
165 165
     protected function searchAction($route)
166 166
     {
167
-        Logger::log('Searching action to execute: ' . $route, LOG_INFO);
167
+        Logger::log('Searching action to execute: '.$route, LOG_INFO);
168 168
         //Revisamos si tenemos la ruta registrada
169 169
         $parts = parse_url($route);
170 170
         $path = (array_key_exists('path', $parts)) ? $parts['path'] : $route;
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
                 $class = RouterHelper::getClassToCall($action);
179 179
                 try {
180 180
                     $this->executeCachedRoute($route, $action, $class, $get);
181
-                } catch (\Exception $e) {
181
+                }catch (\Exception $e) {
182 182
                     Logger::log($e->getMessage(), LOG_ERR);
183 183
                     throw new RouterException($e->getMessage(), 404, $e);
184 184
                 }
@@ -206,13 +206,13 @@  discard block
 block discarded – undo
206 206
         $this->routing = $this->inspectDir($base, "PSFS", array());
207 207
         if (file_exists($modules)) {
208 208
             $module = "";
209
-            if(file_exists($modules . DIRECTORY_SEPARATOR . 'module.json')) {
210
-                $mod_cfg = json_decode(file_get_contents($modules . DIRECTORY_SEPARATOR . 'module.json'), true);
209
+            if (file_exists($modules.DIRECTORY_SEPARATOR.'module.json')) {
210
+                $mod_cfg = json_decode(file_get_contents($modules.DIRECTORY_SEPARATOR.'module.json'), true);
211 211
                 $module = $mod_cfg['module'];
212 212
             }
213 213
             $this->routing = $this->inspectDir($modules, $module, $this->routing);
214 214
         }
215
-        $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", $this->domains, Cache::JSON, TRUE);
215
+        $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", $this->domains, Cache::JSON, TRUE);
216 216
     }
217 217
 
218 218
     /**
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
             $home_params = NULL;
228 228
             foreach ($this->routing as $pattern => $params) {
229 229
                 list($method, $route) = RouterHelper::extractHttpRoute($pattern);
230
-                if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) {
230
+                if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) {
231 231
                     $home_params = $params;
232 232
                 }
233 233
             }
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
         $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->name("*.php");
253 253
         foreach ($files as $file) {
254 254
             $filename = str_replace("/", '\\', str_replace($origen, '', $file->getPathname()));
255
-            $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing);
255
+            $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing);
256 256
         }
257 257
         $this->finder = new Finder();
258 258
 
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
                 }
292 292
                 foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
293 293
                     list($route, $info) = RouterHelper::extractRouteInfo($method, $api);
294
-                    if(null !== $route && null !== $info) {
294
+                    if (null !== $route && null !== $info) {
295 295
                         $info['class'] = $namespace;
296 296
                         $routing[$route] = $info;
297 297
                     }
@@ -314,11 +314,11 @@  discard block
 block discarded – undo
314 314
     {
315 315
         //Calculamos los dominios para las plantillas
316 316
         if ($class->hasConstant("DOMAIN") && !$class->isAbstract()) {
317
-            if(!$this->domains) {
317
+            if (!$this->domains) {
318 318
                 $this->domains = [];
319 319
             }
320
-            $domain = "@" . $class->getConstant("DOMAIN") . "/";
321
-            if(!array_key_exists($domain, $this->domains)) {
320
+            $domain = "@".$class->getConstant("DOMAIN")."/";
321
+            if (!array_key_exists($domain, $this->domains)) {
322 322
                 $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain);
323 323
             }
324 324
         }
@@ -332,11 +332,11 @@  discard block
 block discarded – undo
332 332
      */
333 333
     public function simpatize()
334 334
     {
335
-        $translationFileName = "translations" . DIRECTORY_SEPARATOR . "routes_translations.php";
336
-        $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName;
335
+        $translationFileName = "translations".DIRECTORY_SEPARATOR."routes_translations.php";
336
+        $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName;
337 337
         $this->generateSlugs($absoluteTranslationFileName);
338 338
         Config::createDir(CONFIG_DIR);
339
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
339
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
340 340
 
341 341
         return $this;
342 342
     }
@@ -354,16 +354,16 @@  discard block
 block discarded – undo
354 354
     public function getRoute($slug = '', $absolute = FALSE, $params = [])
355 355
     {
356 356
         if (strlen($slug) === 0) {
357
-            return ($absolute) ? Request::getInstance()->getRootUrl() . '/' : '/';
357
+            return ($absolute) ? Request::getInstance()->getRootUrl().'/' : '/';
358 358
         }
359 359
         if (NULL === $slug || !array_key_exists($slug, $this->slugs)) {
360 360
             throw new RouterException(_("No existe la ruta especificada"));
361 361
         }
362
-        $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
362
+        $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $this->slugs[$slug];
363 363
         if (!empty($params)) foreach ($params as $key => $value) {
364
-            $url = str_replace("{" . $key . "}", $value, $url);
364
+            $url = str_replace("{".$key."}", $value, $url);
365 365
         } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) {
366
-            $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
366
+            $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
367 367
         }
368 368
 
369 369
         return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url);
@@ -406,24 +406,24 @@  discard block
 block discarded – undo
406 406
      */
407 407
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
408 408
     {
409
-        Logger::log('Executing route ' . $route, LOG_INFO);
409
+        Logger::log('Executing route '.$route, LOG_INFO);
410 410
         Security::getInstance()->setSessionKey("__CACHE__", $action);
411 411
         $cache = Cache::needCache();
412 412
         $execute = TRUE;
413 413
         if (FALSE !== $cache && Config::getInstance()->getDebugMode() === FALSE) {
414 414
             $cacheDataName = $this->cache->getRequestCacheHash();
415
-            $cachedData = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName,
416
-                $cache, function () {});
415
+            $cachedData = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName,
416
+                $cache, function() {});
417 417
             if (NULL !== $cachedData) {
418
-                $headers = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName . ".headers",
419
-                    $cache, function () {}, Cache::JSON);
418
+                $headers = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName.".headers",
419
+                    $cache, function() {}, Cache::JSON);
420 420
                 Template::getInstance()->renderCache($cachedData, $headers);
421 421
                 $execute = FALSE;
422 422
             }
423 423
         }
424 424
         if ($execute) {
425 425
             Logger::log(_('Start executing action'), LOG_DEBUG);
426
-            if(false === call_user_func_array(array($class, $action['method']), $params)) {
426
+            if (false === call_user_func_array(array($class, $action['method']), $params)) {
427 427
                 Logger::log(_('An error ocurred trying to execute the action'), LOG_ERR, [error_get_last()]);
428 428
             }
429 429
         }
Please login to merge, or discard this patch.