psfs / core

src/base/types/interfaces/AuthInterface.php

Doc Comments +12 added lines

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

src/base/types/interfaces/ControllerInterface.php

Doc Comments +8 added lines

@@ -7,6 +7,14 @@
  * @package PSFS\base\types\interfaces
  */
 interface ControllerInterface {
+
+    /**
+     * @return string|null
+     */
     public function render($template, Array $vars = null);
+
+    /**
+     * @return void
+     */
     public function response($response, $type = 'text/html');
 }

src/services/DocumentorService.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +1 added lines, -1 removed lines

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

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
                         if (!preg_match('/^\@ROOT/i', $domain)) {
                             $modules[] = str_replace('/', '', str_replace('@', '', $domain));
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         $modules[] = $e->getMessage();
                     }
                 }
@@ -52,7 +52,7 @@ 
          */
         public function extractApiEndpoints($module)
         {
-            $module_path = CORE_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . "Api";
+            $module_path = CORE_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR."Api";
             $endpoints = [];
             if (file_exists($module_path)) {
                 $finder = new Finder();
@@ -60,7 +60,7 @@ 
                 if (count($finder)) {
                     /** @var \SplFileInfo $file */
                     foreach ($finder as $file) {
-                        $namespace = "\\{$module}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                        $namespace = "\\{$module}\\Api\\".str_replace('.php', '', $file->getFilename());
                         $endpoints[$namespace] = $this->extractApiInfo($namespace);
                     }
                 }
@@ -89,7 +89,7 @@ 
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
                 }
@@ -236,7 +236,7 @@ 
          */
         protected function extractReturn($model, $comments = '')
         {
-            $modelDto  = [];
+            $modelDto = [];
             preg_match('/\@return\ (.*)\((.*)\)\n/i', $comments, $returnTypes);
             if (count($returnTypes)) {
                 // Extract principal DTO information
@@ -289,7 +289,7 @@ 
                 } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                     $payload = $this->extractDtoProperties($namespace);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance()->errorLog($e->getMessage());
             }
 
@@ -325,7 +325,7 @@ 
                         if (in_array($methodInfo['method'], ['POST', 'PUT'])) {
                             $methodInfo['payload'] = $this->extractPayload($modelNamespace, $docComments);
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         jpre($e->getMessage());
                         Logger::getInstance()->errorLog($e->getMessage());
                     }
@@ -343,7 +343,7 @@ 
          */
         public static function translateSwaggerFormats($format)
         {
-            switch(strtolower($format)) {
+            switch (strtolower($format)) {
                 case 'bool':
                 case 'boolean':
                     $swaggerType = 'boolean';
@@ -404,13 +404,13 @@ 
                             ]]);
                             if (array_key_exists($subDtoName, $subDto)) {
                                 $definitions = $subDto;
-                            } else {
+                            }else {
                                 $definitions[$subDtoName] = $subDto;
                             }
                             $dto['properties'][$field] = [
-                                '$ref' => "#/definitions/" . $subDtoName,
+                                '$ref' => "#/definitions/".$subDtoName,
                             ];
-                        } else {
+                        }else {
                             list($type, $format) = self::translateSwaggerFormats($format);
                             $dto['properties'][$field] = [
                                 "type" => $type,
@@ -447,7 +447,7 @@ 
                     "url" => Router::getInstance()->getRoute(''),
                 ]
             ];
