psfs / core

src/base/types/helpers/SecurityHelper.php

Spacing +13 added lines, -13 removed lines

@@ -34,7 +34,7 @@ 
             && (preg_match('/^\/(admin|setup\-admin)/i', $route) || Config::getParam('restricted', false))
         ) {
             if (!self::isTest() &&
-                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true)) {
+                null === Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true)) {
                 throw new AdminCredentialsException();
             }
             if (!Security::getInstance()->checkAdmin()) {
@@ -54,8 +54,8 @@ 
         $token = '';
         $length = strlen($timestamp);
         for ($i = 0; $i < $length; $i++) {
-            $token = substr($hash, $i, 1) .
-                substr($timestamp, $i, 1) .
+            $token = substr($hash, $i, 1).
+                substr($timestamp, $i, 1).
                 $token;
         }
         return $token;
@@ -74,16 +74,16 @@ 
         $charsLength = strlen(self::RAND_SEP) - 1;
         $tsLength = strlen($timestamp);
         $i = 0;
-        $partCount = ceil($hashRest / 4);
-        $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+        $partCount = ceil($hashRest/4);
+        $part = substr($hash, $tsLength + $partCount*$i, $partCount);
         while (false !== $part && strlen($part) > 0) {
-            $mixedToken .= $part .
-                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) .
+            $mixedToken .= $part.
+                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1).
                 substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1);
-            $part = substr($hash, $tsLength + $partCount * $i, $partCount);
+            $part = substr($hash, $tsLength + $partCount*$i, $partCount);
             $i++;
         }
-        return $mixedToken . $token;
+        return $mixedToken.$token;
     }
 
     /**
@@ -93,7 +93,7 @@ 
     private static function getTs(bool $isOdd = null): int
     {
         $timestamp = time();
-        $tsIsOdd = (bool)((int)substr($timestamp, -1) % 2);
+        $tsIsOdd = (bool)((int)substr($timestamp, -1)%2);
         if (false === $isOdd && !$tsIsOdd) {
             $timestamp--;
         } elseif (true === $isOdd && !$tsIsOdd) {
@@ -129,9 +129,9 @@ 
         $timestamp = '';
         $part = strrev($part);
         for ($i = 0, $ct = strlen($part); $i < $ct; $i++) {
-            if ($i % 2 == 0) {
+            if ($i%2 == 0) {
                 $timestamp .= substr($part, $i, 1);
-            } else {
+            }else {
                 $partToken .= substr($part, $i, 1);
             }
         }
@@ -148,7 +148,7 @@ 
         list($partToken, $timestamp) = self::extractTs(array_pop($parts));
         $token = null;
         if ($timestamp > 0) {
-            $token = $partToken . implode('', $parts);
+            $token = $partToken.implode('', $parts);
         }
         return [$token, $timestamp];
     }

src/base/types/helpers/AnnotationHelper.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
      */
     public static function extractFromDoc(string $needle, string $comments, string $default = null): ?string
     {
-        preg_match('/@' . $needle . '\ (.*)(\n|\r)/im', $comments, $matches);
+        preg_match('/@'.$needle.'\ (.*)(\n|\r)/im', $comments, $matches);
         return (count($matches) > 0) ? $matches[1] : $default;
     }
 }

src/base/types/helpers/DeployHelper.php

Spacing +3 added lines, -3 removed lines

@@ -24,10 +24,10 @@
         $now = new DateTime();
         $now->setTimezone(new DateTimeZone(Config::getParam('project.timezone', 'Europe/Madrid')));
         $config = Config::getInstance()->dumpConfig();
-        if (file_exists(CACHE_DIR . DIRECTORY_SEPARATOR . $config[self::CACHE_VAR_TAG] . '.file.cache')) {
-            unlink(CACHE_DIR . DIRECTORY_SEPARATOR . $config[self::CACHE_VAR_TAG] . '.file.cache');
+        if (file_exists(CACHE_DIR.DIRECTORY_SEPARATOR.$config[self::CACHE_VAR_TAG].'.file.cache')) {
+            unlink(CACHE_DIR.DIRECTORY_SEPARATOR.$config[self::CACHE_VAR_TAG].'.file.cache');
         }
-        $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/helpers/I18nHelper.php

Spacing +18 added lines, -18 removed lines

@@ -46,8 +46,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))) {
@@ -66,7 +66,7 @@ 
         $translations = array();
         if (file_exists($absoluteFileName)) {
             @include($absoluteFileName);
-        } else {
+        }else {
             Cache::getInstance()->storeData($absoluteFileName, "<?php \$translations = array();\n", Cache::TEXT, TRUE);
         }
 
@@ -83,13 +83,13 @@ 
     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');
@@ -155,7 +155,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);
@@ -175,24 +175,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;

src/base/types/helpers/InjectorHelper.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
                         'required' => $isRequired,
                         'description' => $label,
                     ];
