psfs / core

src/services/AdminServices.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
     {
         $platform = trim(Config::getInstance()->get('platform.name'));
         header('HTTP/1.1 401 Unauthorized');
-        header('WWW-Authenticate: Basic Realm="' . $platform . '"');
+        header('WWW-Authenticate: Basic Realm="'.$platform.'"');
         echo t('Zona restringida');
         exit();
     }
@@ -75,7 +75,7 @@ 
                             $admin['class'] = 'primary';
                             break;
                     }
-                } else {
+                }else {
                     $admin['class'] = 'primary';
                 }
             }

src/base/Template.php

Spacing +6 added lines, -6 removed lines

@@ -120,7 +120,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $dump;
@@ -147,7 +147,7 @@ 
     public function regenerateTemplates()
     {
         $this->generateTemplatesCache();
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true);
         $translations = [];
         if (is_array($domains)) {
             $translations = $this->parsePathTranslations($domains);
@@ -172,8 +172,8 @@ 
             // force compilation
             if ($file->isFile()) {
                 try {
-                    $this->tpl->load(str_replace($tplDir . '/', '', $file));
-                } catch (\Exception $e) {
+                    $this->tpl->load(str_replace($tplDir.'/', '', $file));
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR, ['file' => $e->getFile(), 'line' => $e->getLine()]);
                 }
             }
@@ -253,7 +253,7 @@ 
      */
     private function loadDomains()
     {
-        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', Cache::JSON, true);
+        $domains = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', Cache::JSON, true);
         if (null !== $domains) {
             foreach ($domains as $domain => $paths) {
                 $this->addPath($paths['template'], preg_replace('/(@|\/)/', '', $domain));
@@ -268,7 +268,7 @@ 
     {
         $loader = new FilesystemLoader(GeneratorHelper::getTemplatePath());
         $this->tpl = new Environment($loader, array(
-            'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig',
+            'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig',
             'debug' => (bool)$this->debug,
             'auto_reload' => Config::getParam('twig.autoreload', TRUE),
         ));

src/base/types/helpers/GeneratorHelper.php

Spacing +37 added lines, -37 removed lines

@@ -23,10 +23,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);
                     }
                 }
             }
@@ -42,10 +42,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());
                 }
             }
@@ -61,12 +61,12 @@ 
     {
         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);
             }
         }
     }
@@ -77,7 +77,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);
     }
 
@@ -96,15 +96,15 @@ 
      * @throws \ReflectionException
      */
     public static function checkCustomNamespaceApi($namespace) {
-        if(!empty($namespace)) {
-            if(class_exists($namespace)) {
+        if (!empty($namespace)) {
+            if (class_exists($namespace)) {
                 $reflector = new \ReflectionClass($namespace);
-                if(!$reflector->isSubclassOf(Api::class)) {
+                if (!$reflector->isSubclassOf(Api::class)) {
                     throw new GeneratorException(t('La clase definida debe extender de PSFS\\\base\\\types\\\Api'), 501);
-                } elseif(!$reflector->isAbstract()) {
+                } 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);
             }
         }
@@ -118,14 +118,14 @@ 
      */
     public static function createRoot($path = WEB_DIR, OutputInterface $output = null, $quiet = false) {
 
-        if(null === $output) {
+        if (null === $output) {
             $output = new ConsoleOutput();
         }
 
         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
@@ -138,22 +138,22 @@ 
         ];
         $output->writeln('Start creating html files');
         foreach ($files as $templates => $filename) {
-            $text = Template::getInstance()->dump("generator/html/" . $templates . '.html.twig');
-            if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
-                if(!$quiet) {
-                    $output->writeln('Can\t create the file ' . $filename);
+            $text = Template::getInstance()->dump("generator/html/".$templates.'.html.twig');
+            if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
+                if (!$quiet) {
+                    $output->writeln('Can\t create the file '.$filename);
                 }
-            } else {
-                if(!$quiet) {
-                    $output->writeln($filename . ' created successfully');
+            }else {
+                if (!$quiet) {
+                    $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');
         }
     }
 
@@ -169,12 +169,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);
                     }
                 }
             }
@@ -192,10 +192,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/Security.php

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
      */
     public function getAdmins()
     {
-        return Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true);
+        return Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true);
     }
 
     /**
@@ -89,7 +89,7 @@ 
                 }
                 if (!empty($user) && !empty($admins[$user])) {
                     $auth = $admins[$user]['hash'];
-                    $this->authorized = ($auth === sha1($user . $pass));
+                    $this->authorized = ($auth === sha1($user.$pass));
                     if ($this->authorized) {
                         $this->updateAdmin($user, $admins[$user]['profile']);
                         ResponseHelper::setCookieHeaders([
@@ -102,7 +102,7 @@ 
                         ]);
                         $this->setSessionKey(self::LOGGED_USER_TOKEN, base64_encode("{$user}:{$pass}"));
                     }
-                } else {
+                }else {
                     $this->admin = null;
                     $this->setSessionKey(self::ADMIN_ID_TOKEN, null);
                 }

src/base/types/traits/Security/SessionTrait.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
 
     public function hasSessionKey($key) {
         $exists = false;
-        if(array_key_exists($key, $this->session)) {
+        if (array_key_exists($key, $this->session)) {
             $exists = true;
         }
         return $exists;
@@ -56,7 +56,7 @@ 
             session_start();
         }
         // Fix for phpunits
-        if(!isset($_SESSION)) {
+        if (!isset($_SESSION)) {
             $_SESSION = [];
         }
         $this->session = null === $_SESSION ? [] : $_SESSION;

src/base/types/traits/Security/ProfileTrait.php

Spacing +3 added lines, -3 removed lines

@@ -86,11 +86,11 @@
     public static function save($user)
     {
         $saved = true;
-        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', Cache::JSONGZ, true) ?: [];
-        $admins[$user['username']]['hash'] = sha1($user['username'] . $user['password']);
+        $admins = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', Cache::JSONGZ, true) ?: [];
+        $admins[$user['username']]['hash'] = sha1($user['username'].$user['password']);
         $admins[$user['username']]['profile'] = $user['profile'];
 
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json', $admins, Cache::JSONGZ, true);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json', $admins, Cache::JSONGZ, true);
         return $saved;
     }
 

src/base/types/helpers/AssetsHelper.php

Spacing +8 added lines, -8 removed lines

@@ -69,21 +69,21 @@ 
     {
         $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;
         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";
@@ -98,9 +98,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);
     }
@@ -115,7 +115,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/DocumentorController.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      */
     public function swaggerUi($domain)
     {
-        if(!Router::getInstance()->domainExists($domain)) {
+        if (!Router::getInstance()->domainExists($domain)) {
             throw new RouterException('Domains is empty');
         }
         return $this->render('swagger.html.twig', [

src/controller/base/Admin.php

Spacing +2 added lines, -2 removed lines

@@ -38,9 +38,9 @@
         if (self::isTest()) {
             throw new UserAuthException();
         }
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
             return AdminServices::getInstance()->setAdminHeaders();
-        } else {
+        }else {
             return UserController::showAdminManager();
         }
     }