psfs / core

src/base/types/traits/Api/ConnectionTrait.php

Unused Use Statements -1 removed lines

@@ -6,7 +6,6 @@
 use Propel\Runtime\Propel;
 use PSFS\base\config\Config;
 use PSFS\base\Logger;
-use PSFS\base\types\traits\DebugTrait;
 
 /**
  * Trait ConnectionTrait

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
     {
         $this->con = Propel::getConnection($tableMap::DATABASE_NAME);
         $this->con->beginTransaction();
-        if(method_exists($this->con, 'useDebug')) {
+        if (method_exists($this->con, 'useDebug')) {
             Logger::log('Enabling debug queries mode', LOG_INFO);
             $this->con->useDebug(Config::getParam('debug'));
         }
@@ -45,12 +45,12 @@ 
      */
     protected function closeTransaction($status)
     {
-        if(null !== $this->con) {
+        if (null !== $this->con) {
             $this->traceDebugQuery();
             if (null !== $this->con && $this->con->inTransaction()) {
                 if ($status === 200) {
                     $this->con->commit();
-                } else {
+                }else {
                     $this->con->rollBack();
                 }
             }
@@ -72,13 +72,13 @@ 
      * Checks if the connection has a transaction initialized
      */
     protected function checkTransaction() {
-        if(null !== $this->con && !$this->con->inTransaction()) {
+        if (null !== $this->con && !$this->con->inTransaction()) {
             $this->con->beginTransaction();
         }
-        if(null !== $this->con && $this->con->inTransaction()) {
+        if (null !== $this->con && $this->con->inTransaction()) {
             $this->items++;
         }
-        if($this->items >= Config::getParam('api.block.limit', 1000)) {
+        if ($this->items >= Config::getParam('api.block.limit', 1000)) {
             $this->con->commit();
             $this->items = 0;
         }

src/base/dto/JsonResponse.php

Spacing +1 added lines, -1 removed lines

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

src/base/types/Controller.php

Unused Use Statements -4 removed lines

@@ -2,15 +2,11 @@
 namespace PSFS\base\types;
 
 use PSFS\base\config\Config;
-use PSFS\base\exception\RouterException;
-use PSFS\base\Request;
-use PSFS\base\Router;
 use PSFS\base\Singleton;
 use PSFS\base\types\helpers\GeneratorHelper;
 use PSFS\base\types\helpers\Inspector;
 use PSFS\base\types\interfaces\ControllerInterface;
 use PSFS\base\types\traits\JsonTrait;
-use PSFS\base\types\traits\OutputTrait;
 use PSFS\base\types\traits\RouteTrait;
 
 /**

Spacing +3 added lines, -3 removed lines

@@ -41,11 +41,11 @@ 
     public function render($template, array $vars = array(), $cookies = array(), $domain = null)
     {
         $vars['__menu__'] = $this->getMenu();
-        if(Config::getParam('profiling.enable')) {
+        if (Config::getParam('profiling.enable')) {
             $vars['__profiling__'] = Inspector::getStats();
         }
         $domain = (null === $domain) ? $this->getDomain() : $domain;
-        return $this->tpl->render($domain . $template, $vars, $cookies);
+        return $this->tpl->render($domain.$template, $vars, $cookies);
     }
 
     /**
@@ -76,7 +76,7 @@ 
     {
         $vars['__menu__'] = $this->getMenu();
         $domain = $domain ?: $this->getDomain();
-        return $this->tpl->dump($domain . $template, $vars);
+        return $this->tpl->dump($domain.$template, $vars);
     }
 
     /**

src/base/types/helpers/Inspector.php

Doc Comments +3 added lines

@@ -14,6 +14,9 @@
         ];
     }
 
+    /**
+     * @param string $name
+     */
     public static function stats($name = null) {
         self::$profiling[] = self::collect($name);
     }

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
     protected static function calculateStats(array $stats, $ts, $mem = 0, $files = 0) {
         return [
             'ts' => round($stats['ts'] - $ts, 4),
-            'mem' => round(($stats['mem'] - $mem) / 1024 / 1024, 4),
+            'mem' => round(($stats['mem'] - $mem)/1024/1024, 4),
             'files' => $stats['files'] - $files,
             'name' => $stats['name'],
         ];
@@ -42,7 +42,7 @@ 
         $ts = defined('PSFS_START_TS') ? PSFS_START_TS : 0;
         $mem = defined('PSFS_START_MEM') ? PSFS_START_MEM : 0;
         $files = 0;
-        foreach(self::$profiling as $key => &$value) {
+        foreach (self::$profiling as $key => &$value) {
             $value = self::calculateStats($value, $ts, $mem, $files);
         }
         self::$profiling[] = self::calculateStats(self::collect('Profiling collect ends'), $ts, $mem, $files);

src/base/types/traits/JsonTrait.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      * @param mixed $response
      * @param int $statusCode
      *
-     * @return mixed JSON
+     * @return string|null JSON
      */
     public function json($response, $statusCode = 200)
     {

Spacing +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@ 
      */
     public function json($response, $statusCode = 200)
     {
-        if(Config::getParam('profiling.enable')) {
-            if(is_array($response)) {
+        if (Config::getParam('profiling.enable')) {
+            if (is_array($response)) {
                 $response['profiling'] = Inspector::getStats();
-            } elseif($response instanceof JsonResponse) {
+            } elseif ($response instanceof JsonResponse) {
                 $response = ProfilingJsonResponse::createFromPrevious($response, Inspector::getStats());
             }
         }
@@ -34,13 +34,13 @@ 
         $this->decodeJsonReponse($response);
 
         $mask = JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING;
-        if(Config::getParam('output.json.strict_numbers')) {
+        if (Config::getParam('output.json.strict_numbers')) {
             $mask = JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING | JSON_NUMERIC_CHECK;
         }
 
         $data = json_encode($response, $mask);
-        if(Config::getParam('angular.protection', false)) {
-            $data = ")]}',\n" . $data;
+        if (Config::getParam('angular.protection', false)) {
+            $data = ")]}',\n".$data;
         }
         $this->setStatus($statusCode);
         ResponseHelper::setDebugHeaders([]);

src/bootstrap.php

Spacing +10 added lines, -10 removed lines

@@ -3,17 +3,17 @@
 
 if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'src');
+}else {
+    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR.DIRECTORY_SEPARATOR.'..');
+    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'modules');
 }
-if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
+if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'vendor');
+if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'cache');
+if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'config');
+if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'html');
 
 
 /**

Braces +31 added lines, -11 removed lines

@@ -4,19 +4,39 @@
 defined('PSFS_START_MEM') or define('PSFS_START_MEM', memory_get_usage());
 defined('PSFS_START_TS') or define('PSFS_START_TS', microtime(true));
 
-if (!defined('SOURCE_DIR')) define('SOURCE_DIR', __DIR__);
+if (!defined('SOURCE_DIR')) {
+    define('SOURCE_DIR', __DIR__);
+}
 if (preg_match('/vendor/', SOURCE_DIR)) {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
-} else {
-    if (!defined('BASE_DIR')) define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
-    if (!defined('CORE_DIR')) define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'src');
+    }
+    } else {
+    if (!defined('BASE_DIR')) {
+        define('BASE_DIR', SOURCE_DIR . DIRECTORY_SEPARATOR . '..');
+    }
+    if (!defined('CORE_DIR')) {
+        define('CORE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'modules');
+    }
+    }
+if (!defined('VENDOR_DIR')) {
+    define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
+}
+if (!defined('LOG_DIR')) {
+    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+}
+if (!defined('CACHE_DIR')) {
+    define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
+}
+if (!defined('CONFIG_DIR')) {
+    define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
+}
+if (!defined('WEB_DIR')) {
+    define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
 }
-if (!defined('VENDOR_DIR')) define('VENDOR_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'vendor');
-if (!defined('LOG_DIR')) define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-if (!defined('CACHE_DIR')) define('CACHE_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'cache');
-if (!defined('CONFIG_DIR')) define('CONFIG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'config');
-if (!defined('WEB_DIR')) define('WEB_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'html');
 
 
 /**

src/base/config/Config.php

Doc Comments +1 added lines, -1 removed lines

@@ -196,7 +196,7 @@
     /**
      * Method that returns a config value
      * @param string $param
-     * @param mixed $defaultValue
+     * @param string $defaultValue
      *
      * @return mixed|null
      */

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/types/helpers/I18nHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
     /**
      * @param string $default
-     * @return array|mixed|string
+     * @return string
      */
     private static function extractLocale($default = null)
     {

Spacing +14 added lines, -14 removed lines

@@ -30,21 +30,21 @@ 
                 list($BrowserLocales[$i]) = explode(";", $BrowserLocales[$i]); //trick for "en;q=0.8"
             }
             $locale = array_shift($BrowserLocales);
-        } else {
+        }else {
             $locale = strtolower($locale);
         }
         if (false !== strpos($locale, '_')) {
             $locale = explode('_', $locale);
             if ($locale[0] == 'en') {
-                $locale = $locale[0] . '_GB';
-            } else {
-                $locale = $locale[0] . '_' . strtoupper($locale[1]);
+                $locale = $locale[0].'_GB';
+            }else {
+                $locale = $locale[0].'_'.strtoupper($locale[1]);
             }
-        } else {
+        }else {
             if (strtolower($locale) === 'en') {
                 $locale = 'en_GB';
-            } else {
-                $locale = $locale . '_' . strtoupper($locale);
+            }else {
+                $locale = $locale.'_'.strtoupper($locale);
             }
         }
         if (!in_array($locale, self::$langs)) {
@@ -65,7 +65,7 @@ 
         $translations = array();
         if (file_exists($absoluteTranslationFileName)) {
             @include($absoluteTranslationFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteTranslationFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 
@@ -78,13 +78,13 @@ 
     public static function setLocale()
     {
         $locale = self::extractLocale('es_ES');
-        Logger::log('Set locale to project [' . $locale . ']');
+        Logger::log('Set locale to project ['.$locale.']');
         // Load translations
-        putenv("LC_ALL=" . $locale);
+        putenv("LC_ALL=".$locale);
         setlocale(LC_ALL, $locale);
         // Load the locale path
-        $locale_path = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
-        Logger::log('Set locale dir ' . $locale_path);
+        $locale_path = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+        Logger::log('Set locale dir '.$locale_path);
         GeneratorHelper::createDir($locale_path);
         bindtextdomain('translations', $locale_path);
         textdomain('translations');
@@ -119,9 +119,9 @@ 
      */
     public static function checkI18Class($namespace) {
         $isI18n = false;
-        if(preg_match('/I18n$/i', $namespace)) {
+        if (preg_match('/I18n$/i', $namespace)) {
             $parentClass = preg_replace('/I18n$/i', '', $namespace);
-            if(Router::exists($parentClass)) {
+            if (Router::exists($parentClass)) {
                 $isI18n = true;
             }
         }

src/base/Template.php

Spacing +7 added lines, -7 removed lines

@@ -113,7 +113,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $dump;
@@ -140,7 +140,7 @@ 
     public function regenerateTemplates()
     {
         $this->generateTemplatesCache();
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . "domains.json", Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR."domains.json", Cache::JSON, true);
         $translations = [];
         if (is_array($domains)) {
             $translations = $this->parsePathTranslations($domains);
@@ -162,8 +162,8 @@ 
             // force compilation
             if ($file->isFile()) {
                 try {
-                    $this->tpl->load(str_replace($tplDir . '/', '', $file));
-                } catch (\Exception $e) {
+                    $this->tpl->load(str_replace($tplDir.'/', '', $file));
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]);
                 }
             }
@@ -224,7 +224,7 @@ 
             'getFlash' => TemplateFunctions::GET_FLASH_FUNCTION,
             'getQuery' => TemplateFunctions::GET_QUERY_FUNCTION,
         ];
-        foreach($functions as $name => $function) {
+        foreach ($functions as $name => $function) {
             $this->addTemplateFunction($name, $function);
         }
     }
@@ -243,7 +243,7 @@ 
      */
     private function loadDomains()
     {
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true);
         if (null !== $domains) {
             foreach ($domains as $domain => $paths) {
                 $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain));
@@ -258,7 +258,7 @@ 
     {
         $loader = new \Twig_Loader_Filesystem(GeneratorHelper::getTemplatePath());
         $this->tpl = new \Twig_Environment($loader, array(
-            'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig',
+            'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig',
             'debug' => (bool)$this->debug,
             'auto_reload' => Config::getParam('twig.autoreload', TRUE),
         ));