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
          */

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) {

Spacing +13 added lines, -13 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;
             }
@@ -321,7 +321,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);
             }
@@ -336,13 +336,13 @@ 
         protected function checkEmpty($value) {
             $isEmpty = false;
             // NULL check
-            if(null === $value) {
+            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;
             }
 
@@ -388,10 +388,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);
@@ -435,10 +435,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;
             }
 
@@ -468,11 +468,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;
                 }
             }

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;

Indentation +5 added lines, -5 removed lines

@@ -86,8 +86,8 @@ 
      */
     public function setHash($hash)
     {
-	    $cache = Config::getInstance()->get('cache.var') ?: '';
-	    $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+        $cache = Config::getInstance()->get('cache.var') ?: '';
+        $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
         return $this;
     }
 
@@ -350,9 +350,9 @@ 
         $file = "";
         $html_base = "";
         $debug = Config::getInstance()->getDebugMode();
-	    $cache = Config::getInstance()->get('cache.var');
-	    $cache = $cache ? '.'.$cache : '';
-	    if (preg_match('/\.css$/i', $string)) {
+        $cache = Config::getInstance()->get('cache.var');
+        $cache = $cache ? '.'.$cache : '';
+        if (preg_match('/\.css$/i', $string)) {
             $file = "/".substr(md5($string), 0, 8)."$cache.css";
             $html_base = "css";
             if ($debug) {

Spacing +6 added lines, -6 removed lines

@@ -87,7 +87,7 @@ 
     public function setHash($hash)
     {
 	    $cache = Config::getInstance()->get('cache.var') ?: '';
-	    $this->hash = $hash . (strlen($cache) ? '.' : '') . $cache;
+	    $this->hash = $hash.(strlen($cache) ? '.' : '').$cache;
         return $this;
     }
 
@@ -154,7 +154,7 @@ 
             }
             try {
                 $minifiedJs = Minifier::minify($data);
-            } catch(\Exception $e) {
+            }catch (\Exception $e) {
                 Logger::log($e->getMessage(), LOG_ERR);
                 $minifiedJs = false;
             }
@@ -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'>";
         }
     }
@@ -236,7 +236,7 @@ 
                     Logger::log("$orig copiado a $dest", LOG_INFO);
                 }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Logger::log($e->getMessage(), LOG_ERR);
         }
     }
@@ -264,7 +264,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/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());

src/command/PSFSConsole.php

Braces +6 added lines, -2 removed lines

@@ -31,14 +31,18 @@
     //Hidratamos con los comandos de PSFS
     $commands = new Finder();
     $commands->in(__DIR__)->notName("PSFSConsole.php");
-    foreach ($commands as $com) include_once($com->getRealPath());
+    foreach ($commands as $com) {
+        include_once($com->getRealPath());
+    }
 
     //Hidratamos con los comandos de los módulos
     if (file_exists(CORE_DIR))
     {
         $commands = new Finder();
         $commands->in(CORE_DIR)->path("Command")->name("*.php");
-        foreach ($commands as $com) include_once($com->getRealPath());
+        foreach ($commands as $com) {
+            include_once($com->getRealPath());
+        }
     }
 
     $console->run();

src/base/dto/Form.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         {
             $array = array();
             $array['fields'] = array();
-            foreach($this->fields as $field) {
+            foreach ($this->fields as $field) {
                 $array['fields'][] = $field->__toArray();
             }
             return $array;

src/base/types/AuthApi.php

Spacing +2 added lines, -2 removed lines

@@ -26,13 +26,13 @@
         {
             $namespace = explode('\\', $this->getModelTableMap());
             $module = strtolower($namespace[0]);
-            $secret = Config::getInstance()->get($module . '.api.secret');
+            $secret = Config::getInstance()->get($module.'.api.secret');
             if (NULL === $secret) {
                 $secret = Config::getInstance()->get("api.secret");
             }
             if (NULL === $secret) {
                 $auth = TRUE;
-            } else {
+            }else {
                 $token = Request::getInstance()->getHeader('X-API-SEC-TOKEN');
                 if (array_key_exists('API_TOKEN', $this->query)) {
                     $token = $this->query['API_TOKEN'];