psfs / core

src/base/types/AuthApi.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
         {
             $namespace = explode('\\', $this->getModelTableMap());
             $module = strtolower($namespace[0]);
-            $secret = Config::getInstance()->get($module . '.api.secret');
+            $secret = Config::getInstance()->get($module.'.api.secret');
             if (NULL === $secret) {
                 $secret = Config::getInstance()->get("api.secret");
             }
             if (NULL === $secret) {
                 $auth = TRUE;
-            } else {
+            }else {
                 $token = Request::getInstance()->getHeader('X-API-SEC-TOKEN');
                 if (array_key_exists('API_TOKEN', $this->query)) {
                     $token = $this->query['API_TOKEN'];

src/base/types/interfaces/AuthInterface.php

Doc Comments +12 added lines

@@ -7,7 +7,19 @@
  * @package PSFS\base\types\interfaces
  */
 interface AuthInterface {
+
+    /**
+     * @return boolean
+     */
     function isLogged();
+
+    /**
+     * @return boolean
+     */
     function isAdmin();
+
+    /**
+     * @return boolean
+     */
     function canDo($action);
 }

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 = null);
+
+    /**
+     * @return void
+     */
     public function response($response, $type = 'text/html');
 }

src/services/DocumentorService.php

Doc Comments +1 added lines, -1 removed lines

@@ -371,7 +371,7 @@
          * @param array $parts
          * @param int $partLength
          *
-         * @return array
+         * @return string[]
          */
         private static function extractTsAndMod(array &$parts, $partLength)
         {

Indentation +1 added lines, -1 removed lines

@@ -422,7 +422,7 @@
                                 "type" => $type,
                             ];
                             if (strlen($format)) {
-                               $dto['properties'][$field]['format'] = $format;
+                                $dto['properties'][$field]['format'] = $format;
                             }
                         }
                     }

Spacing +15 added lines, -15 removed lines

@@ -33,7 +33,7 @@ 
                         if (!preg_match('/^\@ROOT/i', $domain)) {
                             $modules[] = str_replace('/', '', str_replace('@', '', $domain));
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         $modules[] = $e->getMessage();
                     }
                 }
