psfs / core

src/base/types/helpers/AdminHelper.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
     {
         $routes = [];
         foreach ($systemRoutes as $params) {
-            if(isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
+            if (isset($params['http']) && 'GET' === $params['http'] && preg_match('/^\/admin(\/|$)/', $params['default'])) {
                 $module = strtoupper($params['module']);
                 $mode = $params['visible'] ? 'visible' : 'hidden';
                 $routes[$module][$mode][] = [
@@ -41,11 +41,11 @@ 
                 ];
             }
         }
-        foreach($routes as $module => &$route) {
-            if(array_key_exists('visible', $route)) {
+        foreach ($routes as $module => &$route) {
+            if (array_key_exists('visible', $route)) {
                 uasort($route['visible'], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
-            if(array_key_exists('hidden', $route)) {
+            if (array_key_exists('hidden', $route)) {
                 uasort($route['hidden'], '\PSFS\base\types\helpers\AdminHelper::sortByLabel');
             }
         }

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/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/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);
         }
     }

src/controller/I18nController.php

Spacing +3 added lines, -3 removed lines

@@ -42,8 +42,8 @@ 
         //Generating the templates translations
         $translations = $this->tpl->regenerateTemplates();
 
-        $localePath = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-        $localePath .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+        $localePath = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+        $localePath .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
         //xgettext localizations
         $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale));
@@ -51,7 +51,7 @@ 
         $translations = array_merge($translations, GeneratorService::findTranslations(CACHE_DIR, $locale));
 
         $translations[] = "msgfmt {$localePath}translations.po -o {$localePath}translations.mo";
-        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '. $localePath . 'translations.po -o ' . $localePath . 'translations.mo');
+        $translations[] = shell_exec('export PATH=\$PATH:/opt/local/bin:/bin:/sbin; msgfmt '.$localePath.'translations.po -o '.$localePath.'translations.mo');
         return $this->render('translations.html.twig', array(
             'translations' => $translations,
         ));

src/services/DocumentorService.php

Spacing +24 added lines, -24 removed lines

@@ -56,10 +56,10 @@ 
                     if ($module === $requestModule && !preg_match('/^ROOT/i', $module)) {
                         $modules = [
                             'name' => $module,
-                            'path' => dirname($info['base'] . DIRECTORY_SEPARATOR . '..'),
+                            'path' => dirname($info['base'].DIRECTORY_SEPARATOR.'..'),
                         ];
                     }
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     $modules[] = $e->getMessage();
                 }
             }
