psfs / core

src/base/types/helpers/ResponseHelper.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
             unset($_SERVER["PHP_AUTH_USER"]);
             unset($_SERVER["PHP_AUTH_PW"]);
             header_remove("Authorization");
-        } else {
+        }else {
             header('Authorization:');
         }
     }
@@ -66,9 +66,9 @@ 
             Logger::log('Adding debug headers to render response');
             $vars["__DEBUG__"]["includes"] = get_included_files();
             $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s');
-            header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes');
-            header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened');
+            header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s');
+            header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes');
+            header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened');
         }
 
         return $vars;

src/base/Request.php

Doc Comments +4 added lines, -1 removed lines

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

Spacing +3 added lines, -3 removed lines

@@ -216,7 +216,7 @@ 
     {
         if (null === $url) $url = $this->getServer('HTTP_ORIGIN');
         ob_start();
-        header('Location: ' . $url);
+        header('Location: '.$url);
         ob_end_clean();
         Security::getInstance()->updateSession();
         exit(_("Redireccionando..."));
@@ -261,9 +261,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;
         if (!in_array($this->getServer('SERVER_PORT'), [80, 443])) {
-            $url .= ':' . $this->getServer('SERVER_PORT');
+            $url .= ':'.$this->getServer('SERVER_PORT');
         }
         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->getServer('HTTP_ORIGIN');
+        if (null === $url) {
+            $url = $this->getServer('HTTP_ORIGIN');
+        }
         ob_start();
         header('Location: ' . $url);
         ob_end_clean();
@@ -261,7 +264,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;
+        }
         if (!in_array($this->getServer('SERVER_PORT'), [80, 443])) {
             $url .= ':' . $this->getServer('SERVER_PORT');
         }

src/controller/ConfigController.php

Doc Comments +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      * @route /admin/config/params
      * @label Parámetros de configuración de PSGS
      * @visible false
-     * @return mixed
+     * @return string|null
      */
     public function getConfigParams()
     {

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
         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);
     }
@@ -45,7 +45,7 @@ 
      */
     public function config()
     {
-        Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri());
+        Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri());
         /* @var $form \PSFS\base\config\ConfigForm */
         $form = new ConfigForm(Router::getInstance()->getRoute('admin-config'), Config::$required, Config::$optional, Config::getInstance()->dumpConfig());
         $form->build();
@@ -82,7 +82,7 @@ 
                 }
                 Security::getInstance()->setFlash("callback_message", _("Configuración actualizada correctamente"));
                 Security::getInstance()->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);
             }
         }

src/controller/RouteController.php

Doc Comments +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
      * @route /admin/routes/show
      * @label Servicio de rutas del sistema
      * @visible false
-     * @return mixed
+     * @return string|null
      */
     public function getRouting()
     {

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
             $router->simpatize();
             Security::getInstance()->setFlash("callback_message", _("Rutas generadas correctamente"));
             Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true));
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             Security::getInstance()->setFlash("callback_message", _("Algo no ha salido bien, revisa los logs"));
             Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-routes", true));

src/controller/UserController.php

Spacing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
                 Logger::log('Configuration saved successful');
                 Security::getInstance()->setFlash("callback_message", _("Usuario agregado correctamente"));
                 Security::getInstance()->setFlash("callback_route", Router::getInstance()->getRoute("admin", true));
-            } else {
+            }else {
                 throw new ConfigException(_('Error al guardar los administradores, prueba a cambiar los permisos'));
             }
         }
@@ -99,7 +99,7 @@ 
     {
         if ($this->isAdmin()) {
             return $this->redirect('admin');
-        } else {
+        }else {
             return Admin::staticAdminLogon($route);
         }
     }
@@ -131,7 +131,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,
                     )
@@ -142,7 +142,7 @@ 
                     'status_message' => _("Acceso permitido... redirigiendo!!"),
                     'delay' => 1,
                 );
-            } else {
+            }else {
                 $form->setError("user", _("El usuario no tiene acceso a la web"));
             }
         }

src/controller/base/Admin.php

