psfs / core

src/base/types/helpers/GeneratorHelper.php

Spacing +33 added lines, -33 removed lines

@@ -27,10 +27,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::deleteDir($dir . "/" . $object);
-                    } else {
-                        unlink($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::deleteDir($dir."/".$object);
+                    }else {
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -45,10 +45,10 @@ 
     {
         $rootDirs = array("css", "js", "media", "font");
         foreach ($rootDirs as $dir) {
-            if (file_exists(WEB_DIR . DIRECTORY_SEPARATOR . $dir)) {
+            if (file_exists(WEB_DIR.DIRECTORY_SEPARATOR.$dir)) {
                 try {
-                    self::deleteDir(WEB_DIR . DIRECTORY_SEPARATOR . $dir);
-                } catch (Exception $e) {
+                    self::deleteDir(WEB_DIR.DIRECTORY_SEPARATOR.$dir);
+                }catch (Exception $e) {
                     syslog(LOG_INFO, $e->getMessage());
                 }
             }
@@ -65,12 +65,12 @@ 
         if (!empty($dir)) {
             try {
                 if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                    throw new Exception(t('Can\'t create directory ') . $dir);
+                    throw new Exception(t('Can\'t create directory ').$dir);
                 }
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 syslog(LOG_WARNING, $e->getMessage());
                 if (!file_exists(dirname($dir))) {
-                    throw new GeneratorException($e->getMessage() . $dir);
+                    throw new GeneratorException($e->getMessage().$dir);
                 }
             }
         }
@@ -82,7 +82,7 @@ 
      */
     public static function getTemplatePath(): string
     {
-        $path = __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR;
+        $path = __DIR__.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'templates'.DIRECTORY_SEPARATOR;
         return realpath($path);
     }
 
@@ -110,7 +110,7 @@ 
                 } elseif (!$reflector->isAbstract()) {
                     throw new GeneratorException(t('La clase definida debe ser abstracta'), 501);
                 }
-            } else {
+            }else {
                 throw new GeneratorException(t('La clase definida para extender la API no existe'), 501);
             }
         }
@@ -132,7 +132,7 @@ 
         GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {
-            GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath);
+            GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath);
         }
 
         // Generates the root needed files
@@ -142,31 +142,31 @@ 
             'crossdomain' => 'crossdomain.xml',
             'humans' => 'humans.txt',
             'robots' => 'robots.txt',
-            'docker' => '..' . DIRECTORY_SEPARATOR . 'docker-compose.yml',
+            'docker' => '..'.DIRECTORY_SEPARATOR.'docker-compose.yml',
         ];
         $verificable = ['humans', 'robots', 'docker'];
         $output->writeln('Start creating html files');
         foreach ($files as $template => $filename) {
-            if (in_array($template, $verificable) && file_exists($path . DIRECTORY_SEPARATOR . $filename)) {
-                $output->writeln($filename . ' already exists');
+            if (in_array($template, $verificable) && file_exists($path.DIRECTORY_SEPARATOR.$filename)) {
+                $output->writeln($filename.' already exists');
                 continue;
             }
-            $text = Template::getInstance()->dump("generator/html/" . $template . '.html.twig');
-            if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
+            $text = Template::getInstance()->dump("generator/html/".$template.'.html.twig');
+            if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
                 if (!$quiet) {
-                    $output->writeln('Can\t create the file ' . $filename);
+                    $output->writeln('Can\t create the file '.$filename);
                 }
-            } else {
+            }else {
                 if (!$quiet) {
-                    $output->writeln($filename . ' created successfully');
+                    $output->writeln($filename.' created successfully');
                 }
             }
         }
 
         //Export base locale translations
-        if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) {
-            GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            self::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+        if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
+            GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            self::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
         }
     }
 
