psfs / core

src/base/Cache.php

Doc Comments +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 
         /**
          * Método que guarda en fichero los datos pasados
-         * @param $path
+         * @param string $path
          * @param $data
          * @param int $transform
          * @param boolean $absolutePath

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
                 if (null !== $function && $this->hasExpiredCache($path, $expires)) {
                     $data = call_user_func($function);
                     $this->storeData($path, $data, $transform);
-                } else {
+                }else {
                     $data = $this->getDataFromFile($path, $transform);
                 }
             }

src/base/Router.php

Doc Comments +2 added lines, -2 removed lines

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

Braces +12 added lines, -4 removed lines

@@ -260,8 +260,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];
@@ -476,8 +478,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"];
             }
@@ -599,12 +603,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 +44 added lines, -44 removed lines

@@ -59,12 +59,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);
             }
         }
 
@@ -84,7 +84,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);
@@ -125,24 +125,24 @@ 
                 $this->checkRestrictedAccess($route);
                 //Search action and execute
                 return $this->searchAction($route);
-            } catch (AccessDeniedException $e) {
+            }catch (AccessDeniedException $e) {
                 Logger::getInstance()->debugLog(_('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::getInstance()->errorLog($e->getMessage());
                 throw $e;
             }
@@ -159,7 +159,7 @@ 
             $corsEnabled = Config::getInstance()->get('cors.enabled');
             $request = Request::getInstance();
             if (NULL !== $corsEnabled && null !== $request->getServer('HTTP_REFERER')) {
-                if($corsEnabled == '*' || preg_match($corsEnabled, $request->getServer('HTTP_REFERER'))) {
+                if ($corsEnabled == '*' || preg_match($corsEnabled, $request->getServer('HTTP_REFERER'))) {
                     if (!$this->headersSent) {
                         // TODO include this headers in Template class output method
                         header("Access-Control-Allow-Credentials: true");
@@ -168,9 +168,9 @@ 
                         header("Access-Control-Allow-Headers: Access-Control-Allow-Methods, Access-Control-Allow-Headers, Access-Control-Allow-Origin, Origin, X-Requested-With, Content-Type, Accept, Authorization, X-API-SEC-TOKEN, X-API-USER-TOKEN");
                         $this->headersSent = true;
                     }
-                    if(Request::getInstance()->getMethod() == 'OPTIONS') {
+                    if (Request::getInstance()->getMethod() == 'OPTIONS') {
                         Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests');
-                        header( "HTTP/1.1 200 OK" );
+                        header("HTTP/1.1 200 OK");
                         exit();
                     }
                 }
@@ -185,11 +185,11 @@ 
          */
         private function compareSlashes($routePattern, $path) {
             $pattern_sep = count(explode('/', $routePattern));
-            if(preg_match('/\/$/', $routePattern)) {
+            if (preg_match('/\/$/', $routePattern)) {
                 $pattern_sep--;
             }
             $path_sep = count(explode('/', $path));
-            if(preg_match('/\/$/', $path)) {
+            if (preg_match('/\/$/', $path)) {
                 $path_sep--;
             }
             return abs($pattern_sep - $path_sep) < 1;
@@ -218,7 +218,7 @@ 
                     $class = $this->getClassToCall($action);
                     try {
                         return $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);
                     }
@@ -308,13 +308,13 @@ 
             if (file_exists($modules)) {
                 $this->routing = $this->inspectDir($modules, "", $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;
                     }
                 }
@@ -339,7 +339,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();
 
@@ -380,7 +380,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,
@@ -410,9 +410,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";
@@ -422,12 +422,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,
                 );
             }
 
@@ -440,11 +440,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;
         }
@@ -495,16 +495,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);
@@ -522,12 +522,12 @@ 
                 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)) {
                         $_profile = ($params["visible"]) ? $profile : 'adminhidden';
-                        if(!array_key_exists($_profile, $routes)) {
+                        if (!array_key_exists($_profile, $routes)) {
                             $routes[$_profile] = array();
                         }
                         $routes[$_profile][] = $params["slug"];
@@ -574,7 +574,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;
         }
@@ -593,7 +593,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;
         }
 