-                } else {
+                }else {
                     $instance = new ReflectionClass($instanceType);
                     $variables[$property->getName()] = [
                         'is_array' => $isArray,
@@ -159,13 +159,13 @@ 
      */
     public static function constructInjectableInstance($variable, $singleton, $classNameSpace, $calledClass)
     {
-        Logger::log('Create inyectable instance for ' . $classNameSpace);
+        Logger::log('Create inyectable instance for '.$classNameSpace);
         $reflector = new ReflectionClass($calledClass);
         $property = $reflector->getProperty($variable);
         $varInstanceType = (null === $classNameSpace) ? InjectorHelper::extractVarType($property->getDocComment()) : $classNameSpace;
         if (true === $singleton && method_exists($varInstanceType, 'getInstance')) {
             $instance = $varInstanceType::getInstance();
-        } else {
+        }else {
             $instance = new $varInstanceType();
         }
         return $instance;
@@ -179,7 +179,7 @@ 
     public static function getClassProperties($class)
     {
         $properties = [];
-        Logger::log('Extracting annotations properties from class ' . $class);
+        Logger::log('Extracting annotations properties from class '.$class);
         $selfReflector = new ReflectionClass($class);
         if (false !== $selfReflector->getParentClass()) {
             $properties = self::getClassProperties($selfReflector->getParentClass()->getName());

src/base/types/helpers/Inspector.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     {
         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'],
         ];

src/base/types/helpers/AssetsHelper.php

Spacing +9 added lines, -9 removed lines

@@ -66,26 +66,26 @@ 
      *
      * @return string[]
      */
-    public static function calculateAssetPath(string $string, string|null $name = null, bool $return = true, string $filenamePath = ''): array
+    public static function calculateAssetPath(string $string, string | null $name = null, bool $return = true, string $filenamePath = ''): array
     {
         $path = explode("/", $string);
         $originalFilename = end($path);
-        $base = WEB_DIR . DIRECTORY_SEPARATOR;
+        $base = WEB_DIR.DIRECTORY_SEPARATOR;
         $debug = Config::getParam('debug');
         $cache = Config::getParam('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, $filenamePath);
         $extension = explode(".", $string);
         $extension = end($extension);
-        $file = "/" . substr(md5($string), 0, 8) . "." . $extension;
+        $file = "/".substr(md5($string), 0, 8).".".$extension;
         $htmlBase = '';
         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";
             $htmlBase = "css";
         } elseif (preg_match('/\.js$/i', $string)) {
-            $file = "/" . substr(md5($string), 0, 8) . "$cache.js";
+            $file = "/".substr(md5($string), 0, 8)."$cache.js";
             $htmlBase = "js";
         } elseif (preg_match("/image/i", $mime)) {
             $htmlBase = "img";
@@ -99,9 +99,9 @@ 
             $file = $name;
         }
         if ($debug) {
-            $file = str_replace("." . $extension, "_" . $originalFilename, $file);
+            $file = str_replace(".".$extension, "_".$originalFilename, $file);
         }
-        $filePath = $htmlBase . $file;
+        $filePath = $htmlBase.$file;
 
         return array($base, $htmlBase, $filePath);
     }
@@ -116,7 +116,7 @@ 
     {
         GeneratorHelper::createDir(dirname($path));
         if ("" !== $content && false === file_put_contents($path, $content)) {
-            throw new ConfigException(t('No se tienen permisos para escribir en ' . $path));
+            throw new ConfigException(t('No se tienen permisos para escribir en '.$path));
         }
     }
 }

src/controller/GeneratorController.php

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
      */
     public function generateModule()
     {
-        Logger::log("Arranque generador de módulos al solicitar " . $this->getRequest()->getRequestUri());
+        Logger::log("Arranque generador de módulos al solicitar ".$this->getRequest()->getRequestUri());
         /* @var $form ConfigForm */
         $form = new ModuleForm();
         $form->build();
@@ -65,8 +65,8 @@ 
                 $this->gen->createStructureModule($module, false, $type, $apiClass);
                 Security::getInstance()->setFlash("callback_message", str_replace("%s", $module, t("Módulo %s generado correctamente")));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-module", true));
-            } catch (Exception $e) {
-                Logger::log($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+            }catch (Exception $e) {
+                Logger::log($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 Security::getInstance()->setFlash("callback_message", htmlentities($e->getMessage()));
             }
         }

src/controller/I18nController.php

Spacing +3 added lines, -3 removed lines

@@ -44,8 +44,8 @@ 
         //Generating the templates translations
         $translations = $this->tpl->regenerateTemplates();
 
-        $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;
 
         //xgettext localizations
         $translations = array_merge($translations, I18nHelper::findTranslations(SOURCE_DIR, $locale));
@@ -53,7 +53,7 @@ 
         $translations = array_merge($translations, I18nHelper::findTranslations(CACHE_DIR, $locale));
 
         $translations[] = "msgfmt {$localePath}translations.po -o {$localePath}translations.mo";
-        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt ' . $localePath . 'translations.po -o ' . $localePath . 'translations.mo');
+        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '.$localePath.'translations.po -o '.$localePath.'translations.mo');
         return $this->render('translations.html.twig', array(
             'translations' => $translations,
         ));