psfs / core

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

src/base/types/helpers/SlackHelper.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
             'text' => 'PSFS Error notifier',
             'attachments' => [
                 [
-                    "text" => $file . (strlen($line) ? ' [' . $line . ']' : ''),
+                    "text" => $file.(strlen($line) ? ' ['.$line.']' : ''),
                     "color" => "danger",
                     "title" => $message,
                     'fallback' => 'PSFS Error notifier',

src/base/types/traits/SystemTrait.php

Spacing +10 added lines, -10 removed lines

@@ -38,7 +38,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -62,34 +62,34 @@ 
     protected function bindWarningAsExceptions()
     {
         Logger::log('Added handlers for errors');
-        if(Config::getParam('debug')) {
+        if (Config::getParam('debug')) {
             Logger::log('Setting error_reporting as E_ALL');
             ini_set('error_reporting', E_ALL);
             ini_set('display_errors', 1);
         }
         //Warning & Notice handler
-        set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+        set_error_handler(function($errno, $errstr, $errfile, $errline) {
             Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
             return true;
         }, E_ALL | E_STRICT | E_DEPRECATED | E_USER_DEPRECATED | E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR);
 
-        register_shutdown_function(function () {
+        register_shutdown_function(function() {
             $error = error_get_last() or json_last_error() or preg_last_error() or \DateTime::getLastErrors();
-            if( $error !== NULL) {
+            if ($error !== NULL) {
                 $errno   = $error["type"];
                 $errfile = $error["file"];
                 $errline = $error["line"];
                 $errstr  = $error["message"];
                 Logger::log($errstr, LOG_CRIT, ['file' => $errfile, 'line' => $errline, 'errno' => $errno]);
-                if(null !== Config::getParam('log.slack.hook')) {
+                if (null !== Config::getParam('log.slack.hook')) {
                     SlackHelper::getInstance()->trace($errstr, $errfile, $errline, $error);
                 }
             }
 
-            if(self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
+            if (self::getTs() > 10 && null !== Config::getParam('log.slack.hook')) {
                 SlackHelper::getInstance()->trace('Slow service endpoint', '', '', [
-                    'time' => round(self::getTs(), 3) . ' secs',
-                    'memory' => round(self::getMem('MBytes'), 3) . ' Mb',
+                    'time' => round(self::getTs(), 3).' secs',
+                    'memory' => round(self::getMem('MBytes'), 3).' Mb',
                 ]);
             }
             return false;
@@ -104,7 +104,7 @@ 
         Logger::log('Initializing stats (mem + ts)');
         if (null !== $_SERVER && array_key_exists('REQUEST_TIME_FLOAT', $_SERVER)) {
             $this->ts = (float)$_SERVER['REQUEST_TIME_FLOAT'];
-        } else {
+        }else {
             $this->ts = PSFS_START_TS;
         }
         $this->mem = PSFS_START_MEM;

src/functions.php

Spacing +2 added lines, -2 removed lines

@@ -48,14 +48,14 @@
     /* @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);
         }
     }
 }
 
-if(!function_exists('t')) {
+if (!function_exists('t')) {
     function t($message, $key = null, $reload = false) {
         return CustomTranslateExtension::_($message, $key, $reload);
     }

Braces +3 added lines, -2 removed lines

@@ -34,9 +34,10 @@
     function getallheaders()
     {
         $headers = [];
-        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;
     }

src/base/Singleton.php

Spacing +8 added lines, -8 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function __construct()
     {
-        Logger::log(static::class . ' constructor invoked');
+        Logger::log(static::class.' constructor invoked');
         $this->init();
     }
 
@@ -81,14 +81,14 @@ 
         $calledClass = static::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;
@@ -103,7 +103,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 */
@@ -121,8 +121,8 @@ 
                 }
             }
             $this->setLoaded();
-        } else {
-            Logger::log(get_class($this) . ' already loaded', LOG_INFO);
+        }else {
+            Logger::log(get_class($this).' already loaded', LOG_INFO);
         }
     }
 }