psfs / core

src/base/types/helpers/FileHelper.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
      */
     public static function readFile($path) {
         $data = false;
-        if(file_exists($path)) {
+        if (file_exists($path)) {
             $data = @file_get_contents($path);
         }
         return $data;
@@ -36,7 +36,7 @@ 
      * @return string
      */
     public static function generateHashFilename($verb, $slug, array $query = []) {
-        return sha1(strtolower($verb) . ' ' . $slug . ' ' . strtolower(http_build_query($query)));
+        return sha1(strtolower($verb).' '.$slug.' '.strtolower(http_build_query($query)));
     }
 
     /**
@@ -47,8 +47,8 @@ 
     public static function generateCachePath(array $action, array $query = []) {
         $class = GeneratorHelper::extractClassFromNamespace($action['class']);
         $filename = self::generateHashFilename($action['http'], $action['slug'], $query);
-        $subPath = substr($filename, 0, 2) . DIRECTORY_SEPARATOR . substr($filename, 2, 2);
-        return $action['module'] . DIRECTORY_SEPARATOR . $class . DIRECTORY_SEPARATOR . $action['method'] . DIRECTORY_SEPARATOR . $subPath . DIRECTORY_SEPARATOR;
+        $subPath = substr($filename, 0, 2).DIRECTORY_SEPARATOR.substr($filename, 2, 2);
+        return $action['module'].DIRECTORY_SEPARATOR.$class.DIRECTORY_SEPARATOR.$action['method'].DIRECTORY_SEPARATOR.$subPath.DIRECTORY_SEPARATOR;
     }
 
     /**

src/base/types/helpers/InjectorHelper.php

Spacing +8 added lines, -8 removed lines

@@ -27,10 +27,10 @@ 
                 $isRequired = self::checkIsRequired($property->getDocComment());
                 $label = self::getLabel($property->getDocComment());
                 $isArray = (bool)preg_match('/\[\]$/', $instanceType);
-                if($isArray) {
+                if ($isArray) {
                     $instanceType = str_replace('[]', '', $instanceType);
                 }
-                if($instanceType === '\\DateTime' || !Router::exists($instanceType)) {
+                if ($instanceType === '\\DateTime' || !Router::exists($instanceType)) {
                     list($type, $format) = DocumentorHelper::translateSwaggerFormats($instanceType);
                     $variables[$property->getName()] = [
                         'type' => $type,
@@ -38,7 +38,7 @@ 
                         'required' => $isRequired,
                         'description' => $label,
                     ];
-                } else {
+                }else {
                     $instance = new \ReflectionClass($instanceType);
                     $variables[$property->getName()] = [
                         'is_array' => $isArray,
@@ -124,7 +124,7 @@ 
         // Extract description
         $label = null;
         preg_match('/@label\ (.*)\n/i', $doc, $matches);
-        if(count($matches)) {
+        if (count($matches)) {
             $label = _($matches[1]);
         }
         return $label;
@@ -137,7 +137,7 @@ 
     public static function getDefaultValue($doc) {
         $default = null;
         preg_match('/@default\ (.*)\n/i', $doc, $matches);
-        if(count($matches)) {
+        if (count($matches)) {
             $default = $matches[1];
         }
         return $default;
@@ -152,13 +152,13 @@ 
      */
     public static function constructInyectableInstance($variable, $singleton, $classNameSpace, $calledClass)
     {
-        Logger::log('Create inyectable instance for ' . $classNameSpace);
+        Logger::log('Create inyectable instance for '.$classNameSpace);
         $reflector = new \ReflectionClass($calledClass);
         $property = $reflector->getProperty($variable);
         $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace;
         if (true === $singleton && method_exists($varInstanceType, 'getInstance')) {
             $instance = $varInstanceType::getInstance();
-        } else {
+        }else {
             $instance = new $varInstanceType();
         }
         return $instance;
@@ -172,7 +172,7 @@ 
     public static function getClassProperties($class)
     {
         $properties = [];
-        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 = self::getClassProperties($selfReflector->getParentClass()->getName());

src/base/Cache.php

Spacing +11 added lines, -11 removed lines

@@ -54,7 +54,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);
         }
     }
 
@@ -68,7 +68,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);
         }
@@ -84,7 +84,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 = self::transformData($data, $transform);
-        $absolutePath = $absolute ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = $absolute ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $this->saveTextToFile($data, $absolutePath);
     }
 
@@ -168,11 +168,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 = $function();
                 $this->storeData($path, $data, $transform, false, $expires);
-            } else {
+            }else {
                 $data = $this->getDataFromFile($path, $transform);
             }
         }
@@ -224,13 +224,13 @@ 
     }
 
     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(self::CACHE_SESSION_VAR);