-            foreach($endpoints as $model) {
+            foreach ($endpoints as $model) {
                 foreach ($model as $endpoint) {
                     $dtos += self::extractSwaggerDefinition($endpoint);
                 }
@@ -466,7 +466,7 @@ 
         protected function extractDtoName($dto, $isArray = false)
         {
             $dto = explode('\\', $dto);
-            $modelDto = array_pop($dto) . "Dto";
+            $modelDto = array_pop($dto)."Dto";
             if ($isArray) {
                 $modelDto .= "List";
             }

src/base/Request.php

Doc Comments +3 added lines

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

Spacing +2 added lines, -2 removed lines

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

Braces +9 added lines, -4 removed lines

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

src/base/Security.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +16 added lines, -16 removed lines

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

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 +1 added lines, -1 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!");
     }
 
     /**

src/base/Singleton.php

Spacing +11 added lines, -11 removed lines

@@ -19,7 +19,7 @@ 
 
     public function __construct()
     {
-        Logger::log(get_class($this) . ' constructor invoked');
+        Logger::log(get_class($this).' constructor invoked');
     }
 
     /**
@@ -106,14 +106,14 @@ 
         $calledClass = get_called_class();
         try {
             $instance = $this->constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass);
-            $setter = "set" . ucfirst($variable);
+            $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;
     }
@@ -124,7 +124,7 @@ 
     public function init()
     {
         if (!$this->isLoaded()) {
-            $cacheFilename = "reflections" . DIRECTORY_SEPARATOR . sha1(get_class($this)) . ".json";
+            $cacheFilename = "reflections".DIRECTORY_SEPARATOR.sha1(get_class($this)).".json";
             /** @var \PSFS\base\Cache $cacheService */
             $cacheService = Cache::getInstance();
             /** @var \PSFS\base\config\Config $configService */
@@ -139,8 +139,8 @@ 
                 $this->load($property, true, $class);
             }
             $this->setLoaded();
-        } else {
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
+        }else {
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
         }
     }
 
@@ -155,7 +155,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());
@@ -196,13 +196,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;

Braces +3 added lines, -1 removed lines

@@ -135,9 +135,11 @@
                 $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 {
             Logger::log(get_class($this) . ' already loaded', LOG_INFO);

src/base/Logger.php

Spacing +4 added lines, -4 removed lines

@@ -13,8 +13,8 @@ 
 
 
 if (!defined("LOG_DIR")) {
-    Config::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-    define("LOG_DIR", BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+    Config::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+    define("LOG_DIR", BASE_DIR.DIRECTORY_SEPARATOR.'logs');
 }
 
 /**
@@ -43,7 +43,7 @@ 
         $config = Config::getInstance();
         $args = func_get_args();
         list($logger, $debug, $path) = $this->setup($config, $args);
-        $this->stream = fopen($path . DIRECTORY_SEPARATOR . date("Ymd") . ".log", "a+");
+        $this->stream = fopen($path.DIRECTORY_SEPARATOR.date("Ymd").".log", "a+");
         $this->addPushLogger($logger, $debug, $config);
     }
 
@@ -185,7 +185,7 @@ 
     private function createLoggerPath(Config $config)
     {
         $logger = $this->setLoggerName($config);
-        $path = LOG_DIR . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m');
+        $path = LOG_DIR.DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m');
         Config::createDir($path);
 
         return $path;

Doc Comments +3 added lines, -3 removed lines

@@ -88,7 +88,7 @@ 
      * @param string $msg
      * @param array $context
      *
-     * @return bool
+     * @return boolean|null
      */
     public function debugLog($msg = '', $context = [])
     {
@@ -97,7 +97,7 @@ 
 
     /**
      * Método que escribe un log de Error
-     * @param $msg
+     * @param string $msg
      * @param array $context
      *
      * @return bool
@@ -109,7 +109,7 @@ 
 
     /**
      * Método que escribe un log de Warning
-     * @param $msg
+     * @param string $msg
      * @param array $context
      * @return bool
      */

src/autoload.php

Spacing +4 added lines, -4 removed lines

@@ -21,11 +21,11 @@
             $path = str_replace("\\", DIRECTORY_SEPARATOR, $class);
 
             // filepath
-            $abs_path = SOURCE_DIR . DIRECTORY_SEPARATOR . $path . ".php";
+            $abs_path = SOURCE_DIR.DIRECTORY_SEPARATOR.$path.".php";
             if (!file_exists($abs_path)) {
-                pre('→ ' . $class);
-                pre('→ ' . $path);
-                pre('→ ' . $abs_path);
+                pre('→ '.$class);
+                pre('→ '.$path);
+                pre('→ '.$abs_path);
             }
 
             // require the file