psfs / core

src/controller/GeneratorController.php

Spacing +13 added lines, -13 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 \PSFS\base\config\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()));
             }
         }
@@ -77,14 +77,14 @@ 
 
     public static function createRoot($path = WEB_DIR, OutputInterface $output = null) {
 
-        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
@@ -96,18 +96,18 @@ 
             'robots' => 'robots.txt',
         ];
         foreach ($files as $templates => $filename) {
-            $text = Template::getInstance()->dump("generator/html/" . $templates . '.html.twig');
-            if (false === file_put_contents($path . DIRECTORY_SEPARATOR . $filename, $text)) {
-                $output->writeln('Can\t create the file ' . $filename);
-            } else {
-                $output->writeln($filename . ' created successfully');
+            $text = Template::getInstance()->dump("generator/html/".$templates.'.html.twig');
+            if (false === file_put_contents($path.DIRECTORY_SEPARATOR.$filename, $text)) {
+                $output->writeln('Can\t create the file '.$filename);
+            }else {
+                $output->writeln($filename.' created successfully');
             }
         }
 
         //Export base locale translations
-        if (!file_exists(BASE_DIR . DIRECTORY_SEPARATOR . 'locale')) {
-            GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            GeneratorService::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');
+            GeneratorService::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
         }
     }
 }
\ No newline at end of file

src/controller/base/Admin.php

Spacing +3 added lines, -3 removed lines

@@ -38,10 +38,10 @@ 
      */
     public static function staticAdminLogon($route = null)
     {
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . 'admins.json')) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.'admins.json')) {
             if ('login' !== Config::getParam('admin.login')) {
                 return AdminServices::getInstance()->setAdminHeaders();
-            } else {
+            }else {
                 $form = new LoginForm();
                 $form->setData(array("route" => $route));
                 $form->build();
@@ -51,7 +51,7 @@ 
                     'form' => $form,
                 ));
             }
-        } else {
+        }else {
             return UserController::showAdminManager();
         }
     }

src/controller/DocumentorController.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
         $download = $this->getRequest()->get('download') ?: false;
 
         $module = $this->srv->getModules($domain);
