psfs / core

src/base/types/helpers/FileHelper.php

Doc Comments +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
  */
 class FileHelper {
     /**
-     * @param mixed $data
+     * @param string $data
      * @param string $path
      * @return int
      */
@@ -18,7 +18,7 @@ 
 
     /**
      * @param string $path
-     * @return mixed|bool
+     * @return string|false
      */
     public static function readFile($path) {
         $data = false;
@@ -51,8 +51,8 @@ 
     }
 
     /**
-     * @param $path
-     * @return bool
+     * @param string $path
+     * @return boolean|null
      */
     public static function deleteDir($path) {
         (new Filesystem())->remove($path);

Spacing +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
      */
     public static function readFile($path) {
         $data = false;
-        if(file_exists($path)) {
+        if (file_exists($path)) {
             $data = file_get_contents($path);
         }
         return $data;
@@ -35,7 +35,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)));
     }
 
     /**
@@ -46,8 +46,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/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 +7 added lines, -7 removed lines

@@ -72,7 +72,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;
@@ -188,10 +188,10 @@ 
             $final_data = array_filter($final_data, function($key, $value) {
                 return in_array($key, Config::$required) || !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)));
             Config::getInstance()->loadConfigData();
             $saved = true;
-        } catch (ConfigException $e) {
+        }catch (ConfigException $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $saved;
@@ -223,7 +223,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;
     }
 
@@ -244,9 +244,9 @@ 
      */
     public static function getParam($key, $defaultValue = null, $module = null)
     {
-        if(null !== $module) {
-            return self::getParam(strtolower($module) . '.' . $key, self::getParam($key, $defaultValue));
-        } else {
+        if (null !== $module) {
+            return self::getParam(strtolower($module).'.'.$key, self::getParam($key, $defaultValue));
+        }else {
             $param = Config::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),
         ));

src/base/config/ConfigForm.php

Spacing +3 added lines, -3 removed lines

@@ -82,9 +82,9 @@
             "class" => "btn-warning md-default",
             "icon" => "fa-plus",
         ];
