psfs / core

src/base/config/Config.php

Spacing +4 added lines, -4 removed lines

@@ -72,7 +72,7 @@ 
      */
     protected function init()
     {
-        if (file_exists(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE)) {
+        if (file_exists(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE)) {
             $this->loadConfigData();
         }
         return $this;
@@ -170,10 +170,10 @@ 
         $final_data = self::saveExtraParams($data);
         $saved = false;
         try {
-            Cache::getInstance()->storeData(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE, $final_data, Cache::JSON, true);
+            Cache::getInstance()->storeData(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE, $final_data, Cache::JSON, true);
             Config::getInstance()->loadConfigData();
             $saved = true;
-        } catch (ConfigException $e) {
+        }catch (ConfigException $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $saved;
@@ -205,7 +205,7 @@ 
      */
     public function loadConfigData()
     {
-        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR . DIRECTORY_SEPARATOR . self::CONFIG_FILE,
+        $this->config = Cache::getInstance()->getDataFromFile(CONFIG_DIR.DIRECTORY_SEPARATOR.self::CONFIG_FILE,
             Cache::JSON,
             TRUE) ?: [];
         $this->debug = (array_key_exists('debug', $this->config)) ? (bool)$this->config['debug'] : FALSE;

Doc Comments +2 added lines, -2 removed lines

@@ -181,7 +181,7 @@ 
     /**
      * Method that returns a config value
      * @param string $param
-     * @param mixed $defaultValue
+     * @param boolean $defaultValue
      *
      * @return mixed|null
      */
@@ -221,7 +221,7 @@ 
     /**
      * Static wrapper for extracting params
      * @param string $key
-     * @param mixed|null $defaultValue
+     * @param boolean|string $defaultValue
      * @return mixed|null
      */
     public static function getParam($key, $defaultValue = null)

src/base/types/helpers/GeneratorHelper.php

Spacing +11 added lines, -11 removed lines

@@ -19,10 +19,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);
                     }
                 }
             }
@@ -38,10 +38,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) {
                     Logger::log($e->getMessage());
                 }
             }
@@ -57,12 +57,12 @@ 
     {
         try {
             if (!is_dir($dir) && @mkdir($dir, 0775, true) === false) {
-                throw new \Exception(_('Can\'t create directory ') . $dir);
+                throw new \Exception(_('Can\'t create directory ').$dir);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_WARNING);
             if (!file_exists(dirname($dir))) {
-                throw new GeneratorException($e->getMessage() . $dir);
+                throw new GeneratorException($e->getMessage().$dir);
             }
         }
     }
@@ -73,7 +73,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);
     }
 }
\ No newline at end of file

src/command/CreateDocumentRoot.php

Spacing +11 added lines, -11 removed lines

@@ -13,14 +13,14 @@ 
         new InputArgument('path', InputArgument::OPTIONAL, 'Path en el que crear el Document Root'),
     ))
     ->setDescription('Comando de creación del Document Root del projecto')