@@ -630,9 +630,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);
         }
@@ -688,16 +688,16 @@ 
          */
         protected function executeCachedRoute($route, $action, $class, $params = NULL)
         {
-            Logger::log('Executing route ' . $route);
+            Logger::log('Executing route '.$route);
             $this->session->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;
@@ -746,7 +746,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

@@ -371,7 +371,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

@@ -78,13 +78,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)));
         }
 
         /**
@@ -104,8 +104,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;
@@ -124,7 +124,7 @@ 
         {
             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();
                 }
@@ -137,7 +137,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'],
@@ -354,12 +354,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;
             }
 
@@ -399,7 +399,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);
             }
@@ -416,16 +416,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;
         }
 

src/base/Service.php

Doc Comments +2 added lines, -2 removed lines

@@ -125,8 +125,8 @@
         }
 
         /**
-         * @param $header
-         * @param null $content
+         * @param string $header
+         * @param string $content
          *
          * @return $this
          */

Spacing +2 added lines, -2 removed lines

@@ -177,7 +177,7 @@ 
             $this->url = NULL;
             $this->params = array();
             $this->headers = array();
-            Logger::log("Context service for " . get_called_class() . " cleared!");
+            Logger::log("Context service for ".get_called_class()." cleared!");
         }
 
         /**
@@ -208,7 +208,7 @@ 
 
         protected function setOpts()
         {
-            switch(strtoupper($this->type)) {
+            switch (strtoupper($this->type)) {
                 case 'GET':
                 default:
                     curl_setopt($this->con, CURLOPT_CUSTOMREQUEST, "GET");

src/base/types/Form.php

Doc Comments +6 added lines, -2 removed lines

@@ -42,6 +42,10 @@ 
          * @return Form
          */
         public function setEncType($enctype) { $this->enctype = $enctype; return $this; }
+
+        /**
+         * @param string|null $action
+         */
         public function setAction($action) { $this->action = $action; return $this; }
         public function setMethod($method) { $this->method = $method; return $this; }
         public function setAttrs(array $attrs) { $this->attrs = $attrs; return $this; }
@@ -466,7 +470,7 @@ 
         }
 
         /**
-         * @param $token_field
+         * @param string $token_field
          * @return bool
          */
         protected function existsFormToken($token_field) {
@@ -494,7 +498,7 @@ 
         /**
          * Método que extrae el valor de un campo del formulario del modelo
          * @param $field
-         * @param $value
+         * @param ObjectCollection $value
          * @param $type
          * @return mixed
          */

Spacing +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
     use PSFS\base\Singleton;
     use PSFS\base\types\interfaces\FormType;
 
-    abstract class Form extends Singleton implements FormType{
+    abstract class Form extends Singleton implements FormType {
 
         /**
          * Variables de formulario
@@ -31,7 +31,7 @@ 
 
         public function __construct($model = null)
         {
-            if(null !== $model) {
+            if (null !== $model) {
                 $this->model = $model;
             }
         }
@@ -122,7 +122,7 @@ 
          */
         public function getFieldValue($name) {
             $value = null;
-            if (null !== $this->getField($name)){
+            if (null !== $this->getField($name)) {
                 $field = $this->getField($name);
                 $value = (array_key_exists('value', $field) && null !== $field['value']) ? $field['value'] : null;
             }
@@ -323,7 +323,7 @@ 
                 $model->save();
                 $save = true;
                 Logger::getInstance()->infoLog(get_class($this->model)." guardado con id ".$this->model->getPrimaryKey());
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance()->errorLog($e->getMessage());
                 throw new FormException($e->getMessage(), $e->getCode(), $e);
             }
@@ -369,10 +369,10 @@ 
             if (array_key_exists($key, $data[$form_name])) {
                 if (preg_match("/id/i", $key) && ($data[$form_name][$key] === 0 || $data[$form_name][$key] === "%" || $data[$form_name][$key] === "")) {
                     $field["value"] = null;
-                } else {
+                }else {
                     $field["value"] = $data[$form_name][$key];
                 }
-            } else {
+            }else {
                 unset($field["value"]);
             }
             return array($data, $field);
@@ -416,10 +416,10 @@ 
                 if (array_key_exists('class_id', $field) && method_exists($class, "get".$field["class_id"])) {
                     $method = "get".$field["class_id"];
                     $data[] = $class->$method();
-                } else {
+                }else {
                     $data[] = $class->getPrimaryKey();
                 }
-            } else {
+            }else {
                 $data[] = $val;
             }
 
@@ -449,11 +449,11 @@ 
                             $field["value"] = $value;
                         } elseif ($value instanceof \DateTime) {
                             $field["value"] = $value->format("Y-m-d H:i:s");
-                        } else {
+                        }else {
                             $field["value"] = $value->getPrimaryKey();
                         }
                     }
-                } else {
+                }else {
                     $field["value"] = $value;
                 }
             }

