psfs / core

src/base/Service.php

Doc Comments +3 added lines, -3 removed lines

@@ -116,7 +116,7 @@ 
     /**
      * Add request param
      *
-     * @param $key
+     * @param integer $key
      * @param null $value
      *
      * @return \PSFS\base\Service
@@ -153,8 +153,8 @@ 
     }
 
     /**
-     * @param $header
-     * @param null $content
+     * @param string $header
+     * @param string $content
      *
      * @return $this
      */

Spacing +17 added lines, -17 removed lines

@@ -59,7 +59,7 @@ 
     protected $isJson = true;
 
     private function closeConnection() {
-        if(null !== $this->con) {
+        if (null !== $this->con) {
             curl_close($this->con);
         }
     }
@@ -239,7 +239,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!");
         $this->closeConnection();
     }
 
@@ -282,17 +282,17 @@ 
     }
 
     protected function applyOptions() {
-        if(count($this->options)) {
+        if (count($this->options)) {
             curl_setopt_array($this->con, $this->options);
         }
     }
 
     protected function applyHeaders() {
         $headers = [];
-        foreach($this->headers as $key => $value) {
-            $headers[] = $key . ': ' . $value;
+        foreach ($this->headers as $key => $value) {
+            $headers[] = $key.': '.$value;
         }
-        if(count($headers)) {
+        if (count($headers)) {
             curl_setopt($this->con, CURLOPT_HTTPHEADER, $headers);
         }
     }
@@ -303,16 +303,16 @@ 
             case 'GET':
             default:
                 $this->addOption(CURLOPT_CUSTOMREQUEST, "GET");
-                if(!empty($this->params)) {
+                if (!empty($this->params)) {
                     $sep = !preg_match('/\?/', $this->getUrl()) ? '?' : '';
-                    $this->url = $this->url . $sep . http_build_query($this->params);
+                    $this->url = $this->url.$sep.http_build_query($this->params);
                 }
                 break;
             case 'POST':
                 $this->addOption(CURLOPT_CUSTOMREQUEST, "POST");
-                if($this->getIsJson()) {
+                if ($this->getIsJson()) {
                     $this->addOption(CURLOPT_POSTFIELDS, json_encode($this->params));
-                } else {
+                }else {
                     $this->addOption(CURLOPT_POSTFIELDS, http_build_query($this->params));
                 }
                 break;
@@ -322,17 +322,17 @@ 
             case 'PUT':
                 $this->addOption(CURLOPT_CUSTOMREQUEST, "PUT");
 
-                if($this->getIsJson()) {
+                if ($this->getIsJson()) {
                     $this->addOption(CURLOPT_POSTFIELDS, json_encode($this->params));
-                } else {
+                }else {
                     $this->addOption(CURLOPT_POSTFIELDS, http_build_query($this->params));
                 }
                 break;
             case 'PATCH':
                 $this->addOption(CURLOPT_CUSTOMREQUEST, "PATCH");
-                if($this->getIsJson()) {
+                if ($this->getIsJson()) {
                     $this->addOption(CURLOPT_POSTFIELDS, json_encode($this->params));
-                } else {
+                }else {
                     $this->addOption(CURLOPT_POSTFIELDS, http_build_query($this->params));
                 }
                 break;
@@ -349,14 +349,14 @@ 
         $this->setDefaults();
         $this->applyOptions();
         $this->applyHeaders();
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             curl_setopt($this->con, CURLOPT_VERBOSE, true);
             $verbose = fopen('php://temp', 'w+');
             curl_setopt($this->con, CURLOPT_STDERR, $verbose);
         }
         $result = curl_exec($this->con);
         $this->result = $this->isJson ? json_decode($result, true) : $result;
-        if('debug' === Config::getParam('log.level')) {
+        if ('debug' === Config::getParam('log.level')) {
             rewind($verbose);
             $verboseLog = stream_get_contents($verbose);
             Logger::log($verboseLog, LOG_DEBUG, [
@@ -365,7 +365,7 @@ 
                 'url' => $this->getUrl(),
             ]);
         }
-        Logger::log($this->url . ' response: ', LOG_DEBUG, $this->result);
+        Logger::log($this->url.' response: ', LOG_DEBUG, $this->result);
         $this->info = curl_getinfo($this->con);
     }
 

src/base/types/helpers/SecurityHelper.php

Spacing +21 added lines, -21 removed lines

@@ -29,7 +29,7 @@ 
         if (!Config::getInstance()->checkTryToSaveConfig()
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || NULL !== Config::getInstance()->get('restricted'))
         ) {
-            if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) {
+            if (null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) {
                 throw new AdminCredentialsException();
             }
             if (!Security::getInstance()->checkAdmin()) {
@@ -49,8 +49,8 @@ 
         $token = '';
         $ct = strlen($ts);
         for ($i = 0; $i < $ct; $i++) {
-            $token = substr($hash, $i, 1) .
-                    substr($ts, $i, 1) .
+            $token = substr($hash, $i, 1).
+                    substr($ts, $i, 1).
                     $token;
         }
         return $token;
@@ -68,16 +68,16 @@ 
         $charsLength = strlen(self::RAND_SEP) - 1;
         $tsLength = strlen($ts);
         $i = 0;
-        $ct = ceil($hashRest / 4);
-        $part = substr($hash, $tsLength + $ct * $i, $ct);
-        while(false !== $part) {
-            $mixedToken .= $part .
-                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) .
+        $ct = ceil($hashRest/4);
+        $part = substr($hash, $tsLength + $ct*$i, $ct);
+        while (false !== $part) {
+            $mixedToken .= $part.
+                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1).
                 substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1);
-            $part = substr($hash, $tsLength + $ct * $i, $ct);
+            $part = substr($hash, $tsLength + $ct*$i, $ct);
             $i++;
         }
-        return $mixedToken . $token;
+        return $mixedToken.$token;
     }
 
     /**
@@ -86,10 +86,10 @@ 
      */
     private static function getTs($isOdd = null) {
         $ts = time();
-        $tsIsOdd = (bool)((int)substr($ts, -1) % 2);
-        if(false === $isOdd && !$tsIsOdd) {
+        $tsIsOdd = (bool)((int)substr($ts, -1)%2);
+        if (false === $isOdd && !$tsIsOdd) {
             $ts--;
-        } elseif(true === $isOdd && !$tsIsOdd) {
+        } elseif (true === $isOdd && !$tsIsOdd) {
             $ts--;
         }
         return $ts;
@@ -121,10 +121,10 @@ 
         $partToken = '';
         $ts = '';
         $part = strrev($part);
-        for($i = 0, $ct = strlen($part); $i < $ct; $i++) {
-            if($i % 2 == 0) {
+        for ($i = 0, $ct = strlen($part); $i < $ct; $i++) {
+            if ($i%2 == 0) {
                 $ts .= substr($part, $i, 1);
-            } else {
+            }else {
                 $partToken .= substr($part, $i, 1);
             }
         }
@@ -139,11 +139,11 @@ 
     private static function parseTokenParts(array $parts) {
         $token = '';
         list($partToken, $ts) = self::extractTs(array_pop($parts));
-        if($ts > 0) {
-            foreach($parts as $part) {
+        if ($ts > 0) {
+            foreach ($parts as $part) {
                 $token .= $part;
             }
-            $token = $partToken . $token;
+            $token = $partToken.$token;
         }
         return [$token, $ts];
     }
@@ -171,8 +171,8 @@ 
      * @return array
      */
     private static function extractTokenParts($token) {
-        for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) {
-            $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token);
+        for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) {
+            $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token);
         }
         return array_unique(explode('||', $token));
     }

src/base/types/helpers/AdminHelper.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
     {
         $routes = [];
         foreach ($systemRoutes as $route => $params) {
-            if(isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
+            if (isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
                 $module = strtoupper($params['module']);
                 $mode = $params["visible"] ? 'visible' : 'hidden';
                 $routes[$module][$mode][] = [
@@ -41,11 +41,11 @@ 
                 ];
             }
         }
-        foreach($routes as $module => &$route) {
-            if(array_key_exists('visible', $route)) {
+        foreach ($routes as $module => &$route) {
+            if (array_key_exists('visible', $route)) {
                 uasort($route["visible"], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
-            if(array_key_exists('hidden', $route)) {
+            if (array_key_exists('hidden', $route)) {
                 uasort($route["hidden"], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
         }

src/base/types/helpers/GeneratorHelper.php

Spacing +16 added lines, -16 removed lines

@@ -19,10 +19,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::deleteDir($dir . "/" . $object);
-                    } else {
-                        unlink($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::deleteDir($dir."/".$object);
+                    }else {
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -38,10 +38,10 @@ 
     {
         $rootDirs = array("css", "js", "media", "font");
         foreach ($rootDirs as $dir) {
-            if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) {
+            if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
-                    self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (\Exception $e) {
+                    self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage());
                 }
             }
@@ -57,12 +57,12 @@ 
     {
         try {
             if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                throw new \Exception(_('Can\'t create directory ') . $dir);
+                throw new \Exception(_('Can\'t create directory ').$dir);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
             if (!file_exists(dirname($dir))) {
-                throw new GeneratorException($e->getMessage() . $dir);
+                throw new GeneratorException($e->getMessage().$dir);
             }
         }
     }
@@ -73,7 +73,7 @@ 
      */
     public static function getTemplatePath()
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 
@@ -91,15 +91,15 @@ 
      * @throws GeneratorException
      */
     public static function checkCustomNamespaceApi($namespace) {
-        if(!empty($namespace)) {
-            if(class_exists($namespace)) {
+        if (!empty($namespace)) {
+            if (class_exists($namespace)) {
                 $reflector = new \ReflectionClass($namespace);
-                if(!$reflector->isSubclassOf(\PSFS\base\types\Api::class)) {
+                if (!$reflector->isSubclassOf(\PSFS\base\types\Api::class)) {
                     throw new GeneratorException(_('La clase definida debe extender de PSFS\\\base\\\types\\\Api'), 501);
-                } elseif(!$reflector->isAbstract()) {
+                } elseif (!$reflector->isAbstract()) {
                     throw new GeneratorException(_('La clase definida debe ser abstracta'), 501);
                 }
-            } else {
+            }else {
                 throw new GeneratorException(_('La clase definida para extender la API no existe'), 501);
             }
         }

src/base/Cache.php

Doc Comments +2 added lines, -2 removed lines

@@ -146,7 +146,7 @@ 
 
     /**
      * Método que guarda en fichero los datos pasados
-     * @param $path
+     * @param string $path
      * @param $data
      * @param int $transform
      * @param boolean $absolute
@@ -201,7 +201,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 +10 added lines, -10 removed lines

@@ -50,7 +50,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if (false === FileHelper::writeFile($path, $data)) {
-            throw new ConfigException(_('No se tienen los permisos suficientes para escribir en el fichero ') . $path);
+            throw new ConfigException(_('No se tienen los permisos suficientes para escribir en el fichero ').$path);
         }
     }
 
@@ -65,7 +65,7 @@ 
     {
         Logger::log('Gathering data from cache', LOG_DEBUG, ['path' => $path]);
         $data = null;
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         if (file_exists($absolutePath)) {
             $data = FileHelper::readFile($absolutePath);
         }
@@ -82,7 +82,7 @@ 
     private function hasExpiredCache($path, $expires = 300, $absolute = false)
     {
         Logger::log('Checking expiration', LOG_DEBUG, ['path' => $path]);
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $lasModificationDate = filemtime($absolutePath);
         return ($lasModificationDate + $expires <= time());
     }
@@ -151,7 +151,7 @@ 
     {
         Logger::log('Store data in cache', LOG_DEBUG, ['path' => $path]);
         $data = Cache::transformData($data, $transform);
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $this->saveTextToFile($data, $absolutePath);
     }
 
@@ -167,11 +167,11 @@ 
     {
         $data = null;
         Logger::log('Reading data from cache', LOG_DEBUG, ['path' => $path]);
-        if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $path)) {
+        if (file_exists(CACHE_DIR.DIRECTORY_SEPARATOR.$path)) {
             if (is_callable($function) && $this->hasExpiredCache($path, $expires)) {
                 $data = call_user_func($function);
                 $this->storeData($path, $data, $transform, false, $expires);
-            } else {
+            }else {
                 $data = $this->getDataFromFile($path, $transform);
             }
         }
@@ -228,12 +228,12 @@ 
      * Flush cache when save a registry
      */
     public function flushCache() {
-        if(Config::getParam('cache.data.enable', false)) {
+        if (Config::getParam('cache.data.enable', false)) {
             Logger::log('Flushing cache', LOG_DEBUG);
             $action = Security::getInstance()->getSessionKey("__CACHE__");
-            $hashPath = FileHelper::generateCachePath($action, $action['params']) . '..' . DIRECTORY_SEPARATOR . ' .. ' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-            if(!file_exists($hashPath)) {
-                $hashPath = CACHE_DIR . DIRECTORY_SEPARATOR . $hashPath;
+            $hashPath = FileHelper::generateCachePath($action, $action['params']).'..'.DIRECTORY_SEPARATOR.' .. '.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
+            if (!file_exists($hashPath)) {
+                $hashPath = CACHE_DIR.DIRECTORY_SEPARATOR.$hashPath;
             }
             FileHelper::deleteDir($hashPath);
         }

src/base/Singleton.php

Braces +3 added lines, -1 removed lines

@@ -121,9 +121,11 @@
                 $cacheService->storeData($cacheFilename, $properties, $cache);
             }
             /** @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

@@ -15,7 +15,7 @@ 
 
     public function __construct()
     {
-        Logger::log(get_class($this) . ' constructor invoked');
+        Logger::log(get_class($this).' constructor invoked');
         $this->init();
     }
 
@@ -68,14 +68,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);
             throw $e;
         }
         return $this;
@@ -88,7 +88,7 @@ 
     {
         if (!$this->isLoaded()) {
             $filename = sha1(get_class($this));
-            $cacheFilename = "reflections" . DIRECTORY_SEPARATOR . substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2) . DIRECTORY_SEPARATOR . $filename . ".json";
+            $cacheFilename = "reflections".DIRECTORY_SEPARATOR.substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2).DIRECTORY_SEPARATOR.$filename.".json";
             /** @var \PSFS\base\Cache $cacheService */
             $cacheService = Cache::getInstance();
             /** @var \PSFS\base\config\Config $configService */
@@ -104,8 +104,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/base/types/helpers/ApiFormHelper.php

Spacing +3 added lines, -3 removed lines

@@ -17,11 +17,11 @@
     public static function checkApiActions($namespace, $domain, $api) {
         $actions = [];
         $reflector = new \ReflectionClass($namespace);
-        if(null !== $reflector) {
-            foreach($reflector->getMethods(\ReflectionMethod::IS_PUBLIC) as $apiAction) {
+        if (null !== $reflector) {
+            foreach ($reflector->getMethods(\ReflectionMethod::IS_PUBLIC) as $apiAction) {
                 $docComments = $apiAction->getDocComment();
                 $action = self::extractAction($docComments);
-                if(null !== $action) {
+                if (null !== $action) {
                     list($route, $info) = RouterHelper::extractRouteInfo($apiAction, $api, $domain);
                     list($method, $cleanRoute) = RouterHelper::extractHttpRoute($route);
                     $formAction = new FormAction();

src/functions.php

Braces +3 added lines, -2 removed lines

@@ -31,9 +31,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;
     }
 }

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     /* @var $file SplFileInfo */
     foreach ($finder as $file) {
         $path = $file->getRealPath();
-        if(!in_array($path, $loaded_files)) {
+        if (!in_array($path, $loaded_files)) {
             $loaded_files[] = $path;
             require_once($path);
         }

src/base/types/traits/BoostrapTrait.php

Spacing +1 added lines, -1 removed lines

@@ -7,4 +7,4 @@
  */
 Trait BoostrapTrait {}
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'bootstrap.php';
\ No newline at end of file
+require_once __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'bootstrap.php';
\ No newline at end of file