-        if(empty($module)) {
+        if (empty($module)) {
             return Router::getInstance()->httpNotFound(null, true);
         }
         switch (strtolower($type)) {
@@ -53,10 +53,10 @@ 
         ini_restore('max_execution_time');
         ini_restore('memory_limit');
 
-        if($download && $type === ApiController::SWAGGER_DOC) {
+        if ($download && $type === ApiController::SWAGGER_DOC) {
             return $this->download(json_encode($doc), 'application/json', 'swagger.json');
         }
-        if($type === ApiController::HTML_DOC) {
+        if ($type === ApiController::HTML_DOC) {
             return $this->render('documentation.html.twig', ["data" => json_encode($doc)]);
         }
         return $this->json($doc, 200);

src/base/types/traits/OutputTrait.php

Spacing +15 added lines, -15 removed lines

@@ -121,7 +121,7 @@ 
                 $this->setStatusCode(Template::STATUS_OK);
                 break;
             default:
-                $this->setStatusCode('HTTP/1.0 ' .($status ?: 200));
+                $this->setStatusCode('HTTP/1.0 '.($status ?: 200));
                 break;
         }
         return $this;
@@ -139,7 +139,7 @@ 
         ResponseHelper::setStatusHeader($this->getStatusCode());
         ResponseHelper::setAuthHeaders($this->isPublicZone());
         ResponseHelper::setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -152,20 +152,20 @@ 
      */
     public function output($output = '', $contentType = 'text/html', array $cookies = array())
     {
-        if(!self::isTest()) {
+        if (!self::isTest()) {
             Logger::log('Start output response');
             ob_start();
             $this->setReponseHeaders($contentType, $cookies);
-            header('Content-length: ' . strlen($output));
-            header('CRC: ' . crc32($output));
+            header('Content-length: '.strlen($output));
+            header('CRC: '.crc32($output));
 
             $needCache = Cache::needCache();
             $cache = Cache::getInstance();
             list($path, $cacheDataName) = $cache->getRequestCacheHash();
             if (null !== $cacheDataName && false !== $needCache && $this->getStatusCode() === Template::STATUS_OK) {
                 Logger::log('Saving output response into cache');
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName, $output);
-                $cache->storeData('json' . DIRECTORY_SEPARATOR . $path . $cacheDataName . '.headers', headers_list(), Cache::JSON);
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName, $output);
+                $cache->storeData('json'.DIRECTORY_SEPARATOR.$path.$cacheDataName.'.headers', headers_list(), Cache::JSON);
             } elseif (Request::getInstance()->getMethod() !== 'GET') {
                 $cache->flushCache();
             }
@@ -175,7 +175,7 @@ 
             ob_end_clean();
             Logger::log('End output response');
             $this->closeRender();
-        } else {
+        }else {
             return $output;
         }
     }
@@ -188,11 +188,11 @@ 
         Logger::log('Close template render');
         $uri = Request::requestUri();
         Security::getInstance()->setSessionKey('lastRequest', array(
-            'url' => Request::getInstance()->getRootUrl() . $uri,
+            'url' => Request::getInstance()->getRootUrl().$uri,
             'ts' => microtime(true),
         ));
         Security::getInstance()->updateSession();
-        Logger::log('End request: ' . $uri, LOG_INFO);
+        Logger::log('End request: '.$uri, LOG_INFO);
         exit;
     }
 
@@ -230,17 +230,17 @@ 
         /////////////////////////////////////////////////////////////
         // Date in the past sets the value to already have been expired.
         header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
-        header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
         header('Cache-Control: no-store, no-cache, must-revalidate'); // HTTP/1.1
         header('Cache-Control: pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
         header('Pragma: no-cache');
         header('Expires: 0');
         header('Content-Transfer-Encoding: binary');
-        header('Content-type: ' . $content);
-        header('Content-length: ' . strlen($data));
-        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        header('Content-type: '.$content);
+        header('Content-length: '.strlen($data));
+        header('Content-Disposition: attachment; filename="'.$filename.'"');
         header('Access-Control-Expose-Headers: Filename');
-        header('Filename: ' . $filename);
+        header('Filename: '.$filename);
         echo $data;
         ob_flush();
         ob_end_clean();

src/base/types/helpers/ResponseHelper.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
             unset($_SERVER["PHP_AUTH_USER"]);
             unset($_SERVER["PHP_AUTH_PW"]);
             header_remove("Authorization");
-        } elseif(!self::isTest()) {
+        } elseif (!self::isTest()) {
             header('Authorization:');
         }
     }
@@ -68,9 +68,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;

src/base/Router.php

Spacing +49 added lines, -49 removed lines

@@ -75,11 +75,11 @@ 
      */
     public function init()
     {
-        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', $this->cacheType, TRUE);
+        list($this->routing, $this->slugs) = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', $this->cacheType, TRUE);
         if (empty($this->routing) || Config::getInstance()->getDebugMode()) {
             $this->debugLoad();
-        } else {
-            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . 'domains.json', $this->cacheType, TRUE);
+        }else {
+            $this->domains = $this->cache->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.'domains.json', $this->cacheType, TRUE);
         }
         $this->checkExternalModules(false);
         $this->setLoaded();
@@ -117,9 +117,9 @@ 
         }
 
         $notFoundRoute = Config::getParam('route.404');
