psfs / core

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();
         }
     }

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use PSFS\base\config\Config;
 use PSFS\base\config\LoginForm;
-use PSFS\base\Router;
 use PSFS\base\Template;
 use PSFS\base\types\AuthAdminController;
 use PSFS\controller\UserController;

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/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);
             }
         }

src/base/types/interfaces/ControllerInterface.php

Doc Comments +6 added lines

@@ -8,7 +8,13 @@
  */
 interface ControllerInterface
 {
+    /**
+     * @return string|null
+     */
     public function render($template, array $vars = [], $cookies = []);
 
+    /**
+     * @return void
+     */
     public function response($response, $type = 'text/html');
 }

src/services/AdminServices.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 use PSFS\base\config\Config;
 use PSFS\base\Security;
 use PSFS\base\Service;
-use PSFS\controller\Admin;
 use Symfony\Component\Finder\Finder;
 
 class AdminServices extends Service

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,7 @@ 
     {
         $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();
     }
@@ -75,7 +75,7 @@ 
                         $admin['class'] = 'primary';
                         break;
                 }
-            } else {
+            }else {
                 $admin["class"] = "primary";
             }
         }
@@ -92,7 +92,7 @@ 
         $logs = array();
         /** @var \SplFileInfo $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();
@@ -128,7 +128,7 @@ 
             $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) {
@@ -181,7 +181,7 @@ 
                     break;
             }
 
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $detail = array(
                 "type" => "danger",
             );

Braces +12 added lines, -4 removed lines

@@ -61,11 +61,13 @@ 
      */
     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::ADMIN_ID_TOKEN:
                         $admin['class'] = 'info';
@@ -95,7 +97,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)
@@ -136,7 +140,9 @@ 
                 $detailLog[] = array_merge(array(
                     "log" => $line,
                 ), $detail);
-                if (count($detailLog) >= 1000) break;
+                if (count($detailLog) >= 1000) {
+                    break;
+                }
             }
             $log = $detailLog;
         }
@@ -160,7 +166,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/services/DocumentorService.php

Doc Comments +1 added lines, -1 removed lines

@@ -360,7 +360,7 @@
      * Translator from php types to swagger types
      * @param string $format
      *
-     * @return array
+     * @return string[]
      */
     public static function translateSwaggerFormats($format)
     {

Spacing +23 added lines, -23 removed lines

@@ -55,10 +55,10 @@ 
                     if (!preg_match('/^ROOT/i', $module) && $module == $requestModule) {
                         $modules = [
                             'name' => $module,
-                            'path' => realpath($info['template'] . DIRECTORY_SEPARATOR . '..'),
+                            'path' => realpath($info['template'].DIRECTORY_SEPARATOR.'..'),
                         ];
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     $modules[] = $e->getMessage();
                 }
             }