Spacing +3 added lines, -3 removed lines

@@ -48,10 +48,10 @@ 
      */
     public static function staticAdminLogon($route = null)
     {
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
             if ('login' !== Config::getInstance()->get('admin_login')) {
                 return AdminServices::getInstance()->setAdminHeaders();
-            } else {
+            }else {
                 $form = new LoginForm();
                 $form->setData(array("route" => $route));
                 $form->build();
@@ -61,7 +61,7 @@ 
                     'form' => $form,
                 ));
             }
-        } else {
+        }else {
             return UserController::showAdminManager();
         }
     }

src/base/extension/TemplateFunctions.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
      * @param string $path
      * @param $domains
      *
-     * @return mixed
+     * @return string
      */
     private static function extractPathname($path, $domains)
     {

Spacing +7 added lines, -7 removed lines

@@ -39,12 +39,12 @@ 
 
         $file_path = "";
         if (!file_exists($file_path)) {
-            $file_path = BASE_DIR . $string;
+            $file_path = BASE_DIR.$string;
         }
         $filename_path = AssetsParser::findDomainPath($string, $file_path);
 
         $file_path = self::processAsset($string, $name, $return, $filename_path);
-        $return_path = (empty($name)) ? Request::getInstance()->getRootUrl() . '/' . $file_path : $name;
+        $return_path = (empty($name)) ? Request::getInstance()->getRootUrl().'/'.$file_path : $name;
         return ($return) ? $return_path : '';
     }
 
@@ -61,7 +61,7 @@ 
         $router = Router::getInstance();
         try {
             return $router->getRoute($path, $absolute, $params);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $router->getRoute('', $absolute, $params);
         }
     }
@@ -187,8 +187,8 @@ 
     private static function putResourceContent($name, $filename_path, $base, $file_path)
     {
         $data = file_get_contents($filename_path);
-        if (!empty($name)) file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
-        else file_put_contents($base . $file_path, $data);
+        if (!empty($name)) file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data);
+        else file_put_contents($base.$file_path, $data);
     }
 
     /**
@@ -206,9 +206,9 @@ 
         if (file_exists($filename_path)) {
             list($base, $html_base, $file_path) = AssetsParser::calculateAssetPath($string, $name, $return, $filename_path);
             //Creamos el directorio si no existe
-            GeneratorHelper::createDir($base . $html_base);
+            GeneratorHelper::createDir($base.$html_base);
             //Si se ha modificado
-            if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($filename_path)) {
+            if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($filename_path)) {
                 if ($html_base == 'css') {
                     self::processCssLines($filename_path);
                 }

Braces +5 added lines, -2 removed lines

@@ -187,8 +187,11 @@
     private static function putResourceContent($name, $filename_path, $base, $file_path)
     {
         $data = file_get_contents($filename_path);
-        if (!empty($name)) file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
-        else file_put_contents($base . $file_path, $data);
+        if (!empty($name)) {
+            file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
+        } else {
+            file_put_contents($base . $file_path, $data);
+        }
     }
 
     /**

src/base/Template.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use PSFS\base\extension\TemplateFunctions;
 use PSFS\base\types\helpers\GeneratorHelper;
 use PSFS\base\types\helpers\ResponseHelper;
-use PSFS\base\types\helpers\TemplateHelper;
 use PSFS\base\types\SingletonTrait;
 
 

Spacing +13 added lines, -13 removed lines

@@ -129,7 +129,7 @@ 
         ResponseHelper::setStatusHeader($this->status_code);
         ResponseHelper::setAuthHeaders($this->public_zone);
         ResponseHelper::setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -145,15 +145,15 @@ 
         Logger::log('Start output response');
         ob_start();
         $this->setReponseHeaders($contentType, $cookies);
-        header('Content-length: ' . strlen($output));
+        header('Content-length: '.strlen($output));
 
         $cache = Cache::needCache();
         if (false !== $cache && $this->status_code === Template::STATUS_OK && $this->debug === false) {
             Logger::log('Saving output response into cache');
             $cacheName = $this->cache->getRequestCacheHash();
-            $tmpDir = substr($cacheName, 0, 2) . DIRECTORY_SEPARATOR . substr($cacheName, 2, 2) . DIRECTORY_SEPARATOR;
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheName, $output);
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheName . ".headers", headers_list(), Cache::JSON);
+            $tmpDir = substr($cacheName, 0, 2).DIRECTORY_SEPARATOR.substr($cacheName, 2, 2).DIRECTORY_SEPARATOR;
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheName, $output);
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheName.".headers", headers_list(), Cache::JSON);
         }
         echo $output;
 
@@ -170,11 +170,11 @@ 
     {
         Logger::log('Close template render');
         Security::getInstance()->setSessionKey("lastRequest", array(
-            "url" => Request::getInstance()->getRootUrl() . Request::requestUri(),
+            "url" => Request::getInstance()->getRootUrl().Request::requestUri(),
             "ts" => microtime(true),
         ));
         Security::getInstance()->updateSession();
-        Logger::log('End request: ' . Request::requestUri(), LOG_INFO);
+        Logger::log('End request: '.Request::requestUri(), LOG_INFO);
         exit;
     }
 
@@ -224,7 +224,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $dump;
@@ -338,7 +338,7 @@ 
     public function regenerateTemplates()
     {
         $this->generateTemplatesCache();
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, true);
         $translations = [];
         if (is_array($domains)) {
             $translations = $this->parsePathTranslations($domains);
@@ -360,8 +360,8 @@ 
             // force compilation
             if ($file->isFile()) {
                 try {
-                    $this->tpl->load(str_replace($tplDir . '/', '', $file));
-                } catch (\Exception $e) {
+                    $this->tpl->load(str_replace($tplDir.'/', '', $file));
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]);
                 }
             }
@@ -435,7 +435,7 @@ 
      */
     private function loadDomains()
     {
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true);
         if (null !== $domains) {
             foreach ($domains as $domain => $paths) {
                 $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain));
