psfs / core

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 +18 added lines, -18 removed lines

@@ -62,7 +62,7 @@ 
         }
         $this->user = (array_key_exists(self::USER_ID_TOKEN, $this->session)) ? unserialize($this->session[self::USER_ID_TOKEN]) : NULL;
         $this->admin = (array_key_exists(self::ADMIN_ID_TOKEN, $this->session)) ? unserialize($this->session[self::ADMIN_ID_TOKEN]) : NULL;
-        if(null === $this->admin) {
+        if (null === $this->admin) {
             $this->checkAdmin();
         }
     }
@@ -121,13 +121,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)));
     }
 
     /**
@@ -161,8 +161,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;
@@ -181,7 +181,7 @@ 
     {
         Logger::log('Checking admin session');
         if (!$this->authorized && !$this->checked) {
-            if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
+            if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
                 $request = Request::getInstance();
                 $admins = $this->getAdmins();
                 //Sacamos las credenciales de la petición
@@ -192,8 +192,8 @@ 
                 }
                 if (!empty($user) && !empty($admins[$user])) {
                     $auth = $admins[$user]['hash'];
-                    $this->authorized = ($auth == sha1($user . $pass));
-                    if($this->authorized) {
+                    $this->authorized = ($auth == sha1($user.$pass));
+                    if ($this->authorized) {
                         $this->admin = array(
                             'alias' => $user,
                             'profile' => $admins[$user]['profile'],
@@ -416,12 +416,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;
         }
 
@@ -461,7 +461,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);
         }
@@ -478,16 +478,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

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

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 
     public function __construct()
     {
-        Logger::log(get_class($this) . ' constructor invoked');
+        Logger::log(get_class($this).' constructor invoked');
         $this->init();
     }
 
@@ -90,14 +90,14 @@ 
         $calledClass = get_called_class();
         try {
             $instance = InjectorHelper::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;
     }
@@ -108,7 +108,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 */
@@ -123,8 +123,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);
         }
     }
 }

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

src/base/Cache.php

Doc Comments +2 added lines, -2 removed lines

@@ -121,7 +121,7 @@ 
 
     /**
      * Método que guarda en fichero los datos pasados
-     * @param $path
+     * @param string $path
      * @param $data
      * @param int $transform
      * @param boolean $absolutePath
@@ -156,7 +156,7 @@ 
 
     /**
      * Método estático que revisa si se necesita cachear la respuesta de un servicio o no
-     * @return integer|boolean
+     * @return integer
      */
     public static function needCache()
     {

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
      */
     private function saveTextToFile($data, $path, $absolute = false)
     {
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $filename = basename($absolutePath);
         Config::createDir(str_replace($filename, "", $absolutePath));
         if (false === file_put_contents($absolutePath, $data)) {
@@ -48,7 +48,7 @@ 
     public function getDataFromFile($path, $transform = Cache::TEXT, $absolute = false)
     {
         $data = null;
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         if (file_exists($absolutePath)) {
             $data = file_get_contents($absolutePath);
         }
@@ -64,7 +64,7 @@ 
      */
     private function hasExpiredCache($path, $expires = 300, $absolute = false)
     {
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $lasModificationDate = filemtime($absolutePath);
         return ($lasModificationDate + $expires <= time());
     }
@@ -87,7 +87,7 @@ 
                 break;
             case Cache::GZIP:
                 // TODO implementar
-                if(function_exists('gzuncompress')) {
+                if (function_exists('gzuncompress')) {
                     $data = gzuncompress($data ?: '');
                 }
                 break;
@@ -112,7 +112,7 @@ 
                 $data = Cache::transformData($data, Cache::GZIP);
                 break;
             case Cache::GZIP:
-                if(function_exists('gzcompress')) {
+                if (function_exists('gzcompress')) {
                     $data = gzcompress($data ?: '');
                 }
                 break;
@@ -144,11 +144,11 @@ 
     public function readFromCache($path, $expires = 300, callable $function, $transform = Cache::TEXT)
     {
         $data = null;
-        if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $path)) {
+        if (file_exists(CACHE_DIR.DIRECTORY_SEPARATOR.$path)) {
             if (null !== $function && $this->hasExpiredCache($path, $expires)) {
                 $data = call_user_func($function);
                 $this->storeData($path, $data, $transform);
-            } else {
+            }else {
                 $data = $this->getDataFromFile($path, $transform);
             }
         }
@@ -178,7 +178,7 @@ 
         $hash = "";
         $action = Security::getInstance()->getSessionKey("__CACHE__");
         if (null !== $action && $action["cache"] > 0) {
-            $hash = $action["http"] . " " . $action["slug"];
+            $hash = $action["http"]." ".$action["slug"];
         }
         return sha1($hash);
     }

src/command/CreateDocumentRoot.php

Spacing +7 added lines, -7 removed lines

@@ -32,18 +32,18 @@
                 'robots' => 'robots.txt',
             ];
             foreach ($files as $templates => $filename) {
-                $text = \PSFS\base\Template::getInstance()->dump("generator/html/". $templates . '.html.twig');
-                if(false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
-                    $output->writeln('Can\t create the file ' . $filename);
-                } else {
-                    $output->writeln($filename . ' created successfully');
+                $text = \PSFS\base\Template::getInstance()->dump("generator/html/".$templates.'.html.twig');
+                if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
+                    $output->writeln('Can\t create the file '.$filename);
+                }else {
+                    $output->writeln($filename.' created successfully');
                 }
             }
 
             //Export base locale translations
-            if(!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
+            if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
                 \PSFS\base\config\Config::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
-                \PSFS\Services\GeneratorService::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+                \PSFS\Services\GeneratorService::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
             }
 
             $output->writeln("Document root generado en ".$path);

Braces +6 added lines, -2 removed lines

@@ -6,7 +6,9 @@ 
     use Symfony\Component\Console\Input\InputInterface;
     use Symfony\Component\Console\Output\OutputInterface;
 
-    if (!isset($console)) $console = new Application();
+    if (!isset($console)) {
+        $console = new Application();
+    }
     $console
         ->register('psfs:create:root')
         ->setDefinition(array(
@@ -16,7 +18,9 @@ 
         ->setCode(function(InputInterface $input, OutputInterface $output) {
             // Creates the html path
             $path = $input->getArgument('path');
-            if (empty($path)) $path = WEB_DIR;
+            if (empty($path)) {
+                $path = WEB_DIR;
+            }
             \PSFS\base\config\Config::createDir($path);
             $paths = array("js", "css", "img", "media", "font");
             foreach ($paths as $htmlPath) {

src/controller/ConfigController.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
      * @GET
      * @route /admin/config/params
      * @visible false
-     * @return mixed
+     * @return string|null
      */
     public function getConfigParams() {
         $response = array_merge(Config::$required, Config::$optional);

Spacing +4 added lines, -4 removed lines

@@ -25,10 +25,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);
     }
@@ -42,7 +42,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();
@@ -79,7 +79,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

@@ -28,7 +28,7 @@
      * @GET
      * @route /admin/routes/show
      * @visible false
-     * @return mixed
+     * @return string|null
      */
     public function getRouting()
     {

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,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/I18nController.php

Spacing +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
         //Generating the templates translations
         $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;
 
         //xgettext localizations
         $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale));

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
     public function getTranslations($locale)
     {
         //Default locale
-        if (null === $locale) $locale = $this->config->get("default_language");
+        if (null === $locale) {
+            $locale = $this->config->get("default_language");
+        }
 
         //Generating the templates translations
         $translations = $this->tpl->regenerateTemplates();