@@ -77,7 +77,7 @@ 
      */
     public function extractApiEndpoints(array $module)
     {
-        $modulePath = $module['path'] . DIRECTORY_SEPARATOR . 'Api';
+        $modulePath = $module['path'].DIRECTORY_SEPARATOR.'Api';
         $moduleName = $module['name'];
         $endpoints = [];
         if (file_exists($modulePath)) {
@@ -86,7 +86,7 @@ 
             if (count($finder)) {
                 /** @var \SplFileInfo $file */
                 foreach ($finder as $file) {
-                    $namespace = "\\{$moduleName}\\Api\\" . str_replace('.php', '', $file->getFilename());
+                    $namespace = "\\{$moduleName}\\Api\\".str_replace('.php', '', $file->getFilename());
                     $info = $this->extractApiInfo($namespace, $moduleName);
                     if (!empty($info)) {
                         $endpoints[$namespace] = $info;
@@ -109,14 +109,14 @@ 
         if (Router::exists($namespace) && !I18nHelper::checkI18Class($namespace)) {
             $reflection = new \ReflectionClass($namespace);
             $visible = InjectorHelper::checkIsVisible($reflection->getDocComment());
-            if($visible) {
+            if ($visible) {
                 foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
                     try {
                         $mInfo = $this->extractMethodInfo($namespace, $method, $reflection, $module);
                         if (NULL !== $mInfo) {
                             $info[] = $mInfo;
                         }
-                    } catch (\Exception $e) {
+                    }catch (\Exception $e) {
                         Logger::log($e->getMessage(), LOG_ERR);
                     }
                 }
@@ -249,7 +249,7 @@ 
             $payload = $this->extractModelFields($namespace);
             $reflector = new \ReflectionClass($namespace);
             $shortName = $reflector->getShortName();
-        } else {
+        }else {
             $namespace = $model;
             $shortName = $model;
         }
@@ -338,10 +338,10 @@ 
                         "required" => $field->isNotNull(),
                         'format' => $format,
                     ];
-                    if(count($field->getValueSet())) {
+                    if (count($field->getValueSet())) {
                         $info['enum'] = array_values($field->getValueSet());
                     }
-                    if(null !== $field->getDefaultValue()) {
+                    if (null !== $field->getDefaultValue()) {
                         $info['default'] = $field->getDefaultValue();
                     }
                     $payload[ApiHelper::getColumnMapName($field)] = $info;
@@ -349,7 +349,7 @@ 
             } elseif (null !== $reflector && $reflector->isSubclassOf(self::DTO_INTERFACE)) {
                 $payload = $this->extractDtoProperties($namespace);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
 
@@ -380,7 +380,7 @@ 
                     $return = $this->extractReturn($modelNamespace, $docComments);
                     $url = array_pop($route);
                     $methodInfo = [
-                        'url' => str_replace('/' . $module . '/api', '', $url),
+                        'url' => str_replace('/'.$module.'/api', '', $url),
                         'method' => $info['http'],
                         'description' => $info['label'],
                         'return' => $return,
@@ -391,7 +391,7 @@ 
                     $this->setRequestParams($method, $methodInfo, $modelNamespace, $docComments);
                     $this->setQueryParams($method, $methodInfo);
                     $this->setRequestHeaders($reflection, $methodInfo);
-                } catch (\Exception $e) {
+                }catch (\Exception $e) {
                     Logger::log($e->getMessage(), LOG_ERR);
                 }
             }
@@ -460,10 +460,10 @@ 
         $formatted = [
             "swagger" => "2.0",
             "host" => preg_replace('/^(http|https)\:\/\/(.*)\/$/i', '$2', Router::getInstance()->getRoute('', true)),
-            "basePath" => '/' . $module['name'] . '/api',
+            "basePath" => '/'.$module['name'].'/api',
             "schemes" => [Request::getInstance()->getServer('HTTPS') === 'on' ? 'https' : 'http'],
             "info" => [
-                "title" => t('Documentación API módulo ') . $module['name'],
+                "title" => t('Documentación API módulo ').$module['name'],
                 "version" => Config::getParam('api.version', '1.0.0'),
                 "contact" => [
                     "name" => Config::getParam("author", "Fran López"),
@@ -476,7 +476,7 @@ 
         foreach ($endpoints as $model) {
             foreach ($model as $endpoint) {
                 if (!preg_match('/^\/(admin|api)\//i', $endpoint['url']) && strlen($endpoint['url'])) {
-                    $url = preg_replace('/\/' . $module['name'] . '\/api/i', '', $endpoint['url']);
+                    $url = preg_replace('/\/'.$module['name'].'\/api/i', '', $endpoint['url']);
                     $description = $endpoint['description'];
                     $method = strtolower($endpoint['method']);
                     $paths[$url][$method] = [
@@ -537,7 +537,7 @@ 
     protected function extractDtoName($dto, $isArray = false)
     {
         $dto = explode('\\', $dto);
-        $modelDto = array_pop($dto) . "Dto";
+        $modelDto = array_pop($dto)."Dto";
         if ($isArray) {
             $modelDto .= "List";
         }
@@ -587,10 +587,10 @@ 
     {
 
         $methodInfo['headers'] = [];
-        foreach($reflection->getProperties() as $property) {
+        foreach ($reflection->getProperties() as $property) {
             $doc = $property->getDocComment();
             preg_match('/@header\ (.*)\n/i', $doc, $headers);
-            if(count($headers)) {
+            if (count($headers)) {
                 $header = [
                     "name" => $headers[1],
                     "in" => "header",
@@ -635,7 +635,7 @@ 
             foreach ($method->getParameters() as $parameter) {
                 $parameterName = $parameter->getName();
                 $types = [];
-                preg_match_all('/\@param\ (.*)\ \$' . $parameterName . '$/im', $docComments, $types);
+                preg_match_all('/\@param\ (.*)\ \$'.$parameterName.'$/im', $docComments, $types);
                 if (count($types) > 1 && count($types[1]) > 0) {
                     $methodInfo['parameters'][$parameterName] = $types[1][0];
                 }
@@ -657,21 +657,21 @@ 
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'array',
                         'items' => [
-                            '$ref' => '#/definitions/' . $info['type'],
+                            '$ref' => '#/definitions/'.$info['type'],
                         ]
                     ];
-                } else {
+                }else {
                     $modelDto['objects'][$dtoName][$param] = [
                         'type' => 'object',
-                        '$ref' => '#/definitions/' . $info['type'],
+                        '$ref' => '#/definitions/'.$info['type'],
                     ];
                 }
                 $modelDto['objects'][$info['class']] = $info['properties'];
                 $paramDto = $this->checkDtoAttributes($info['properties'], $info['properties'], $info['class']);
-                if(array_key_exists('objects', $paramDto)) {
+                if (array_key_exists('objects', $paramDto)) {
                     $modelDto['objects'] = array_merge($modelDto['objects'], $paramDto['objects']);
                 }
-            } else {
+            }else {
                 $modelDto['objects'][$dtoName][$param] = $info;
             }
         }