psfs / core

src/controller/ConfigController.php

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
         foreach ($domains as $domain => $routes) {
             $pDomain = str_replace('@', '', $domain);
             $pDomain = str_replace('/', '', $pDomain);
-            $response[] = strtolower($pDomain) . '.api.secret';
+            $response[] = strtolower($pDomain).'.api.secret';
         }
         return $this->json($response);
     }
@@ -53,7 +53,7 @@ 
      */
     public function config()
     {
-        Logger::log("Config loaded executed by " . $this->getRequest()->getRequestUri());
+        Logger::log("Config loaded executed by ".$this->getRequest()->getRequestUri());
         if (defined('PSFS_UNIT_TESTING_EXECUTION')) {
             throw new ConfigException('CONFIG');
         }
@@ -92,7 +92,7 @@ 
                 }
                 Security::getInstance()->setFlash("callback_message", t("Configuración actualizada correctamente"));
                 Security::getInstance()->setFlash("callback_route", $this->getRoute("admin-config", true));
-            } else {
+            }else {
                 throw new HttpException(t('Error al guardar la configuración, prueba a cambiar los permisos'), 403);
             }
         }

src/base/types/helpers/GeneratorHelper.php

Spacing +33 added lines, -33 removed lines

@@ -24,10 +24,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);
                     }
                 }
             }
@@ -43,10 +43,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());
                 }
             }
@@ -63,12 +63,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);
                 }
             }
         }
@@ -80,7 +80,7 @@ 
      */
     public static function getTemplatePath()
     {
-        $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);
     }
 
@@ -109,7 +109,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);
             }
         }
@@ -131,7 +131,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
@@ -141,31 +141,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');
         }
     }
 
@@ -181,12 +181,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);
                     }
                 }
             }
@@ -204,10 +204,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/DeployHelper.php

Spacing +3 added lines, -3 removed lines

@@ -21,10 +21,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/config/Config.php

Spacing +8 added lines, -8 removed lines

@@ -96,7 +96,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;
@@ -211,13 +211,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;
@@ -249,7 +249,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']);
@@ -274,7 +274,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 @@ 
         $configs = ['domains.json', 'urls.json'];
         $done = true;
         foreach ($configs 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;
                 }
             }

src/base/extension/TemplateFunctions.php

Spacing +11 added lines, -11 removed lines

@@ -44,13 +44,13 @@ 
 
         $filePath = '';
         if (!file_exists($filePath)) {
-            $filePath = BASE_DIR . $string;
+            $filePath = BASE_DIR.$string;
         }
         $filenamePath = AssetsHelper::findDomainPath($string, $filePath);
 
         $filePath = self::processAsset($string, $name, $return, $filenamePath);
         $basePath = Config::getParam('resources.cdn.url', Request::getInstance()->getRootUrl());
-        $returnPath = empty($name) ? $basePath . '/' . $filePath : $name;
+        $returnPath = empty($name) ? $basePath.'/'.$filePath : $name;
         return $return ? $returnPath : '';
     }
 
@@ -67,7 +67,7 @@ 
         $router = Router::getInstance();
         try {
             return $router->getRoute($path, $absolute, $params);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $router->getRoute('', $absolute, $params);
         }
     }
@@ -161,12 +161,12 @@ 
         $domains = Template::getDomains(true);
         $filenamePath = self::extractPathname($path, $domains);
         // Check if resources has been copied to public folders
-        if(!$debug) {
-            $cacheFilename = Config::getParam('cache.var', '__initial__') . '.file.cache';
+        if (!$debug) {
+            $cacheFilename = Config::getParam('cache.var', '__initial__').'.file.cache';
             $cachedFiles = Cache::getInstance()->readFromCache($cacheFilename,
                 1, fn() => [], Cache::JSON, true) ?: [];
             // Force the resource copy
-            if(!in_array($filenamePath, $cachedFiles) || $force) {
+            if (!in_array($filenamePath, $cachedFiles) || $force) {
                 $force = true;
                 $cachedFiles[] = $filenamePath;
                 Cache::getInstance()->storeData($cacheFilename, $cachedFiles, Cache::JSON);
@@ -226,9 +226,9 @@ 
     {
         $data = file_get_contents($filenamePath);
         if (!empty($name)) {
-            file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
-        } else {
-            file_put_contents($base . $filePath, $data);
+            file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data);
+        }else {
+            file_put_contents($base.$filePath, $data);
         }
     }
 
@@ -247,9 +247,9 @@ 
         if (file_exists($filenamePath)) {
             list($base, $htmlBase, $filePath) = AssetsHelper::calculateAssetPath($string, $name, $return, $filenamePath);
             //Creamos el directorio si no existe
-            GeneratorHelper::createDir($base . $htmlBase);
+            GeneratorHelper::createDir($base.$htmlBase);
             //Si se ha modificado
-            if (!file_exists($base . $filePath) || filemtime($base . $filePath) < filemtime($filenamePath)) {
+            if (!file_exists($base.$filePath) || filemtime($base.$filePath) < filemtime($filenamePath)) {
                 if ($htmlBase === 'css') {
                     self::processCssLines($filenamePath);
                 }

src/base/Cache.php

Spacing +10 added lines, -10 removed lines

@@ -56,7 +56,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);
         }
     }
 
@@ -70,7 +70,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);
         }
@@ -86,7 +86,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());
     }
@@ -153,7 +153,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);
     }
 
@@ -170,12 +170,12 @@ 
     public function readFromCache($path, $expires = 300, $function = null, $transform = Cache::TEXT, $ignoreExpiration = false)
     {
         $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) && !$ignoreExpiration) {
                 $data = $function();
                 $this->storeData($path, $data, $transform);
-            } else {
+            }else {
                 $data = $this->getDataFromFile($path, $transform);
             }
         }
@@ -221,7 +221,7 @@ 
             $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];
@@ -233,9 +233,9 @@ 
             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;
+                $hashPath = FileHelper::generateCachePath($action, $action['params']).'..'.DIRECTORY_SEPARATOR.' .. '.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR;
                 if (!file_exists($hashPath)) {
-                    $hashPath = CACHE_DIR . DIRECTORY_SEPARATOR . $hashPath;
+                    $hashPath = CACHE_DIR.DIRECTORY_SEPARATOR.$hashPath;
                 }
                 FileHelper::deleteDir($hashPath);
             }