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/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/base/types/Form.php

Spacing +24 added lines, -24 removed lines

@@ -69,8 +69,8 @@ 
     public function add($name, array $value = array())
     {
         $this->fields[$name] = $value;
-        $this->fields[$name]['name'] = $this->getName() . '['.$name.']';
-        $this->fields[$name]['id'] = $this->getName() . '_' . $name;
+        $this->fields[$name]['name'] = $this->getName().'['.$name.']';
+        $this->fields[$name]['id'] = $this->getName().'_'.$name;
         $this->fields[$name]['placeholder'] = array_key_exists('placeholder', $value) ? $value['placeholder'] : $name;
         $this->fields[$name]['hasLabel'] = array_key_exists('hasLabel', $value) ? $value['hasLabel'] : true;
         return $this;
@@ -133,7 +133,7 @@ 
         }
         if ('' !== $hashOrig) {
             $this->crfs = sha1($hashOrig);
-            $this->add($this->getName() . '_token', array(
+            $this->add($this->getName().'_token', array(
                 'type' => 'hidden',
                 'value' => $this->crfs,
             ));
@@ -202,7 +202,7 @@ 
     public function isValid()
     {
         $valid = true;
-        $tokenField = $this->getName() . '_token';
+        $tokenField = $this->getName().'_token';
         //Controlamos CSRF token
         if (!$this->existsFormToken($tokenField)) {
             $this->errors[$tokenField] = t('Formulario no válido');
@@ -276,7 +276,7 @@ 
         $data = array();
         if (count($this->fields) > 0) {
             foreach ($this->fields as $key => $field) {
-                if (self::SEPARATOR !== $key && $key !== ($this->getName() . '_token')) {
+                if (self::SEPARATOR !== $key && $key !== ($this->getName().'_token')) {
                     $data[$key] = array_key_exists('value', $field) ? $field['value'] : null;
                 }
             }
@@ -390,8 +390,8 @@ 
             $model = $this->getHydratedModel();
             $model->save();
             $save = true;
-            Logger::log(get_class($this->model) . ' guardado con id ' . $this->model->getPrimaryKey(), LOG_INFO);
-        } catch (\Exception $e) {
+            Logger::log(get_class($this->model).' guardado con id '.$this->model->getPrimaryKey(), LOG_INFO);
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             throw new FormException($e->getMessage(), $e->getCode(), $e);
         }
@@ -410,10 +410,10 @@ 
         if (null === $value) {
             $isEmpty = true;
             // Empty Array check
-        } else if (is_array($value) && 0 === count($value)) {
+        }else if (is_array($value) && 0 === count($value)) {
             $isEmpty = true;
             // Empty string check
-        } else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) {
+        }else if ('' === preg_replace('/(\ |\r|\n)/m', '', $value)) {
             $isEmpty = true;
         }
 
@@ -440,7 +440,7 @@ 
             && array_key_exists($key, $field)
             && !array_key_exists('error', $field[$key])
             && !empty($field['value'])
-            && preg_match('/' . $field['pattern'] . '/', $field['value']) === 0
+            && preg_match('/'.$field['pattern'].'/', $field['value']) === 0
         ) {
             $this->setError($key, str_replace('%s', "<strong>{$key}</strong>", t('El campo %s no tiene un formato válido')));
             $field['error'] = $this->getError($key);
@@ -462,10 +462,10 @@ 
         if (array_key_exists($key, $data[$formName])) {
             if (preg_match('/id/i', $key) && ($data[$formName][$key] === 0 || $data[$formName][$key] === '%' || $data[$formName][$key] === '')) {
                 $field['value'] = null;
-            } else {
+            }else {
                 $field['value'] = $data[$formName][$key];
             }
-        } else {
+        }else {
             unset($field['value']);
         }
         return array($data, $field);
@@ -479,8 +479,8 @@ 
      */
     private function hydrateModelField($key, $value)
     {
-        $setter = 'set' . ucfirst($key);
-        $getter = 'get' . ucfirst($key);
+        $setter = 'set'.ucfirst($key);
+        $getter = 'get'.ucfirst($key);
         if (method_exists($this->model, $setter)) {
             if (method_exists($this->model, $getter)) {
                 $tmp = $this->model->$getter();
@@ -505,16 +505,16 @@ 
     {
         //Extraemos el dato del modelo relacionado si existe el getter
         $method = null;
-        if (array_key_exists('class_data', $field) && method_exists($val, 'get' . $field['class_data'])) {
-            $classMethod = 'get' . $field['class_data'];
+        if (array_key_exists('class_data', $field) && method_exists($val, 'get'.$field['class_data'])) {
+            $classMethod = 'get'.$field['class_data'];
             $class = $val->$classMethod();
-            if (array_key_exists('class_id', $field) && method_exists($class, 'get' . $field['class_id'])) {
-                $method = 'get' . $field['class_id'];
+            if (array_key_exists('class_id', $field) && method_exists($class, 'get'.$field['class_id'])) {
+                $method = 'get'.$field['class_id'];
                 $data[] = $class->$method();
-            } else {
+            }else {
                 $data[] = $class->getPrimaryKey();
             }
-        } else {
+        }else {
             $data[] = $val;
         }
 
@@ -530,7 +530,7 @@ 
     private function extractModelFieldValue($key, $field)
     {
         //Extraemos el valor del campo del modelo
-        $method = 'get' . ucfirst($key);
+        $method = 'get'.ucfirst($key);
         $type = (array_key_exists('type', $field)) ? $field['type'] : 'text';
         //Extraemos los campos del modelo
         if (method_exists($this->model, $method)) {
@@ -540,16 +540,16 @@ 
                 //Si es una relación múltiple
                 if ($value instanceof ObjectCollection) {
                     $field = $this->computeModelFieldValue($field, $value, $type);
-                } else { //O una relación unitaria
+                }else { //O una relación unitaria
                     if (method_exists($value, '__toString')) {
                         $field['value'] = $value;
                     } elseif ($value instanceof \DateTime) {
                         $field['value'] = $value->format('Y-m-d H:i:s');
-                    } else {
+                    }else {
                         $field['value'] = $value->getPrimaryKey();
                     }
                 }
-            } else {
+            }else {
                 $field['value'] = $value;
             }
         }