-            if(is_array($action)) {
-                $hashPath = FileHelper::generateCachePath($action, $action['params']) . '..' . DIRECTORY_SEPARATOR . ' .. ' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
-                if(!file_exists($hashPath)) {
-                    $hashPath = CACHE_DIR . DIRECTORY_SEPARATOR . $hashPath;
+            if (is_array($action)) {
+                $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/config/Config.php

Spacing +6 added lines, -6 removed lines

@@ -74,7 +74,7 @@ 
      */
     protected function init()
     {
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) {
             $this->loadConfigData();
         }
         return $this;
@@ -190,10 +190,10 @@ 
             $final_data = array_filter($final_data, function($key, $value) {
                 return in_array($key, self::$required, true) || !empty($value);
             }, ARRAY_FILTER_USE_BOTH);
-            $saved = (false !== file_put_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, json_encode($final_data, JSON_PRETTY_PRINT)));
+            $saved = (false !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, json_encode($final_data, JSON_PRETTY_PRINT)));
             self::getInstance()->loadConfigData();
             $saved = true;
-        } catch (ConfigException $e) {
+        }catch (ConfigException $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $saved;
@@ -225,7 +225,7 @@ 
      */
     public function loadConfigData()
     {
-        $this->config = json_decode(file_get_contents(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE), true) ?: [];
+        $this->config = json_decode(file_get_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE), true) ?: [];
         $this->debug = array_key_exists('debug', $this->config) ? (bool)$this->config['debug'] : FALSE;
     }
 
@@ -246,8 +246,8 @@ 
      */
     public static function getParam($key, $defaultValue = null, $module = null)
     {
-        if(null !== $module) {
-            return self::getParam(strtolower($module) . '.' . $key, self::getParam($key, $defaultValue));
+        if (null !== $module) {
+            return self::getParam(strtolower($module).'.'.$key, self::getParam($key, $defaultValue));
         }
         $param = self::getInstance()->get($key);
         return (null !== $param) ? $param : $defaultValue;

src/base/Security.php

Spacing +8 added lines, -8 removed lines

@@ -73,7 +73,7 @@ 
             session_start();
         }
         // Fix for phpunits
-        if(!isset($_SESSION)) {
+        if (!isset($_SESSION)) {
             $_SESSION = [];
         }
     }
@@ -127,11 +127,11 @@ 
     public static function save($user)
     {
         $saved = true;
-        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true) ?: [];
-        $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']);
+        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true) ?: [];
+        $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']);
         $admins[$user['username']]['profile'] = $user['profile'];
 
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', $admins, Cache::JSONGZ, true);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
         return $saved;
     }
 
@@ -174,7 +174,7 @@ 
      */
     public function getAdmins()
     {
-        return Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true);
+        return Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true);
     }
 
     /**
@@ -199,9 +199,9 @@ 
                 }
                 if (!empty($user) && !empty($admins[$user])) {
                     $auth = $admins[$user]['hash'];
-                    $this->authorized = ($auth === sha1($user . $pass));
+                    $this->authorized = ($auth === sha1($user.$pass));
                     if ($this->authorized) {
-                        $this->updateAdmin($user , $admins[$user]['profile']);
+                        $this->updateAdmin($user, $admins[$user]['profile']);
                         ResponseHelper::setCookieHeaders([
                             [
                                 'name' => $this->getHash(),
@@ -212,7 +212,7 @@ 
                         ]);
                         $this->setSessionKey(self::LOGGED_USER_TOKEN, base64_encode("{$user}:{$pass}"));
                     }
-                } else {
+                }else {
                     $this->admin = null;
                     $this->setSessionKey(self::ADMIN_ID_TOKEN, null);
                 }

src/base/types/helpers/ApiFormHelper.php

Spacing +4 added lines, -4 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();
@@ -44,7 +44,7 @@ 
     {
         $action = null;
         if (false !== preg_match('/@action\s+([^\s]+)/', $doc, $matches)) {
-            if(count($matches) > 1) {
+            if (count($matches) > 1) {
                 list(, $action) = $matches;
             }
         }

src/bootstrap.php

Spacing +14 added lines, -14 removed lines

@@ -6,20 +6,20 @@ 
 
 defined('SOURCE_DIR') or define('SOURCE_DIR', __DIR__);
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+}else {
+    defined('BASE_DIR') or define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+    defined('CORE_DIR') or define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
 }
-defined('VENDOR_DIR') or define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-defined('LOG_DIR') or define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-defined('CACHE_DIR') or define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-defined('CONFIG_DIR') or define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-defined('WEB_DIR') or define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
-defined('LOCALE_DIR') or define('LOCALE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+defined('VENDOR_DIR') or define('VENDOR_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'vendor');
+defined('LOG_DIR') or define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+defined('CACHE_DIR') or define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+defined('CONFIG_DIR') or define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+defined('WEB_DIR') or define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
+defined('LOCALE_DIR') or define('LOCALE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
 
-if(!class_exists(bootstrap::class)) {
+if (!class_exists(bootstrap::class)) {
     /**
      * Class Bootstrap
      * @package PSFS
@@ -27,9 +27,9 @@ 
     class bootstrap {
         protected static $loaded = false;
         public static function load() {
-            if(!self::$loaded) {
+            if (!self::$loaded) {
                 defined('PSFS_BOOTSTRAP_LOADED') or define('PSFS_BOOTSTRAP_LOADED', true);
-                if(class_exists("\\PSFS\\base\\Logger")) \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
+                if (class_exists("\\PSFS\\base\\Logger")) \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
                 self::$loaded = true;
             }
         }

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
         public static function load() {
             if(!self::$loaded) {
                 defined('PSFS_BOOTSTRAP_LOADED') or define('PSFS_BOOTSTRAP_LOADED', true);
-                if(class_exists("\\PSFS\\base\\Logger")) \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
+                if(class_exists("\\PSFS\\base\\Logger")) {
+                    \PSFS\base\Logger::log('Bootstrap initialized', LOG_INFO);
+                }
                 self::$loaded = true;
             }
         }

src/base/extension/CustomTranslateExtension.php

Spacing +15 added lines, -15 removed lines

@@ -27,22 +27,22 @@ 
      * @param bool $use_base
      */
     protected static function checkLoad($custom_key = null, $force_reload = false, $use_base = false) {
-        if($force_reload) self::dropInstance();
+        if ($force_reload) self::dropInstance();
         self::$locale = I18nHelper::extractLocale(Security::getInstance()->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY));
         self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
