psfs / core

src/base/types/Form.php

Doc Comments +6 added lines, -2 removed lines

@@ -42,6 +42,10 @@ 
          * @return Form
          */
         public function setEncType($enctype) { $this->enctype = $enctype; return $this; }
+
+        /**
+         * @param string|null $action
+         */
         public function setAction($action) { $this->action = $action; return $this; }
         public function setMethod($method) { $this->method = $method; return $this; }
         public function setAttrs(array $attrs) { $this->attrs = $attrs; return $this; }
@@ -466,7 +470,7 @@ 
         }
 
         /**
-         * @param $token_field
+         * @param string $token_field
          * @return bool
          */
         protected function existsFormToken($token_field) {
@@ -494,7 +498,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 +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
     use PSFS\base\Singleton;
     use PSFS\base\types\interfaces\FormType;
 
-    abstract class Form extends Singleton implements FormType{
+    abstract class Form extends Singleton implements FormType {
 
         /**
          * Variables de formulario
@@ -31,7 +31,7 @@ 
 
         public function __construct($model = null)
         {
-            if(null !== $model) {
+            if (null !== $model) {
                 $this->model = $model;
             }
         }
@@ -122,7 +122,7 @@ 
          */
         public function getFieldValue($name) {
             $value = null;
-            if (null !== $this->getField($name)){
+            if (null !== $this->getField($name)) {
                 $field = $this->getField($name);
                 $value = (array_key_exists('value', $field) && null !== $field['value']) ? $field['value'] : null;
             }
@@ -323,7 +323,7 @@ 
                 $model->save();
                 $save = true;
                 Logger::getInstance()->infoLog(get_class($this->model)." guardado con id ".$this->model->getPrimaryKey());
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance()->errorLog($e->getMessage());
                 throw new FormException($e->getMessage(), $e->getCode(), $e);
             }
@@ -369,10 +369,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);
@@ -416,10 +416,10 @@ 
                 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;
             }
 
@@ -449,11 +449,11 @@ 
                             $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 +4 added lines, -2 removed lines

@@ -156,7 +156,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);
                 }
             }
@@ -442,7 +444,7 @@ 
                     //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) {

src/controller/Admin.php

Doc Comments +2 added lines, -2 removed lines

@@ -302,7 +302,7 @@ 
      * Servicio que devuelve los parámetros disponibles
      * @route /admin/config/params
      * @visible false
