psfs / core

src/base/types/Api.php

Spacing +26 added lines, -26 removed lines

@@ -56,20 +56,20 @@ 
     public function init()
     {
         parent::init();
-        Logger::log(static::class . ' init', LOG_DEBUG);
+        Logger::log(static::class.' init', LOG_DEBUG);
         $this->domain = $this->getDomain();
         $this->hydrateRequestData();
         $this->hydrateOrders();
-        if($this instanceof CustomApi === false) {
+        if ($this instanceof CustomApi === false) {
             $this->createConnection($this->getTableMap());
         }
         $this->checkFieldType();
         $this->setLoaded(true);
-        Logger::log(static::class . ' loaded', LOG_DEBUG);
+        Logger::log(static::class.' loaded', LOG_DEBUG);
     }
 
     private function checkActions($method) {
-        switch($method) {
+        switch ($method) {
             default:
             case 'modelList': $this->action = self::API_ACTION_LIST; break;
             case 'get': $this->action = self::API_ACTION_GET; break;
@@ -94,7 +94,7 @@ 
         $code = 200;
         list($return, $total, $pages) = $this->getList();
         $message = null;
-        if(!$total) {
+        if (!$total) {
             $message = t('No se han encontrado elementos para la búsqueda');
         }
 
@@ -119,7 +119,7 @@ 
         $pages = 1;
         $message = null;
         list($code, $return) = $this->getSingleResult($pk);
-        if($code !== 200) {
+        if ($code !== 200) {
             $message = t('No se ha encontrado el elemento solicitado');
         }
 
@@ -148,13 +148,13 @@ 
                 $status = 200;
                 $saved = TRUE;
                 $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-            } else {
+            }else {
                 $message = t('No se ha podido guardar el modelo seleccionado');
             }
-        } catch (\Exception $e) {
-            $message = t('Ha ocurrido un error intentando guardar el elemento: ') .'<br>'. $e->getMessage();
+        }catch (\Exception $e) {
+            $message = t('Ha ocurrido un error intentando guardar el elemento: ').'<br>'.$e->getMessage();
             $context = [];
-            if(null !== $e->getPrevious()) {
+            if (null !== $e->getPrevious()) {
                 $context[] = $e->getPrevious()->getMessage();
             }
             Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -190,18 +190,18 @@ 
                     $updated = TRUE;
                     $status = 200;
                     $model = $this->model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
-                } else {
+                }else {
                     $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $message = t('Ha ocurrido un error intentando actualizar el elemento, por favor revisa los logs');
                 $context = [];
-                if(null !== $e->getPrevious()) {
+                if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
             }
-        } else {
+        }else {
             $message = t('No se ha encontrado el modelo al que se hace referencia para actualizar');
         }
 
@@ -229,15 +229,15 @@ 
                 $this->con->beginTransaction();
                 $this->hydrateModel($pk);
                 if (NULL !== $this->model) {
-                    if(method_exists('clearAllReferences', $this->model)) {
+                    if (method_exists('clearAllReferences', $this->model)) {
                         $this->model->clearAllReferences(true);
                     }
                     $this->model->delete($this->con);
                     $deleted = TRUE;
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 $context = [];
-                if(null !== $e->getPrevious()) {
+                if (null !== $e->getPrevious()) {
                     $context[] = $e->getPrevious()->getMessage();
                 }
                 Logger::log($e->getMessage(), LOG_CRIT, $context);
@@ -266,7 +266,7 @@ 
             $this->saveBulk();
             $saved = true;
             $status = 200;
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_CRIT, $this->getRequest()->getData());
             $message = t('Bulk insert rolled back');
         }
@@ -278,7 +278,7 @@ 
 
         /** @var CustomerTableMap $tableMap */
         $modelPk = ApiHelper::extractPrimaryKeyColumnName($this->getTableMap());
-        foreach($this->list->getData() as $data) {
+        foreach ($this->list->getData() as $data) {
             $return[] = ApiHelper::mapArrayObject($this->getModelNamespace(), $modelPk, $this->query, $data);
         }
         return $return;
@@ -295,23 +295,23 @@ 
         try {
             $this->paginate();
             if (null !== $this->list) {
-                if(array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
+                if (array_key_exists(self::API_FIELDS_RESULT_FIELD, $this->query) && Config::getParam('api.field.types')) {
                     $return = $this->extractDataWithFormat();
-                } else {
+                }else {
                     $return = $this->list->toArray(null, false, $this->fieldType ?: TableMap::TYPE_PHPNAME, false);
                 }
                 $total = 0;
                 $pages = 0;
-                if($this->list instanceof PropelModelPager) {
+                if ($this->list instanceof PropelModelPager) {
                     $total = $this->list->getNbResults();
                     $pages = $this->list->getLastPage();
-                } elseif($this->list instanceof ArrayCollection) {
+                } elseif ($this->list instanceof ArrayCollection) {
                     $total = count($return);
                     $pages = 1;
                 }
             }
-        } catch (\Exception $e) {
-            Logger::log(get_class($this) . ': ' . $e->getMessage(), LOG_ERR);
+        }catch (\Exception $e) {
+            Logger::log(get_class($this).': '.$e->getMessage(), LOG_ERR);
         }
 
         return array($return, $total, $pages);
@@ -329,7 +329,7 @@ 
         $return = array();
         if (NULL === $model || !method_exists($model, 'toArray')) {
             $code = 404;
-        } else {
+        }else {
             $return = $model->toArray($this->fieldType ?: TableMap::TYPE_PHPNAME, true, [], true);
         }
 

src/base/types/traits/Api/Crud/ApiListTrait.php

Spacing +12 added lines, -12 removed lines

@@ -37,7 +37,7 @@ 
     protected function hydrateOrders()
     {
         if (count($this->query)) {
-            Logger::log(static::class . ' gathering query string', LOG_DEBUG);
+            Logger::log(static::class.' gathering query string', LOG_DEBUG);
             foreach ($this->query as $key => $value) {
                 if ($key === self::API_ORDER_FIELD) {
                     $orders = json_decode($value, true);
@@ -55,10 +55,10 @@ 
      */
     protected function extractPagination()
     {
-        Logger::log(static::class . ' extract pagination start', LOG_DEBUG);
+        Logger::log(static::class.' extract pagination start', LOG_DEBUG);
         $page = array_key_exists(self::API_PAGE_FIELD, $this->query) ? $this->query[self::API_PAGE_FIELD] : 1;
         $limit = array_key_exists(self::API_LIMIT_FIELD, $this->query) ? $this->query[self::API_LIMIT_FIELD] : 100;
-        Logger::log(static::class . ' extract pagination end', LOG_DEBUG);
+        Logger::log(static::class.' extract pagination end', LOG_DEBUG);
         return array($page, (int)$limit);
     }
 
@@ -67,9 +67,9 @@ 
      * @param ModelCriteria $query
      * @throws \PSFS\base\exception\ApiException
      */
-    protected function addOrders(ModelCriteria &$query)
+    protected function addOrders(ModelCriteria & $query)
     {
-        Logger::log(static::class . ' extract orders start ', LOG_DEBUG);
+        Logger::log(static::class.' extract orders start ', LOG_DEBUG);
         $orderAdded = FALSE;
         $tableMap = $this->getTableMap();
         foreach ($this->order->getOrders() as $field => $direction) {
@@ -77,18 +77,18 @@ 
                 $orderAdded = TRUE;
                 if ($direction === Order::ASC) {
                     $query->addAscendingOrderByColumn($column->getPhpName());
-                } else {
+                }else {
                     $query->addDescendingOrderByColumn($column->getPhpName());
                 }
             }
         }
         if (!$orderAdded) {
             $pks = $this->getPkDbName();
-            foreach(array_keys($pks) as $key) {
+            foreach (array_keys($pks) as $key) {
                 $query->addAscendingOrderByColumn($key);
             }
         }
-        Logger::log(static::class . ' extract orders end', LOG_DEBUG);
+        Logger::log(static::class.' extract orders end', LOG_DEBUG);
     }
 
     /**
@@ -96,14 +96,14 @@ 
      *
      * @param ModelCriteria $query
      */
-    protected function addFilters(ModelCriteria &$query)
+    protected function addFilters(ModelCriteria & $query)
     {
         if (count($this->query) > 0) {
             $tableMap = $this->getTableMap();
             foreach ($this->query as $field => $value) {
                 if (self::API_COMBO_FIELD === $field) {
                     ApiHelper::composerComboField($tableMap, $query, $this->extraColumns, $value);
-                } elseif(!preg_match('/^__/', $field)) {
+                } elseif (!preg_match('/^__/', $field)) {
                     ApiHelper::addModelField($tableMap, $query, $field, $value);
                 }
             }
@@ -123,11 +123,11 @@ 
             list($page, $limit) = $this->extractPagination();
             if ($limit === -1) {
                 $this->list = $query->find($this->con);
-            } else {
+            }else {
                 $this->list = $query->paginate($page, $limit, $this->con);
             }
             $this->checkReturnFields($this->list->getQuery());
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
     }

src/base/types/helpers/AdminHelper.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         $excluded_modules = explode(',', strtoupper(Config::getParam('hide.modules', '')));
         foreach ($systemRoutes as $params) {
             $module = strtoupper($params['module']);
-            if(in_array($module, $excluded_modules) && $module !== 'PSFS') {
+            if (in_array($module, $excluded_modules) && $module !== 'PSFS') {
                 continue;
             }
             if (isset($params['http']) && Request::VERB_GET === $params['http']

src/base/types/traits/Router/ModulesTrait.php

Spacing +11 added lines, -11 removed lines

@@ -54,11 +54,11 @@ 
         if ($files->hasResults()) {
             foreach ($files->getIterator() as $file) {
                 if ($namespace !== Router::PSFS_BASE_NAMESPACE && method_exists($file, 'getRelativePathname')) {
-                    $filename = '\\' . str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
-                } else {
+                    $filename = '\\'.str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
+                }else {
                     $filename = str_replace('/', '\\', str_replace($origen, '', $file->getPathname()));
                 }
-                $routing = $this->addRouting($namespace . str_replace('.php', '', $filename), $routing, $namespace);
+                $routing = $this->addRouting($namespace.str_replace('.php', '', $filename), $routing, $namespace);
             }
         }
         $this->initializeFinder();
@@ -111,7 +111,7 @@ 
             if (!is_array($this->domains)) {
                 $this->domains = [];
             }
-            $domain = '@' . $class->getConstant('DOMAIN') . '/';
+            $domain = '@'.$class->getConstant('DOMAIN').'/';
             if (!array_key_exists($domain, $this->domains)) {
                 $this->domains[$domain] = RouterHelper::extractDomainInfo($class, $domain);
             }
@@ -138,11 +138,11 @@ 
     private function loadExternalAutoloader($hydrateRoute, SplFileInfo $modulePath, $externalModulePath, &$routing = [])
     {
         $extModule = $modulePath->getBasename();
-        $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php');
+        $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php');
         if (file_exists($moduleAutoloader)) {
             include_once $moduleAutoloader;
             if ($hydrateRoute) {
-                $routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $routing);
+                $routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $routing);
             }
         }
     }
@@ -158,18 +158,18 @@ 
         $modulesToIgnore = explode(',', Config::getParam('hide.modules', ''));
         try {
             $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module);
-            $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src';
+            $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src';
             if (file_exists($externalModulePath)) {
                 $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0);
                 if ($externalModule->hasResults()) {
                     foreach ($externalModule->getIterator() as $modulePath) {
-                        if(!in_array(strtoupper($modulePath->getRelativePathname()), $modulesToIgnore)) {
+                        if (!in_array(strtoupper($modulePath->getRelativePathname()), $modulesToIgnore)) {
                             $this->loadExternalAutoloader($hydrateRoute, $modulePath, $externalModulePath, $routing);
                         }
                     }
                 }
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
         }
     }
@@ -181,9 +181,9 @@ 
     public function domainExists($domainToCheck) {
         $exists = false;
         $domains = array_keys($this->getDomains());
-        foreach($domains as $domain) {
+        foreach ($domains as $domain) {
             $cleanDomain = strtolower(str_replace(['@', '/', '\\'], '', $domain));
-            if($cleanDomain === strtolower($domainToCheck)) {
+            if ($cleanDomain === strtolower($domainToCheck)) {
                 $exists = true;
                 break;
             }

src/base/Router.php

Spacing +24 added lines, -24 removed lines

@@ -62,8 +62,8 @@ 
      */
     public function init()
     {
-        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', $this->cacheType, TRUE);
-        $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->cacheType, TRUE);
+        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', $this->cacheType, TRUE);
+        $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->cacheType, TRUE);
         if (empty($this->routing) || Config::getParam('debug', true)) {
             $this->debugLoad();
         }
@@ -79,12 +79,12 @@ 
      */
     private function debugLoad()
     {
-                if(!Config::getParam('skip.route_generation', false)) {
+                if (!Config::getParam('skip.route_generation', false)) {
                     Logger::log('Begin routes load');
                     $this->hydrateRouting();
                     $this->simpatize();
                     Logger::log('End routes load');
-                } else {
+                }else {
                     Logger::log('Routes generation skipped');
                 }
     }
@@ -101,13 +101,13 @@ 
         try {
             //Search action and execute
             return $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
-            Logger::log(t('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile() . '[' . $e->getLine() . ']']);
+        }catch (AccessDeniedException $e) {
+            Logger::log(t('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile().'['.$e->getLine().']']);
             return Admin::staticAdminLogon();
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             Logger::log($r->getMessage(), LOG_WARNING);
             $code = $r->getCode();
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -125,7 +125,7 @@ 
      */
     protected function searchAction($route)
     {
-        Inspector::stats('[Router] Searching action to execute: ' . $route, Inspector::SCOPE_DEBUG);
+        Inspector::stats('[Router] Searching action to execute: '.$route, Inspector::SCOPE_DEBUG);
         //Revisamos si tenemos la ruta registrada
         $parts = parse_url($route);
         $path = array_key_exists('path', $parts) ? $parts['path'] : $route;
@@ -145,7 +145,7 @@ 
                     }
 
                     throw new RouterException(t('Preconditions failed'), 412);
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw $e;
                 }
@@ -170,7 +170,7 @@ 
                 }
             }
             $valid = count($action['requirements']) === $checked;
-        } else {
+        }else {
             $valid = true;
         }
         return $valid;
@@ -193,11 +193,11 @@ 
             if ($modules->hasResults()) {
                 foreach ($modules->getIterator() as $modulePath) {
                     $module = $modulePath->getBasename();
-                    $this->routing = $this->inspectDir($modulesPath . DIRECTORY_SEPARATOR . $module, $module, $this->routing);
+                    $this->routing = $this->inspectDir($modulesPath.DIRECTORY_SEPARATOR.$module, $module, $this->routing);
                 }
             }
         }
-        $this->cache->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->domains, Cache::JSON, TRUE);
+        $this->cache->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->domains, Cache::JSON, TRUE);
     }
 
     /**
@@ -214,7 +214,7 @@ 
             $homeParams = NULL;
             foreach ($this->routing as $pattern => $params) {
                 list($method, $route) = RouterHelper::extractHttpRoute($pattern);
-                if (preg_match('/' . preg_quote($route, '/') . '$/i', '/' . $home)) {
+                if (preg_match('/'.preg_quote($route, '/').'$/i', '/'.$home)) {
                     $homeParams = $params;
                 }
                 unset($method);
@@ -246,18 +246,18 @@ 
     {
         $baseUrl = $absolute ? Request::getInstance()->getRootUrl() : '';
         if ('' === $slug) {
-            return $baseUrl . '/';
+            return $baseUrl.'/';
         }
         if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(t('No existe la ruta especificada'));
         }
-        $url = $baseUrl . $this->slugs[$slug];
+        $url = $baseUrl.$this->slugs[$slug];
         if (!empty($params)) {
             foreach ($params as $key => $value) {
-                $url = str_replace('{' . $key . '}', $value, $url);
+                $url = str_replace('{'.$key.'}', $value, $url);
             }
         } elseif (!empty($this->routing[$this->slugs[$slug]]['default'])) {
-            $url = $baseUrl . $this->routing[$this->slugs[$slug]]['default'];
+            $url = $baseUrl.$this->routing[$this->slugs[$slug]]['default'];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL|HEAD|PATCH)\#\|\#/', '', $url);
@@ -269,7 +269,7 @@ 
      */
     private function checkPreActions($class, $method)
     {
-        $preAction = 'pre' . ucfirst($method);
+        $preAction = 'pre'.ucfirst($method);
         if (method_exists($class, $preAction)) {
             Inspector::stats('[Router] Pre action invoked', Inspector::SCOPE_DEBUG);
             try {
@@ -277,7 +277,7 @@ 
                     Logger::log(t('Pre action failed'), LOG_ERR, [error_get_last()]);
                     error_clear_last();
                 }
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR, [$class, $method]);
             }
         }
@@ -294,7 +294,7 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Inspector::stats('[Router] Executing route ' . $route, Inspector::SCOPE_DEBUG);
+        Inspector::stats('[Router] Executing route '.$route, Inspector::SCOPE_DEBUG);
         $action['params'] = array_merge($action['params'], $params, Request::getInstance()->getQueryParams());
         Security::getInstance()->setSessionKey(Cache::CACHE_SESSION_VAR, $action);
         $cache = Cache::needCache();
@@ -302,15 +302,15 @@ 
         $return = null;
         if (FALSE !== $cache && $action['http'] === 'GET' && Config::getParam('debug') === FALSE) {
             list($path, $cacheDataName) = $this->cache->getRequestCacheHash();
-            $cachedData = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $cache);
+            $cachedData = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $cache);
             if (NULL !== $cachedData) {
-                $headers = $this->cache->readFromCache('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', $cache, null, Cache::JSON);
+                $headers = $this->cache->readFromCache('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', $cache, null, Cache::JSON);
                 Template::getInstance()->renderCache($cachedData, $headers);
                 $execute = FALSE;
             }
         }
         if ($execute) {
-            Inspector::stats('[Router] Start executing action ' . $route, Inspector::SCOPE_DEBUG);
+            Inspector::stats('[Router] Start executing action '.$route, Inspector::SCOPE_DEBUG);
             $this->checkPreActions($class, $action['method']);
             $return = call_user_func_array([$class, $action['method']], $params);
             if (false === $return) {

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

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
      * @param true $isArray
      * @return array
      */
-    public function processPayload(array|string $namespace, bool $isArray): array
+    public function processPayload(array | string $namespace, bool $isArray): array
     {
         if (false !== strpos($namespace, '[') && false !== strpos($namespace, ']')) {
             $namespace = str_replace(']', '', str_replace('[', '', $namespace));
@@ -102,7 +102,7 @@ 
             list($isArray, $payload) = $this->processPayload($namespace, $isArray);
             $reflector = new ReflectionClass($namespace);
             $shortName = $reflector->getShortName();
-        } else {
+        }else {
             $namespace = $model;
             $shortName = $model;
         }
@@ -177,10 +177,10 @@ 
                     if ($module === $requestModule && !preg_match('/^ROOT/i', $module)) {
                         $modules = [
                             'name' => $module,
-                            'path' => realpath(dirname($info['base'] . DIRECTORY_SEPARATOR . '..')),
+                            'path' => realpath(dirname($info['base'].DIRECTORY_SEPARATOR.'..')),
                         ];
                     }
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $modules[] = $e->getMessage();
                 }
             }
@@ -223,7 +223,7 @@ 
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 $payload = $this->extractDtoProperties($namespace);
             }
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
 

src/base/types/helpers/I18nHelper.php

Spacing +19 added lines, -19 removed lines

@@ -44,8 +44,8 @@ 
         // TODO check more en locales
         if (strtolower($locale) === 'en') {
             $locale = 'en_GB';
-        } else {
-            $locale = $locale . '_' . strtoupper($locale);
+        }else {
+            $locale = $locale.'_'.strtoupper($locale);
         }
         $defaultLocales = explode(',', Config::getParam('i18n.locales', ''));
         if (!in_array($locale, array_merge($defaultLocales, self::$langs))) {
@@ -64,7 +64,7 @@ 
         $translations = array();
         if (file_exists($absoluteFileName)) {
             @include($absoluteFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 
@@ -81,19 +81,19 @@ 
     public static function setLocale(string $default = null, string $customKey = null, bool $force = false): void
     {
         $locale = $force ? $default : self::extractLocale($default);
-        Inspector::stats('[i18NHelper] Set locale to project [' . $locale . ']', Inspector::SCOPE_DEBUG);
+        Inspector::stats('[i18NHelper] Set locale to project ['.$locale.']', Inspector::SCOPE_DEBUG);
         // Load translations
-        putenv("LC_ALL=" . $locale);
+        putenv("LC_ALL=".$locale);
         setlocale(LC_ALL, $locale);
         // Load the locale path
-        $localePath = BASE_DIR . DIRECTORY_SEPARATOR . 'locale';
-        Logger::log('Set locale dir ' . $localePath);
+        $localePath = BASE_DIR.DIRECTORY_SEPARATOR.'locale';
+        Logger::log('Set locale dir '.$localePath);
         GeneratorHelper::createDir($localePath);
         bindtextdomain('translations', $localePath);
         textdomain('translations');
         bind_textdomain_codeset('translations', 'UTF-8');
         Security::getInstance()->setSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY, substr($locale, 0, 2));
-        if($force) t('', $customKey, true);
+        if ($force) t('', $customKey, true);
     }
 
     /**
@@ -153,7 +153,7 @@ 
             ['i', 'i', 'i', 'i', 'I', 'I', 'I', 'I'],
             ['o', 'o', 'o', 'o', 'O', 'O', 'O', 'O'],
             ['u', 'u', 'u', 'u', 'U', 'U', 'U', 'U'],
-            ['n', 'N', 'c', 'C',],
+            ['n', 'N', 'c', 'C', ],
         ];
 
         $text = htmlspecialchars($string);
@@ -173,24 +173,24 @@ 
      */
     public static function findTranslations(string $path, string $locale): array
     {
-        $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-        $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+        $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+        $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
         $translations = array();
         if (file_exists($path)) {
             $directory = dir($path);
             while (false !== ($fileName = $directory->read())) {
                 GeneratorHelper::createDir($localePath);
-                if (!file_exists($localePath . 'translations.po')) {
-                    file_put_contents($localePath . 'translations.po', '');
+                if (!file_exists($localePath.'translations.po')) {
+                    file_put_contents($localePath.'translations.po', '');
                 }
-                $inspectPath = realpath($path . DIRECTORY_SEPARATOR . $fileName);
-                $cmdPhp = "export PATH=\$PATH:/opt/local/bin; xgettext " .
-                    $inspectPath . DIRECTORY_SEPARATOR .
+                $inspectPath = realpath($path.DIRECTORY_SEPARATOR.$fileName);
+                $cmdPhp = "export PATH=\$PATH:/opt/local/bin; xgettext ".
+                    $inspectPath.DIRECTORY_SEPARATOR.
                     "*.php --from-code=UTF-8 -j -L PHP --debug --force-po -o {$localePath}translations.po";
-                if (is_dir($path . DIRECTORY_SEPARATOR . $fileName) && preg_match('/^\./', $fileName) == 0) {
-                    $res = t('Revisando directorio: ') . $inspectPath;
-                    $res .= t('Comando ejecutado: ') . $cmdPhp;
+                if (is_dir($path.DIRECTORY_SEPARATOR.$fileName) && preg_match('/^\./', $fileName) == 0) {
+                    $res = t('Revisando directorio: ').$inspectPath;
+                    $res .= t('Comando ejecutado: ').$cmdPhp;
                     $res .= shell_exec($cmdPhp);
                     usleep(10);
                     $translations[] = $res;

Braces +3 added lines, -1 removed lines

@@ -93,7 +93,9 @@
         textdomain('translations');
         bind_textdomain_codeset('translations', 'UTF-8');
         Security::getInstance()->setSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY, substr($locale, 0, 2));
-        if($force) t('', $customKey, true);
+        if($force) {
+            t('', $customKey, true);
+        }
     }
 
     /**

src/base/extension/CustomTranslateExtension.php

Spacing +11 added lines, -11 removed lines

@@ -48,7 +48,7 @@ 
     {
         // Gather always the base translations
         $standardTranslations = [];
-        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale . '.json']);
+        self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', self::$locale.'.json']);
         if (file_exists(self::$filename)) {
             $standardTranslations = json_decode(file_get_contents(self::$filename), true);
         }
@@ -67,32 +67,32 @@ 
         $session_locale = $session->getSessionKey(I18nHelper::PSFS_SESSION_LANGUAGE_KEY);
         self::$locale = $forceReload ? $session_locale : I18nHelper::extractLocale($session_locale);
         $version = $session->getSessionKey(self::LOCALE_CACHED_VERSION);
-        $configVersion = self::$locale . '_' . Config::getParam('cache.var', 'v1');
+        $configVersion = self::$locale.'_'.Config::getParam('cache.var', 'v1');
         if ($forceReload) {
             Inspector::stats('[translationsCheckLoad] Force translations reload', Inspector::SCOPE_DEBUG);
             self::dropInstance();
             $version = null;
             self::$translations = [];
         }
-        if(count(self::$translations) === 0) {
+        if (count(self::$translations) === 0) {
             Inspector::stats('[translationsCheckLoad] Extracting translations', Inspector::SCOPE_DEBUG);
             self::$generate = (boolean)Config::getParam('i18n.autogenerate', false);
-            if(null !== $version && $version === $configVersion) {
+            if (null !== $version && $version === $configVersion) {
                 Inspector::stats('[translationsCheckLoad] Translations loaded from session', Inspector::SCOPE_DEBUG);
                 self::$translations = $session->getSessionKey(self::LOCALE_CACHED_TAG);
-            } else {
+            }else {
                 if (!$useBase) {
                     $customKey = $customKey ?: $session->getSessionKey(self::CUSTOM_LOCALE_SESSION_KEY);
                 }
                 $standardTranslations = self::extractBaseTranslations();
                 // If the project has custom translations, gather them
                 if (null !== $customKey) {
-                    Logger::log('[' . self::class . '] Custom key detected: ' . $customKey, LOG_INFO);
-                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale . '.json']);
+                    Logger::log('['.self::class.'] Custom key detected: '.$customKey, LOG_INFO);
+                    self::$filename = implode(DIRECTORY_SEPARATOR, [LOCALE_DIR, 'custom', $customKey, self::$locale.'.json']);
                 }
                 // Finally we merge base and custom translations to complete all the i18n set
                 if (file_exists(self::$filename)) {
-                    Logger::log('[' . self::class . '] Custom locale detected: ' . $customKey . ' [' . self::$locale . ']', LOG_INFO);
+                    Logger::log('['.self::class.'] Custom locale detected: '.$customKey.' ['.self::$locale.']', LOG_INFO);
                     self::$translations = array_merge($standardTranslations, json_decode(file_get_contents(self::$filename), true));
                     $session->setSessionKey(self::LOCALE_CACHED_TAG, self::$translations);
                     $session->setSessionKey(self::LOCALE_CACHED_VERSION, $configVersion);
@@ -118,7 +118,7 @@ 
     public function getFilters()
     {
         return array(
-            new TwigFilter('trans', function ($message) {
+            new TwigFilter('trans', function($message) {
                 return self::_($message);
             }),
         );
@@ -140,12 +140,12 @@ 
      */
     public static function _($message, $customKey = null, $forceReload = false)
     {
-        if(0 === count(self::$translations) || $forceReload) {
+        if (0 === count(self::$translations) || $forceReload) {
             self::translationsCheckLoad($customKey, $forceReload);
         }
         if (is_array(self::$translations) && array_key_exists($message, self::$translations)) {
             $translation = self::$translations[$message];
-        } else {
+        }else {
             $translation = gettext($message);
         }
         if (self::$generate) {