-        if(!$use_base) {
+        if (!$use_base) {
             $custom_key = $custom_key ?: Security::getInstance()->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY);
         }
-        if(null !== $custom_key) {
-            Logger::log('[' . self::class . '] Custom key detected: ' . $custom_key, LOG_INFO);
-            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $custom_key, self::$locale . '.json']);
-        } else {
-            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale . '.json']);
+        if (null !== $custom_key) {
+            Logger::log('['.self::class.'] Custom key detected: '.$custom_key, LOG_INFO);
+            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $custom_key, self::$locale.'.json']);
+        }else {
+            self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale.'.json']);
         }
-        if(file_exists(self::$filename)) {
-            Logger::log('[' . self::class . '] Custom locale detected: ' . $custom_key . ' [' . self::$locale . ']', LOG_INFO);
+        if (file_exists(self::$filename)) {
+            Logger::log('['.self::class.'] Custom locale detected: '.$custom_key.' ['.self::$locale.']', LOG_INFO);
             self::$translations = json_decode(file_get_contents(self::$filename), true);
-        } elseif(null !== $custom_key) {
+        } elseif (null !== $custom_key) {
             self::checkLoad(null, $force_reload, true);
         }
     }
@@ -83,12 +83,12 @@ 
      */
     public static function _($message, $custom_key = null, $force_reload = false) {
         self::checkLoad($custom_key, $force_reload);
-        if(array_key_exists($message, self::$translations)) {
-            $translation =  self::$translations[$message];
-        } else {
+        if (array_key_exists($message, self::$translations)) {
+            $translation = self::$translations[$message];
+        }else {
             $translation = gettext($message);
         }
-        if(self::$generate) {
+        if (self::$generate) {
             self::generate($message, $translation);
         }
         return $translation;
@@ -99,7 +99,7 @@ 
      * @param string $translation
      */
     protected static function generate($message, $translation) {
-        if(!array_key_exists($message, self::$translations)) {
+        if (!array_key_exists($message, self::$translations)) {
             self::$translations[$message] = $translation;
         }
         file_put_contents(self::$filename, json_encode(array_unique(self::$translations), JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));

Braces +3 added lines, -1 removed lines

@@ -27,7 +27,9 @@
      * @param bool $use_base
      */
     protected static function checkLoad($custom_key = null, $force_reload = false, $use_base = false) {
-        if($force_reload) self::dropInstance();
+        if($force_reload) {
+            self::dropInstance();
+        }
         self::$locale = I18nHelper::extractLocale(Security::getInstance()->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY));
         self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
         if(!$use_base) {

src/base/dto/JsonResponse.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         $this->success = $result;
         $this->total = $total ?: (is_array($data) ? count($data) : 0);
         $this->pages = $pages;
-        if(null !== $message) {
+        if (null !== $message) {
             $this->message = $message;
         }
     }