henrystivens / upload-image-and-data

core/libs/db/adapters/firebird.php

Doc Comments +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
      * Efectua operaciones SQL sobre la base de datos
      *
      * @param string $sql_query
-     * @return resource or false
+     * @return resource|null or false
      */
     public function query($sql_query)
     {

Spacing +17 added lines, -17 removed lines

@@ -175,9 +175,9 @@ 
      * @param int $opt
      * @return array
      */
-    public function fetch_array($result_query=NULL, $opt=MYSQL_BOTH)
+    public function fetch_array($result_query = NULL, $opt = MYSQL_BOTH)
     {
-        $result=array();
+        $result = array();
         if (!$result_query) {
             $result_query = $this->last_result_query;
             if (!$result_query) {
@@ -216,7 +216,7 @@ 
     /**
      * Devuelve el numero de filas de un select
      */
-    public function num_rows($result_query='')
+    public function num_rows($result_query = '')
     {
         // GDS Interbase no soporta esta funcion (No debe ser usada)
         return false;
@@ -229,7 +229,7 @@ 
      * @param resource $result_query
      * @return string
      */
-    public function field_name($number, $result_query='')
+    public function field_name($number, $result_query = '')
     {
 
         if (!$result_query) {
@@ -252,7 +252,7 @@ 
      * @param resource $result_query
      * @return boolean
      */
-    public function data_seek($number, $result_query=NULL)
+    public function data_seek($number, $result_query = NULL)
     {
         if (!$result_query) {
             $result_query = $this->last_result_query;
@@ -273,7 +273,7 @@ 
      * @param resource $result_query
      * @return int
      */
-    public function affected_rows($result_query=NULL)
+    public function affected_rows($result_query = NULL)
     {
         if (($numberRows = ibase_affected_rows()) !== false) {
             return $numberRows;
@@ -287,7 +287,7 @@ 
      *
      * @return string
      */
-    public function error($err='')
+    public function error($err = '')
     {
         if (!$this->id_connection) {
             $this->last_error = ibase_errmsg() ? ibase_errmsg() : "[Error Desconocido en Firebird: $err]";
@@ -297,7 +297,7 @@ 
             return $this->last_error;
         }
         $this->last_error = ibase_errmsg() ? ibase_errmsg() : "[Error Desconocido en Firebird: $err]";
-        $this->last_error.= $err;
+        $this->last_error .= $err;
         if ($this->logger) {
             Logger::error($this->last_error);
         }
@@ -336,7 +336,7 @@ 
      *
      * @return int
      */
-    public function last_insert_id($table='', $primary_key='')
+    public function last_insert_id($table = '', $primary_key = '')
     {
         return ibase_insert_id($this->id_connection);
     }
@@ -347,7 +347,7 @@ 
      * @param string $table
      * @return boolean
      */
-    public function table_exists($table, $schema='')
+    public function table_exists($table, $schema = '')
     {
         $table = strtoupper(addslashes("$table"));
         // NOT LIKE 'RDB\$%'
@@ -367,11 +367,11 @@ 
         $sql_new = $sql;
 
         if (isset($params['limit']) && is_numeric($params['limit'])) {
-            $sql_new.=" FIRST $params[limit]";
+            $sql_new .= " FIRST $params[limit]";
         }
 
         if (isset($params['offset']) && is_numeric($params['offset'])) {
-            $sql_new.=" SKIP $params[offset]";
+            $sql_new .= " SKIP $params[offset]";
         }
 
         return $sql_new;
@@ -383,7 +383,7 @@ 
      * @param string $table
      * @return boolean
      */
-    public function drop_table($table, $if_exists=true)
+    public function drop_table($table, $if_exists = true)
     {
         if ($if_exists) {
             if ($this->table_exists($table)) {
@@ -409,7 +409,7 @@ 
      * @param array $definition
      * @return resource
      */
-    public function create_table($table, $definition, $index=array())
+    public function create_table($table, $definition, $index = array())
     {
         $create_sql = "CREATE TABLE $table (";
         if (!is_array($definition)) {
@@ -463,7 +463,7 @@ 
             }
             $create_lines[] = "$field " . $field_def['type'] . $size . ' ' . $not_null . ' ' . $extra;
         }
-        $create_sql.= join(',', $create_lines);
+        $create_sql .= join(',', $create_lines);
         $last_lines = array();
         if (count($primary)) {
             $last_lines[] = 'PRIMARY KEY(' . join(",", $primary) . ')';
@@ -475,7 +475,7 @@ 
             $last_lines[] = join(',', $unique_index);
         }
         if (count($last_lines)) {
-            $create_sql.= ',' . join(',', $last_lines) . ')';
+            $create_sql .= ',' . join(',', $last_lines) . ')';
         }
         return $this->query($create_sql);
     }
@@ -496,7 +496,7 @@ 
      * @param string $table
      * @return array
      */
-    public function describe_table($table, $schema='')
+    public function describe_table($table, $schema = '')
     {
         if ($schema == '') {
             return $this->fetch_all("DESCRIBE $table");

core/libs/db/adapters/informix.php

Doc Comments +2 added lines, -2 removed lines

@@ -580,7 +580,7 @@ 
      * @param string $table
      * @param array $values
      * @param array $fields
-     * @return boolean
+     * @return resource|null
      */
     public function insert($table, $values, $fields=null)
     {
@@ -595,7 +595,7 @@ 
      * @param array $fields
      * @param array $values
      * @param string $where_condition
-     * @return boolean
+     * @return resource|null
      */
     public function update($table, $fields, $values, $where_condition=null)
     {

Indentation +3 added lines, -3 removed lines

@@ -408,9 +408,9 @@
      * @return string
      */
     public function limit($sql){
-           /**
-                 * No esta soportado por Informix
-                 */
+            /**
+             * No esta soportado por Informix
+             */
                 return "$sql \n";
     }
 

Spacing +18 added lines, -18 removed lines

@@ -193,7 +193,7 @@ 
      * @param int $opt
      * @return array
      */
-    public function fetch_array($result_query=NULL, $opt=2)
+    public function fetch_array($result_query = NULL, $opt = 2)
     {
 
         if (!$result_query) {
@@ -253,7 +253,7 @@ 
      * @param resource $result_query
      * @return int
      */
-    public function num_rows($result_query=NULL)
+    public function num_rows($result_query = NULL)
     {
 
         if (!$result_query) {
@@ -282,7 +282,7 @@ 
      * @param resource $result_query
      * @return string
      */
-    public function field_name($number, $result_query=NULL)
+    public function field_name($number, $result_query = NULL)
     {
 
         if (!$result_query) {
@@ -308,7 +308,7 @@ 
      * @param resource $result_query
      * @return boolean
      */
-    public function data_seek($number, $result_query=NULL)
+    public function data_seek($number, $result_query = NULL)
     {
         if (!$result_query) {
             $result_query = $this->last_result_query;
@@ -329,7 +329,7 @@ 
      * @param resource $result_query
      * @return int
      */
-    public function affected_rows($result_query=NULL)
+    public function affected_rows($result_query = NULL)
     {
         if (!$result_query) {
             $result_query = $this->last_result_query;
@@ -349,7 +349,7 @@ 
      *
      * @return string
      */
-    public function error($err='')
+    public function error($err = '')
     {
         if (!$this->id_connection) {
             $this->last_error = ifx_errormsg() ? ifx_errormsg() : "[Error Desconocido en Informix: $err]";
@@ -359,7 +359,7 @@ 
             return $this->last_error;
         }
         $this->last_error = ifx_errormsg($this->id_connection) ? ifx_errormsg($this->id_connection) : "[Error Desconocido en Informix: $err]";
-        $this->last_error.= $err;
+        $this->last_error .= $err;
         if ($this->logger) {
             Logger::error($this->last_error);
         }
@@ -381,7 +381,7 @@ 
      *
      * @return int
      */
-    public function last_insert_id($table='', $primary_key='')
+    public function last_insert_id($table = '', $primary_key = '')
     {
         $sqlca = ifx_getsqlca($this->last_result_query);
         return $sqlca["sqlerrd1"];
@@ -393,7 +393,7 @@ 
      * @param string $table
      * @return integer
      */
-    public function table_exists($table, $schema='')
+    public function table_exists($table, $schema = '')
     {
         // Informix no soporta schemas
         $table = addslashes("$table");
@@ -407,7 +407,7 @@ 
      * @param string $sql
      * @return string
      */
-    public function limit($sql){
+    public function limit($sql) {
            /**
                  * No esta soportado por Informix
                  */
@@ -421,7 +421,7 @@ 
      * @param string $table
      * @return boolean
      */
-    public function drop_table($table, $if_exists=true)
+    public function drop_table($table, $if_exists = true)
     {
         if ($if_exists) {
             if ($this->table_exists($table)) {
@@ -449,7 +449,7 @@ 
      * @param array $definition
      * @return resource
      */
-    public function create_table($table, $definition, $index=array())
+    public function create_table($table, $definition, $index = array())
     {
         $create_sql = "CREATE TABLE $table (";
         if (!is_array($definition)) {
@@ -499,7 +499,7 @@ 
             }
             $create_lines[] = "$field " . $field_def['type'] . $size . ' ' . $not_null . ' ' . $extra;
         }
-        $create_sql.= join(',', $create_lines);
+        $create_sql .= join(',', $create_lines);
         $last_lines = array();
         if (count($primary)) {
             $last_lines[] = 'PRIMARY KEY(' . join(",", $primary) . ')';
@@ -511,7 +511,7 @@ 
             $last_lines[] = join(',', $unique_index);
         }
         if (count($last_lines)) {
-            $create_sql.= ',' . join(',', $last_lines) . ')';
+            $create_sql .= ',' . join(',', $last_lines) . ')';
         }
         $this->set_return_rows(false);
         return $this->query($create_sql);
@@ -533,7 +533,7 @@ 
      * @param string $table
      * @return array
      */
-    public function describe_table($table, $schema='')
+    public function describe_table($table, $schema = '')
     {
 
         // Informix no soporta schemas
@@ -582,7 +582,7 @@ 
      * @param array $fields
      * @return boolean
      */
-    public function insert($table, $values, $fields=null)
+    public function insert($table, $values, $fields = null)
     {
         $this->set_return_rows(false);
         return parent::insert($table, $values, $fields);
@@ -597,7 +597,7 @@ 
      * @param string $where_condition
      * @return boolean
      */
-    public function update($table, $fields, $values, $where_condition=null)
+    public function update($table, $fields, $values, $where_condition = null)
     {
         $this->set_return_rows(false);
         return parent::update($table, $fields, $values, $where_condition);
@@ -620,7 +620,7 @@ 
      *
      * @param boolean $value
      */
-    public function set_return_rows($value=true)
+    public function set_return_rows($value = true)
     {
         $this->return_rows = $value;
     }

core/libs/db/adapters/mysqli.php

Doc Comments +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
     /**
      * Cierra la Conexión al Motor de Base de datos
      *
-     * @return boolean
+     * @return boolean|null
      */
     public function close()
     {

Spacing +17 added lines, -17 removed lines

@@ -121,7 +121,7 @@ 
 
         $this->id_connection = new mysqli($config['host'], $config['username'], $config['password'], $config['name'], $config['port']);
         //no se usa $object->error() ya que solo funciona a partir de 5.2.9 y 5.3
-        if (mysqli_connect_error ()) throw new KumbiaException(mysqli_connect_error());
+        if (mysqli_connect_error()) throw new KumbiaException(mysqli_connect_error());
         //Selecciona charset
         if (isset($config['charset'])) $this->id_connection->set_charset($config['charset']);
         return TRUE;
@@ -168,7 +168,7 @@ 
      * @param int $opt
      * @return array
      */
-    public function fetch_array($result_query='', $opt=MYSQLI_BOTH)
+    public function fetch_array($result_query = '', $opt = MYSQLI_BOTH)
     {
         if (!$result_query) {
             $result_query = $this->last_result_query;
@@ -192,7 +192,7 @@ 
     /**
      * Devuelve el numero de filas de un select
      */
-    public function num_rows($result_query='')
+    public function num_rows($result_query = '')
     {
         if (!$result_query) {
             $result_query = $this->last_result_query;
@@ -214,7 +214,7 @@ 
      * @param resource $result_query
      * @return string
      */
-    public function field_name($number, $result_query='')
+    public function field_name($number, $result_query = '')
     {
 
         if (!$result_query) {
@@ -238,7 +238,7 @@ 
      * @param resource $result_query
      * @return boolean
      */
-    public function data_seek($number, $result_query='')
+    public function data_seek($number, $result_query = '')
     {
         if (!$result_query) {
             $result_query = $this->last_result_query;
@@ -259,7 +259,7 @@ 
      * @param resource $result_query
      * @return int
      */
-    public function affected_rows($result_query='')
+    public function affected_rows($result_query = '')
     {
         if (($numberRows = mysqli_affected_rows($this->id_connection)) !== false) {
             return $numberRows;
@@ -273,10 +273,10 @@ 
      *
      * @return string
      */
-    public function error($err='')
+    public function error($err = '')
     {
         $this->last_error = mysqli_error($this->id_connection) ? mysqli_error($this->id_connection) : "[Error Desconocido en MySQL: $err]";
-        $this->last_error.= $err;
+        $this->last_error .= $err;
         if ($this->logger) {
             Logger::error($this->last_error);
         }
@@ -298,7 +298,7 @@ 
      *
      * @return int
      */
-    public function last_insert_id($table='', $primary_key='')
+    public function last_insert_id($table = '', $primary_key = '')
     {
         return mysqli_insert_id($this->id_connection);
     }
@@ -309,7 +309,7 @@ 
      * @param string $table
      * @return boolean
      */
-    public function table_exists($table, $schema='')
+    public function table_exists($table, $schema = '')
     {
         $table = addslashes("$table");
         if ($schema == '') {
@@ -333,11 +333,11 @@ 
         $sql_new = $sql;
 
         if (isset($params['limit']) && is_numeric($params['limit'])) {
-            $sql_new.=" LIMIT $params[limit]";
+            $sql_new .= " LIMIT $params[limit]";
         }
 
         if (isset($params['offset']) && is_numeric($params['offset'])) {
-            $sql_new.=" OFFSET $params[offset]";
+            $sql_new .= " OFFSET $params[offset]";
         }
 
         return $sql_new;
@@ -349,7 +349,7 @@ 
      * @param string $table
      * @return resource
      */
-    public function drop_table($table, $if_exists=true)
+    public function drop_table($table, $if_exists = true)
     {
         if ($if_exists) {
             return $this->query("DROP TABLE IF EXISTS $table");
@@ -371,7 +371,7 @@ 
      * @param array $definition
      * @return resource
      */
-    public function create_table($table, $definition, $index=array())
+    public function create_table($table, $definition, $index = array())
     {
         $create_sql = "CREATE TABLE $table (";
         if (!is_array($definition)) {
@@ -421,7 +421,7 @@ 
             }
             $create_lines[] = "`$field` " . $field_def['type'] . $size . ' ' . $not_null . ' ' . $extra;
         }
-        $create_sql.= join(',', $create_lines);
+        $create_sql .= join(',', $create_lines);
         $last_lines = array();
         if (count($primary)) {
             $last_lines[] = 'PRIMARY KEY(' . join(",", $primary) . ')';
@@ -433,7 +433,7 @@ 
             $last_lines[] = join(',', $unique_index);
         }
         if (count($last_lines)) {
-            $create_sql.= ',' . join(',', $last_lines) . ')';
+            $create_sql .= ',' . join(',', $last_lines) . ')';
         }
         return $this->query($create_sql);
     }
@@ -454,7 +454,7 @@ 
      * @param string $table
      * @return array
      */
-    public function describe_table($table, $schema='')
+    public function describe_table($table, $schema = '')
     {
         if ($schema == '') {
             return $this->fetch_all("DESCRIBE `$table`");

Braces +9 added lines, -3 removed lines

@@ -117,13 +117,19 @@
      */
     public function connect($config)
     {
-        if (!extension_loaded('mysqli')) throw new KumbiaException('Debe cargar la extensión de PHP llamada php_mysqli');
+        if (!extension_loaded('mysqli')) {
+            throw new KumbiaException('Debe cargar la extensión de PHP llamada php_mysqli');
+        }
 
         $this->id_connection = new mysqli($config['host'], $config['username'], $config['password'], $config['name'], $config['port']);
         //no se usa $object->error() ya que solo funciona a partir de 5.2.9 y 5.3
-        if (mysqli_connect_error ()) throw new KumbiaException(mysqli_connect_error());
+        if (mysqli_connect_error ()) {
+            throw new KumbiaException(mysqli_connect_error());
+        }
         //Selecciona charset
-        if (isset($config['charset'])) $this->id_connection->set_charset($config['charset']);
+        if (isset($config['charset'])) {
+            $this->id_connection->set_charset($config['charset']);
+        }
         return TRUE;
     }
 

core/libs/db/adapters/pdo/pgsql.php

Doc Comments +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
     /**
      * Devuelve el ultimo id autonumerico generado en la BD
      *
-     * @return integer
+     * @return string
      */
     public function last_insert_id($table='', $primary_key='')
     {

Spacing +9 added lines, -9 removed lines

@@ -94,7 +94,7 @@ 
      *
      * @return integer
      */
-    public function last_insert_id($table='', $primary_key='')
+    public function last_insert_id($table = '', $primary_key = '')
     {
         return $this->pdo->lastInsertId("{$table}_{$primary_key}_seq");
     }
@@ -105,7 +105,7 @@ 
      * @param string $table
      * @return boolean
      */
-    function table_exists($table, $schema='')
+    function table_exists($table, $schema = '')
     {
         $table = addslashes(strtolower($table));
         if (strpos($table, ".")) {
@@ -132,11 +132,11 @@ 
         $sql_new = $sql;
 
         if (isset($params['limit']) && is_numeric($params['limit'])) {
-            $sql_new.=" LIMIT $params[limit]";
+            $sql_new .= " LIMIT $params[limit]";
         }
 
         if (isset($params['offset']) && is_numeric($params['offset'])) {
-            $sql_new.=" OFFSET $params[offset]";
+            $sql_new .= " OFFSET $params[offset]";
         }
 
         return $sql_new;
@@ -148,7 +148,7 @@ 
      * @param string $table
      * @return boolean
      */
-    public function drop_table($table, $if_exists=true)
+    public function drop_table($table, $if_exists = true)
     {
         if ($if_exists) {
             if ($this->table_exists($table)) {
@@ -173,7 +173,7 @@ 
      * @param array $definition
      * @return boolean
      */
-    public function create_table($table, $definition, $index=array())
+    public function create_table($table, $definition, $index = array())
     {
         $create_sql = "CREATE TABLE $table (";
         if (!is_array($definition)) {
@@ -223,7 +223,7 @@ 
             }
             $create_lines[] = "$field " . $field_def['type'] . $size . ' ' . $not_null . ' ' . $extra;
         }
-        $create_sql.= join(',', $create_lines);
+        $create_sql .= join(',', $create_lines);
         $last_lines = array();
         if (count($primary)) {
             $last_lines[] = 'PRIMARY KEY(' . join(",", $primary) . ')';
@@ -235,7 +235,7 @@ 
             $last_lines[] = join(',', $unique_index);
         }
         if (count($last_lines)) {
-            $create_sql.= ',' . join(',', $last_lines) . ')';
+            $create_sql .= ',' . join(',', $last_lines) . ')';
         }
         return $this->query($create_sql);
     }
@@ -264,7 +264,7 @@ 
      * @param string $table
      * @return array
      */
-    public function describe_table($table, $schema='')
+    public function describe_table($table, $schema = '')
     {
         $describe = $this->fetch_all("SELECT a.attname AS Field, t.typname AS Type,
                 CASE WHEN attnotnull=false THEN 'YES' ELSE 'NO' END AS Null,

core/libs/db/adapters/pdo/sqlite.php

Doc Comments +1 added lines, -1 removed lines

@@ -145,7 +145,7 @@
      *
      * @param string $table
      * @param array $definition
-     * @return boolean
+     * @return integer
      */
     public function create_table($table, $definition, $index=array())
     {

Spacing +8 added lines, -8 removed lines

@@ -91,7 +91,7 @@ 
      * @param string $table
      * @return boolean
      */
-    public function table_exists($table, $schema='')
+    public function table_exists($table, $schema = '')
     {
         $table = strtolower($table);
         $num = $this->fetch_one("SELECT COUNT(*) FROM sqlite_master WHERE name = '$table'");
@@ -110,11 +110,11 @@ 
         $sql_new = $sql;
 
         if (isset($params['limit']) && is_numeric($params['limit'])) {
-            $sql_new.=" LIMIT $params[limit]";
+            $sql_new .= " LIMIT $params[limit]";
         }
 
         if (isset($params['offset']) && is_numeric($params['offset'])) {
-            $sql_new.=" OFFSET $params[offset]";
+            $sql_new .= " OFFSET $params[offset]";
         }
 
         return $sql_new;
@@ -126,7 +126,7 @@ 
      * @param string $table
      * @return boolean
      */
-    public function drop_table($table, $if_exists=true)
+    public function drop_table($table, $if_exists = true)
     {
         if ($if_exists) {
             return $this->query("DROP TABLE IF EXISTS $table");
@@ -147,7 +147,7 @@ 
      * @param array $definition
      * @return boolean
      */
-    public function create_table($table, $definition, $index=array())
+    public function create_table($table, $definition, $index = array())
     {
         $create_sql = "CREATE TABLE $table (";
         if (!is_array($definition)) {
@@ -197,7 +197,7 @@ 
             }
             $create_lines[] = "$field " . $field_def['type'] . $size . ' ' . $not_null . ' ' . $extra;
         }
-        $create_sql.= join(',', $create_lines);
+        $create_sql .= join(',', $create_lines);
         $last_lines = array();
         if (count($primary)) {
             $last_lines[] = 'PRIMARY KEY(' . join(",", $primary) . ')';
@@ -209,7 +209,7 @@ 
             $last_lines[] = join(',', $unique_index);
         }
         if (count($last_lines)) {
-            $create_sql.= ',' . join(',', $last_lines) . ')';
+            $create_sql .= ',' . join(',', $last_lines) . ')';
         }
         return $this->exec($create_sql);
     }
@@ -232,7 +232,7 @@ 
      * @param string $table
      * @return array
      */
-    public function describe_table($table, $schema='')
+    public function describe_table($table, $schema = '')
     {
         $fields = array();
         if (!$schema) {

core/libs/db/db_base.php

Doc Comments +2 added lines, -3 removed lines

@@ -170,7 +170,7 @@ 
      * @param string $table
      * @param array $values
      * @param array $fields
-     * @return boolean
+     * @return resource|null
      */
     public function insert($table, $values, $fields=null)
     {
@@ -197,7 +197,7 @@ 
      * @param array $fields
      * @param array $values
      * @param string $where_condition
-     * @return boolean
+     * @return resource|null
      */
     public function update($table, $fields, $values, $where_condition=null)
     {
@@ -298,7 +298,6 @@ 
     /**
      * Efectua operaciones SQL sobre la base de datos
      * Este método lo extienden los adapters
-     * @param string $sql_query
      * @return resource or false
      */
     public function query($sql)

Spacing +5 added lines, -5 removed lines

@@ -63,7 +63,7 @@ 
      * @param string $orderBy
      * @return array
      */
-    public function find($table, $where="1=1", $fields="*", $orderBy="1")
+    public function find($table, $where = "1=1", $fields = "*", $orderBy = "1")
     {
         ActiveRecord::sql_item_sanitize($table);
         ActiveRecord::sql_sanitize($fields);
@@ -172,7 +172,7 @@ 
      * @param array $fields
      * @return boolean
      */
-    public function insert($table, $values, $fields=null)
+    public function insert($table, $values, $fields = null)
     {
         //$insert_sql = "";
         if (is_array($values)) {
@@ -199,7 +199,7 @@ 
      * @param string $where_condition
      * @return boolean
      */
-    public function update($table, $fields, $values, $where_condition=null)
+    public function update($table, $fields, $values, $where_condition = null)
     {
         $update_sql = "UPDATE $table SET ";
         if (count($fields) != count($values)) {
@@ -211,9 +211,9 @@ 
             $update_values[] = $field . ' = ' . $values[$i];
             $i++;
         }
-        $update_sql.= join(',', $update_values);
+        $update_sql .= join(',', $update_values);
         if ($where_condition != null) {
-            $update_sql.= " WHERE $where_condition";
+            $update_sql .= " WHERE $where_condition";
         }
         return $this->query($update_sql);
     }

core/libs/kumbia_active_record/kumbia_active_record.php

Doc Comments +5 added lines, -7 removed lines

@@ -661,7 +661,7 @@ 
     /**
      * Commit a Transaction
      *
-     * @return success
+     * @return resource|null
      */
     public function commit()
     {
@@ -671,7 +671,7 @@ 
     /**
      * Rollback a Transaction
      *
-     * @return success
+     * @return resource|null
      */
     public function rollback()
     {
@@ -681,7 +681,7 @@ 
     /**
      * Start a transaction in RDBM
      *
-     * @return success
+     * @return resource|null
      */
     public function begin()
     {
@@ -725,7 +725,7 @@ 
      * Execute a SQL Statement directly
      *
      * @param string $sqlQuery
-     * @return int affected
+     * @return resource|null affected
      */
     public function sql($sqlQuery)
     {
@@ -1217,7 +1217,6 @@ 
     /**
      * Creates a new Row in map table
      *
-     * @param mixed $values
      * @return boolean success
      */
     public function create()
@@ -1785,7 +1784,6 @@ 
     /**
      * Updates Data in the Relational Table
      *
-     * @param mixed $values
      * @return boolean|null sucess
      */
     function update()
@@ -1943,7 +1941,7 @@ 
      * Delete All data from Relational Map Table
      *
      * @param string $conditions
-     * @return boolean
+     * @return resource|null
      */
     public function delete_all($conditions = '')
     {

Indentation +1 added lines, -1 removed lines

@@ -2478,7 +2478,7 @@
             /**
              * Carga la clase
              * */
-			$model = Util::smallcase($Model);
+            $model = Util::smallcase($Model);
             $file = APP_PATH . "models/$model.php";
             if (is_file($file)) {
                 include $file;

Spacing +52 added lines, -52 removed lines

@@ -258,7 +258,7 @@ 
      *
      * @param array $data
      */
-    function __construct($data=null)
+    function __construct($data = null)
     {
         if (!$this->source) {
             $this->_model_name();
@@ -278,7 +278,7 @@ 
 
         if ($data) {
             if (!is_array($data)) $data = Util::getParams(func_get_args());
-            foreach($this->fields as $field) {
+            foreach ($this->fields as $field) {
                 if (isset($data[$field])) {
                     $this->$field = $data[$field];
                 }
@@ -382,8 +382,8 @@ 
         } elseif (array_key_exists($mmodel, $this->_has_and_belongs_to_many)) {
             $relation = $this->_has_and_belongs_to_many[$mmodel];
             $relation_model = self::get($relation->model);
-            $source = ($this->schema ? "{$this->schema}." : NULL ) . $this->source;
-            $relation_source = ($relation_model->schema ? "{$relation_model->schema}." : NULL ) . $relation_model->source;
+            $source = ($this->schema ? "{$this->schema}." : NULL) . $this->source;
+            $relation_source = ($relation_model->schema ? "{$relation_model->schema}." : NULL) . $relation_model->source;
             /**
              * Cargo atraves de que tabla se efectuara la relacion
              *
@@ -394,7 +394,7 @@ 
                 } else {
                     $relation->through = "{$relation_source}_{$this->source}";
                 }
-            }else{
+            } else {
                 $through = explode('/', $relation->through);
                 $relation->through = end($through);
             }
@@ -634,7 +634,7 @@ 
      * @param $key
      * @return array
      */
-    public function get_alias($key=null)
+    public function get_alias($key = null)
     {
         if ($key && array_key_exists($key, $this->alias)) {
             return $this->alias[$key];
@@ -649,7 +649,7 @@ 
      * @param string $key
      * @param string $value
      */
-    public function set_alias($key=null, $value=null)
+    public function set_alias($key = null, $value = null)
     {
         if ($key && array_key_exists($key, $this->alias)) {
             $this->alias[$key] = $value;
@@ -685,7 +685,7 @@ 
      */
     public function begin()
     {
-        $this->_connect();//(true);
+        $this->_connect(); //(true);
         return $this->db->begin();
     }
 
@@ -745,20 +745,20 @@ 
         $what = Util::getParams(func_get_args());
         $select = "SELECT ";
         if (isset($what['columns'])) {
-            $select.= self::sql_sanitize($what['columns']);
+            $select .= self::sql_sanitize($what['columns']);
         } elseif (isset($what['distinct'])) {
-            $select.= 'DISTINCT ';
-            $select.= $what['distinct'] ? self::sql_sanitize($what['distinct']) : join(",", $this->fields);
+            $select .= 'DISTINCT ';
+            $select .= $what['distinct'] ? self::sql_sanitize($what['distinct']) : join(",", $this->fields);
         } else {
-            $select.= join(",", $this->fields);
+            $select .= join(",", $this->fields);
         }
         if ($this->schema) {
-            $select.= " FROM {$this->schema}.{$this->source}";
+            $select .= " FROM {$this->schema}.{$this->source}";
         } else {
-            $select.= " FROM {$this->source}";
+            $select .= " FROM {$this->source}";
         }
         $what['limit'] = 1;
-        $select.= $this->convert_params_to_sql($what);
+        $select .= $this->convert_params_to_sql($what);
         $resp = false;
 
         $result = $this->db->fetch_one($select);
@@ -789,19 +789,19 @@ 
         $what = Util::getParams(func_get_args());
         $select = "SELECT ";
         if (isset($what['columns'])) {
-            $select.= $what['columns'] ? self::sql_sanitize($what['columns']) : join(",", $this->fields);
+            $select .= $what['columns'] ? self::sql_sanitize($what['columns']) : join(",", $this->fields);
         } elseif (isset($what['distinct'])) {
-            $select.= 'DISTINCT ';
-            $select.= $what['distinct'] ? self::sql_sanitize($what['distinct']) : join(",", $this->fields);
+            $select .= 'DISTINCT ';
+            $select .= $what['distinct'] ? self::sql_sanitize($what['distinct']) : join(",", $this->fields);
         } else {
-            $select.= join(",", $this->fields);
+            $select .= join(",", $this->fields);
         }
         if ($this->schema) {
-            $select.= " FROM {$this->schema}.{$this->source}";
+            $select .= " FROM {$this->schema}.{$this->source}";
         } else {
-            $select.= " FROM {$this->source}";
+            $select .= " FROM {$this->source}";
         }
-        $select.= $this->convert_params_to_sql($what);
+        $select .= $this->convert_params_to_sql($what);
         $results = array();
         $all_results = $this->db->in_query($select);
         foreach ($all_results AS $result) {
@@ -845,7 +845,7 @@ 
                 self::sql_item_sanitize($this->primary_key[0]);
                 if (isset($what[0])) {
                     if (is_numeric($what[0])) {
-                        $what['conditions'] = "{$this->primary_key[0]} = ".(int)$what[0] ;
+                        $what['conditions'] = "{$this->primary_key[0]} = " . (int) $what[0];
                     } else {
                         if ($what[0] == '') {
                             $what['conditions'] = "{$this->primary_key[0]} = ''";
@@ -856,27 +856,27 @@ 
                 }
             }
             if (isset($what['join'])) {
-                $select.= " {$what['join']}";
+                $select .= " {$what['join']}";
             }
             if (isset($what['conditions'])) {
-                $select.= " WHERE {$what['conditions']}";
+                $select .= " WHERE {$what['conditions']}";
             }
             if (isset($what['group'])) {
-                $select.= " GROUP BY {$what['group']}";
+                $select .= " GROUP BY {$what['group']}";
             }
             if (isset($what['having'])) {
-                $select.= " HAVING {$what['having']}";
+                $select .= " HAVING {$what['having']}";
             }
             if (isset($what['order'])) {
                 self::sql_sanitize($what['order']);
-                $select.= " ORDER BY {$what['order']}";
+                $select .= " ORDER BY {$what['order']}";
             }
             $limit_args = array($select);
             if (isset($what['limit'])) {
-                array_push($limit_args, "limit: ".(int)$what['limit']);
+                array_push($limit_args, "limit: " . (int) $what['limit']);
             }
             if (isset($what['offset'])) {
-                array_push($limit_args, "offset: ".(int)$what['offset']);
+                array_push($limit_args, "offset: " . (int) $what['offset']);
             }
             if (count($limit_args) > 1) {
                 $select = call_user_func_array(array($this, 'limit'), $limit_args);
@@ -884,9 +884,9 @@ 
         } else {
             if (strlen($what)) {
                 if (is_numeric($what)) {
-                    $select.= "WHERE {$this->primary_key[0]} = ".(int)$what[0] ;
+                    $select .= "WHERE {$this->primary_key[0]} = " . (int) $what[0];
                 } else {
-                    $select.= "WHERE $what";
+                    $select .= "WHERE $what";
                 }
             }
         }
@@ -938,7 +938,7 @@ 
          * Se elimina el de indice cero ya que por defecto convert_params_to_sql lo considera como una condicion en WHERE
          */
         unset($what[0]);
-        $select.= $this->convert_params_to_sql($what);
+        $select .= $this->convert_params_to_sql($what);
         $results = array();
         foreach ($this->db->fetch_all($select) as $result) {
             $results[] = $result[0];
@@ -980,15 +980,15 @@ 
         if (isset($what['distinct']) && $what['distinct']) {
             if (isset($what['group'])) {
                 $select = "SELECT COUNT(*) FROM (SELECT DISTINCT {$what['distinct']} FROM $table ";
-                $select.= $this->convert_params_to_sql($what);
-                $select.= ') AS t ';
+                $select .= $this->convert_params_to_sql($what);
+                $select .= ') AS t ';
             } else {
                 $select = "SELECT COUNT(DISTINCT {$what['distinct']}) FROM $table ";
-                $select.= $this->convert_params_to_sql($what);
+                $select .= $this->convert_params_to_sql($what);
             }
         } else {
             $select = "SELECT COUNT(*) FROM $table ";
-            $select.= $this->convert_params_to_sql($what);
+            $select .= $this->convert_params_to_sql($what);
         }
         $num = $this->db->fetch_one($select);
         return $num[0];
@@ -1018,7 +1018,7 @@ 
             $table = $this->source;
         }
         $select = "SELECT AVG({$what['column']}) FROM $table ";
-        $select.= $this->convert_params_to_sql($what);
+        $select .= $this->convert_params_to_sql($what);
         $num = $this->db->fetch_one($select);
         return $num[0];
     }
@@ -1041,7 +1041,7 @@ 
             $table = $this->source;
         }
         $select = "SELECT SUM({$what['column']}) FROM $table ";
-        $select.= $this->convert_params_to_sql($what);
+        $select .= $this->convert_params_to_sql($what);
         $num = $this->db->fetch_one($select);
         return $num[0];
     }
@@ -1070,7 +1070,7 @@ 
             $table = $this->source;
         }
         $select = "SELECT MAX({$what['column']}) FROM $table ";
-        $select.= $this->convert_params_to_sql($what);
+        $select .= $this->convert_params_to_sql($what);
         $num = $this->db->fetch_one($select);
         return $num[0];
     }
@@ -1099,7 +1099,7 @@ 
             $table = $this->source;
         }
         $select = "SELECT MIN({$what['column']}) FROM $table ";
-        $select.= $this->convert_params_to_sql($what);
+        $select .= $this->convert_params_to_sql($what);
         $num = $this->db->fetch_one($select);
         return $num[0];
     }
@@ -1279,7 +1279,7 @@ 
      * @param array $values array de valores a cargar
      * @return boolean success
      */
-    public function save($values=null)
+    public function save($values = null)
     {
         if ($values) {
             if (!is_array($values))
@@ -1644,7 +1644,7 @@ 
                 }
                 if (isset($this->$np)) {
                     $fields[] = $np;
-                    if (is_null($this->$np) || $this->$np == '' && $this->$np!='0') {
+                    if (is_null($this->$np) || $this->$np == '' && $this->$np != '0') {
                         $values[] = 'NULL';
                     } else {
                         /**
@@ -2006,7 +2006,7 @@ 
      * message: mensaje a mostrar
      * field: nombre de campo a mostrar en el mensaje
      */
-    protected function validates_presence_of($field, $params=array())
+    protected function validates_presence_of($field, $params = array())
     {
         if (is_string($params))
             $params = Util::getParams(func_get_args());
@@ -2027,7 +2027,7 @@ 
      * too_long: mensaje a mostrar cuando sea muy largo
      * field: nombre de campo a mostrar en el mensaje
      */
-    protected function validates_length_of($field, $max, $min=0, $params=array())
+    protected function validates_length_of($field, $max, $min = 0, $params = array())
     {
         if (is_string($params))
             $params = Util::getParams(func_get_args());
@@ -2047,7 +2047,7 @@ 
      * message: mensaje a mostrar
      * field: nombre del campo a mostrar en el mensaje
      */
-    protected function validates_inclusion_in($field, $list, $params=array())
+    protected function validates_inclusion_in($field, $list, $params = array())
     {
         if (is_string($params))
             $params = Util::getParams(func_get_args());
@@ -2066,7 +2066,7 @@ 
      * message: mensaje a mostrar
      * field: nombre del campo a mostrar en el mensaje
      */
-    protected function validates_exclusion_of($field, $list, $params=array())
+    protected function validates_exclusion_of($field, $list, $params = array())
     {
         if (is_string($params))
             $params = Util::getParams(func_get_args());
@@ -2085,7 +2085,7 @@ 
      * message: mensaje a mostrar
      * field: nombre del campo a mostrar en el mensaje
      */
-    protected function validates_format_of($field, $pattern, $params=array())
+    protected function validates_format_of($field, $pattern, $params = array())
     {
         if (is_string($params))
             $params = Util::getParams(func_get_args());
@@ -2103,7 +2103,7 @@ 
      * message: mensaje a mostrar
      * field: nombre del campo a mostrar en el mensaje
      */
-    protected function validates_numericality_of($field, $params=array())
+    protected function validates_numericality_of($field, $params = array())
     {
         if (is_string($params))
             $params = Util::getParams(func_get_args());
@@ -2120,7 +2120,7 @@ 
      * message: mensaje a mostrar
      * field: nombre del campo a mostrar en el mensaje
      */
-    protected function validates_email_in($field, $params=array())
+    protected function validates_email_in($field, $params = array())
     {
         if (is_string($params))
             $params = Util::getParams(func_get_args());
@@ -2137,7 +2137,7 @@ 
      * message: mensaje a mostrar
      * field: nombre del campo a mostrar en el mensaje
      */
-    protected function validates_uniqueness_of($field, $params=array())
+    protected function validates_uniqueness_of($field, $params = array())
     {
         if (is_string($params))
             $params = Util::getParams(func_get_args());
@@ -2154,7 +2154,7 @@ 
      * message: mensaje a mostrar
      * field: nombre del campo a mostrar en el mensaje
      */
-    protected function validates_date_in($field, $params=array())
+    protected function validates_date_in($field, $params = array())
     {
         if (is_string($params))
             $params = Util::getParams(func_get_args());

Braces +53 added lines, -36 removed lines

@@ -277,7 +277,9 @@ 
         $this->_connect();
 
         if ($data) {
-            if (!is_array($data)) $data = Util::getParams(func_get_args());
+            if (!is_array($data)) {
+                $data = Util::getParams(func_get_args());
+            }
             foreach($this->fields as $field) {
                 if (isset($data[$field])) {
                     $this->$field = $data[$field];
@@ -394,7 +396,7 @@ 
                 } else {
                     $relation->through = "{$relation_source}_{$this->source}";
                 }
-            }else{
+            } else{
                 $through = explode('/', $relation->through);
                 $relation->through = end($through);
             }
@@ -593,8 +595,9 @@ 
             if ($field['Key'] == 'PRI') {
                 $this->primary_key[] = $field['Field'];
                 $this->alias[$field['Field']] = 'Código';
-            } else
-                $this->non_primary[] = $field['Field'];
+            } else {
+                            $this->non_primary[] = $field['Field'];
+            }
             /**
              * Si se indica que no puede ser nulo, pero se indica un
              * valor por defecto, entonces no se incluye en la lista, ya que
@@ -1282,8 +1285,9 @@ 
     public function save($values=null)
     {
         if ($values) {
-            if (!is_array($values))
-                $values = Util::getParams(func_get_args());
+            if (!is_array($values)) {
+                            $values = Util::getParams(func_get_args());
+            }
             foreach ($this->fields as $field) {
                 if (isset($values[$field])) {
                     $this->$field = $values[$field];
@@ -1345,8 +1349,9 @@ 
         if (isset($this->_validates['presence_of'])) {
             foreach ($this->_validates['presence_of'] as $f => $opt) {
                 if (isset($this->$f) && (is_null($this->$f) || $this->$f == '')) {
-                    if (!$ex && $f == $this->primary_key[0])
-                        continue;
+                    if (!$ex && $f == $this->primary_key[0]) {
+                                            continue;
+                    }
                     if (isset($opt['message'])) {
                         Flash::error($opt['message']);
                         return false;
@@ -1396,18 +1401,20 @@ 
                     $field = isset($opt['field']) ? $opt['field'] : $f;
 
                     if (strlen($this->$f) < $opt['min']) {
-                        if (isset($opt['too_short']))
-                            Flash::error($opt['too_short']);
-                        else
-                            Flash::error("Error: El campo $field debe tener como mínimo $opt[min] caracteres");
+                        if (isset($opt['too_short'])) {
+                                                    Flash::error($opt['too_short']);
+                        } else {
+                                                    Flash::error("Error: El campo $field debe tener como mínimo $opt[min] caracteres");
+                        }
                         return false;
                     }
 
                     if (strlen($this->$f) > $opt['max']) {
-                        if (isset($opt['too_long']))
-                            Flash::error($opt['too_long']);
-                        else
-                            Flash::error("Error: El campo $field debe tener como máximo $opt[max] caracteres");
+                        if (isset($opt['too_long'])) {
+                                                    Flash::error($opt['too_long']);
+                        } else {
+                                                    Flash::error("Error: El campo $field debe tener como máximo $opt[max] caracteres");
+                        }
                         return false;
                     }
                 }
@@ -1569,8 +1576,9 @@ 
             } else {
                 if (isset($this->after_validation_on_update)) {
                     $method = $this->after_validation_on_update;
-                    if ($this->$method() == 'cancel')
-                        return false;
+                    if ($this->$method() == 'cancel') {
+                                            return false;
+                    }
                 }
             }
         }
@@ -2008,8 +2016,9 @@ 
      */
     protected function validates_presence_of($field, $params=array())
     {
-        if (is_string($params))
-            $params = Util::getParams(func_get_args());
+        if (is_string($params)) {
+                    $params = Util::getParams(func_get_args());
+        }
 
         $this->_validates['presence_of'][$field] = $params;
     }
@@ -2029,8 +2038,9 @@ 
      */
     protected function validates_length_of($field, $max, $min=0, $params=array())
     {
-        if (is_string($params))
-            $params = Util::getParams(func_get_args());
+        if (is_string($params)) {
+                    $params = Util::getParams(func_get_args());
+        }
 
         $this->_validates['length_of'][$field] = $params;
         $this->_validates['length_of'][$field]['min'] = $min;
@@ -2049,8 +2059,9 @@ 
      */
     protected function validates_inclusion_in($field, $list, $params=array())
     {
-        if (is_string($params))
-            $params = Util::getParams(func_get_args());
+        if (is_string($params)) {
+                    $params = Util::getParams(func_get_args());
+        }
 
         $this->_validates['inclusion_in'][$field] = $params;
         $this->_validates['inclusion_in'][$field]['list'] = $list;
@@ -2068,8 +2079,9 @@ 
      */
     protected function validates_exclusion_of($field, $list, $params=array())
     {
-        if (is_string($params))
-            $params = Util::getParams(func_get_args());
+        if (is_string($params)) {
+                    $params = Util::getParams(func_get_args());
+        }
 
         $this->_validates['exclusion_of'][$field] = $params;
         $this->_validates['exclusion_of'][$field]['list'] = $list;
@@ -2087,8 +2099,9 @@ 
      */
     protected function validates_format_of($field, $pattern, $params=array())
     {
-        if (is_string($params))
-            $params = Util::getParams(func_get_args());
+        if (is_string($params)) {
+                    $params = Util::getParams(func_get_args());
+        }
 
         $this->_validates['format_of'][$field] = $params;
         $this->_validates['format_of'][$field]['pattern'] = $pattern;
@@ -2105,8 +2118,9 @@ 
      */
     protected function validates_numericality_of($field, $params=array())
     {
-        if (is_string($params))
-            $params = Util::getParams(func_get_args());
+        if (is_string($params)) {
+                    $params = Util::getParams(func_get_args());
+        }
 
         $this->_validates['numericality_of'][$field] = $params;
     }
@@ -2122,8 +2136,9 @@ 
      */
     protected function validates_email_in($field, $params=array())
     {
-        if (is_string($params))
-            $params = Util::getParams(func_get_args());
+        if (is_string($params)) {
+                    $params = Util::getParams(func_get_args());
+        }
 
         $this->_validates['email_in'][$field] = $params;
     }
@@ -2139,8 +2154,9 @@ 
      */
     protected function validates_uniqueness_of($field, $params=array())
     {
-        if (is_string($params))
-            $params = Util::getParams(func_get_args());
+        if (is_string($params)) {
+                    $params = Util::getParams(func_get_args());
+        }
 
         $this->_validates['uniqueness_of'][$field] = $params;
     }
@@ -2156,8 +2172,9 @@ 
      */
     protected function validates_date_in($field, $params=array())
     {
-        if (is_string($params))
-            $params = Util::getParams(func_get_args());
+        if (is_string($params)) {
+                    $params = Util::getParams(func_get_args());
+        }
 
         $this->_validates['date_in'][$field] = $params;
     }

core/libs/upload/upload.php

Doc Comments +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
     /**
      * Asigna las extensiones de archivos permitidas
      *
-     * @param array|string $value lista de extensiones para archivos, si es string separado por |
+     * @param string[] $value lista de extensiones para archivos, si es string separado por |
      */
     public function setExtensions($value) {
         if (!is_array($value)) {

default/app/models/user.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     /**
      * Sube y actualiza la foto del usuario.
      * 
-     * @return boolean | null
+     * @return boolean|null | null
      */
     public function updatePhoto() {
         if ($photo = $this->uploadPhoto('photo')) {