-     * @return mixed
+     * @return string|null
      */
     public function getConfigParams() {
         $response = array_merge(Config::$required, Config::$optional);
@@ -330,7 +330,7 @@ 
      * Servicio que devuelve los parámetros disponibles
      * @route /admin/routes/show
      * @visible false
-     * @return mixed
+     * @return string|null
      */
     public function getRouting()
     {

Braces +3 added lines, -1 removed lines

@@ -175,7 +175,9 @@
      */
     public function getTranslations($locale = '') {
         //Idioma por defecto
-        if(empty($locale)) $locale = $this->config->get("default_language");
+        if(empty($locale)) {
+            $locale = $this->config->get("default_language");
+        }
 
         //Generamos las traducciones de las plantillas
         $translations = $this->tpl->regenerateTemplates();

Spacing +18 added lines, -18 removed lines

@@ -20,7 +20,7 @@ 
  * @package PSFS\controller
  * @domain ROOT
  */
-class Admin extends AuthAdminController{
+class Admin extends AuthAdminController {
 
     const DOMAIN = 'ROOT';
 
@@ -84,7 +84,7 @@ 
                 Logger::getInstance()->infoLog("Configuración guardada correctamente");
                 $this->security->setFlash("callback_message", _("Usuario agregado correctamente"));
                 $this->security->setFlash("callback_route", $this->getRoute("admin"), true);
-            } else {
+            }else {
                 throw new \HttpException('Error al guardar los administradores, prueba a cambiar los permisos', 403);
             }
         }
@@ -150,7 +150,7 @@ 
                 $cookies = array(
                     array(
                         "name" => Security::getInstance()->getHash(),
-                        "value" => base64_encode($form->getFieldValue("user") . ":" . $form->getFieldValue("pass")),
+                        "value" => base64_encode($form->getFieldValue("user").":".$form->getFieldValue("pass")),
                         "expire" => time() + 3600,
                         "http" => true,
                     )
@@ -161,7 +161,7 @@ 
                     'status_message' => _("Acceso permitido... redirigiendo!!"),
                     'delay' => 1,
                 );
-            } else {
+            }else {
                 $form->setError("user", _("El usuario no tiene acceso a la web"));
             }
         }
@@ -177,13 +177,13 @@ 
      */
     public function getTranslations($locale = '') {
         //Idioma por defecto
-        if(empty($locale)) $locale = $this->config->get("default_language");
+        if (empty($locale)) $locale = $this->config->get("default_language");
 
         //Generamos las traducciones de las plantillas
         $translations = $this->tpl->regenerateTemplates();
 
-        $locale_path = realpath(BASE_DIR . DIRECTORY_SEPARATOR . 'locale');
-        $locale_path .= DIRECTORY_SEPARATOR . $locale . DIRECTORY_SEPARATOR . 'LC_MESSAGES' . DIRECTORY_SEPARATOR;
+        $locale_path = realpath(BASE_DIR.DIRECTORY_SEPARATOR.'locale');
+        $locale_path .= DIRECTORY_SEPARATOR.$locale.DIRECTORY_SEPARATOR.'LC_MESSAGES'.DIRECTORY_SEPARATOR;
 
         //Localizamos xgettext
         $translations = array_merge($translations, GeneratorService::findTranslations(SOURCE_DIR, $locale));
@@ -230,18 +230,18 @@ 
         $form = new ConfigForm();
         $form->build();
         $form->hydrate();
-        if($form->isValid()) {
+        if ($form->isValid()) {
             $debug = Config::getInstance()->getDebugMode();
             $newDebug = $form->getFieldValue("debug");
-            if(Config::save($form->getData(), $form->getExtraData())) {
+            if (Config::save($form->getData(), $form->getExtraData())) {
                 Logger::getInstance()->infoLog(_('Configuración guardada correctamente'));
                 //Verificamos si tenemos que limpiar la cache del DocumentRoot
-                if(boolval($debug) !== boolval($newDebug)) {
+                if (boolval($debug) !== boolval($newDebug)) {
                     Config::clearDocumentRoot();
                 }
                 $this->security->setFlash("callback_message", _("Configuración actualizada correctamente"));
                 $this->security->setFlash("callback_route", $this->getRoute("admin-config", true));
-            } else {
+            }else {
                 throw new \HttpException(_('Error al guardar la configuración, prueba a cambiar los permisos'), 403);
             }
         }
@@ -300,10 +300,10 @@ 
             $type = $form->getFieldValue("controllerType");
             try {
                 $this->gen->createStructureModule($module, $force, $type);
-                $this->security->setFlash("callback_message", str_replace("%s",$module, _("Módulo %s generado correctamente")));
+                $this->security->setFlash("callback_message", str_replace("%s", $module, _("Módulo %s generado correctamente")));
                 $this->security->setFlash("callback_route", $this->getRoute("admin-module", true));
-            } catch(\Exception $e) {
-                Logger::getInstance()->infoLog($e->getMessage() . " [" . $e->getFile() . ":" . $e->getLine() . "]");
+            }catch (\Exception $e) {
+                Logger::getInstance()->infoLog($e->getMessage()." [".$e->getFile().":".$e->getLine()."]");
                 throw new ConfigException('Error al generar el módulo, prueba a cambiar los permisos', 403);
             }
         }
@@ -325,10 +325,10 @@ 
     public function getConfigParams() {
         $response = array_merge(Config::$required, Config::$optional);
         $domains = Router::getInstance()->getDomains();
-        foreach($domains as $domain => $routes) {
+        foreach ($domains as $domain => $routes) {
             $pDomain = str_replace('@', '', $domain);
             $pDomain = str_replace('/', '', $pDomain);
-            $response[] = strtolower($pDomain) . '.api.secret';
+            $response[] = strtolower($pDomain).'.api.secret';
         }
         return $this->json($response);
     }
@@ -370,7 +370,7 @@ 
 
         $selected = '';
         $monthOpen = null;
-        if($this->getRequest()->getMethod() == 'POST')
+        if ($this->getRequest()->getMethod() == 'POST')
         {
             $selected = $this->getRequest()->get("log");
             list($log, $monthOpen) = $this->srv->formatLogFile($selected);
@@ -398,7 +398,7 @@ 
             $router->simpatize();
             $this->security->setFlash("callback_message", _("Rutas generadas correctamente"));
             $this->security->setFlash("callback_route", $this->getRoute("admin", true));
-        } catch(\Exception $e) {
+        }catch (\Exception $e) {
             Logger::getInstance()->errorLog($e->getMessage());
             $this->security->setFlash("callback_message", _("Algo no ha salido bien, revisa los logs"));
             $this->security->setFlash("callback_route", $this->getRoute("admin", true));

src/base/dto/Dto.php

Spacing +6 added lines, -6 removed lines

@@ -20,13 +20,13 @@ 
             try {
                 $reflectionClass = new \ReflectionClass($this);
                 $properties = $reflectionClass->getProperties();
-                if(count($properties) > 0) {
+                if (count($properties) > 0) {
                     /** @var \ReflectionProperty $property */
-                    foreach($properties as $property) {
+                    foreach ($properties as $property) {
                         $dto[$property->getName()] = $property->getValue($this);
                     }
                 }
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::getInstance(get_class($this))->errorLog($e->getMessage());
             }
             return $dto;
@@ -47,9 +47,9 @@ 
          */
         public function fromArray(array $object = array())
         {
-            if(count($object) > 0) {
-                foreach($object as $key => $value) {
-                    if(property_exists($this, $key)) {
+            if (count($object) > 0) {
+                foreach ($object as $key => $value) {
+                    if (property_exists($this, $key)) {
                         $this->$key = $value;
                     }
                 }

src/base/dto/Order.php

Spacing +4 added lines, -4 removed lines

@@ -31,8 +31,8 @@ 
         {
             $order = array();
             if (count($order) > 0) {
-                foreach($this->fields as $field => $direction) {
-                    if(strtolower($fieldToRemove) === strtolower($field)) {
+                foreach ($this->fields as $field => $direction) {
+                    if (strtolower($fieldToRemove) === strtolower($field)) {
                         continue;
                     }
                     $order[$field] = $direction;
@@ -60,9 +60,9 @@ 
          */
         public static function parseDirection($direction = Order::ASC)
         {
-            if(preg_match('/^asc$/i', $direction)) {
+            if (preg_match('/^asc$/i', $direction)) {
                 return Order::ASC;
-            } else {
+            }else {
                 return Order::DESC;
             }
         }

src/base/extension/AssetsParser.php

Braces +1 added lines, -1 removed lines

@@ -303,7 +303,7 @@
         $js = file_get_contents($file);
         try {
             $data .= ";\n".$js;
-        }catch (\Exception $e) {
+        } catch (\Exception $e) {
             throw new ConfigException($e->getMessage());
         }
         return $data;

Spacing +4 added lines, -4 removed lines

@@ -197,7 +197,7 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<script type='text/javascript' src='{$file}'></script>\n";
             }
-        } else {
+        }else {
             echo "\t\t<script type='text/javascript' src='/js/".$this->hash.".js'></script>\n";
         }
     }
@@ -211,7 +211,7 @@ 
             foreach ($this->compiled_files as $file) {
                 echo "\t\t<link href='{$file}' rel='stylesheet' media='screen, print'>";
             }
-        } else {
+        }else {
             echo "\t\t<link href='/css/".$this->hash.".css' rel='stylesheet' media='screen, print'>";
         }
     }
@@ -236,7 +236,7 @@ 
                     $this->log->infoLog("$orig copiado a $dest");
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $this->log->errorLog($e->getMessage());
         }
     }
@@ -265,7 +265,7 @@ 
             if ($this->debug) {
                 $data = file_get_contents($file);
                 $this->storeContents($base.$file_path, $data);
-            } else {
+            }else {
                 $data .= file_get_contents($file);
             }
             $this->compiled_files[] = "/css/".$file_path;

src/base/extension/AssetsTokenParser.php

Braces +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
         $tmp = array();
         if (NULL === $node) {
             $node = $value;
-        }else {
+        } else {
             $tmp = $this->getTmpAttribute($node);
         }
         $tmp[] = $value->getAttribute("value");

src/base/extension/TemplateFunctions.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
             $router = Router::getInstance();
             try {
                 return $router->getRoute($path, $absolute, $params);
-            } catch (\Exception $e)
+            }catch (\Exception $e)
             {
                 return $router->getRoute('', $absolute, $params);
             }

Doc Comments +1 added lines, -1 removed lines

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

Braces +5 added lines, -2 removed lines

@@ -179,8 +179,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/types/SingletonTrait.php

Braces +3 added lines, -1 removed lines

@@ -22,7 +22,9 @@
             $class = get_called_class();
             if (!array_key_exists($class, self::$instance) || !self::$instance[$class] instanceof $class) {
                 self::$instance[$class] = new $class(func_get_args());
-                if (method_exists(self::$instance[$class], "init")) self::$instance[$class]->init();
+                if (method_exists(self::$instance[$class], "init")) {
+                    self::$instance[$class]->init();
+                }
             }
             return self::$instance[$class];
         }

src/command/CreateModule.php

Braces +7 added lines, -3 removed lines

@@ -29,12 +29,16 @@ 
 
             public function infoLog($msg)
             {
-                if ($this->verbosity) $this->log->writeln($msg);
+                if ($this->verbosity) {
+                    $this->log->writeln($msg);
+                }
             }
         }
     }
 
-    if (!isset($console)) $console = new Application();
+    if (!isset($console)) {
+        $console = new Application();
+    }
     $console
         ->register('psfs:create:module')
         ->setDefinition(array(
@@ -58,7 +62,7 @@ 
                 {
                     \PSFS\services\GeneratorService::getInstance()->createStructureModule($module, $log);
                 }
-            }catch (\Exception $e)
+            } catch (\Exception $e)
             {
                 $output->writeln($e->getMessage());
                 $output->writeln($e->getTraceAsString());