-        if(null !== $notFoundRoute) {
+        if (null !== $notFoundRoute) {
             Request::getInstance()->redirect($this->getRoute($notFoundRoute, true));
-        } else {
+        }else {
             return $template->render('error.html.twig', array(
                 'exception' => $exception,
                 'trace' => $exception->getTraceAsString(),
@@ -170,12 +170,12 @@ 
         try {
             //Search action and execute
             return $this->searchAction($route);
-        } catch (AccessDeniedException $e) {
-            Logger::log(_('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile() . '[' . $e->getLine() . ']']);
+        }catch (AccessDeniedException $e) {
+            Logger::log(_('Solicitamos credenciales de acceso a zona restringida'), LOG_WARNING, ['file' => $e->getFile().'['.$e->getLine().']']);
             return Admin::staticAdminLogon($route);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             Logger::log($r->getMessage(), LOG_WARNING);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw $e;
         }
@@ -193,7 +193,7 @@ 
      */
     protected function searchAction($route)
     {
-        Logger::log('Searching action to execute: ' . $route, LOG_INFO);
+        Logger::log('Searching action to execute: '.$route, LOG_INFO);
         //Revisamos si tenemos la ruta registrada
         $parts = parse_url($route);
         $path = array_key_exists('path', $parts) ? $parts['path'] : $route;
@@ -208,12 +208,12 @@ 
                 /** @var $class \PSFS\base\types\Controller */
                 $class = RouterHelper::getClassToCall($action);
                 try {
-                    if($this->checkRequirements($action, $get)) {
+                    if ($this->checkRequirements($action, $get)) {
                         return $this->executeCachedRoute($route, $action, $class, $get);
-                    } else {
+                    }else {
                         throw new RouterException(_('La ruta no es válida'), 400);
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                     throw $e;
                 }
@@ -228,15 +228,15 @@ 
      * @return bool
      */
     private function checkRequirements(array $action, $params = []) {
-        if(!empty($params) && !empty($action['requirements'])) {
+        if (!empty($params) && !empty($action['requirements'])) {
             $checked = 0;
-            foreach(array_keys($params) as $key) {
-                if(in_array($key, $action['requirements'], true)) {
+            foreach (array_keys($params) as $key) {
+                if (in_array($key, $action['requirements'], true)) {
                     $checked++;
                 }
             }
             $valid = count($action['requirements']) === $checked;
-        } else {
+        }else {
             $valid = true;
         }
         return $valid;
@@ -286,14 +286,14 @@ 
         $this->checkExternalModules();
         if (file_exists($modulesPath)) {
             $modules = $this->finder->directories()->in($modulesPath)->depth(0);
-            if($modules->hasResults()) {
+            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);
     }
 
     /**
@@ -309,7 +309,7 @@ 
             $home_params = 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)) {
                     $home_params = $params;
                 }
                 unset($method);
@@ -331,14 +331,14 @@ 
     private function inspectDir($origen, $namespace = 'PSFS', $routing = [])
     {
         $files = $this->finder->files()->in($origen)->path('/(controller|api)/i')->depth(1)->name('*.php');
-        if($files->hasResults()) {
+        if ($files->hasResults()) {
             foreach ($files->getIterator() as $file) {
-                if($namespace !== 'PSFS' && method_exists($file, 'getRelativePathname')) {
-                    $filename = '\\' . str_replace('/', '\\', str_replace($origen, '', $file->getRelativePathname()));
-                } else {
+                if ($namespace !== 'PSFS' && method_exists($file, 'getRelativePathname')) {
+                    $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->finder = new Finder();
@@ -367,7 +367,7 @@ 
     private function addRouting($namespace, &$routing, $module = 'PSFS')
     {
         if (self::exists($namespace)) {
-            if(I18nHelper::checkI18Class($namespace)) {
+            if (I18nHelper::checkI18Class($namespace)) {
                 return $routing;
             }
             $reflection = new \ReflectionClass($namespace);
@@ -409,7 +409,7 @@ 
             if (!$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);
             }
@@ -425,11 +425,11 @@ 
      */
     public function simpatize()
     {
-        $translationFileName = 'translations' . DIRECTORY_SEPARATOR . 'routes_translations.php';
-        $absoluteTranslationFileName = CACHE_DIR . DIRECTORY_SEPARATOR . $translationFileName;
+        $translationFileName = 'translations'.DIRECTORY_SEPARATOR.'routes_translations.php';
+        $absoluteTranslationFileName = CACHE_DIR.DIRECTORY_SEPARATOR.$translationFileName;
         $this->generateSlugs($absoluteTranslationFileName);
         GeneratorHelper::createDir(CONFIG_DIR);
-        Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . 'urls.json', array($this->routing, $this->slugs), Cache::JSON, TRUE);
+        Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.'urls.json', array($this->routing, $this->slugs), Cache::JSON, TRUE);
 
         return $this;
     }
@@ -445,18 +445,18 @@ 
     public function getRoute($slug = '', $absolute = FALSE, array $params = [])
     {
         if ('' === $slug) {
-            return $absolute ? Request::getInstance()->getRootUrl() . '/' : '/';
+            return $absolute ? Request::getInstance()->getRootUrl().'/' : '/';
         }
         if (!is_array($this->slugs) || !array_key_exists($slug, $this->slugs)) {
             throw new RouterException(_('No existe la ruta especificada'));
         }
-        $url = $absolute ? Request::getInstance()->getRootUrl() . $this->slugs[$slug] : $this->slugs[$slug];
+        $url = $absolute ? Request::getInstance()->getRootUrl().$this->slugs[$slug] : $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 = $absolute ? Request::getInstance()->getRootUrl() . $this->routing[$this->slugs[$slug]]['default'] : $this->routing[$this->slugs[$slug]]['default'];
+            $url = $absolute ? Request::getInstance()->getRootUrl().$this->routing[$this->slugs[$slug]]['default'] : $this->routing[$this->slugs[$slug]]['default'];
         }
 
         return preg_replace('/(GET|POST|PUT|DELETE|ALL)\#\|\#/', '', $url);
@@ -475,15 +475,15 @@ 
      * @param string $method
      */
     private function checkPreActions($class, $method) {
-        $preAction = 'pre' . ucfirst($method);
-        if(method_exists($class, $preAction)) {
+        $preAction = 'pre'.ucfirst($method);
+        if (method_exists($class, $preAction)) {
             Logger::log(_('Pre action invoked'));
             try {
-                if(false === call_user_func_array([$class, $preAction])) {
+                if (false === call_user_func_array([$class, $preAction])) {
                     Logger::log(_('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]);
             }
         }
@@ -500,7 +500,7 @@ 
      */
     protected function executeCachedRoute($route, $action, $class, $params = NULL)
     {
-        Logger::log('Executing route ' . $route, LOG_INFO);
+        Logger::log('Executing route '.$route, LOG_INFO);
         $action['params'] = array_merge($action['params'], $params, Request::getInstance()->getQueryParams());
         Security::getInstance()->setSessionKey(Cache::CACHE_SESSION_VAR, $action);
         $cache = Cache::needCache();
@@ -508,9 +508,9 @@ 
         $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;
             }
@@ -555,11 +555,11 @@ 
     private function loadExternalAutoloader($hydrateRoute, SplFileInfo $modulePath, $externalModulePath)
     {
         $extModule = $modulePath->getBasename();
-        $moduleAutoloader = realpath($externalModulePath . DIRECTORY_SEPARATOR . $extModule . DIRECTORY_SEPARATOR . 'autoload.php');
-        if(file_exists($moduleAutoloader)) {
+        $moduleAutoloader = realpath($externalModulePath.DIRECTORY_SEPARATOR.$extModule.DIRECTORY_SEPARATOR.'autoload.php');
+        if (file_exists($moduleAutoloader)) {
             include_once $moduleAutoloader;
             if ($hydrateRoute) {
-                $this->routing = $this->inspectDir($externalModulePath . DIRECTORY_SEPARATOR . $extModule, '\\' . $extModule, $this->routing);
+                $this->routing = $this->inspectDir($externalModulePath.DIRECTORY_SEPARATOR.$extModule, '\\'.$extModule, $this->routing);
             }
         }
     }
@@ -573,16 +573,16 @@ 
     {
         try {
             $module = preg_replace('/(\\\|\/)/', DIRECTORY_SEPARATOR, $module);
-            $externalModulePath = VENDOR_DIR . DIRECTORY_SEPARATOR . $module . DIRECTORY_SEPARATOR . 'src';
-            if(file_exists($externalModulePath)) {
+            $externalModulePath = VENDOR_DIR.DIRECTORY_SEPARATOR.$module.DIRECTORY_SEPARATOR.'src';
+            if (file_exists($externalModulePath)) {
                 $externalModule = $this->finder->directories()->in($externalModulePath)->depth(0);
-                if($externalModule->hasResults()) {
+                if ($externalModule->hasResults()) {
                     foreach ($externalModule->getIterator() as $modulePath) {
                         $this->loadExternalAutoloader($hydrateRoute, $modulePath, $externalModulePath);
                     }
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
             $module = null;
         }

src/base/Logger.php

Spacing +9 added lines, -9 removed lines

@@ -16,8 +16,8 @@ 
 
 
 if (!defined('LOG_DIR')) {
-    GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
-    define('LOG_DIR', BASE_DIR . DIRECTORY_SEPARATOR . 'logs');
+    GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'logs');
+    define('LOG_DIR', BASE_DIR.DIRECTORY_SEPARATOR.'logs');
 }
 
 /**
@@ -54,7 +54,7 @@ 
     {
         $args = func_get_args();
         list($logger, $debug, $path) = $this->setup($args);
-        $this->stream = fopen($path . DIRECTORY_SEPARATOR . date('Ymd') . '.log', 'a+');
+        $this->stream = fopen($path.DIRECTORY_SEPARATOR.date('Ymd').'.log', 'a+');
         $this->addPushLogger($logger, $debug);
         $this->logLevel = Config::getParam('log.level', 'NOTICE');
     }
@@ -136,7 +136,7 @@ 
     private function createLoggerPath()
     {
         $logger = $this->setLoggerName();
-        $path = LOG_DIR . DIRECTORY_SEPARATOR . $logger . DIRECTORY_SEPARATOR . date('Y') . DIRECTORY_SEPARATOR . date('m');
+        $path = LOG_DIR.DIRECTORY_SEPARATOR.$logger.DIRECTORY_SEPARATOR.date('Y').DIRECTORY_SEPARATOR.date('m');
         GeneratorHelper::createDir($path);
 
         return $path;
@@ -158,7 +158,7 @@ 
      * @return bool
      */
     private function checkLogLevel($level = \Monolog\Logger::NOTICE) {
-        switch($this->logLevel) {
+        switch ($this->logLevel) {
             case 'DEBUG': $logPass = Monolog::DEBUG; break;
             case 'INFO': $logPass = Monolog::INFO; break;
             default:
@@ -178,10 +178,10 @@ 
      */
     public static function log($msg, $type = LOG_DEBUG, array $context = null, $force = false)
     {
-        if(null === $context) {
+        if (null === $context) {
             $context = [];
         }
-        if(Config::getParam('profiling.enable') && 'DEBUG' === Config::getParam('log.level', 'NOTICE')) {
+        if (Config::getParam('profiling.enable') && 'DEBUG' === Config::getParam('log.level', 'NOTICE')) {
             Inspector::stats($msg);
         }
         switch ($type) {
@@ -192,7 +192,7 @@ 
                 self::getInstance()->addLog($msg, \Monolog\Logger::WARNING, $context, $force);
                 break;
             case LOG_CRIT:
-                if(Config::getParam('log.slack.hook')) {
+                if (Config::getParam('log.slack.hook')) {
                     SlackHelper::getInstance()->trace($msg, '', '', $context, $force);
                 }
                 self::getInstance()->addLog($msg, \Monolog\Logger::CRITICAL, $context, $force);
@@ -235,7 +235,7 @@ 
     {
         $context['uri'] = null !== $_SERVER && array_key_exists('REQUEST_URI', $_SERVER) ? $_SERVER['REQUEST_URI'] : 'Unknow';
         $context['method'] = null !== $_SERVER && array_key_exists('REQUEST_METHOD', $_SERVER) ? $_SERVER['REQUEST_METHOD'] : 'Unknow';
-        if(null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) {
+        if (null !== $_SERVER && array_key_exists('HTTP_X_PSFS_UID', $_SERVER)) {
             $context['uid'] = $_SERVER['HTTP_X_PSFS_UID'];
         }
         return $context;

src/base/types/helpers/SecurityHelper.php

Spacing +21 added lines, -21 removed lines

@@ -33,7 +33,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()) {
@@ -53,8 +53,8 @@ 
         $token = '';
         $ct = strlen($ts);
         for ($i = 0; $i < $ct; $i++) {
-            $token = substr($hash, $i, 1) .
-                    substr($ts, $i, 1) .
+            $token = substr($hash, $i, 1).
+                    substr($ts, $i, 1).
                     $token;
         }
         return $token;
@@ -72,16 +72,16 @@ 
         $charsLength = strlen(self::RAND_SEP) - 1;
         $tsLength = strlen($ts);
         $i = 0;
-        $ct = ceil($hashRest / 4);
-        $part = substr($hash, $tsLength + $ct * $i, $ct);
-        while(false !== $part) {
-            $mixedToken .= $part .
-                substr(self::RAND_SEP, round(rand(0, $charsLength), 0, PHP_ROUND_HALF_DOWN), 1) .
+        $ct = ceil($hashRest/4);
+        $part = substr($hash, $tsLength + $ct*$i, $ct);
+        while (false !== $part) {
+            $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 + $ct * $i, $ct);
+            $part = substr($hash, $tsLength + $ct*$i, $ct);
             $i++;
         }
-        return $mixedToken . $token;
+        return $mixedToken.$token;
     }
 
     /**
@@ -90,10 +90,10 @@ 
      */
     private static function getTs($isOdd = null) {
         $ts = time();
-        $tsIsOdd = (bool)((int)substr($ts, -1) % 2);
-        if(false === $isOdd && !$tsIsOdd) {
+        $tsIsOdd = (bool)((int)substr($ts, -1)%2);
+        if (false === $isOdd && !$tsIsOdd) {
             $ts--;
-        } elseif(true === $isOdd && !$tsIsOdd) {
+        } elseif (true === $isOdd && !$tsIsOdd) {
             $ts--;
         }
         return $ts;
@@ -125,10 +125,10 @@ 
         $partToken = '';
         $ts = '';
         $part = strrev($part);
-        for($i = 0, $ct = strlen($part); $i < $ct; $i++) {
-            if($i % 2 == 0) {
+        for ($i = 0, $ct = strlen($part); $i < $ct; $i++) {
+            if ($i%2 == 0) {
                 $ts .= substr($part, $i, 1);
-            } else {
+            }else {
                 $partToken .= substr($part, $i, 1);
             }
         }
@@ -143,11 +143,11 @@ 
     private static function parseTokenParts(array $parts) {
         $token = '';
         list($partToken, $ts) = self::extractTs(array_pop($parts));
-        if($ts > 0) {
-            foreach($parts as $part) {
+        if ($ts > 0) {
+            foreach ($parts as $part) {
                 $token .= $part;
             }
-            $token = $partToken . $token;
+            $token = $partToken.$token;
         }
         return [$token, $ts];
     }
@@ -175,8 +175,8 @@ 
      * @return array
      */
     private static function extractTokenParts($token) {
-        for($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) {
-            $token = str_replace(substr(self::RAND_SEP,$i,1), "|", $token);
+        for ($i = 0, $ct = strlen(self::RAND_SEP); $i < $ct; $i++) {
+            $token = str_replace(substr(self::RAND_SEP, $i, 1), "|", $token);
         }
         return array_unique(explode('||', $token));
     }

src/Dispatcher.php

Spacing +6 added lines, -6 removed lines

@@ -73,18 +73,18 @@
                 if (!Request::getInstance()->isFile()) {
                     return $this->router->execute($uri ?: $this->actualUri);
                 }
-            } else {
+            }else {
                 return ConfigController::getInstance()->config();
             }
-        } catch (AdminCredentialsException $a) {
+        }catch (AdminCredentialsException $a) {
             return UserController::showAdminManager();
-        } catch (SecurityException $s) {
+        }catch (SecurityException $s) {
             return $this->security->notAuthorized($this->actualUri);
-        } catch (RouterException $r) {
+        }catch (RouterException $r) {
             return $this->router->httpNotFound($r);
-        } catch(ApiException $a) {
+        }catch (ApiException $a) {
             return $this->router->httpNotFound($a, true);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $this->dumpException($e);
         }
     }