Braces +4 added lines, -2 removed lines

@@ -156,7 +156,9 @@ 
             //Validamos los campos del formulario
             if ($valid && count($this->fields) > 0) {
                 foreach ($this->fields as $key => &$field) {
-                    if ($key === $token_field || $key === self::SEPARATOR) continue;
+                    if ($key === $token_field || $key === self::SEPARATOR) {
+                        continue;
+                    }
                     list($field, $valid) = $this->checkFieldValidation($field, $key);
                 }
             }
@@ -442,7 +444,7 @@ 
                     //Si es una relación múltiple
                     if ($value instanceof ObjectCollection) {
                         $field = $this->computeModelFieldValue($field, $value, $type);
-                    }else { //O una relación unitaria
+                    } else { //O una relación unitaria
                         if (method_exists($value, "__toString")) {
                             $field["value"] = $value;
                         } elseif ($value instanceof \DateTime) {

src/controller/Admin.php

Doc Comments +2 added lines, -2 removed lines

@@ -302,7 +302,7 @@ 
      * Servicio que devuelve los parámetros disponibles
      * @route /admin/config/params
      * @visible false
-     * @return mixed
+     * @return string|null
      */
     public function getConfigParams() {
         $response = array_merge(Config::$required, Config::$optional);
@@ -330,7 +330,7 @@ 
      * Servicio que devuelve los parámetros disponibles
      * @route /admin/routes/show
      * @visible false
-     * @return mixed
+     * @return string|null
      */
     public function getRouting()
     {

Braces +3 added lines, -1 removed lines

@@ -175,7 +175,9 @@
      */
     public function getTranslations($locale = '') {
         //Idioma por defecto
-        if(empty($locale)) $locale = $this->config->get("default_language");
+        if(empty($locale)) {
+            $locale = $this->config->get("default_language");
+        }
 
         //Generamos las traducciones de las plantillas
         $translations = $this->tpl->regenerateTemplates();

Spacing +18 added lines, -18 removed lines

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

src/base/Request.php

Spacing +6 added lines, -6 removed lines

@@ -4,14 +4,14 @@ 
 
 use PSFS\base\types\SingletonTrait;
 
-if(!function_exists("getallheaders"))
+if (!function_exists("getallheaders"))
 {
     function getallheaders()
     {
         $headers = array();
-        foreach($_SERVER as $h=>$v)
-            if(preg_match('/HTTP_(.+)/',$h,$hp))
-                $headers[$hp[1]]=$v;
+        foreach ($_SERVER as $h=>$v)
+            if (preg_match('/HTTP_(.+)/', $h, $hp))
+                $headers[$hp[1]] = $v;
         return $headers;
     }
 }
@@ -109,12 +109,12 @@ 
      * Método que devuelve la url solicitada
      * @return string|null
      */
-    public static function requestUri(){ return self::getInstance()->getRequestUri(); }
+    public static function requestUri() { return self::getInstance()->getRequestUri(); }
 
     /**
      * @return string
      */
-    public function getRequestUri(){ return array_key_exists('REQUEST_URI', $this->server) ? $this->server['REQUEST_URI'] : ''; }
+    public function getRequestUri() { return array_key_exists('REQUEST_URI', $this->server) ? $this->server['REQUEST_URI'] : ''; }
 
     /**
      * Método que devuelve el idioma de la petición

Braces +9 added lines, -4 removed lines

@@ -9,9 +9,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;
     }
 }
@@ -180,7 +181,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();
@@ -226,7 +229,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;
     }
 

Doc Comments +4 added lines

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

src/base/Singleton.php

Braces +4 added lines, -2 removed lines

@@ -125,11 +125,13 @@
                 $cacheService->storeData($cacheFilename, $properties, Cache::JSON);
             }
             /** @var \ReflectionProperty $property */
-            if (!empty($properties) && is_array($properties)) foreach ($properties as $property => $class) {
+            if (!empty($properties) && is_array($properties)) {
+                foreach ($properties as $property => $class) {
                 $this->load($property, true, $class);
             }
+            }
             $this->setLoaded();
-        }else {
+        } else {
             $logService->warningLog(get_class($this)." ya cargada");
         }
     }

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 
     public function __construct()
     {
-        Logger::log(get_class($this) . ' constructor invoked');
+        Logger::log(get_class($this).' constructor invoked');
     }
 
     /**
@@ -41,7 +41,7 @@ 
      * @param $value
      */
     public function __set($variable, $value) {
-        if(property_exists(get_class($this), $variable)) {
+        if (property_exists(get_class($this), $variable)) {
             $this->$variable = $value;
         }
     }
@@ -98,11 +98,11 @@ 
             $setter = "set".ucfirst($variable);
             if (method_exists($calledClass, $setter)) {
                 $this->$setter($instance);
-            } else {
+            }else {
                 $this->$variable = $instance;
             }
-        } catch (\Exception $e) {
-            Logger::log($e->getMessage() . ': ' . $e->getFile() . ' ['  . $e->getLine() . ']', LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log($e->getMessage().': '.$e->getFile().' ['.$e->getLine().']', LOG_ERR);
         }
         return $this;
     }
@@ -128,7 +128,7 @@ 
             }
             $this->setLoaded();
         }else {
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
         }
     }
 
@@ -142,7 +142,7 @@ 
         if (null === $class) {
             $class = get_class($this);
         }
-        Logger::log('Extracting annotations properties from class ' . $class);
+        Logger::log('Extracting annotations properties from class '.$class);
         $selfReflector = new \ReflectionClass($class);
         if (false !== $selfReflector->getParentClass()) {
             $properties = $this->getClassProperties($selfReflector->getParentClass()->getName());
@@ -182,13 +182,13 @@ 
      */
     private function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass)
     {
-        Logger::log('Create inyectable instance for ' . $classNameSpace . ' into ' . get_class($this));
+        Logger::log('Create inyectable instance for '.$classNameSpace.' into '.get_class($this));
         $reflector = new \ReflectionClass($calledClass);
         $property = $reflector->getProperty($variable);
         $varInstanceType = (null === $classNameSpace) ? $this->extractVarType($property->getDocComment()) : $classNameSpace;
         if (true === $singleton && method_exists($varInstanceType, "getInstance")) {
             $instance = $varInstanceType::getInstance();
-        } else {
+        }else {
             $instance = new $varInstanceType();
         }
         return $instance;

src/base/Template.php

Spacing +1 added lines, -1 removed lines

@@ -307,7 +307,7 @@
             if ($file->isFile()) {
                 try {
                     $this->tpl->loadTemplate(str_replace($tplDir.'/', '', $file));
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
             }

Braces +2 added lines, -2 removed lines

@@ -197,7 +197,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             echo $e->getMessage()."<pre>".$e->getTraceAsString()."</pre>";
         }
         return $dump;
@@ -394,7 +394,7 @@ 
             unset($_SERVER["PHP_AUTH_USER"]);
             unset($_SERVER["PHP_AUTH_PW"]);
             header_remove("Authorization");
-        }else {
+        } else {
             header('Authorization:');
         }
     }

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 
 use PSFS\base\config\Config;
-use PSFS\base\exception\ConfigException;
 use PSFS\base\extension\AssetsTokenParser;
 use PSFS\base\extension\TemplateFunctions;
 use PSFS\base\types\SingletonTrait;