@@ -452,7 +452,7 @@ 
         $this->cache = Cache::getInstance();
         $loader = new \Twig_Loader_Filesystem(GeneratorHelper::getTemplatePath());
         $this->tpl = new \Twig_Environment($loader, array(
-            'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig',
+            'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig',
             'debug' => (bool)$this->debug,
             'auto_reload' => Config::getParam('twig.auto_reload', TRUE),
         ));

src/base/types/Form.php

Doc Comments +5 added lines, -2 removed lines

@@ -48,6 +48,9 @@ 
         return $this;
     }
 
+    /**
+     * @param string|null $action
+     */
     public function setAction($action)
     {
         $this->action = $action;
@@ -562,7 +565,7 @@ 
     }
 
     /**
-     * @param $token_field
+     * @param string $token_field
      * @return bool
      */
     protected function existsFormToken($token_field)
@@ -594,7 +597,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 +24 added lines, -24 removed lines

@@ -69,8 +69,8 @@ 
     public function add($name, array $value = array())
     {
         $this->fields[$name] = $value;
-        $this->fields[$name]['name'] = $this->getName() . "[{$name}]";
-        $this->fields[$name]['id'] = $this->getName() . '_' . $name;
+        $this->fields[$name]['name'] = $this->getName()."[{$name}]";
+        $this->fields[$name]['id'] = $this->getName().'_'.$name;
         $this->fields[$name]['placeholder'] = (array_key_exists('placeholder', $value)) ? $value['placeholder'] : $name;
         $this->fields[$name]['hasLabel'] = (array_key_exists('hasLabel', $value)) ? $value['hasLabel'] : true;
         return $this;
@@ -133,7 +133,7 @@ 
         }
         if ('' !== $hash_orig) {
             $this->crfs = sha1($hash_orig);
-            $this->add($this->getName() . '_token', array(
+            $this->add($this->getName().'_token', array(
                 "type" => "hidden",
                 "value" => $this->crfs,
             ));
@@ -202,7 +202,7 @@ 
     public function isValid()
     {
         $valid = true;
-        $token_field = $this->getName() . '_token';
+        $token_field = $this->getName().'_token';
         //Controlamos CSRF token
         if (!$this->existsFormToken($token_field)) {
             $this->errors[$token_field] = _('Formulario no válido');
@@ -274,7 +274,7 @@ 
         $data = array();
         if (count($this->fields) > 0) {
             foreach ($this->fields as $key => $field) {
-                if (self::SEPARATOR !== $key && $key !== ($this->getName() . "_token")) {
+                if (self::SEPARATOR !== $key && $key !== ($this->getName()."_token")) {
                     $data[$key] = (array_key_exists('value', $field)) ? $field["value"] : null;
                 }
             }
@@ -389,8 +389,8 @@ 
             $model = $this->getHydratedModel();
             $model->save();
             $save = true;
-            Logger::getInstance()->infoLog(get_class($this->model) . " guardado con id " . $this->model->getPrimaryKey());
-        } catch (\Exception $e) {
+            Logger::getInstance()->infoLog(get_class($this->model)." guardado con id ".$this->model->getPrimaryKey());
+        }catch (\Exception $e) {
             Logger::getInstance()->errorLog($e->getMessage());
             throw new FormException($e->getMessage(), $e->getCode(), $e);
         }
@@ -409,10 +409,10 @@ 
         if (null === $value) {
             $isEmpty = true;
             // Empty Array check
-        } else if (is_array($value) && 0 === count($value)) {
+        }else if (is_array($value) && 0 === count($value)) {
             $isEmpty = true;
             // Empty string check
-        } else if (0 === strlen(preg_replace('/(\ |\r|\n)/m', '', $value))) {
+        }else if (0 === strlen(preg_replace('/(\ |\r|\n)/m', '', $value))) {
             $isEmpty = true;
         }
 
@@ -439,7 +439,7 @@ 
             && array_key_exists($key, $field)
             && !array_key_exists('error', $field[$key])
             && !empty($field["value"])
-            && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0
+            && preg_match('/'.$field['pattern'].'/', $field['value']) === 0
         ) {
             $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", _("El campo %s no tiene un formato válido")));
             $field["error"] = $this->getError($key);
@@ -461,10 +461,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);
@@ -478,8 +478,8 @@ 
      */
     private function hydrateModelField($key, $value)
     {
-        $setter = "set" . ucfirst($key);
-        $getter = "get" . ucfirst($key);
+        $setter = "set".ucfirst($key);
+        $getter = "get".ucfirst($key);
         if (method_exists($this->model, $setter)) {
             if (method_exists($this->model, $getter)) {
                 $tmp = $this->model->$getter();
@@ -504,16 +504,16 @@ 
     {
         //Extraemos el dato del modelo relacionado si existe el getter
         $method = null;
-        if (array_key_exists('class_data', $field) && method_exists($val, "get" . $field["class_data"])) {
-            $class_method = "get" . $field["class_data"];
+        if (array_key_exists('class_data', $field) && method_exists($val, "get".$field["class_data"])) {
+            $class_method = "get".$field["class_data"];
             $class = $val->$class_method();
-            if (array_key_exists('class_id', $field) && method_exists($class, "get" . $field["class_id"])) {
-                $method = "get" . $field["class_id"];
+            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;
         }
 
@@ -529,7 +529,7 @@ 
     private function extractModelFieldValue($key, $field)
     {
         //Extraemos el valor del campo del modelo
-        $method = "get" . ucfirst($key);
+        $method = "get".ucfirst($key);
         $type = (array_key_exists('type', $field)) ? $field["type"] : "text";
         //Extraemos los campos del modelo
         if (method_exists($this->model, $method)) {
@@ -539,16 +539,16 @@ 
                 //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) {
                         $field["value"] = $value->format("Y-m-d H:i:s");
-                    } else {
+                    }else {
                         $field["value"] = $value->getPrimaryKey();
                     }
                 }
-            } else {
+            }else {
                 $field["value"] = $value;
             }
         }

Braces +3 added lines, -1 removed lines

@@ -212,7 +212,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);
             }
         }