@@ -76,7 +76,7 @@ 
      */
     public function extractApiEndpoints(array $module)
     {
-        $module_path = $module['path'] . DIRECTORY_SEPARATOR . 'Api';
+        $module_path = $module['path'].DIRECTORY_SEPARATOR.'Api';
         $module_name = $module['name'];
         $endpoints = [];
         if (file_exists($module_path)) {
@@ -85,7 +85,7 @@ 
             if (count($finder)) {
                 /** @var \SplFileInfo $file */
                 foreach ($finder as $file) {
-                    $namespace = "\\{$module_name}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                    $namespace = "\\{$module_name}\\Api\\".str_replace('.php', '', $file->getFilename());
                     $info = $this->extractApiInfo($namespace, $module_name);
                     if (!empty($info)) {
                         $endpoints[$namespace] = $info;
@@ -114,7 +114,7 @@ 
                     if (NULL !== $mInfo) {
                         $info[] = $mInfo;
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
             }
@@ -241,7 +241,7 @@ 
             $payload = $this->extractModelFields($namespace);
             $reflector = new \ReflectionClass($namespace);
             $namespace = $reflector->getShortName();
-        } else {
+        }else {
             $namespace = $model;
         }
 
@@ -333,7 +333,7 @@ 
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 $payload = $this->extractDtoProperties($namespace);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::getInstance()->errorLog($e->getMessage());
         }
 
@@ -364,7 +364,7 @@ 
                     $return = $this->extractReturn($modelNamespace, $docComments);
                     $url = array_pop($route);
                     $methodInfo = [
-                        'url' => str_replace("/" . $module . "/api", '', $url),
+                        'url' => str_replace("/".$module."/api", '', $url),
                         'method' => $info['http'],
                         'description' => $info['label'],
                         'return' => $return,
@@ -375,7 +375,7 @@ 
                     $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments);
                     $this->setQueryParams($method, $methodInfo);
                     $this->setRequestHeaders($reflection, $methodInfo);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::getInstance()->errorLog($e->getMessage());
                 }
             }
@@ -524,10 +524,10 @@ 
         $formatted = [
             "swagger" => "2.0",
             "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)),
-            "basePath" => '/' . $module['name'] . '/api',
+            "basePath" => '/'.$module['name'].'/api',
             "schemes" => [Request::getInstance()->getServer('HTTPS') == 'on' ? "https" : "http"],
             "info" => [
-                "title" => _('Documentación API módulo ') . $module['name'],
+                "title" => _('Documentación API módulo ').$module['name'],
                 "version" => Config::getParam('api.version', '1.0'),
                 "contact" => [
                     "name" => Config::getParam("author", "Fran López"),
@@ -540,7 +540,7 @@ 
         foreach ($endpoints as $model) {
             foreach ($model as $endpoint) {
                 if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) {
-                    $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']);
+                    $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']);
                     $description = $endpoint['description'];
                     $method = strtolower($endpoint['method']);
                     $paths[$url][$method] = [
@@ -575,16 +575,16 @@ 
                     foreach ($endpoint['objects'] as $name => $object) {
                         if (class_exists($name)) {
                             $class = GeneratorHelper::extractClassFromNamespace($name);
-                            if(array_key_exists('data', $endpoint['return']) && count(array_keys($object)) === count(array_keys($endpoint['return']['data']))) {
+                            if (array_key_exists('data', $endpoint['return']) && count(array_keys($object)) === count(array_keys($endpoint['return']['data']))) {
                                 $classDefinition = [
                                     'type' => 'object',
-                                    '$ref' => '#/definitions/' . $class,
+                                    '$ref' => '#/definitions/'.$class,
                                 ];
-                            } else {
+                            }else {
                                 $classDefinition = [
                                     'type' => 'array',
                                     'items' => [
-                                        '$ref' => '#/definitions/' . $class,
+                                        '$ref' => '#/definitions/'.$class,
                                     ],
                                 ];
                             }
@@ -602,7 +602,7 @@ 
                                     'required' => true,
                                     'schema' => [
                                         'type' => 'object',
-                                        '$ref' => '#/definitions/' . $endpoint['payload']['type'],
+                                        '$ref' => '#/definitions/'.$endpoint['payload']['type'],
                                     ],
                                 ];
                             }
@@ -629,7 +629,7 @@ 
     protected function extractDtoName($dto, $isArray = false)
     {
         $dto = explode('\\', $dto);
-        $modelDto = array_pop($dto) . "Dto";
+        $modelDto = array_pop($dto)."Dto";
         if ($isArray) {
             $modelDto .= "List";
         }
@@ -679,10 +679,10 @@ 
     {
 
         $methodInfo['headers'] = [];
-        foreach($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property) {
             $doc = $property->getDocComment();
             preg_match('/@header\ (.*)\n/i', $doc, $headers);
-            if(count($headers)) {
+            if (count($headers)) {
                 $header = [
                     "name" => $headers[1],
                     "in" => "header",
@@ -694,13 +694,13 @@ 
 
                 // Extract description
                 preg_match('/@label\ (.*)\n/i', $doc, $label);
-                if(count($label)) {
+                if (count($label)) {
                     $header['description'] = _($label[1]);
                 }
 
                 // Extract default value
                 preg_match('/@default\ (.*)\n/i', $doc, $default);
-                if(count($default)) {
+                if (count($default)) {
                     $header['default'] = $default[1];
                 }
                 $methodInfo['headers'][] = $header;
@@ -730,7 +730,7 @@ 
             foreach ($method->getParameters() as $parameter) {
                 $parameterName = $parameter->getName();
                 $types = [];
-                preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types);
+                preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types);
                 if (count($types) > 1) {
                     $methodInfo['parameters'][$parameterName] = $types[1][0];
                 }

src/base/config/LoginForm.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
             ))
             ->addButton('submit', _("Acceder como {{username}}"))
             ->addButton("cancel", _("Cancelar"), "button", array(
-                "onclick" => "javacript:location.href = \"" . Router::getInstance()->getRoute('') . "\";",
+                "onclick" => "javacript:location.href = \"".Router::getInstance()->getRoute('')."\";",
                 "class" => "btn-link",
             ));
     }

src/base/dto/Order.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
     {
         if (preg_match('/^asc$/i', $direction)) {
             return Order::ASC;
-        } else {
+        }else {
             return Order::DESC;
         }
     }

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'];