@@ -51,7 +51,7 @@ 
          */
         public function extractApiEndpoints($module)
         {
-            $module_path = CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Api";
+            $module_path = CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Api";
             $endpoints = [];
             if (file_exists($module_path)) {
                 $finder = new Finder();
@@ -59,7 +59,7 @@ 
                 if (count($finder)) {
                     /** @var \SplFileInfo $file */
                     foreach ($finder as $file) {
-                        $namespace = "\\{$module}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                        $namespace = "\\{$module}\\Api\\".str_replace('.php', '', $file->getFilename());
                         $endpoints[$namespace] = $this->extractApiInfo($namespace);
                     }
                 }
@@ -88,7 +88,7 @@ 
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
                 }
@@ -221,9 +221,9 @@ 
             if ($reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 foreach ($reflector->getProperties(\ReflectionMethod::IS_PUBLIC) as $property) {
                     $type = $this->extractVarType($property->getDocComment());
-                    if(class_exists($type)) {
+                    if (class_exists($type)) {
                         $properties[$property->getName()] = $this->extractModelFields($type);
-                    } else {
+                    }else {
                         $properties[$property->getName()] = $type;
                     }
                 }
@@ -242,7 +242,7 @@ 
          */
         protected function extractReturn($model, $comments = '')
         {
-            $modelDto  = [];
+            $modelDto = [];
             preg_match('/\@return\ (.*)\((.*)\)\n/i', $comments, $returnTypes);
             if (count($returnTypes)) {
                 // Extract principal DTO information
@@ -295,7 +295,7 @@ 
                 } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                     $payload = $this->extractDtoProperties($namespace);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance()->errorLog($e->getMessage());
             }
 
@@ -331,7 +331,7 @@ 
                         if (in_array($methodInfo['method'], ['POST', 'PUT'])) {
                             $methodInfo['payload'] = $this->extractPayload($modelNamespace, $docComments);
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         jpre($e->getMessage());
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
@@ -349,7 +349,7 @@ 
          */
         public static function translateSwaggerFormats($format)
         {
-            switch(strtolower($format)) {
+            switch (strtolower($format)) {
                 case 'bool':
                 case 'boolean':
                     $swaggerType = 'boolean';
@@ -410,13 +410,13 @@ 
                             ]]);
                             if (array_key_exists($subDtoName, $subDto)) {
                                 $definitions = $subDto;
-                            } else {
+                            }else {
                                 $definitions[$subDtoName] = $subDto;
                             }
                             $dto['properties'][$field] = [
-                                '$ref' => "#/definitions/" . $subDtoName,
+                                '$ref' => "#/definitions/".$subDtoName,
                             ];
-                        } else {
+                        }else {
                             list($type, $format) = self::translateSwaggerFormats($format);
                             $dto['properties'][$field] = [
                                 "type" => $type,
@@ -453,7 +453,7 @@ 
                     "url" => Router::getInstance()->getRoute(''),
                 ]
             ];
-            foreach($endpoints as $model) {
+            foreach ($endpoints as $model) {
                 foreach ($model as $endpoint) {
                     $dtos += self::extractSwaggerDefinition($endpoint);
                 }
@@ -472,7 +472,7 @@ 
         protected function extractDtoName($dto, $isArray = false)
         {
             $dto = explode('\\', $dto);
-            $modelDto = array_pop($dto) . "Dto";
+            $modelDto = array_pop($dto)."Dto";
             if ($isArray) {
                 $modelDto .= "List";
             }

src/base/types/Api.php

Spacing +19 added lines, -19 removed lines

@@ -180,7 +180,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addOrders(ModelCriteria &$query)
+        private function addOrders(ModelCriteria & $query)
         {
             $orderAdded = FALSE;
             foreach ($this->order->getOrders() as $field => $direction) {
@@ -188,7 +188,7 @@ 
                     $orderAdded = TRUE;
                     if ($direction === Order::ASC) {
                         $query->addAscendingOrderByColumn($field);
-                    } else {
+                    }else {
                         $query->addDescendingOrderByColumn($field);
                     }
                 }
@@ -203,7 +203,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addExtraColumns(ModelCriteria &$query)
+        private function addExtraColumns(ModelCriteria & $query)
         {
             if (!empty($this->extraColumns)) {
                 foreach ($this->extraColumns as $expression => $columnName) {
@@ -217,7 +217,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        protected function joinTables(ModelCriteria &$query)
+        protected function joinTables(ModelCriteria & $query)
         {
             //TODO for specific implementations
         }
@@ -227,7 +227,7 @@ 
          *
          * @param ModelCriteria $query
          */
-        private function addFilters(ModelCriteria &$query)
+        private function addFilters(ModelCriteria & $query)
         {
             if (count($this->query) > 0) {
                 foreach ($this->query as $field => $value) {
@@ -245,7 +245,7 @@ 
                             $text = preg_replace('/(\'|\")/', '', $value);
                             $text = preg_replace('/\ /', '%', $text);
                             $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE);
-                        } else {
+                        }else {
                             $query->filterBy($tableField, $value, Criteria::EQUAL);
                         }
                     }
@@ -268,10 +268,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::getInstance(get_class($this))->errorLog($e->getMessage());
             }
         }
@@ -288,7 +288,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());
             }
         }
@@ -376,7 +376,7 @@ 
                     $saved = TRUE;
                     $model = $this->model->toArray();
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 jpre($e->getMessage(), TRUE);
                 Logger::getInstance()->errorLog($e->getMessage());
             }
@@ -405,7 +405,7 @@ 
                         $this->model->delete($this->con);
                         $deleted = TRUE;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance(get_class($this->model))->errorLog($e->getMessage());
                 }
             }
@@ -449,7 +449,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(NULL);
 
@@ -493,7 +493,7 @@ 
             if ($this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -537,7 +537,7 @@ 
             return $this->render('api.admin.html.twig', array(
                 "api"    => $this->getApi(),
                 "domain" => $this->domain,
-                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-' . $this->getApi() . "-pk"), TRUE)),
+                "url"    => preg_replace('/\/\{(.*)\}$/i', '', $this->getRoute(strtolower('api-'.$this->getApi()."-pk"), TRUE)),
             ));
         }
 
@@ -559,16 +559,16 @@ 
             /** @var TableMap $map */
             $map = $this->getModelTableMap();
             $fields = $map::getTableMap();
-            foreach($fields->getFieldNames() as $field) {
+            foreach ($fields->getFieldNames() as $field) {
                 $fDto = new Field($field, _($field));
                 /** @var ColumnMap $mappedColumn */
                 $mappedColumn = $fields->getColumn($field);
-                if($mappedColumn->isForeignKey()) {
+                if ($mappedColumn->isForeignKey()) {
                     $fDto->type = Field::COMBO_TYPE;
                     $fDto->required = $mappedColumn->isNotNull();
                     $relatedModel = strtolower($mappedColumn->getRelation()->getForeignTable()->getPhpName());
                     $fDto->entity = $relatedModel;
-                    $fDto->url = Router::getInstance()->getRoute('api-' . $relatedModel . '-pk');
+                    $fDto->url = Router::getInstance()->getRoute('api-'.$relatedModel.'-pk');
                 } elseif ($mappedColumn->isPrimaryKey()) {
                     $fDto->type = Field::HIDDEN_TYPE;
                     $fDto->required = false;
@@ -595,7 +595,7 @@ 
                 $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());
             }
 
@@ -615,7 +615,7 @@ 
             $return = array();
             if (NULL === $model) {
                 $code = 404;
-            } else {
+            }else {
                 $return = $model->toArray();
             }
 

src/services/AdminServices.php

Spacing +19 added lines, -19 removed lines

@@ -6,7 +6,7 @@ 
     use PSFS\controller\Admin;
     use Symfony\Component\Finder\Finder;
 
-    class AdminServices extends Service{
+    class AdminServices extends Service {
 
         /**
          * @Inyectable
@@ -30,10 +30,10 @@ 
          */
         public function setAdminHeaders()
         {
-            if("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
+            if ("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
             $platform = trim(Config::getInstance()->get("platform_name"));
             header('HTTP/1.1 401 Unauthorized');
-            header('WWW-Authenticate: Basic Realm="' . $platform. '"');
+            header('WWW-Authenticate: Basic Realm="'.$platform.'"');
             echo _("Zona restringida");
             exit();
         }
@@ -45,9 +45,9 @@ 
         public function getAdmins()
         {
             $admins = $this->security->getAdmins();
-            if(!empty($admins))
+            if (!empty($admins))
             {
-                if(!$this->security->checkAdmin())
+                if (!$this->security->checkAdmin())
                 {
                     $this->setAdminHeaders();
                 }
@@ -62,17 +62,17 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if (!empty($admins)) foreach ($admins as &$admin)
             {
-                if(isset($admin["profile"]))
+                if (isset($admin["profile"]))
                 {
-                    switch($admin["profile"]) {
+                    switch ($admin["profile"]) {
                         case sha1('admin'): $admin['class'] = 'warning'; break;
                         case sha1('superadmin'): $admin['class'] = 'info'; break;
                         default:
                         case sha1('user'): $admin['class'] = 'primary'; break;
                     }
-                }else{
+                }else {
                     $admin["class"] = "primary";
                 }
             }
@@ -88,12 +88,12 @@ 
             $files->files()->in(LOG_DIR)->name("*.log")->sortByModifiedTime();
             $logs = array();
             /** @var \SplFileInfo $file */
-            foreach($files as $file)
+            foreach ($files as $file)
             {
-                $size = $file->getSize() / 8 / 1024;
+                $size = $file->getSize()/8/1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -117,27 +117,27 @@ 
             $files->files()->in(LOG_DIR)->name($selectedLog);
             $file = null;
             $log = array();
-            foreach($files as $match)
+            foreach ($files as $match)
             {
                 $file = $match;
                 break;
             }
             /** @var \SplFileInfo $file */
-            if(!empty($file))
+            if (!empty($file))
             {
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
                 $monthOpen = $dateTime->format("m");
-                $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename());
+                $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename());
                 krsort($content);
                 $detailLog = array();
-                foreach($content as &$line)
+                foreach ($content as &$line)
                 {
                     list($line, $detail) = $this->parseLogLine($line, $match);
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if (count($detailLog) >= 1000) break;
                 }
                 $log = $detailLog;
             }
@@ -166,7 +166,7 @@ 
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';
                 $type = explode(".", $type);
-                $type = count($type)>1 ? $type[1] : $type[0];
+                $type = count($type) > 1 ? $type[1] : $type[0];
                 switch ($type) {
                     case 'INFO':
                         $detail["type"] = "success";
@@ -182,7 +182,7 @@ 
                         break;
                 }
 
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $detail = array(
                     "type" => "danger",
                 );

Braces +18 added lines, -7 removed lines

@@ -31,7 +31,9 @@ 
          */
         public function setAdminHeaders()
         {
-            if("login" === $this->config->get("admin_login")) return Admin::getInstance()->adminLogin("admin-setup");
+            if("login" === $this->config->get("admin_login")) {
+                return Admin::getInstance()->adminLogin("admin-setup");
+            }
             $platform = trim(Config::getInstance()->get("platform_name"));
             header('HTTP/1.1 401 Unauthorized');
             header('WWW-Authenticate: Basic Realm="' . $platform. '"');
@@ -63,17 +65,20 @@ 
          */
         private function parseAdmins(&$admins)
         {
-            if(!empty($admins)) foreach($admins as &$admin)
+            if(!empty($admins)) {
+                foreach($admins as &$admin)
             {
                 if(isset($admin["profile"]))
                 {
                     switch($admin["profile"]) {
-                        case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning'; break;
+                        case Security::MANAGER_ID_TOKEN: $admin['class'] = 'warning';
+            }
+            break;
                         case Security::ADMIN_ID_TOKEN: $admin['class'] = 'info'; break;
                         default:
                         case Security::USER_ID_TOKEN: $admin['class'] = 'primary'; break;
                     }
-                }else{
+                } else{
                     $admin["class"] = "primary";
                 }
             }
@@ -94,7 +99,9 @@ 
                 $size = $file->getSize() / 8 / 1024;
                 $time = date("c", $file->getMTime());
                 $dateTime = new \DateTime($time);
-                if(!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+                if(!isset($logs[$dateTime->format("Y")])) {
+                    $logs[$dateTime->format("Y")] = array();
+                }
                 $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                     "filename" => $file->getFilename(),
                     "size" => round($size, 3)
@@ -138,7 +145,9 @@ 
                     $detailLog[] = array_merge(array(
                         "log" => $line,
                     ), $detail);
-                    if(count($detailLog) >= 1000) break;
+                    if(count($detailLog) >= 1000) {
+                        break;
+                    }
                 }
                 $log = $detailLog;
             }
@@ -162,7 +171,9 @@ 
 
                     $detail = json_decode($match[0][0], TRUE);
                 }
-                if (empty($detail)) $detail = array();
+                if (empty($detail)) {
+                    $detail = array();
+                }
                 preg_match_all('/\>\ (.*):/i', $line, $match);
 
                 $type = (isset($match[1][0])) ? $match[1][0] : '';

src/base/Request.php

Doc Comments +3 added lines

@@ -121,6 +121,9 @@
         return self::getInstance()->getHeader($name);
     }
 
+    /**
+     * @return string
+     */
     public function getHeader($name)
     {
         $header = null;

Spacing +2 added lines, -2 removed lines

@@ -216,7 +216,7 @@ 
     {
         if (null === $url) $url = $this->server['HTTP_ORIGIN'];
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         exit(_("Redireccionando..."));
     }
@@ -260,7 +260,7 @@ 
         $host = $this->getServerName();
         $protocol = $protocol ? $this->getProtocol() : '';
         $url = '';
-        if (!empty($host) && !empty($protocol)) $url = $protocol . $host;
+        if (!empty($host) && !empty($protocol)) $url = $protocol.$host;
         return $url;
     }
 

Braces +9 added lines, -4 removed lines

@@ -8,9 +8,10 @@ 
     function getallheaders()
     {
         $headers = array();
-        foreach ($_SERVER as $h => $v)
-            if (preg_match('/HTTP_(.+)/', $h, $hp))
+        foreach ($_SERVER as $h => $v) {
+                    if (preg_match('/HTTP_(.+)/', $h, $hp))
                 $headers[$hp[1]] = $v;
+        }
         return $headers;
     }
 }
@@ -214,7 +215,9 @@ 
      */
     public function redirect($url = null)
     {
-        if (null === $url) $url = $this->server['HTTP_ORIGIN'];
+        if (null === $url) {
+            $url = $this->server['HTTP_ORIGIN'];
+        }
         ob_start();
         header('Location: ' . $url);
         ob_end_clean();
@@ -260,7 +263,9 @@ 
         $host = $this->getServerName();
         $protocol = $protocol ? $this->getProtocol() : '';
         $url = '';
-        if (!empty($host) && !empty($protocol)) $url = $protocol . $host;
+        if (!empty($host) && !empty($protocol)) {
+            $url = $protocol . $host;
+        }
         return $url;
     }
 

src/base/Router.php

Doc Comments +2 added lines, -2 removed lines

@@ -617,7 +617,7 @@ 
     /**
      * Método que extrae los parámetros de una función
      *
-     * @param array $sr
+     * @param string[] $sr
      * @param \ReflectionMethod $method
      *
      * @return array
@@ -670,7 +670,7 @@ 
      *
      * @param string $docComments
      *
-     * @return bool
+     * @return string
      */
     private function extractReflectionCacheability($docComments)
     {

Braces +12 added lines, -4 removed lines

@@ -286,8 +286,10 @@ 
         $_route = explode("/", $url['path']);
         $_pattern = explode("/", $pattern);
         $get = array();
-        if (!empty($_pattern)) foreach ($_pattern as $index => $component) {
+        if (!empty($_pattern)) {
+            foreach ($_pattern as $index => $component) {
             $_get = array();
+        }
             preg_match_all('/^\{(.*)\}$/i', $component, $_get);
             if (!empty($_get[1]) && isset($_route[$index])) {
                 $get[array_pop($_get[1])] = $_route[$index];
@@ -502,8 +504,10 @@ 
             throw new RouterException(_("No existe la ruta especificada"));
         }
         $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
-        if (!empty($params)) foreach ($params as $key => $value) {
+        if (!empty($params)) {
+            foreach ($params as $key => $value) {
             $url = str_replace("{" . $key . "}", $value, $url);
+        }
         } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) {
             $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
         }
@@ -628,12 +632,16 @@ 
         $default = '';
         $params = array();
         $parameters = $method->getParameters();
-        if (count($parameters) > 0) foreach ($parameters as $param) {
+        if (count($parameters) > 0) {
+            foreach ($parameters as $param) {
             if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                 $params[$param->getName()] = $param->getDefaultValue();
+        }
                 $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
             }
-        } else $default = $regex;
+        } else {
+            $default = $regex;
+        }
 
         return array($regex, $default, $params);
     }

Spacing +42 added lines, -42 removed lines

@@ -54,12 +54,12 @@ 
      */
     public function init()
     {
-        if (!file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json") || Config::getInstance()->getDebugMode()) {
+        if (!file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json") || Config::getInstance()->getDebugMode()) {
             $this->hydrateRouting();
             $this->simpatize();
-        } else {
-            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", Cache::JSON, TRUE);
-            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, TRUE);
+        }else {
+            list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", Cache::JSON, TRUE);
+            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, TRUE);
         }
     }
 
@@ -79,7 +79,7 @@ 
                 "success" => FALSE,
                 "error" => $e->getMessage(),
             )), 'application/json');
-        } else {
+        }else {
             if (NULL === $e) {
                 Logger::log('Not found page throwed without previus exception');
                 $e = new \Exception(_('Page not found'), 404);
@@ -108,8 +108,8 @@ 
      */
     public function getAllRoutes() {
         $routes = [];
-        foreach($this->routing as $path => $route) {
-            if(array_key_exists('slug', $route)) {
+        foreach ($this->routing as $path => $route) {
+            if (array_key_exists('slug', $route)) {
                 $routes[$route['slug']] = $path;
             }
         }
@@ -134,24 +134,24 @@ 
             $this->checkRestrictedAccess($route);
             //Search action and execute
             $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
+        }catch (AccessDeniedException $e) {
             Logger::log(_('Solicitamos credenciales de acceso a zona restringida'));
             if ('login' === Config::getInstance()->get('admin_login')) {
                 return $this->redirectLogin($route);
-            } else {
+            }else {
                 return $this->sentAuthHeader();
             }
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             if (FALSE !== preg_match('/\/$/', $route)) {
                 if (preg_match('/admin/', $route)) {
                     $default = Config::getInstance()->get('admin_action');
-                } else {
+                }else {
                     $default = Config::getInstance()->get('home_action');
                 }
 
                 return $this->execute($this->getRoute($default));
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -228,7 +228,7 @@ 
                 $class = $this->getClassToCall($action);
                 try {
                     $this->executeCachedRoute($route, $action, $class, $get);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw new RouterException($e->getMessage(), 404, $e);
                 }
@@ -317,19 +317,19 @@ 
         $this->routing = $this->inspectDir($base, "PSFS", array());
         if (file_exists($modules)) {
             $module = "";
-            if(file_exists($modules . DIRECTORY_SEPARATOR . 'module.json')) {
-                $mod_cfg = json_decode(file_get_contents($modules . DIRECTORY_SEPARATOR . 'module.json'), true);
+            if (file_exists($modules.DIRECTORY_SEPARATOR.'module.json')) {
+                $mod_cfg = json_decode(file_get_contents($modules.DIRECTORY_SEPARATOR.'module.json'), true);
                 $module = $mod_cfg['module'];
             }
             $this->routing = $this->inspectDir($modules, $module, $this->routing);
         }
-        $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", $this->domains, Cache::JSON, TRUE);
+        $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", $this->domains, Cache::JSON, TRUE);
         $home = Config::getInstance()->get('home_action');
         if (NULL !== $home || $home !== '') {
             $home_params = NULL;
             foreach ($this->routing as $pattern => $params) {
                 list($method, $route) = $this->extractHttpRoute($pattern);
-                if (preg_match("/" . preg_quote($route, "/") . "$/i", "/" . $home)) {
+                if (preg_match("/".preg_quote($route, "/")."$/i", "/".$home)) {
                     $home_params = $params;
                 }
             }
@@ -354,7 +354,7 @@ 
         $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->name("*.php");
         foreach ($files as $file) {
             $filename = str_replace("/", '\\', str_replace($origen, '', $file->getPathname()));
-            $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing);
+            $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing);
         }
         $this->finder = new Finder();
 
@@ -404,7 +404,7 @@ 
                             $httpMethod = $this->extractReflectionHttpMethod($docComments);
                             $visible = $this->extractReflectionVisibility($docComments);
                             $expiration = $this->extractReflectionCacheability($docComments);
-                            $routing[$httpMethod . "#|#" . $regex] = array(
+                            $routing[$httpMethod."#|#".$regex] = array(
                                 "class" => $namespace,
                                 "method" => $method->getName(),
                                 "params" => $params,
@@ -434,9 +434,9 @@ 
     {
         //Calculamos los dominios para las plantillas
         if ($class->hasConstant("DOMAIN")) {
-            $domain = "@" . $class->getConstant("DOMAIN") . "/";
-            $path = dirname($class->getFileName()) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-            $path = realpath($path) . DIRECTORY_SEPARATOR;
+            $domain = "@".$class->getConstant("DOMAIN")."/";
+            $path = dirname($class->getFileName()).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+            $path = realpath($path).DIRECTORY_SEPARATOR;
             $tpl_path = "templates";
             $public_path = "public";
             $model_path = "models";
@@ -446,12 +446,12 @@ 
                 $model_path = ucfirst($model_path);
             }
             if ($class->hasConstant("TPL")) {
-                $tpl_path .= DIRECTORY_SEPARATOR . $class->getConstant("TPL");
+                $tpl_path .= DIRECTORY_SEPARATOR.$class->getConstant("TPL");
             }
             $this->domains[$domain] = array(
-                "template" => $path . $tpl_path,
-                "model" => $path . $model_path,
-                "public" => $path . $public_path,
+                "template" => $path.$tpl_path,
+                "model" => $path.$model_path,
+                "public" => $path.$public_path,
             );
         }
 
@@ -464,11 +464,11 @@ 
      */
     public function simpatize()
     {
-        $translationFileName = "translations" . DIRECTORY_SEPARATOR . "routes_translations.php";
-        $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName;
+        $translationFileName = "translations".DIRECTORY_SEPARATOR."routes_translations.php";
+        $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName;
         $this->generateSlugs($absoluteTranslationFileName);
         Config::createDir(CONFIG_DIR);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . "urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR."urls.json", array($this->routing, $this->slugs), Cache::JSON, TRUE);
 
         return $this;
     }
@@ -519,16 +519,16 @@ 
     public function getRoute($slug = '', $absolute = FALSE, $params = NULL)
     {
         if (strlen($slug) === 0) {
-            return ($absolute) ? Request::getInstance()->getRootUrl() . '/' : '/';
+            return ($absolute) ? Request::getInstance()->getRootUrl().'/' : '/';
         }
         if (NULL === $slug || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(_("No existe la ruta especificada"));
         }
-        $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
+        $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $this->slugs[$slug];
         if (!empty($params)) foreach ($params as $key => $value) {
-            $url = str_replace("{" . $key . "}", $value, $url);
+            $url = str_replace("{".$key."}", $value, $url);
         } elseif (!empty($this->routing[$this->slugs[$slug]]["default"])) {
-            $url = ($absolute) ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
+            $url = ($absolute) ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]["default"] : $this->routing[$this->slugs[$slug]]["default"];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url);
@@ -546,7 +546,7 @@ 
             if (preg_match('/^\/admin(\/|$)/', $routePattern)) {
                 if (preg_match('/^\\\?PSFS/', $params["class"])) {
                     $profile = "superadmin";
-                } else {
+                }else {
                     $profile = "admin";
                 }
                 if (!empty($params["default"]) && preg_match('/(GET|ALL)/i', $httpMethod)) {
@@ -598,7 +598,7 @@ 
     protected function getClassToCall($action)
     {
         Logger::log('Getting class to call for executing the request action', LOG_DEBUG, $action);
-        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\" . $action["class"];
+        $actionClass = class_exists($action["class"]) ? $action["class"] : "\\".$action["class"];
         $class = (method_exists($actionClass, "getInstance")) ? $actionClass::getInstance() : new $actionClass;
         return $class;
     }
@@ -617,7 +617,7 @@ 
         $expr = preg_quote($expr, '/');
         $expr = str_replace('###', '(.*)', $expr);
         $expr2 = preg_replace('/\(\.\*\)$/', '', $expr);
-        $matched = preg_match('/^' . $expr . '\/?$/i', $path) || preg_match('/^' . $expr2 . '?$/i', $path);
+        $matched = preg_match('/^'.$expr.'\/?$/i', $path) || preg_match('/^'.$expr2.'?$/i', $path);
         return $matched;
     }
 
@@ -654,9 +654,9 @@ 
         if (count($parameters) > 0) foreach ($parameters as $param) {
             if ($param->isOptional() && !is_array($param->getDefaultValue())) {
                 $params[$param->getName()] = $param->getDefaultValue();
-                $default = str_replace('{' . $param->getName() . '}', $param->getDefaultValue(), $regex);
+                $default = str_replace('{'.$param->getName().'}', $param->getDefaultValue(), $regex);
             }
-        } else $default = $regex;
+        }else $default = $regex;
 
         return array($regex, $default, $params);
     }
@@ -712,16 +712,16 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Logger::log('Executing route ' . $route);
+        Logger::log('Executing route '.$route);
         Security::getInstance()->setSessionKey("__CACHE__", $action);
         $cache = Cache::needCache();
         $execute = TRUE;
         if (FALSE !== $cache && Config::getInstance()->getDebugMode() === FALSE) {
             $cacheDataName = $this->cache->getRequestCacheHash();
-            $cachedData = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName, $cache, function () {
+            $cachedData = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName, $cache, function() {
             });
             if (NULL !== $cachedData) {
-                $headers = $this->cache->readFromCache("templates" . DIRECTORY_SEPARATOR . $cacheDataName . ".headers", $cache, function () {
+                $headers = $this->cache->readFromCache("templates".DIRECTORY_SEPARATOR.$cacheDataName.".headers", $cache, function() {
                 }, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;
@@ -768,7 +768,7 @@ 
         $translations = array();
         if (file_exists($absoluteTranslationFileName)) {
             include($absoluteTranslationFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 

src/base/Security.php

Doc Comments +1 added lines, -1 removed lines

@@ -415,7 +415,7 @@
      * @param array $parts
      * @param int $partLength
      *
-     * @return array
+     * @return string[]
      */
     private static function extractTsAndMod(array &$parts, $partLength)
     {

Spacing +16 added lines, -16 removed lines

@@ -105,13 +105,13 @@ 
     public static function save($user)
     {
         $admins = array();
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
-            $admins = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json'), TRUE);
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
+            $admins = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json'), TRUE);
         }
-        $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']);
+        $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']);
         $admins[$user['username']]['profile'] = $user['profile'];
 
-        return (FALSE !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', json_encode($admins, JSON_PRETTY_PRINT)));
+        return (FALSE !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', json_encode($admins, JSON_PRETTY_PRINT)));
     }
 
     /**
@@ -145,8 +145,8 @@ 
     public function getAdmins()
     {
         $admins = array();
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
-            $admins = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json'), TRUE);
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
+            $admins = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json'), TRUE);
         }
 
         return $admins;
@@ -166,7 +166,7 @@ 
         Logger::log('Checking admin session');
         if (!$this->authorized) {
             $request = Request::getInstance();
-            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 Router::getInstance()->getAdmin()->adminers();
             }
@@ -179,7 +179,7 @@ 
             }
             if (!empty($user) && !empty($admins[$user])) {
                 $auth = $admins[$user]['hash'];
-                $this->authorized = ($auth == sha1($user . $pass));
+                $this->authorized = ($auth == sha1($user.$pass));
                 $this->admin = array(
                     'alias' => $user,
                     'profile' => $admins[$user]['profile'],
@@ -398,12 +398,12 @@ 
         $axis = 0;
         $parts = array();
         try {
-            $partLength = floor(strlen($token) / 10);
-            for ($i = 0, $ct = ceil(strlen($token) / $partLength); $i < $ct; $i++) {
+            $partLength = floor(strlen($token)/10);
+            for ($i = 0, $ct = ceil(strlen($token)/$partLength); $i < $ct; $i++) {
                 $parts[] = substr($token, $axis, $partLength);
                 $axis += $partLength;
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $partLength = 0;
         }
 
@@ -443,7 +443,7 @@ 
         $decoded = NULL;
         list($partLength, $parts) = self::extractTokenParts($token);
         list($ts, $mod) = self::extractTsAndMod($parts, $partLength);
-        $hashMod = substr(strtoupper(sha1($module)), strlen($ts) / 2, strlen($ts) * 2);
+        $hashMod = substr(strtoupper(sha1($module)), strlen($ts)/2, strlen($ts)*2);
         if (time() - (integer)$ts < 300 && $hashMod === $mod) {
             $decoded = implode('', $parts);
         }
@@ -460,16 +460,16 @@ 
     public static function generateToken($secret, $module = 'PSFS')
     {
         $ts = time();
-        $hashModule = substr(strtoupper(sha1($module)), strlen($ts) / 2, strlen($ts) * 2);
+        $hashModule = substr(strtoupper(sha1($module)), strlen($ts)/2, strlen($ts)*2);
         $hash = hash('sha256', $secret);
-        $insert = floor(strlen($hash) / strlen($ts));
+        $insert = floor(strlen($hash)/strlen($ts));
         $j = 0;
         $token = '';
         for ($i = 0, $ct = strlen($ts); $i < $ct; $i++) {
-            $token .= substr($ts, $i, 1) . substr($hash, $j, $insert) . substr($hashModule, $i, 2);
+            $token .= substr($ts, $i, 1).substr($hash, $j, $insert).substr($hashModule, $i, 2);
             $j += $insert;
         }
-        $token .= substr($hash, ($insert * strlen($ts)), strlen($hash) - ($insert * strlen($ts)));
+        $token .= substr($hash, ($insert*strlen($ts)), strlen($hash) - ($insert*strlen($ts)));
         return $token;
     }