-        if(Config::getParam('admin.version', 'v1') === 'v1') {
-            $add["onclick"] = "javascript:addNewField(document.getElementById('" . $this->getName() . "'));";
-        } else {
+        if (Config::getParam('admin.version', 'v1') === 'v1') {
+            $add["onclick"] = "javascript:addNewField(document.getElementById('".$this->getName()."'));";
+        }else {
             $add["ng-click"] = "addNewField()";
         }
         $this->addButton('submit', _("Guardar configuración"), "submit", array(

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

Spacing +27 added lines, -27 removed lines

@@ -65,21 +65,21 @@ 
         if (count($pks) == 1) {
             $pks = array_keys($pks);
             return [
-                $tableMap::TABLE_NAME . '.' . $pks[0] => Api::API_MODEL_KEY_FIELD
+                $tableMap::TABLE_NAME.'.'.$pks[0] => Api::API_MODEL_KEY_FIELD
             ];
         } elseif (count($pks) > 1) {
             $apiPks = [];
             $principal = '';
             $sep = 'CONCAT(';
             foreach ($pks as $pk) {
-                $apiPks[$tableMap::TABLE_NAME . '.' . $pk->getName()] = $pk->getPhpName();
-                $principal .= $sep . $tableMap::TABLE_NAME . '.' . $pk->getName();
-                $sep = ', "' . Api::API_PK_SEPARATOR . '", ';
+                $apiPks[$tableMap::TABLE_NAME.'.'.$pk->getName()] = $pk->getPhpName();
+                $principal .= $sep.$tableMap::TABLE_NAME.'.'.$pk->getName();
+                $sep = ', "'.Api::API_PK_SEPARATOR.'", ';
             }
             $principal .= ')';
             $apiPks[$principal] = Api::API_MODEL_KEY_FIELD;
             return $apiPks;
-        } else {
+        }else {
             throw new ApiException(_('El modelo de la API no está debidamente mapeado, no hay Primary Key o es compuesta'));
         }
     }
@@ -102,10 +102,10 @@ 
         $pks = '';
         $sep = '';
         foreach ($tableMap->getPrimaryKeys() as $pk) {
-            $pks .= $sep . $pk->getFullyQualifiedName();
+            $pks .= $sep.$pk->getFullyQualifiedName();
             $sep = ', "|", ';
         }
-        $this->extraColumns['CONCAT("' . $tableMap->getPhpName() . ' #", ' . $pks . ')'] = Api::API_LIST_NAME_FIELD;
+        $this->extraColumns['CONCAT("'.$tableMap->getPhpName().' #", '.$pks.')'] = Api::API_LIST_NAME_FIELD;
     }
 
     /**
@@ -127,7 +127,7 @@ 
             }
             if (null !== $column) {
                 $this->extraColumns[$column->getFullyQualifiedName()] = Api::API_LIST_NAME_FIELD;
-            } else {
+            }else {
                 $this->addClassListName($tableMap);
             }
         }
@@ -139,22 +139,22 @@ 
      * @param ModelCriteria $query
      * @param string $action
      */
-    private function addExtraColumns(ModelCriteria &$query, $action)
+    private function addExtraColumns(ModelCriteria & $query, $action)
     {
         if (Api::API_ACTION_LIST === $action) {
             $this->addDefaultListField();
             $this->addPkToList();
         }
         if (!empty($this->extraColumns)) {
-            if(Config::getParam('api.extrafields.compat', true)) {
+            if (Config::getParam('api.extrafields.compat', true)) {
                 $fields = array_values($this->extraColumns);
-            } else {
+            }else {
                 $returnFields = Request::getInstance()->getQuery(Api::API_FIELDS_RESULT_FIELD);
                 $fields = explode(',', $returnFields ?: '');
                 $fields[] = self::API_MODEL_KEY_FIELD;
             }
             foreach ($this->extraColumns as $expression => $columnName) {
-                if(empty($fields) || in_array($columnName, $fields)) {
+                if (empty($fields) || in_array($columnName, $fields)) {
                     $query->withColumn($expression, $columnName);
                 }
             }
@@ -182,21 +182,21 @@ 
     /**
      * @param ModelCriteria $query
      */
-    protected function checkI18n(ModelCriteria &$query)
+    protected function checkI18n(ModelCriteria & $query)
     {
         $this->extractApiLang();
         $model = $this->getModelNamespace();
-        $modelI18n = $model . 'I18n';
+        $modelI18n = $model.'I18n';
         if (method_exists($query, 'useI18nQuery')) {
             $query->useI18nQuery($this->lang);
-            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n) . 'TableMap';
+            $modelI18nTableMapClass = str_replace('\\Models\\', '\\Models\\Map\\', $modelI18n).'TableMap';
             /** @var TableMap $modelI18nTableMap */
             $modelI18nTableMap = $modelI18nTableMapClass::getTableMap();
-            foreach($modelI18nTableMap->getColumns() as $columnMap) {
-                if(!$columnMap->isPrimaryKey()) {
-                    $query->withColumn($modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName(), $columnMap->getPhpName());
-                } elseif(!$columnMap->isForeignKey()) {
-                    $query->withColumn('IFNULL(' . $modelI18nTableMapClass::TABLE_NAME . '.' . $columnMap->getName() . ', "'.$this->lang.'")', $columnMap->getPhpName());
+            foreach ($modelI18nTableMap->getColumns() as $columnMap) {
+                if (!$columnMap->isPrimaryKey()) {
+                    $query->withColumn($modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName(), $columnMap->getPhpName());
+                } elseif (!$columnMap->isForeignKey()) {
+                    $query->withColumn('IFNULL('.$modelI18nTableMapClass::TABLE_NAME.'.'.$columnMap->getName().', "'.$this->lang.'")', $columnMap->getPhpName());
                 }
             }
         }
@@ -206,23 +206,23 @@ 
      * @param ActiveRecordInterface $model
      * @param array $data
      */
-    protected function hydrateModelFromRequest(ActiveRecordInterface &$model, array $data = []) {
+    protected function hydrateModelFromRequest(ActiveRecordInterface & $model, array $data = []) {
         $model->fromArray($data);
         $tableMap = $this->getTableMap();
         try {
-            $relateI18n = $tableMap->getRelation($tableMap->getPhpName() . 'I18n');
-            if(null !== $relateI18n) {
+            $relateI18n = $tableMap->getRelation($tableMap->getPhpName().'I18n');
+            if (null !== $relateI18n) {
                 $i18NTableMap = $relateI18n->getLocalTable();
-                foreach($i18NTableMap->getColumns() as $columnMap) {
-                    $method = 'set' . $columnMap->getPhpName();
-                    if(!($columnMap->isPrimaryKey() && $columnMap->isForeignKey())
+                foreach ($i18NTableMap->getColumns() as $columnMap) {
+                    $method = 'set'.$columnMap->getPhpName();
+                    if (!($columnMap->isPrimaryKey() && $columnMap->isForeignKey())
                         &&array_key_exists($columnMap->getPhpName(), $data)
                         && method_exists($model, $method)) {
                         $model->$method($data[$columnMap->getPhpName()]);
                     }
                 }
             }
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
         }
     }

src/base/types/helpers/RequestHelper.php

Braces +45 added lines, -22 removed lines

@@ -70,22 +70,28 @@ 
             if (strpos($_SERVER['HTTP_X_FORWARDED_FOR'], ',') !== false) {
                 $iplist = explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']);
                 foreach ($iplist as $ip) {
-                    if (self::validateIpAddress($ip))
-                        return $ip;
+                    if (self::validateIpAddress($ip)) {
+                                            return $ip;
+                    }
                 }
             } else {
-                if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR']))
-                    return $_SERVER['HTTP_X_FORWARDED_FOR'];
+                if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                                    return $_SERVER['HTTP_X_FORWARDED_FOR'];
+                }
             }
         }
-        if (!empty($_SERVER['HTTP_X_FORWARDED']) && self::validateIpAddress($_SERVER['HTTP_X_FORWARDED']))
-            return $_SERVER['HTTP_X_FORWARDED'];
-        if (!empty($_SERVER['HTTP_X_CLUSTER_CLIENT_IP']) && self::validateIpAddress($_SERVER['HTTP_X_CLUSTER_CLIENT_IP']))
-            return $_SERVER['HTTP_X_CLUSTER_CLIENT_IP'];
-        if (!empty($_SERVER['HTTP_FORWARDED_FOR']) && self::validateIpAddress($_SERVER['HTTP_FORWARDED_FOR']))
-            return $_SERVER['HTTP_FORWARDED_FOR'];
-        if (!empty($_SERVER['HTTP_FORWARDED']) && self::validateIpAddress($_SERVER['HTTP_FORWARDED']))
-            return $_SERVER['HTTP_FORWARDED'];
+        if (!empty($_SERVER['HTTP_X_FORWARDED']) && self::validateIpAddress($_SERVER['HTTP_X_FORWARDED'])) {
+                    return $_SERVER['HTTP_X_FORWARDED'];
+        }
+        if (!empty($_SERVER['HTTP_X_CLUSTER_CLIENT_IP']) && self::validateIpAddress($_SERVER['HTTP_X_CLUSTER_CLIENT_IP'])) {
+                    return $_SERVER['HTTP_X_CLUSTER_CLIENT_IP'];
+        }
+        if (!empty($_SERVER['HTTP_FORWARDED_FOR']) && self::validateIpAddress($_SERVER['HTTP_FORWARDED_FOR'])) {
+                    return $_SERVER['HTTP_FORWARDED_FOR'];
+        }
+        if (!empty($_SERVER['HTTP_FORWARDED']) && self::validateIpAddress($_SERVER['HTTP_FORWARDED'])) {
+                    return $_SERVER['HTTP_FORWARDED'];
+        }
 
         // return unreliable ip since all else failed
         return $_SERVER['REMOTE_ADDR'];
@@ -96,8 +102,9 @@ 
      * a private network range.
      */
     public static function validateIpAddress($ip) {
-        if (strtolower($ip) === 'unknown')
-            return false;
+        if (strtolower($ip) === 'unknown') {
+                    return false;
+        }
 
         // generate ipv4 network address
         $ip = ip2long($ip);
@@ -109,14 +116,30 @@ 
             // signed numbers (ints default to signed in PHP)
             $ip = sprintf('%u', $ip);
             // do private network range checking
-            if ($ip >= 0 && $ip <= 50331647) return false;
-            if ($ip >= 167772160 && $ip <= 184549375) return false;
-            if ($ip >= 2130706432 && $ip <= 2147483647) return false;
-            if ($ip >= 2851995648 && $ip <= 2852061183) return false;
-            if ($ip >= 2886729728 && $ip <= 2887778303) return false;
-            if ($ip >= 3221225984 && $ip <= 3221226239) return false;
-            if ($ip >= 3232235520 && $ip <= 3232301055) return false;
-            if ($ip >= 4294967040) return false;
+            if ($ip >= 0 && $ip <= 50331647) {
+                return false;
+            }
+            if ($ip >= 167772160 && $ip <= 184549375) {
+                return false;
+            }
+            if ($ip >= 2130706432 && $ip <= 2147483647) {
+                return false;
+            }
+            if ($ip >= 2851995648 && $ip <= 2852061183) {
+                return false;
+            }
+            if ($ip >= 2886729728 && $ip <= 2887778303) {
+                return false;
+            }
+            if ($ip >= 3221225984 && $ip <= 3221226239) {
+                return false;
+            }
+            if ($ip >= 3232235520 && $ip <= 3232301055) {
+                return false;
+            }
+            if ($ip >= 4294967040) {
+                return false;
+            }
         }
         return true;
     }

Spacing +3 added lines, -3 removed lines

@@ -42,10 +42,10 @@ 
 
                     // TODO include this headers in Template class output method
                     header("Access-Control-Allow-Credentials: true");
-                    header("Access-Control-Allow-Origin: " . Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
+                    header("Access-Control-Allow-Origin: ".Request::getInstance()->getServer('HTTP_ORIGIN', '*'));
                     header("Vary: Origin");
                     header("Access-Control-Allow-Methods: GET, POST, DELETE, PUT, PATCH, OPTIONS");
-                    header("Access-Control-Allow-Headers: " . implode(', ', self::getCorsHeaders()));
+                    header("Access-Control-Allow-Headers: ".implode(', ', self::getCorsHeaders()));
                 }
                 if (Request::getInstance()->getMethod() == 'OPTIONS') {
                     Logger::log('Returning OPTIONS header confirmation for CORS pre flight requests', LOG_DEBUG);
@@ -74,7 +74,7 @@ 
                     if (self::validateIpAddress($ip))
                         return $ip;
                 }
-            } else {
+            }else {
                 if (self::validateIpAddress($_SERVER['HTTP_X_FORWARDED_FOR']))
                     return $_SERVER['HTTP_X_FORWARDED_FOR'];
             }

src/base/extension/AssetsParser.php

Spacing +58 added lines, -58 removed lines

@@ -33,7 +33,7 @@ 
     public function __construct($type = 'js')
     {
         $this->type = $type;
-        $this->path = WEB_DIR . DIRECTORY_SEPARATOR;
+        $this->path = WEB_DIR.DIRECTORY_SEPARATOR;
         $this->domains = Template::getDomains(true);
         $this->debug = Config::getInstance()->getDebugMode();
     }
@@ -55,7 +55,7 @@ 
             $source_file = explode("?", $source_file);
             $source_file = $source_file[0];
         }
-        $orig = realpath(dirname($filename_path) . DIRECTORY_SEPARATOR . $source_file);
+        $orig = realpath(dirname($filename_path).DIRECTORY_SEPARATOR.$source_file);
         return $orig;
     }
 
@@ -68,12 +68,12 @@ 
      */
     public function addFile($filename)
     {
-        if (file_exists($this->path . $filename) && preg_match('/\.' . $this->type . '$/i', $filename)) {
+        if (file_exists($this->path.$filename) && preg_match('/\.'.$this->type.'$/i', $filename)) {
             $this->files[] = $filename;
         } elseif (!empty($this->domains)) {
             foreach ($this->domains as $domain => $paths) {
                 $domain_filename = str_replace($domain, $paths["public"], $filename);
-                if (file_exists($domain_filename) && preg_match('/\.' . $this->type . '$/i', $domain_filename)) {
+                if (file_exists($domain_filename) && preg_match('/\.'.$this->type.'$/i', $domain_filename)) {
                     $this->files[] = $domain_filename;
                 }
             }
@@ -90,7 +90,7 @@ 
     public function setHash($hash)
     {
         $cache = Config::getParam('cache.var', '');
-        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+        $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
         return $this;
     }
 
@@ -124,8 +124,8 @@ 
      */
     protected function compileCss()
     {
-        $base = $this->path . "css" . DIRECTORY_SEPARATOR;
-        if ($this->debug || !file_exists($base . $this->hash . ".css")) {
+        $base = $this->path."css".DIRECTORY_SEPARATOR;
+        if ($this->debug || !file_exists($base.$this->hash.".css")) {
             $data = '';
             if (0 < count($this->files)) {
                 $minifier = new CSS();
@@ -133,15 +133,15 @@ 
                     $data = $this->processCssLine($file, $base, $data);
                 }
             }
-            if($this->debug) {
-                $this->storeContents($base . $this->hash . ".css", $data);
-            } else {
+            if ($this->debug) {
+                $this->storeContents($base.$this->hash.".css", $data);
+            }else {
                 $minifier = new CSS();
                 $minifier->add($data);
                 ini_set('max_execution_time', -1);
                 ini_set('memory_limit', -1);
                 GeneratorHelper::createDir($base);
-                $minifier->minify($base . $this->hash . ".css");
+                $minifier->minify($base.$this->hash.".css");
                 unset($cssMinifier);
                 ini_restore('memory_limit');
                 ini_restore('max_execution_time');
@@ -157,8 +157,8 @@ 
      */
     protected function compileJs()
     {
-        $base = $this->path . "js" . DIRECTORY_SEPARATOR;
-        if ($this->debug || !file_exists($base . $this->hash . ".js")) {
+        $base = $this->path."js".DIRECTORY_SEPARATOR;
+        if ($this->debug || !file_exists($base.$this->hash.".js")) {
             $data = '';
             if (0 < count($this->files)) {
                 $minifier = new JS();
@@ -167,19 +167,19 @@ 
                     if (file_exists($file)) {
                         if ($this->debug) {
                             $data = $this->putDebugJs($path_parts, $base, $file);
-                        } elseif (!file_exists($base . $this->hash . ".js")) {
+                        } elseif (!file_exists($base.$this->hash.".js")) {
                             $minifier->add($file);
                             //$data = $this->putProductionJs($base, $file, $data);
                         }
                     }
                 }
-                if($this->debug) {
-                    $this->storeContents($base . $this->hash . ".js", $data);
-                } else {
+                if ($this->debug) {
+                    $this->storeContents($base.$this->hash.".js", $data);
+                }else {
                     ini_set('max_execution_time', -1);
                     ini_set('memory_limit', -1);
                     GeneratorHelper::createDir($base);
-                    $minifier->minify($base . $this->hash . ".js");
+                    $minifier->minify($base.$this->hash.".js");
                     ini_restore('memory_limit');
                     ini_restore('max_execution_time');
                 }
@@ -199,7 +199,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if ("" !== $content && false === file_put_contents($path, $content)) {
-            throw new ConfigException(_('No se tienen permisos para escribir en ' . $path));
+            throw new ConfigException(_('No se tienen permisos para escribir en '.$path));
         }
     }
 
@@ -228,8 +228,8 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
-            echo "\t\t<script type='text/javascript' src='/js/" . $this->hash . ".js'></script>\n";
+        }else {
+            echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n";
         }
     }
 
@@ -242,8 +242,8 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
-            echo "\t\t<link href='/css/" . $this->hash . ".css' rel='stylesheet'>";
+        }else {
+            echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet'>";
         }
     }
 
@@ -254,20 +254,20 @@ 
     protected function extractCssResources($source, $file)
     {
         $source_file = $this->extractSourceFilename($source);
-        $orig = realpath(dirname($file) . DIRECTORY_SEPARATOR . $source_file);
+        $orig = realpath(dirname($file).DIRECTORY_SEPARATOR.$source_file);
         $orig_part = preg_split('/(\/|\\\)public(\/|\\\)/i', $orig);
         try {
             if (count($source) > 1 && array_key_exists(1, $orig_part)) {
-                $dest = $this->path . $orig_part[1];
+                $dest = $this->path.$orig_part[1];
                 GeneratorHelper::createDir(dirname($dest));
                 if (!file_exists($dest) || filemtime($orig) > filemtime($dest)) {
                     if (@copy($orig, $dest) === FALSE) {
-                        throw new \RuntimeException('Can\' copy ' . $dest . '');
+                        throw new \RuntimeException('Can\' copy '.$dest.'');
                     }
                     Logger::log("$orig copiado a $dest", LOG_INFO);
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
     }
@@ -284,21 +284,21 @@ 
     {
         if (file_exists($file)) {
             $path_parts = explode("/", $file);
-            $file_path = $this->hash . "_" . $path_parts[count($path_parts) - 1];
-            if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($file) || $this->debug) {
+            $file_path = $this->hash."_".$path_parts[count($path_parts) - 1];
+            if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($file) || $this->debug) {
                 //Si tenemos modificaciones tenemos que compilar de nuevo todos los ficheros modificados
-                if (file_exists($base . $this->hash . ".css") && @unlink($base . $this->hash . ".css") === false) {
-                    throw new ConfigException("Can't unlink file " . $base . $this->hash . ".css");
+                if (file_exists($base.$this->hash.".css") && @unlink($base.$this->hash.".css") === false) {
+                    throw new ConfigException("Can't unlink file ".$base.$this->hash.".css");
                 }
                 $this->loopCssLines($file);
             }
             if ($this->debug) {
                 $data = file_get_contents($file);
-                $this->storeContents($base . $file_path, $data);
-            } else {
+                $this->storeContents($base.$file_path, $data);
+            }else {
                 $data .= file_get_contents($file);
             }
-            $this->compiled_files[] = "/css/" . $file_path;
+            $this->compiled_files[] = "/css/".$file_path;
         }
 
         return $data;
@@ -313,12 +313,12 @@ 
      */
     protected function putDebugJs($path_parts, $base, $file)
     {
-        $file_path = $this->hash . "_" . $path_parts[count($path_parts) - 1];
-        $this->compiled_files[] = "/js/" . $file_path;
+        $file_path = $this->hash."_".$path_parts[count($path_parts) - 1];
+        $this->compiled_files[] = "/js/".$file_path;
         $data = "";
-        if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($file)) {
+        if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($file)) {
             $data = file_get_contents($file);
-            $this->storeContents($base . $file_path, $data);
+            $this->storeContents($base.$file_path, $data);
         }
         return $data;
     }
@@ -360,60 +360,60 @@ 
     {
         $ppath = explode("/", $string);
         $original_filename = $ppath[count($ppath) - 1];
-        $base = WEB_DIR . DIRECTORY_SEPARATOR;
+        $base = WEB_DIR.DIRECTORY_SEPARATOR;
         $file = "";
         $html_base = "";
         $debug = Config::getInstance()->getDebugMode();
         $cache = Config::getInstance()->get('cache.var');
-        $cache = $cache ? '.' . $cache : '';
+        $cache = $cache ? '.'.$cache : '';
         $finfo = finfo_open(FILEINFO_MIME_TYPE); // devuelve el tipo mime de su extensión
         $mime = finfo_file($finfo, $filename_path);
         finfo_close($finfo);
         if (preg_match('/\.css$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.css";
+            $file = "/".substr(md5($string), 0, 8)."$cache.css";
             $html_base = "css";
             if ($debug) {
-                $file = str_replace(".css", "_" . $original_filename, $file);
+                $file = str_replace(".css", "_".$original_filename, $file);
             }
         } elseif (preg_match('/\.js$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.js";
+            $file = "/".substr(md5($string), 0, 8)."$cache.js";
             $html_base = "js";
             if ($debug) {
-                $file = str_replace(".js", "_" . $original_filename, $file);
+                $file = str_replace(".js", "_".$original_filename, $file);
             }
         } elseif (preg_match("/image/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "img";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (preg_match("/(doc|pdf)/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "docs";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (preg_match("/(video|audio|ogg)/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "media";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (preg_match("/(text|html)/i", $mime)) {
             $ext = explode(".", $string);
-            $file = "/" . substr(md5($string), 0, 8) . "." . $ext[count($ext) - 1];
+            $file = "/".substr(md5($string), 0, 8).".".$ext[count($ext) - 1];
             $html_base = "templates";
             if ($debug) {
-                $file = str_replace("." . $ext[count($ext) - 1], "_" . $original_filename, $file);
+                $file = str_replace(".".$ext[count($ext) - 1], "_".$original_filename, $file);
             }
         } elseif (!$return && !is_null($name)) {
             $html_base = '';
             $file = $name;
         }
-        $file_path = $html_base . $file;
+        $file_path = $html_base.$file;
 
         return array($base, $html_base, $file_path);
     }
@@ -431,15 +431,15 @@ 
         if (preg_match_all('#url\((.*?)\)#', $line, $urls, PREG_SET_ORDER)) {
             foreach ($urls as $source) {
                 $orig = self::calculateResourcePathname($filename_path, $source);
-                if(!empty($orig)) {
+                if (!empty($orig)) {
                     $orig_part = preg_split("/Public/i", $orig);
-                    $dest = WEB_DIR . $orig_part[1];
+                    $dest = WEB_DIR.$orig_part[1];
                     GeneratorHelper::createDir(dirname($dest));
                     if (@copy($orig, $dest) === false) {
-                        throw new ConfigException("Can't copy " . $orig . " to " . $dest);
+                        throw new ConfigException("Can't copy ".$orig." to ".$dest);
                     }
-                } else {
-                    Logger::log($filename_path . ' has an empty origin with the url ' . $source, LOG_WARNING);
+                }else {
+                    Logger::log($filename_path.' has an empty origin with the url '.$source, LOG_WARNING);
                 }
             }
         }

src/base/Security.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php
 namespace PSFS\base;
 
-use PSFS\base\types\helpers\RequestHelper;
 use PSFS\base\types\helpers\ResponseHelper;
 use PSFS\base\types\traits\SecureTrait;
 use PSFS\base\types\traits\SingletonTrait;

Spacing +8 added lines, -8 removed lines

@@ -76,7 +76,7 @@ 
             session_start();
         }
         // Fix for phpunits
-        if(!isset($_SESSION)) {
+        if (!isset($_SESSION)) {
             $_SESSION = [];
         }
     }
@@ -136,12 +136,12 @@ 
     {
         $saved = true;
         try {
-            $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);
-        } catch(\Exception $e) {
+            Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             $saved = false;
         }
@@ -178,7 +178,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);
     }
 
     /**
@@ -206,7 +206,7 @@ 
                 }
                 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->admin = array(
                             'alias' => $user,
@@ -223,7 +223,7 @@ 
                         ]);
                         $this->setSessionKey(self::LOGGED_USER_TOKEN, base64_encode("{$user}:{$pass}"));
                     }
-                } else {
+                }else {
                     $this->admin = null;
                     $this->setSessionKey(self::ADMIN_ID_TOKEN, null);
                 }