@@ -182,12 +182,12 @@ 
     {
         if (file_exists($filenamePath)) {
             $destfolder = basename($filenamePath);
-            if (!file_exists(WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) || $debug || $force) {
+            if (!file_exists(WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) || $debug || $force) {
                 if (is_dir($filenamePath)) {
-                    self::copyr($filenamePath, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
-                } else {
-                    if (@copy($filenamePath, WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder) === FALSE) {
-                        throw new ConfigException("Can't copy " . $filenamePath . " to " . WEB_DIR . $dest . DIRECTORY_SEPARATOR . $destfolder);
+                    self::copyr($filenamePath, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
+                }else {
+                    if (@copy($filenamePath, WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder) === FALSE) {
+                        throw new ConfigException("Can't copy ".$filenamePath." to ".WEB_DIR.$dest.DIRECTORY_SEPARATOR.$destfolder);
                     }
                 }
             }
@@ -206,10 +206,10 @@ 
         self::createDir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file != '.') && ($file != '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::copyr($src . '/' . $file, $dst . '/' . $file);
-                } elseif (@copy($src . '/' . $file, $dst . '/' . $file) === false) {
-                    throw new ConfigException("Can't copy " . $src . " to " . $dst);
+                if (is_dir($src.'/'.$file)) {
+                    self::copyr($src.'/'.$file, $dst.'/'.$file);
+                } elseif (@copy($src.'/'.$file, $dst.'/'.$file) === false) {
+                    throw new ConfigException("Can't copy ".$src." to ".$dst);
                 }
             }
         }

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;

Braces +3 added lines, -1 removed lines

@@ -95,7 +95,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/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/base/types/helpers/ResponseHelper.php

Spacing +5 added lines, -5 removed lines

@@ -76,9 +76,9 @@ 
             Logger::log('Adding debug headers to render response');
             $vars["__DEBUG__"]["includes"] = get_included_files();
             $vars["__DEBUG__"]["trace"] = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            header('X-PSFS-DEBUG-TS: ' . Dispatcher::getInstance()->getTs() . ' s');
-            header('X-PSFS-DEBUG-MEM: ' . Dispatcher::getInstance()->getMem('MBytes') . ' MBytes');
-            header('X-PSFS-DEBUG-FILES: ' . count(get_included_files()) . ' files opened');
+            header('X-PSFS-DEBUG-TS: '.Dispatcher::getInstance()->getTs().' s');
+            header('X-PSFS-DEBUG-MEM: '.Dispatcher::getInstance()->getMem('MBytes').' MBytes');
+            header('X-PSFS-DEBUG-FILES: '.count(get_included_files()).' files opened');
         }
 
         return $vars;
@@ -90,7 +90,7 @@ 
      * @return int|string
      * @throws GeneratorException
      */
-    public static function httpNotFound(Exception $exception = NULL, bool $isJson = false): int|string
+    public static function httpNotFound(Exception $exception = NULL, bool $isJson = false): int | string
     {
         if (self::isTest()) {
             return 404;
@@ -109,7 +109,7 @@ 
         $notFoundRoute = Config::getParam('route.404');
         if (null !== $notFoundRoute) {
             Request::getInstance()->redirect(Router::getInstance()->getRoute($notFoundRoute, true));
-        } else {
+        }else {
             return $template->render('error.html.twig', array(
                 'exception' => $exception,
                 'trace' => $exception->getTraceAsString(),

src/base/config/Config.php

Spacing +8 added lines, -8 removed lines

@@ -97,7 +97,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;
@@ -212,13 +212,13 @@ 
         $finalData = self::saveExtraParams($data);
         $saved = false;
         try {
-            $finalData = array_filter($finalData, function ($key, $value) {
+            $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;
@@ -250,7 +250,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;
         if (array_key_exists('cache.var', $this->config)) {
             Security::getInstance()->setSessionKey('config.cache.var', $this->config['cache.var']);
@@ -275,7 +275,7 @@ 
     public static function getParam($key, $defaultValue = null, $module = null)
     {
         if (null !== $module) {
-            return self::getParam(strtolower($module) . '.' . $key, self::getParam($key, $defaultValue));
+            return self::getParam(strtolower($module).'.'.$key, self::getParam($key, $defaultValue));
         }
         $param = self::getInstance()->get($key);
         return (null !== $param) ? $param : $defaultValue;
@@ -291,8 +291,8 @@ 
     {
         $done = true;
         foreach (self::$cleanable_config_files as $configFile) {
-            if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . $configFile)) {
-                if (!unlink(CONFIG_DIR . DIRECTORY_SEPARATOR . $configFile)) {
+            if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.$configFile)) {
+                if (!unlink(CONFIG_DIR.DIRECTORY_SEPARATOR.$configFile)) {
                     $done = false;
                 }
             }