-    ->setCode(function (InputInterface $input, OutputInterface $output) {
+    ->setCode(function(InputInterface $input, OutputInterface $output) {
         // Creates the html path
         $path = $input->getArgument('path');
         if (empty($path)) $path = WEB_DIR;
         \PSFS\base\types\helpers\GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {
-            \PSFS\base\types\helpers\GeneratorHelper::createDir($path . DIRECTORY_SEPARATOR . $htmlPath);
+            \PSFS\base\types\helpers\GeneratorHelper::createDir($path.DIRECTORY_SEPARATOR.$htmlPath);
         }
 
         // Generates the root needed files
@@ -32,19 +32,19 @@ 
             'robots' => 'robots.txt',
         ];
         foreach ($files as $templates => $filename) {
-            $text = \PSFS\base\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 = \PSFS\base\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')) {
-            \PSFS\base\types\helpers\GeneratorHelper::createDir(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-            \PSFS\Services\GeneratorService::copyr(SOURCE_DIR . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'locale', BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
+        if (!file_exists(BASE_DIR.DIRECTORY_SEPARATOR.'locale')) {
+            \PSFS\base\types\helpers\GeneratorHelper::createDir(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+            \PSFS\Services\GeneratorService::copyr(SOURCE_DIR.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'locale', BASE_DIR.DIRECTORY_SEPARATOR.'locale');
         }
 
-        $output->writeln("Document root generado en " . $path);
+        $output->writeln("Document root generado en ".$path);
     });

Braces +6 added lines, -2 removed lines

@@ -6,7 +6,9 @@ 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-if (!isset($console)) $console = new Application();
+if (!isset($console)) {
+    $console = new Application();
+}
 $console
     ->register('psfs:create:root')
     ->setDefinition(array(
@@ -16,7 +18,9 @@ 
     ->setCode(function (InputInterface $input, OutputInterface $output) {
         // Creates the html path
         $path = $input->getArgument('path');
-        if (empty($path)) $path = WEB_DIR;
+        if (empty($path)) {
+            $path = WEB_DIR;
+        }
         \PSFS\base\types\helpers\GeneratorHelper::createDir($path);
         $paths = array("js", "css", "img", "media", "font");
         foreach ($paths as $htmlPath) {

src/base/extension/TemplateFunctions.php

Doc Comments +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
      * @param string $path
      * @param $domains
      *
-     * @return mixed
+     * @return string
      */
     private static function extractPathname($path, $domains)
     {

Spacing +7 added lines, -7 removed lines

@@ -39,12 +39,12 @@ 
 
         $file_path = "";
         if (!file_exists($file_path)) {
-            $file_path = BASE_DIR . $string;
+            $file_path = BASE_DIR.$string;
         }
         $filename_path = AssetsParser::findDomainPath($string, $file_path);
 
         $file_path = self::processAsset($string, $name, $return, $filename_path);
-        $return_path = (empty($name)) ? Request::getInstance()->getRootUrl() . '/' . $file_path : $name;
+        $return_path = (empty($name)) ? Request::getInstance()->getRootUrl().'/'.$file_path : $name;
         return ($return) ? $return_path : '';
     }
 
@@ -61,7 +61,7 @@ 
         $router = Router::getInstance();
         try {
             return $router->getRoute($path, $absolute, $params);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             return $router->getRoute('', $absolute, $params);
         }
     }
@@ -187,8 +187,8 @@ 
     private static function putResourceContent($name, $filename_path, $base, $file_path)
     {
         $data = file_get_contents($filename_path);
-        if (!empty($name)) file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
-        else file_put_contents($base . $file_path, $data);
+        if (!empty($name)) file_put_contents(WEB_DIR.DIRECTORY_SEPARATOR.$name, $data);
+        else file_put_contents($base.$file_path, $data);
     }
 
     /**
@@ -206,9 +206,9 @@ 
         if (file_exists($filename_path)) {
             list($base, $html_base, $file_path) = AssetsParser::calculateAssetPath($string, $name, $return, $filename_path);
             //Creamos el directorio si no existe
-            GeneratorHelper::createDir($base . $html_base);
+            GeneratorHelper::createDir($base.$html_base);
             //Si se ha modificado
-            if (!file_exists($base . $file_path) || filemtime($base . $file_path) < filemtime($filename_path)) {
+            if (!file_exists($base.$file_path) || filemtime($base.$file_path) < filemtime($filename_path)) {
                 if ($html_base == 'css') {
                     self::processCssLines($filename_path);
                 }

Braces +5 added lines, -2 removed lines

@@ -187,8 +187,11 @@
     private static function putResourceContent($name, $filename_path, $base, $file_path)
     {
         $data = file_get_contents($filename_path);
-        if (!empty($name)) file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
-        else file_put_contents($base . $file_path, $data);
+        if (!empty($name)) {
+            file_put_contents(WEB_DIR . DIRECTORY_SEPARATOR . $name, $data);
+        } else {
+            file_put_contents($base . $file_path, $data);
+        }
     }
 
     /**

src/base/Template.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use PSFS\base\extension\TemplateFunctions;
 use PSFS\base\types\helpers\GeneratorHelper;
 use PSFS\base\types\helpers\ResponseHelper;
-use PSFS\base\types\helpers\TemplateHelper;
 use PSFS\base\types\SingletonTrait;
 
 

Spacing +13 added lines, -13 removed lines

@@ -129,7 +129,7 @@ 
         ResponseHelper::setStatusHeader($this->status_code);
         ResponseHelper::setAuthHeaders($this->public_zone);
         ResponseHelper::setCookieHeaders($cookies);
-        header('Content-type: ' . $contentType);
+        header('Content-type: '.$contentType);
 
     }
 
@@ -145,15 +145,15 @@ 
         Logger::log('Start output response');
         ob_start();
         $this->setReponseHeaders($contentType, $cookies);
-        header('Content-length: ' . strlen($output));
+        header('Content-length: '.strlen($output));
 
         $cache = Cache::needCache();
         if (false !== $cache && $this->status_code === Template::STATUS_OK && $this->debug === false) {
             Logger::log('Saving output response into cache');
             $cacheName = $this->cache->getRequestCacheHash();
-            $tmpDir = substr($cacheName, 0, 2) . DIRECTORY_SEPARATOR . substr($cacheName, 2, 2) . DIRECTORY_SEPARATOR;
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheName, $output);
-            $this->cache->storeData("json" . DIRECTORY_SEPARATOR . $tmpDir . $cacheName . ".headers", headers_list(), Cache::JSON);
+            $tmpDir = substr($cacheName, 0, 2).DIRECTORY_SEPARATOR.substr($cacheName, 2, 2).DIRECTORY_SEPARATOR;
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheName, $output);
+            $this->cache->storeData("json".DIRECTORY_SEPARATOR.$tmpDir.$cacheName.".headers", headers_list(), Cache::JSON);
         }
         echo $output;
 
@@ -170,11 +170,11 @@ 
     {
         Logger::log('Close template render');
         Security::getInstance()->setSessionKey("lastRequest", array(
-            "url" => Request::getInstance()->getRootUrl() . Request::requestUri(),
+            "url" => Request::getInstance()->getRootUrl().Request::requestUri(),
             "ts" => microtime(true),
         ));
         Security::getInstance()->updateSession();
-        Logger::log('End request: ' . Request::requestUri(), LOG_INFO);
+        Logger::log('End request: '.Request::requestUri(), LOG_INFO);
         exit;
     }
 
@@ -224,7 +224,7 @@ 
         $dump = '';
         try {
             $dump = $this->tpl->render($tpl, $vars);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
         return $dump;
@@ -338,7 +338,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);
@@ -360,8 +360,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()]);
                 }
             }
@@ -435,7 +435,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));
@@ -452,7 +452,7 @@ 
         $this->cache = Cache::getInstance();
         $loader = new \Twig_Loader_Filesystem(GeneratorHelper::getTemplatePath());
         $this->tpl = new \Twig_Environment($loader, array(
-            'cache' => CACHE_DIR . DIRECTORY_SEPARATOR . 'twig',
+            'cache' => CACHE_DIR.DIRECTORY_SEPARATOR.'twig',
             'debug' => (bool)$this->debug,
             'auto_reload' => Config::getParam('twig.auto_reload', TRUE),
         ));

src/base/types/Form.php

Doc Comments +5 added lines, -2 removed lines

@@ -48,6 +48,9 @@ 
         return $this;
     }
 
+    /**
+     * @param string|null $action
+     */
     public function setAction($action)
     {
         $this->action = $action;
@@ -562,7 +565,7 @@ 
     }
 
     /**
-     * @param $token_field
+     * @param string $token_field
      * @return bool
      */
     protected function existsFormToken($token_field)
@@ -594,7 +597,7 @@ 
     /**
      * Método que extrae el valor de un campo del formulario del modelo
      * @param $field
-     * @param $value
+     * @param ObjectCollection $value
      * @param $type
      * @return mixed
      */

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 ('' !== $hash_orig) {
             $this->crfs = sha1($hash_orig);
-            $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;
-        $token_field = $this->getName() . '_token';
+        $token_field = $this->getName().'_token';
         //Controlamos CSRF token
         if (!$this->existsFormToken($token_field)) {
             $this->errors[$token_field] = _('Formulario no válido');
@@ -274,7 +274,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;
                 }
             }
@@ -389,8 +389,8 @@ 
             $model = $this->getHydratedModel();
             $model->save();
             $save = true;
-            Logger::getInstance()->infoLog(get_class($this->model) . " guardado con id " . $this->model->getPrimaryKey());
-        } catch (\Exception $e) {
+            Logger::getInstance()->infoLog(get_class($this->model)." guardado con id ".$this->model->getPrimaryKey());
+        }catch (\Exception $e) {
             Logger::getInstance()->errorLog($e->getMessage());
             throw new FormException($e->getMessage(), $e->getCode(), $e);
         }
@@ -409,10 +409,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 (0 === strlen(preg_replace('/(\ |\r|\n)/m', '', $value))) {
+        }else if (0 === strlen(preg_replace('/(\ |\r|\n)/m', '', $value))) {
             $isEmpty = true;
         }
 
@@ -439,7 +439,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>", _("El campo %s no tiene un formato válido")));
             $field["error"] = $this->getError($key);
@@ -461,10 +461,10 @@ 
         if (array_key_exists($key, $data[$form_name])) {
             if (preg_match("/id/i", $key) && ($data[$form_name][$key] === 0 || $data[$form_name][$key] === "%" || $data[$form_name][$key] === "")) {
                 $field["value"] = null;
-            } else {
+            }else {
                 $field["value"] = $data[$form_name][$key];
             }
-        } else {
+        }else {
             unset($field["value"]);
         }
         return array($data, $field);
@@ -478,8 +478,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();
@@ -504,16 +504,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"])) {
-            $class_method = "get" . $field["class_data"];
+        if (array_key_exists('class_data', $field) && method_exists($val, "get".$field["class_data"])) {
+            $class_method = "get".$field["class_data"];
             $class = $val->$class_method();
-            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;
         }
 
@@ -529,7 +529,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)) {
@@ -539,16 +539,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;
             }
         }

Braces +3 added lines, -1 removed lines

@@ -212,7 +212,9 @@
         //Validamos los campos del formulario
         if ($valid && count($this->fields) > 0) {
             foreach ($this->fields as $key => &$field) {
-                if ($key === $token_field || $key === self::SEPARATOR) continue;
+                if ($key === $token_field || $key === self::SEPARATOR) {
+                    continue;
+                }
                 list($field, $valid) = $this->checkFieldValidation($field, $key);
             }
         }

src/base/types/helpers/ApiHelper.php

Doc Comments +1 added lines, -1 removed lines

@@ -199,7 +199,7 @@
 
     /**
      * @param ColumnMap $column
-     * @param ModelCriteria $quwuery
+     * @param ModelCriteria $query
      * @param mixed $value
      */
     private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null)

Spacing +11 added lines, -11 removed lines

@@ -40,7 +40,7 @@ 
             } elseif ($mappedColumn->isText()) {
                 if ($mappedColumn->getSize() > 100) {
                     $fDto = self::createField($field, Field::TEXTAREA_TYPE, $required);
-                } else {
+                }else {
                     $fDto = self::generateStringField($field, $required);
                 }
             } elseif ($mappedColumn->getType() === PropelTypes::BOOLEAN) {
@@ -83,7 +83,7 @@ 
         $fDto->entity = $relatedModel;
         $relatedField = $foreignTable->getColumn($mappedColumn->getRelatedColumnName());
         $fDto->relatedField = $relatedField->getPhpName();
-        $fDto->url = Router::getInstance()->getRoute('api-' . $relatedModel);
+        $fDto->url = Router::getInstance()->getRoute('api-'.$relatedModel);
         return $fDto;
     }
 
@@ -190,7 +190,7 @@ 
     {
         try {
             $column = $tableMap->getColumnByPhpName($field);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
             $column = null;
         }
@@ -202,7 +202,7 @@ 
      * @param ModelCriteria $quwuery
      * @param mixed $value
      */
-    private static function addQueryFilter(ColumnMap $column, ModelCriteria &$query, $value = null)
+    private static function addQueryFilter(ColumnMap $column, ModelCriteria & $query, $value = null)
     {
         $tableField = $column->getPhpName();
         if (preg_match('/^<=/', $value)) {
@@ -216,8 +216,8 @@ 
         } elseif (preg_match('/^(\'|\")(.*)(\'|\")$/', $value)) {
             $text = preg_replace('/(\'|\")/', '', $value);
             $text = preg_replace('/\ /', '%', $text);
-            $query->filterBy($tableField, '%' . $text . '%', Criteria::LIKE);
-        } else {
+            $query->filterBy($tableField, '%'.$text.'%', Criteria::LIKE);
+        }else {
             $query->filterBy($tableField, $value, Criteria::EQUAL);
         }
     }
@@ -228,24 +228,24 @@ 
      * @param array $extraColumns
      * @param mixed $value
      */
-    public static function composerComboField(TableMap $tableMap, ModelCriteria &$query, array $extraColumns = [], $value = null)
+    public static function composerComboField(TableMap $tableMap, ModelCriteria & $query, array $extraColumns = [], $value = null)
     {
         $exp = 'CONCAT(';
         $sep = '';
         foreach ($tableMap->getColumns() as $column) {
             if ($column->isText()) {
-                $exp .= $sep . 'IFNULL(' . $column->getFullyQualifiedName() . ',"")';
+                $exp .= $sep.'IFNULL('.$column->getFullyQualifiedName().',"")';
                 $sep = ', " ", ';
             }
         }
         foreach ($extraColumns as $extra => $name) {
-            $exp .= $sep . $extra;
+            $exp .= $sep.$extra;
             $sep = ', " ", ';
         }
         $exp .= ")";
         $text = preg_replace('/(\'|\")/', '', $value);
         $text = preg_replace('/\ /', '%', $text);
-        $query->where($exp . Criteria::LIKE . '"%' . $text . '%"');
+        $query->where($exp.Criteria::LIKE.'"%'.$text.'%"');
     }
 
     /**
@@ -255,7 +255,7 @@ 
      * @param string $field
      * @param mixed $value
      */
-    public static function addModelField(TableMap $tableMap, ModelCriteria &$query, $field, $value = null)
+    public static function addModelField(TableMap $tableMap, ModelCriteria & $query, $field, $value = null)
     {
         if ($column = self::checkFieldExists($tableMap, $field)) {
             self::addQueryFilter($column, $query, $value);

src/base/types/interfaces/ControllerInterface.php

Doc Comments +6 added lines

@@ -8,7 +8,13 @@
  */
 interface ControllerInterface
 {
+    /**
+     * @return string|null
+     */
     public function render($template, array $vars = [], $cookies = []);
 
+    /**
+     * @return void
+     */
     public function response($response, $type = 'text/html');
 }

src/services/AdminServices.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 use PSFS\base\config\Config;
 use PSFS\base\Security;
 use PSFS\base\Service;
-use PSFS\controller\Admin;
 use Symfony\Component\Finder\Finder;
 
 class AdminServices extends Service

Spacing +5 added lines, -5 removed lines

@@ -34,7 +34,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 _("Zona restringida");
         exit();
     }
@@ -75,7 +75,7 @@ 
                         $admin['class'] = 'primary';
                         break;
                 }
-            } else {
+            }else {
                 $admin["class"] = "primary";
             }
         }
@@ -92,7 +92,7 @@ 
         $logs = array();
         /** @var \SplFileInfo $file */
         foreach ($files as $file) {
-            $size = $file->getSize() / 8 / 1024;
+            $size = $file->getSize()/8/1024;
             $time = date("c", $file->getMTime());
             $dateTime = new \DateTime($time);
             if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
@@ -128,7 +128,7 @@ 
             $time = date("c", $file->getMTime());
             $dateTime = new \DateTime($time);
             $monthOpen = $dateTime->format("m");
-            $content = file($file->getPath() . DIRECTORY_SEPARATOR . $file->getFilename());
+            $content = file($file->getPath().DIRECTORY_SEPARATOR.$file->getFilename());
             krsort($content);
             $detailLog = array();
             foreach ($content as &$line) {
@@ -181,7 +181,7 @@ 
                     break;
             }
 
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $detail = array(
                 "type" => "danger",
             );

Braces +12 added lines, -4 removed lines

@@ -61,11 +61,13 @@ 
      */
     private function parseAdmins(&$admins)
     {
-        if (!empty($admins)) foreach ($admins as &$admin) {
+        if (!empty($admins)) {
+            foreach ($admins as &$admin) {
             if (isset($admin["profile"])) {
                 switch ($admin["profile"]) {
                     case Security::MANAGER_ID_TOKEN:
                         $admin['class'] = 'warning';
+        }
                         break;
                     case Security::ADMIN_ID_TOKEN:
                         $admin['class'] = 'info';
@@ -95,7 +97,9 @@ 
             $size = $file->getSize() / 8 / 1024;
             $time = date("c", $file->getMTime());
             $dateTime = new \DateTime($time);
-            if (!isset($logs[$dateTime->format("Y")])) $logs[$dateTime->format("Y")] = array();
+            if (!isset($logs[$dateTime->format("Y")])) {
+                $logs[$dateTime->format("Y")] = array();
+            }
             $logs[$dateTime->format("Y")][$dateTime->format("m")][$time] = array(
                 "filename" => $file->getFilename(),
                 "size" => round($size, 3)
@@ -136,7 +140,9 @@ 
                 $detailLog[] = array_merge(array(
                     "log" => $line,
                 ), $detail);
-                if (count($detailLog) >= 1000) break;
+                if (count($detailLog) >= 1000) {
+                    break;
+                }
             }
             $log = $detailLog;
         }
@@ -160,7 +166,9 @@ 
 
                 $detail = json_decode($match[0][0], TRUE);
             }
-            if (empty($detail)) $detail = array();
+            if (empty($detail)) {
+                $detail = array();
+            }
             preg_match_all('/\>\ (.*):/i', $line, $match);
 
             $type = (isset($match[1][0])) ? $match[1][0] : '';