psfs / core

src/base/types/traits/Helper/FieldModelHelperTrait.php

Spacing +15 added lines, -15 removed lines

@@ -31,7 +31,7 @@ 
         $fDto->entity = $relatedModel;
         $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName());
         $fDto->relatedField = $relatedField->getPhpName();
-        $fDto->url = Router::getInstance()->getRoute(strtolower($domain) . '-api-' . $relatedModel);
+        $fDto->url = Router::getInstance()->getRoute(strtolower($domain).'-api-'.$relatedModel);
         return $fDto;
     }
 
@@ -43,18 +43,18 @@ 
     private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null)
     {
         $tableField = $column->getFullyQualifiedName();
-        if(is_array($value)) {
+        if (is_array($value)) {
             $query->add($tableField, $value, Criteria::IN);
         } elseif (preg_match('/^\[/', $value) && preg_match('/\]$/', $value)) {
             $query->add($tableField, explode(',', preg_replace('/(\[|\])/', '', $value)), Criteria::IN);
         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
             $text = preg_replace('/(\'|\")/', '', $value);
             $text = preg_replace('/\ /', '%', $text);
-            $query->add($tableField, '%' . $text . '%', Criteria::LIKE);
-        } else {
-            if(null !== $column->getValueSet()) {
+            $query->add($tableField, '%'.$text.'%', Criteria::LIKE);
+        }else {
+            if (null !== $column->getValueSet()) {
                 $valueSet = $column->getValueSet();
-                if(in_array($value, $valueSet)) {
+                if (in_array($value, $valueSet)) {
                     $value = array_search($value, $valueSet);
                 }
             }
@@ -84,7 +84,7 @@ 
      */
     public static function extractQuery($modelNameNamespace, ConnectionInterface $con = null)
     {
-        $queryReflector = new \ReflectionClass($modelNameNamespace . "Query");
+        $queryReflector = new \ReflectionClass($modelNameNamespace."Query");
         /** @var \Propel\Runtime\ActiveQuery\ModelCriteria $query */
         $query = $queryReflector->getMethod('create')->invoke($con);
 
@@ -103,31 +103,31 @@ 
         $sep = '';
         foreach ($tableMap->getColumns() as $column) {
             if ($column->isText()) {
-                $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                 $sep = ', " ", ';
             }
         }
-        foreach($tableMap->getRelations() as $relation) {
-            if(preg_match('/I18n$/i', $relation->getName())) {
+        foreach ($tableMap->getRelations() as $relation) {
+            if (preg_match('/I18n$/i', $relation->getName())) {
                 $localeTableMap = $relation->getLocalTable();
                 foreach ($localeTableMap->getColumns() as $column) {
                     if ($column->isText()) {
-                        $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                        $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                         $sep = ', " ", ';
                     }
                 }
             }
         }
         foreach (array_keys($extraColumns) as $extra) {
-            if(!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) {
-                $exp .= $sep . $extra;
+            if (!preg_match("/(COUNT|DISTINCT|SUM|MAX|MIN|GROUP)/i", $extra)) {
+                $exp .= $sep.$extra;
                 $sep = ', " ", ';
             }
         }
         $exp .= ")";
         $text = preg_replace('/(\'|\")/', '', $value);
         $text = preg_replace('/\ /', '%', $text);
-        $query->where($exp . Criteria::LIKE . '"%' . $text . '%"');
+        $query->where($exp.Criteria::LIKE.'"%'.$text.'%"');
     }
 
     /**
@@ -136,7 +136,7 @@ 
      */
     public static function extractPrimaryKeyColumnName(TableMap $tableMap) {
         $modelPk = null;
-        foreach($tableMap->getPrimaryKeys() as $pk) {
+        foreach ($tableMap->getPrimaryKeys() as $pk) {
             $modelPk = $pk;
             break;
         }

src/base/dto/Form.php

Spacing +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@ 
             $array['fields'][] = $field->__toArray();
         }
         usort($array['fields'], function($fieldA, $fieldB) {
-            if((bool)$fieldA['required'] !== (bool)$fieldB['required']) {
-                if((bool)$fieldA['required']) {
+            if ((bool)$fieldA['required'] !== (bool)$fieldB['required']) {
+                if ((bool)$fieldA['required']) {
                     return -1;
-                } else {
+                }else {
                     return 1;
                 }
             }
@@ -56,7 +56,7 @@ 
             }
             return ($aOrder < $bOrder) ? -1 : 1;
         });
-        foreach($this->actions as $action) {
+        foreach ($this->actions as $action) {
             $array['actions'][] = $action->__toArray();
         }
         return $array;

src/base/extension/AssetsTokenParser.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
         $tmp = [];
         if (null === $node) {
             $node = $value;
-        } else {
+        }else {
             $tmp = $this->getTmpAttribute($node);
         }
         if (null !== $node) {

src/base/types/helpers/DeployHelper.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public static function updateCacheVar() {
         $now = new \DateTime(null, new \DateTimeZone(Config::getParam('project.timezone', 'Europe/Madrid')));
         $config = Config::getInstance()->dumpConfig();
-        $config[self::CACHE_VAR_TAG] = 'v' . $now->format('Ymd.His');
+        $config[self::CACHE_VAR_TAG] = 'v'.$now->format('Ymd.His');
         Config::save($config);
         return $config[self::CACHE_VAR_TAG];
     }

src/base/types/traits/SystemTrait.php

Spacing +10 added lines, -10 removed lines

@@ -37,7 +37,7 @@ 
                 $use /= 1024;
                 break;
             case "MBytes":
-                $use /= (1024 * 1024);
+                $use /= (1024*1024);
                 break;
             case "Bytes":
             default:
@@ -61,34 +61,34 @@ 
     protected function bindWarningAsExceptions()
     {
         Inspector::stats('[SystemTrait] Added handlers for errors', Inspector::SCOPE_DEBUG);
-        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;
@@ -103,7 +103,7 @@ 
         Inspector::stats('[SystemTrait] 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/base/types/traits/JsonTrait.php

Spacing +7 added lines, -7 removed lines

@@ -25,10 +25,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(Config::getParam('log.level')));
             }
         }
@@ -36,17 +36,17 @@ 
         $this->decodeJsonResponse($response);
 
         $mask = JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING;
-        if(Config::getParam('output.json.strict_numbers')) {
+        if (Config::getParam('output.json.strict_numbers')) {
             $mask = JSON_UNESCAPED_LINE_TERMINATORS | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_BIGINT_AS_STRING | JSON_NUMERIC_CHECK;
         }
 
         $data = json_encode($response, $mask);
-        if(json_last_error() !== JSON_ERROR_NONE) {
+        if (json_last_error() !== JSON_ERROR_NONE) {
             Logger::log(json_last_error_msg(), LOG_CRIT);
         }
 
-        if(Config::getParam('angular.protection', false)) {
-            $data = ")]}',\n" . $data;
+        if (Config::getParam('angular.protection', false)) {
+            $data = ")]}',\n".$data;
         }
         $this->setStatus($statusCode);
         ResponseHelper::setDebugHeaders([]);

src/base/types/helpers/Inspector.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
      */
     public static function stats($name = null, $scope = self::SCOPE_PROFILE) {
         self::$debug[] = self::collect($name);
-        if($scope === self::SCOPE_PROFILE) {
+        if ($scope === self::SCOPE_PROFILE) {
             self::$profiling[] = self::collect($name);
         }
     }
@@ -47,7 +47,7 @@ 
     protected static function calculateStats(array $stats, $timestamp, $mem = 0, $files = 0) {
         return [
             'ts' => round($stats['ts'] - $timestamp, 4),
-            'mem' => round(($stats['mem'] - $mem) / 1024 / 1024, 4),
+            'mem' => round(($stats['mem'] - $mem)/1024/1024, 4),
             'files' => $stats['files'] - $files,
             'name' => $stats['name'],
         ];
@@ -63,7 +63,7 @@ 
         $mem = defined('PSFS_START_MEM') ? PSFS_START_MEM : 0;
         $files = 0;
         $scopeSelected = $scope === self::SCOPE_DEBUG ? self::$debug : self::$profiling;
-        foreach($scopeSelected as &$value) {
+        foreach ($scopeSelected as &$value) {
             $value = self::calculateStats($value, $timestamp, $mem, $files);
         }
         $scopeSelected[] = self::calculateStats(self::collect('Profiling collect ends'), $timestamp, $mem, $files);

src/base/Cache.php

Spacing +13 added lines, -13 removed lines

@@ -55,7 +55,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if (false === FileHelper::writeFile($path, $data)) {
-            throw new ConfigException(t('No se tienen los permisos suficientes para escribir en el fichero ') . $path);
+            throw new ConfigException(t('No se tienen los permisos suficientes para escribir en el fichero ').$path);
         }
     }
 
@@ -69,7 +69,7 @@ 
     {
         Inspector::stats('[Cache] Gathering data from cache', Inspector::SCOPE_DEBUG);
         $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);
         }
@@ -85,7 +85,7 @@ 
     private function hasExpiredCache($path, $expires = 300, $absolute = false)
     {
         Inspector::stats('[Cache] Checking expiration', Inspector::SCOPE_DEBUG);
-        $absolutePath = ($absolute) ? $path : CACHE_DIR . DIRECTORY_SEPARATOR . $path;
+        $absolutePath = ($absolute) ? $path : CACHE_DIR.DIRECTORY_SEPARATOR.$path;
         $lasModificationDate = filemtime($absolutePath);
         return ($lasModificationDate + $expires <= time());
     }
@@ -152,7 +152,7 @@ 
     {
         Inspector::stats('[Cache] Store data in cache', Inspector::SCOPE_DEBUG);
         $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,12 +168,12 @@ 
     public function readFromCache($path, $expires = 300, $function = null, $transform = Cache::TEXT)
     {
         $data = null;
-        Inspector::stats('[Cache] Reading data from cache: ' . json_encode(['path' => $path]), Inspector::SCOPE_DEBUG);
-        if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $path)) {
+        Inspector::stats('[Cache] Reading data from cache: '.json_encode(['path' => $path]), Inspector::SCOPE_DEBUG);
+        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);
             }
         }
@@ -219,20 +219,20 @@ 
             $query[Api::HEADER_API_LANG] = Request::header(Api::HEADER_API_LANG, 'es');
             $filename = FileHelper::generateHashFilename($action['http'], $action['slug'], $query);
             $hashPath = FileHelper::generateCachePath($action, $query);
-            Inspector::stats('[Cache] Cache file calculated: ' . json_encode(['file' => $filename, 'hash' => $hashPath]), Inspector::SCOPE_DEBUG);
+            Inspector::stats('[Cache] Cache file calculated: '.json_encode(['file' => $filename, 'hash' => $hashPath]), Inspector::SCOPE_DEBUG);
             Logger::log('Cache file calculated', LOG_DEBUG, ['file' => $filename, 'hash' => $hashPath]);
         }
         return [$hashPath, $filename];
     }
 
     public function flushCache() {
-        if(Config::getParam('cache.data.enable', false)) {
+        if (Config::getParam('cache.data.enable', false)) {
             Inspector::stats('[Cache] Flushing cache', Inspector::SCOPE_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 +7 added lines, -7 removed lines

@@ -85,7 +85,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;
@@ -201,10 +201,10 @@ 
             $finalData = array_filter($finalData, 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($finalData, JSON_PRETTY_PRINT)));
+            $saved = (false !== file_put_contents(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, json_encode($finalData, JSON_PRETTY_PRINT)));
             self::getInstance()->loadConfigData();
             $saved = true;
-        } catch (ConfigException $e) {
+        }catch (ConfigException $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $saved;
@@ -236,9 +236,9 @@ 
      */
     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;
-        if(array_key_exists('cache.var', $this->config)) {
+        if (array_key_exists('cache.var', $this->config)) {
             Security::getInstance()->setSessionKey('config.cache.var', $this->config['cache.var']);
         }
     }
@@ -260,8 +260,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;