webcol / Calima

mvc/controladores/instaladorControlador.php

Doc Comments +8 added lines

@@ -93,6 +93,14 @@
     }
 
 
+    /**
+     * @param string $analytics
+     * @param string $hostbd
+     * @param string $nombrebd
+     * @param string $usuariobd
+     * @param string $clavebd
+     * @param string $config
+     */
     public function paso1($proyecto,$analytics,$hostbd,$nombrebd,$usuariobd,$usuariobd,$clavebd,$config){
         
                

Braces +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
              if($a){
                  
                 $this->paso1($proyecto,$analytics,$hostbd,$nombrebd,$usuariobd,$usuariobd,$clavebd,$config);
-             }else{
+             } else{
                  $this->_ayuda->redireccionUrl('instalador?error="Los datos que estas ingresando no coniciden con los de la BD"');
              }
         

Sistema/Ayudantes/CFPHPAyuda.php

Doc Comments +3 added lines

@@ -72,6 +72,9 @@
     exit();
     }
     
+    /**
+     * @param string $url
+     */
     function redireccionUrl($url){
         $url=Cf_BASE_URL.$url;
     header('Location: ' . $url);

Braces +1 added lines, -2 removed lines

@@ -48,8 +48,7 @@
     function filtroEmail($email){
         if (!filter_input(INPUT_POST, $email, FILTER_VALIDATE_EMAIL)){
             echo "E-Mail no es valido";
-        }
-        else
+        } else
         {
             echo "E-Mail es valido";
         }

Sistema/Ayudantes/CFPHPCache.php

Doc Comments +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 	 *
 	 * @access public
 	 * @param string $clave
-	 * @param mixed $content the the content you want to store
+	 * @param mixed $contenido the the content you want to store
 	 * @param bool $raw whether if you want to store raw data or not. If it is true, $content *must* be a string
 	 *        It can be useful for static html caching.
 	 * @return bool whether if the operation was successful or not
@@ -112,7 +112,7 @@ 
 	 * Check if a file has expired or not.
 	 *
 	 * @access public
-	 * @param $archivo the rout to the file
+	 * @param string $archivo the rout to the file
 	 * @param int $fecha the number of minutes it was set to expire
 	 * @return bool if the file has expired or not
 	 */

Sistema/Ayudantes/CFPHPFormularios.php

Doc Comments +1 added lines, -7 removed lines

@@ -330,7 +330,6 @@ 
 	 * @name validate
 	 * @tutorial this function validate items sends trhough form. It DON'T FILTER
 	 * 	Basically simulate HTML5 trhoguh PHP for full compatibility
-	 * @param boolean $error_list If is true, it generate in $this->error_list a list with data required 
 	 */
 	public function validate() {
 		$this->error_list = ''; // Clean error list
@@ -480,7 +479,7 @@ 
 	 * @name validateArray
 	 * This functions validate an Array, is a complement to validateRadio, select...
 	 * @param array/string $values List of values to validate
-	 * @param array/string $value/s selecteds by user 
+	 * @param array/string $value selecteds by user 
 	 */
 	private function validateArray($values, $value, $data = array()) {
 		if (is_array($values)) {
@@ -508,7 +507,6 @@ 
 	/**
 	 * @name validateRadio
 	 * @tutorial This function test if an radio is valid depending assigned values
-	 * @param array $data Contains all information about input
 	 * @return boolean If return true, its okay
 	 */
 	private function validateRadio($params) {
@@ -540,7 +538,6 @@ 
 	/**
 	 * @name validateSelect
 	 * @tutorial This function test if an select is valid depending assigned values
-	 * @param array $data Contains all information about input
 	 * @return boolean If return true, its okay
 	 */
 	private function validateSelect($param) {
@@ -775,7 +772,6 @@ 
 	 * @param string $name Select name
 	 * @param array $values Array('value'=>'text to show')
 	 * @param boolean $required Specify if select is required
-	 * @param string $id ID Specify ID to manipulate via javascript or CSS
 	 * @param array $attributes Optional atributes not listened (in array).
 	 */
 	public function addSelect($label = '', $name = '', $values = '', $selected = null, $required = false, $multiple = false, $attributes = array()) {
@@ -849,7 +845,6 @@ 
 	 * @name addButton
 	 * @tutorial Use this function to add a button with "onclick" action (or id/class to call via jquery)
 	 * @param string $value Name to show in button and ID
-	 * @param string $onClick Action to load when button is clicked
 	 * @param array $attributes Optional atributes not listened (in array).
 	 */
 	public function addTextArea($label = '', $name = '', $value = '', $required = false, $attributes = array()) {
@@ -878,7 +873,6 @@ 
 	/**
 	 * @name log
 	 * @tutorial Save a log if is enabled logging
-	 * @param boolean $save If is true, save the log
 	 * @param string $message Message to log
 	 */
 	private function log($message, $data = array()) {

Braces +162 added lines, -55 removed lines

@@ -130,14 +130,18 @@ 
 		// Itearate all inputs
 		foreach ($toShow as $input) {
 			// Reading data
-			if (isset($input['data'])) $data = $input['data'];
+			if (isset($input['data'])) {
+			    $data = $input['data'];
+			}
 			
 			// New row
 			echo '<div>';
 				// Showing labels
 				if ($this->show_labels) {
 					echo '<div>';
-						if (isset($input['label']) and $input['label'] != '') echo $input['label'];
+						if (isset($input['label']) and $input['label'] != '') {
+						    echo $input['label'];
+						}
 					echo '</div>';
 				}
 				
@@ -182,7 +186,9 @@ 
 	private function showInput($data) {
 		$r = '';
 		// Number start if is range
-		if ($data['type'] == 'range' and isset($data['min'])) $r .= $data['min'] . ' '; 
+		if ($data['type'] == 'range' and isset($data['min'])) {
+		    $r .= $data['min'] . ' ';
+		}
 		
 		$r .= '<input ';
 		
@@ -197,7 +203,9 @@ 
 		$r .= '/>';
 		
 		// Number end if is range
-		if ($data['type'] == 'range' and isset($data['max'])) $r .= $data['max'] . ' ';
+		if ($data['type'] == 'range' and isset($data['max'])) {
+		    $r .= $data['max'] . ' ';
+		}
 		
 		// Return
 		return $r;
@@ -220,7 +228,9 @@ 
 		// Si no tiene m�ltiples valores (es un string), lo retornamos de golpe 
 		if (!is_array($values)) {
 			// Comprobamos el value, es posible que el usuario este intentando crear los Radio (option) de forma separada
-			if (!is_array($values) and $selected == $values) $base .= ' checked="checked" ';
+			if (!is_array($values) and $selected == $values) {
+			    $base .= ' checked="checked" ';
+			}
 			return $base . ' value="'.$values.'" />';
 		} 
 
@@ -229,7 +239,9 @@ 
 		$r = '';
 		foreach ($values as $id=>$text) {
 			$r .= $base;
-			if ($selected !== null and $id == $selected) $r .= ' checked="checked" ';
+			if ($selected !== null and $id == $selected) {
+			    $r .= ' checked="checked" ';
+			}
 			$r .= ' value="'. $id .'" />'.$text.'</label>';
 		}
 		
@@ -263,7 +275,9 @@ 
 		if ($selected != '') {
 			foreach ($values as $val=>$txt) {
 				$r .= '<option value="' . $val . '"';
-					if ($val == $selected) $r .= ' selected ';
+					if ($val == $selected) {
+					    $r .= ' selected ';
+					}
 				$r .= '>' . $txt . '</option>';
 			}
 		} else {
@@ -304,12 +318,24 @@ 
 	 */
 	private function showStartForm() {
 		$r = '<form ';
-		if ($this->action!= '') $r .= 'action="'.$this->action.'" ';
-		if ($this->method != '') $r .= 'method="'.$this->method .'" ';
-		if ($this->name != '') $r .= 'name="'.$this->name .'" ';
-		if ($this->on_submit != '') $r .= 'onSubmit="'.$this->on_submit  .'" ';
-		if ($this->id != '') $r .= 'id="'.$this->id .'" ';
-		if ($this->class != '') $r .= 'class="'.$this->class .'" ';
+		if ($this->action!= '') {
+		    $r .= 'action="'.$this->action.'" ';
+		}
+		if ($this->method != '') {
+		    $r .= 'method="'.$this->method .'" ';
+		}
+		if ($this->name != '') {
+		    $r .= 'name="'.$this->name .'" ';
+		}
+		if ($this->on_submit != '') {
+		    $r .= 'onSubmit="'.$this->on_submit  .'" ';
+		}
+		if ($this->id != '') {
+		    $r .= 'id="'.$this->id .'" ';
+		}
+		if ($this->class != '') {
+		    $r .= 'class="'.$this->class .'" ';
+		}
 	
 		return $r . '>'.PHP_EOL;
 	}
@@ -370,7 +396,9 @@ 
 			}
 		}
 		
-		if ($success >= $total) return true;
+		if ($success >= $total) {
+		    return true;
+		}
 		return false;
 	}
 	
@@ -570,8 +598,11 @@ 
 	 * @return string/null Return the value, if don't exist, return null
 	 */
 	private function getData($key, $default = null) {
-		if ($this->method == "post") return isset($_POST[$key]) ? $_POST[$key] : $default;
-		else return isset($_GET[$key]) ? $_GET[$key] : $default;
+		if ($this->method == "post") {
+		    return isset($_POST[$key]) ? $_POST[$key] : $default;
+		} else {
+		    return isset($_GET[$key]) ? $_GET[$key] : $default;
+		}
 	}
 	
 	/*
@@ -614,9 +645,15 @@ 
 		);
 		
 		
-		if ($required) $data['required'] = 'required';
-		if ($placeholder != '') $data['placeholder'] = $placeholder;
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($placeholder != '') {
+		    $data['placeholder'] = $placeholder;
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		
 		// Saving data to object
@@ -624,7 +661,9 @@ 
 			'type' => 'input',
 			'data' => $data	
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		 
 		$this->content[] = $content;
 	}
@@ -651,19 +690,33 @@ 
 		);
 	
 		
-		if ($required) $data['required'] = 'required';
-		if ($min) $data['min'] = $min;
-		if ($max) $data['max'] = $max;
-		if ($step) $data['step'] = $step;
-		if ($placeholder != '') $data['placeholder'] = $placeholder;
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($min) {
+		    $data['min'] = $min;
+		}
+		if ($max) {
+		    $data['max'] = $max;
+		}
+		if ($step) {
+		    $data['step'] = $step;
+		}
+		if ($placeholder != '') {
+		    $data['placeholder'] = $placeholder;
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 	
 		// Saving data to object
 		$content = array(
 			'type' => 'input',
 			'data' => $data
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -688,19 +741,33 @@ 
 			'value' => $value,
 		);
 	
-		if ($required) $data['required'] = 'required';
-		if ($min) $data['min'] = $min;
-		if ($max) $data['max'] = $max;
-		if ($step) $data['step'] = $step;
-		if ($placeholder != '') $data['placeholder'] = $placeholder;
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($min) {
+		    $data['min'] = $min;
+		}
+		if ($max) {
+		    $data['max'] = $max;
+		}
+		if ($step) {
+		    $data['step'] = $step;
+		}
+		if ($placeholder != '') {
+		    $data['placeholder'] = $placeholder;
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 	
 		// Saving data to object
 		$content = array(
 			'type' => 'input',
 			'data' => $data
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -721,14 +788,20 @@ 
 			'name' => $name,
 			'value' => $value
 		);
-		if ($required) $data['required'] = 'required';
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		$content = array(
 			'type' => 'input',
 			'data' => $data 
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -746,13 +819,19 @@ 
 	 * @param array $attributes Optional atributes not listened (in array). This will be applicated to all radioButton
 	 */
 	public function addRadio($label = '', $name = '', $values = array(), $selected = null, $required = false, $attributes = array()) {
-		if (!is_array($values)) die('FATAL ERROR: Trying to create "RadioButton" with string VALUE, is requried use ARRAY()');
+		if (!is_array($values)) {
+		    die('FATAL ERROR: Trying to create "RadioButton" with string VALUE, is requried use ARRAY()');
+		}
 		$data = array(
 			'name' => $name,
 		);
 		
-		if ($required) $data['required'] = 'required';		
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		
 		
@@ -762,7 +841,9 @@ 
 			'values' => $values,
 			'selected' => $selected
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -783,9 +864,15 @@ 
 			'name' => $name,
 			'required' => $required,
 		);
-		if ($required) $data['required'] = 'required';
-		if ($multiple) $data['multiple'] = 'multiple';
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if ($multiple) {
+		    $data['multiple'] = 'multiple';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		
 		// In this case, the values are saved in the main of array to speed up select loader
@@ -795,7 +882,9 @@ 
 			'values' => $values,
 			'selected' => $selected
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		
 		$this->content[] = $content;
 	}
@@ -813,7 +902,9 @@ 
 			'name' => $name,
 			'value' => $value
 		);
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		$this->content[] = array(
 			'type' => 'input',
@@ -836,7 +927,9 @@ 
 			'value' => $value,
 			'onClick' => $onClick
 		);
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		$this->content[] = array(
 			'type' => 'input',
@@ -858,8 +951,12 @@ 
 			'name' => $name,
 		);
 		
-		if ($required) $data['required'] = 'required';
-		if (!empty($attributes)) array_merge($data, $attributes);
+		if ($required) {
+		    $data['required'] = 'required';
+		}
+		if (!empty($attributes)) {
+		    array_merge($data, $attributes);
+		}
 		
 		// Saving data to object
 		$content = array(
@@ -867,7 +964,9 @@ 
 			'text' => $value,
 			'data' => $data	
 		);
-		if ($label != '') $content['label'] = $label;
+		if ($label != '') {
+		    $content['label'] = $label;
+		}
 		 
 		$this->content[] = $content;
 	}
@@ -885,18 +984,26 @@ 
 		if ($this->logErrors) {
 			// Try to get a name (label or name)
 			if (class_exists('kw')) {
-				if (isset($data['label'])) $this->errors .= 'Found an error in field' . ': "' . $data['label'] . '": ';
-				elseif (isset($data['name'])) $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				if (isset($data['label'])) {
+				    $this->errors .= 'Found an error in field' . ': "' . $data['label'] . '": ';
+				} elseif (isset($data['name'])) {
+				    $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				}
 			} else {
-				if (isset($data['label'])) $this->errors .= 'Found an error in field' . $data['label'] . '": ';
-				elseif (isset($data['name'])) $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				if (isset($data['label'])) {
+				    $this->errors .= 'Found an error in field' . $data['label'] . '": ';
+				} elseif (isset($data['name'])) {
+				    $this->errors .= 'Found an error in field' . ': "' . $data['name'] . '": ';
+				}
 			}
 			
 			// preparing message
 			$this->errors .= ' ' . $message . '.';
 			
 			// Extra message (title attribute)
-			if (isset($data['title']) and $data['title'] != '') $this->errors .= ' | '. 'MESSAGE' .': ' . $data['title'];
+			if (isset($data['title']) and $data['title'] != '') {
+			    $this->errors .= ' | '. 'MESSAGE' .': ' . $data['title'];
+			}
 			
 			$this->errors .= '<br />';
 		}

Sistema/Ayudantes/CFPHPSeguridad.php

Doc Comments +4 added lines, -3 removed lines

@@ -59,6 +59,10 @@ 
         return $cadenaAleatoria;
     }
     // encriptacion
+
+    /**
+     * @param string $clave
+     */
     function cifrado($clave){
         $cfi=sha1(md5($clave));
         return $clave=Cf_KEY_MD5.$cfi;
@@ -130,9 +134,6 @@ 
  *
  * @strip injection chars from email headers
  *
- * @param string $string
- *
- * return string
  *
  */
 function emailSeguro($cadena) {

Braces +10 added lines, -12 removed lines

@@ -79,12 +79,13 @@ 
     }
     
     function obtenerDireccionIP(){
-    if (!empty($_SERVER ['HTTP_CLIENT_IP'] ))
-      $ip=$_SERVER ['HTTP_CLIENT_IP'];
-    elseif (!empty($_SERVER ['HTTP_X_FORWARDED_FOR'] ))
-      $ip=$_SERVER ['HTTP_X_FORWARDED_FOR'];
-    else
-      $ip=$_SERVER ['REMOTE_ADDR'];
+    if (!empty($_SERVER ['HTTP_CLIENT_IP'] )) {
+          $ip=$_SERVER ['HTTP_CLIENT_IP'];
+    } elseif (!empty($_SERVER ['HTTP_X_FORWARDED_FOR'] )) {
+          $ip=$_SERVER ['HTTP_X_FORWARDED_FOR'];
+    } else {
+          $ip=$_SERVER ['REMOTE_ADDR'];
+    }
 
     return $ip;
 	}
@@ -94,8 +95,7 @@ 
 
         if($ipCliente == $ip){
         return true;
-        }
-        else{
+        } else{
         header('location: http://www.tusitioweb/redireccion');
         exit;
         }
@@ -106,8 +106,7 @@ 
 
     if (in_array($ipCliente,$ips)){
         return true;
-    }
-    else{
+    } else{
         header('location: http://direccion_envio_salida');
         exit;
     }
@@ -118,8 +117,7 @@ 
 
     if(substr($ipCliente, 0, 8 ) == "150.214."){
         return true;
-    }
-    else{
+    } else{
         header('location: http://direccion_envio_salida');
         exit;
     }

Sistema/librerias/rb.php

Doc Comments +41 added lines, -60 removed lines

@@ -201,7 +201,7 @@ 
 	 * in.
 	 *
 	 * @param string $newSql   the query
-	 * @param array  $bindings the bindings to process (key-value pairs)
+	 * @param array  $newBindings the bindings to process (key-value pairs)
 	 *
 	 * @return string
 	 */
@@ -378,7 +378,7 @@ 
 	 * @param string $sql      SQL to be executed
 	 * @param array  $bindings list of values to bind to SQL snippet
 	 *
-	 * @return array
+	 * @return integer
 	 */
 	public function GetAll( $sql, $bindings = array() );
 
@@ -409,7 +409,7 @@ 
 	 * @param string $sql      SQL to execute
 	 * @param array  $bindings list of values to bind to SQL snippet
 	 *
-	 * @return mixed
+	 * @return integer
 	 */
 	public function GetAssocRow( $sql, $bindings = array() );
 	
@@ -437,7 +437,7 @@ 
 	 * @param string $sql      SQL Code to execute
 	 * @param array  $bindings list of values to bind to SQL snippet
 	 *
-	 * @return array Affected Rows
+	 * @return integer Affected Rows
 	 */
 	public function Execute( $sql, $bindings = array() );
 
@@ -463,7 +463,7 @@ 
 	 * @param string $sql      SQL code to execute
 	 * @param array  $bindings Bindings
 	 *
-	 * @return mixed
+	 * @return Cursor\PDOCursor
 	 */
 	public function GetCursor( $sql, $bindings = array() );
 
@@ -474,8 +474,8 @@ 
 	 * passes on to the screen for inspection.
 	 * This method has no return value.
 	 *
-	 * @param boolean $trueFalse turn on/off
 	 *
+	 * @param boolean $tf
 	 * @return void
 	 */
 	public function setDebugMode( $tf );
@@ -647,7 +647,7 @@ 
 	 * @param string $sql      the SQL string to be send to database server
 	 * @param array  $bindings the values that need to get bound to the query slots
 	 *
-	 * @return void
+	 * @return \PDOStatement
 	 *
 	 * @throws SQL
 	 */
@@ -717,7 +717,7 @@ 
 	 *    $driver = new RPDO($dsn, $user, $password);
 	 *    $driver = new RPDO($existingConnection);
 	 *
-	 * @param string|object $dsn    database connection string
+	 * @param string $dsn    database connection string
 	 * @param string        $user   optional, usename to sign in
 	 * @param string        $pass   optional, password for connection login
 	 *
@@ -813,7 +813,7 @@ 
 	 * this method if you are an expert on RedBeanPHP, PDO and UTF8 connections and
 	 * you know your database server VERY WELL.
 	 *
-	 * @param PDO $pdo PDO instance
+	 * @param \PDO $pdo PDO instance
 	 *
 	 * @return void
 	 */
@@ -940,7 +940,6 @@ 
 	 * SQL to the screen together with some information about the
 	 * results.
 	 *
-	 * @param boolean $trueFalse turn on/off
 	 * @param Logger  $logger    logger instance
 	 *
 	 * @return void
@@ -1408,7 +1407,6 @@ 
 	 * Obtains the own list of a certain type.
 	 *
 	 * @param string      $type   name of the list you want to retrieve
-	 * @param OODB        $oodb   The RB OODB object database instance
 	 *
 	 * @return array
 	 */
@@ -2235,7 +2233,6 @@ 
 	 * of combining a get/unset.
 	 *
 	 * @param string $path    path
-	 * @param mixed  $default default value
 	 *
 	 * @return mixed
 	 */
@@ -2450,7 +2447,6 @@ 
 	 * For polymorphic bean relations.
 	 * Same as fetchAs but uses a column instead of a direct value.
 	 *
-	 * @param string $column
 	 *
 	 * @return OODBBean
 	 */
@@ -2688,7 +2684,6 @@ 
 	 * example #1. After preparing the linking bean, the bean is returned thus
 	 * allowing the chained setter: ->song = $song.
 	 *
-	 * @param string|OODBBean $type          type of bean to dispense or the full bean
 	 * @param string|array            $qualification JSON string or array (optional)
 	 *
 	 * @return OODBBean
@@ -2959,7 +2954,7 @@ 
 	 * this event. Part of the observer pattern implementation in RedBeanPHP.
 	 *
 	 * @param string $eventname event you want signal
-	 * @param mixed  $info      message object to send along
+	 * @param Adapter\DBAdapter  $info      message object to send along
 	 *
 	 * @return void
 	 */
@@ -3158,7 +3153,7 @@ 
 	 * adapter. RedBean will only access the adapter and never to talk
 	 * directly to the driver though.
 	 *
-	 * @return object
+	 * @return Driver
 	 */
 	public function getDatabase();
 
@@ -3352,6 +3347,7 @@ 
 
 	/**
 	 * @see Adapter::getCell
+	 * @param integer $noSignal
 	 */
 	public function getCell( $sql, $bindings = array(), $noSignal = NULL )
 	{
@@ -3497,7 +3493,7 @@ 
 	/**
 	 * Constructor, creates a new instance of a PDO Database Cursor.
 	 *
-	 * @param PDOStatement  $res        the PDO statement
+	 * @param \PDOStatement  $res        the PDO statement
 	 * @param string        $fetchStyle fetch style constant to use
 	 *
 	 * @return void
@@ -3728,7 +3724,7 @@ 
 	 *
 	 * @param string $type       source type
 	 * @param string $targetType target type (type to join)
-	 * @param string $leftRight  type of join (possible: 'LEFT', 'RIGHT' or 'INNER').
+	 * @param string $joinType
 	 *
 	 * @return string $joinSQLSnippet
 	 */
@@ -3867,7 +3863,6 @@ 
 	 *
 	 * @param string $type       name of the table you want to query
 	 * @param array  $conditions criteria ( $column => array( $values ) )
-	 * @param string $addSQL     additional SQL snippet
 	 * @param array  $bindings   bindings for SQL snippet
 	 *
 	 * @return array
@@ -3880,8 +3875,6 @@ 
 	 * type, conditions (optional) and additional SQL snippet (optional).
 	 *
 	 * @param string $type       name of the table you want to query
-	 * @param array  $conditions criteria ( $column => array( $values ) )
-	 * @param string $addSQL     additional SQL snippet
 	 * @param array  $bindings   bindings for SQL snippet
 	 *
 	 * @return Cursor
@@ -3910,7 +3903,7 @@ 
 	 * @param string $sourceID   ID for the source
 	 * @param string $destID     ID for the destination
 	 *
-	 * @return array|null
+	 * @return string
 	 */
 	public function queryRecordLink( $sourceType, $destType, $sourceID, $destID );
 
@@ -3920,7 +3913,6 @@ 
 	 *
 	 * @param string $type       name of the table you want to query
 	 * @param array  $conditions criteria ( $column => array( $values ) )
-	 * @param string $addSQL     additional SQL snippet
 	 * @param array  $bindings   bindings for SQL snippet
 	 *
 	 * @return integer
@@ -3979,7 +3971,6 @@ 
 	 *
 	 * @param string $type       name of the table you want to query
 	 * @param array  $conditions criteria ( $column => array( $values ) )
-	 * @param string $sql        additional SQL
 	 * @param array  $bindings   bindings
 	 *
 	 * @return void
@@ -4007,7 +3998,6 @@ 
 	 * This methods accepts a type and infers the corresponding table name.
 	 *
 	 * @param string $type               type
-	 * @param array  $columnsPartOfIndex columns to include in index
 	 *
 	 * @return void
 	 */
@@ -4078,7 +4068,7 @@ 
 	 * SQL policies and does therefore not require database specific escaping rules.
 	 *
 	 * @param string  $databaseStructure name of the column/table to check
-	 * @param boolean $noQuotes          TRUE to NOT put backticks or quotes around the string
+	 * @param boolean $dontQuote          TRUE to NOT put backticks or quotes around the string
 	 *
 	 * @return string
 	 */
@@ -4107,7 +4097,7 @@ 
 	 * This method also accepts a single associative array as
 	 * its first argument.
 	 *
-	 * @param string|array $fromType
+	 * @param string $fromType
 	 * @param string       $toType (optional)
 	 *
 	 * @return void
@@ -4138,7 +4128,7 @@ 
 	 * it's optional. A default version is available in AQueryWriter.
 	 *
 	 * @param $type     the source type to fetch a target type for
-	 * @param $property the property to fetch the type of
+	 * @param string $property the property to fetch the type of
 	 *
 	 * @return string|NULL
 	 */
@@ -4743,7 +4733,6 @@ 
 	 * Inserts a record into the database using a series of insert columns
 	 * and corresponding insertvalues. Returns the insert id.
 	 *
-	 * @param string $table         table to perform query on
 	 * @param array  $insertcolumns columns to be inserted
 	 * @param array  $insertvalues  values to be inserted
 	 *
@@ -4791,7 +4780,6 @@ 
 	/**
 	 * Checks table name or column name.
 	 *
-	 * @param string $table table string
 	 *
 	 * @return string
 	 *
@@ -5206,6 +5194,9 @@ 
 
 	/**
 	 * @see QueryWriter::widenColumn
+	 * @param string $type
+	 * @param string $property
+	 * @param integer $dataType
 	 */
 	public function widenColumn( $type, $property, $dataType )
 	{
@@ -5241,6 +5232,7 @@ 
 
 	/**
 	 * @see QueryWriter::getAssocTable
+	 * @param string[] $types
 	 */
 	public function getAssocTable( $types )
 	{
@@ -5857,9 +5849,8 @@ 
 	 *
 	 * @param  string  $type        type you want to modify table of
 	 * @param  string  $targetType  target type
-	 * @param  string  $field       field of the type that needs to get the fk
-	 * @param  string  $targetField field where the fk needs to point to
-	 * @param  integer $buildopt    0 = NO ACTION, 1 = ON DELETE CASCADE
+	 * @param string $property
+	 * @param string $targetProperty
 	 *
 	 * @return boolean $didIt
 	 *
@@ -5893,6 +5884,7 @@ 
 
 	/**
 	 * @see AQueryWriter::getKeyMapForType
+	 * @param string $type
 	 */
 	protected function getKeyMapForType( $type )
 	{
@@ -6710,7 +6702,7 @@ 
 	/**
 	 * Processes an embedded bean.
 	 *
-	 * @param OODBBean|SimpleModel $embeddedBean the bean or model
+	 * @param OODBBean $embeddedBean the bean or model
 	 *
 	 * @return integer
 	 */
@@ -6752,7 +6744,6 @@ 
 	 * checks if there have been any modification to this bean, in that case
 	 * the bean is stored once again, otherwise the bean will be left untouched.
 	 *
-	 * @param OODBBean $bean       the bean
 	 * @param array            $ownresidue list
 	 *
 	 * @return void
@@ -6943,7 +6934,6 @@ 
 	 *
 	 * @param string $type       type of beans you are looking for
 	 * @param array  $conditions list of conditions
-	 * @param string $addSQL     SQL to be used in query
 	 * @param array  $bindings   whether you prefer to use a WHERE clause or not (TRUE = not)
 	 *
 	 * @return array
@@ -7448,7 +7438,7 @@ 
 	 * configuration for you.
 	 *
 	 * @param string  $type              type of bean you want to dispense
-	 * @param string  $number            number of beans you would like to get
+	 * @param integer  $number            number of beans you would like to get
 	 * @param boolean $alwaysReturnArray if TRUE always returns the result as an array
 	 *
 	 * @return OODBBean
@@ -7651,7 +7641,7 @@ 
 	 * configuration for you.
 	 *
 	 * @param string  $type              type of bean you want to dispense
-	 * @param string  $number            number of beans you would like to get
+	 * @param integer  $number            number of beans you would like to get
 	 * @param boolean $alwaysReturnArray if TRUE always returns the result as an array
 	 *
 	 * @return OODBBean
@@ -7846,7 +7836,7 @@ 
 	 * Constructor, requires a query writer.
 	 *
 	 * @param QueryWriter   $writer writer
-	 * @param array|boolean $frozen mode of operation: TRUE (frozen), FALSE (default, fluid) or ARRAY (chilled)
+	 * @param boolean $frozen mode of operation: TRUE (frozen), FALSE (default, fluid) or ARRAY (chilled)
 	 */
 	public function __construct( QueryWriter $writer, $frozen = FALSE )
 	{
@@ -7940,7 +7930,7 @@ 
 	 * configuration for you.
 	 *
 	 * @param string  $type              type of bean you want to dispense
-	 * @param string  $number            number of beans you would like to get
+	 * @param integer  $number            number of beans you would like to get
 	 * @param boolean $alwaysReturnArray if TRUE always returns the result as an array
 	 *
 	 * @return OODBBean
@@ -8014,8 +8004,8 @@ 
 	 *
 	 * @param string $type       type of beans you are looking for
 	 * @param array  $conditions list of conditions
-	 * @param string $addSQL     SQL to be used in query
 	 * @param array  $bindings   whether you prefer to use a WHERE clause or not (TRUE = not)
+	 * @param string $sql
 	 *
 	 * @return array
 	 *
@@ -8030,10 +8020,10 @@ 
 	 * Same as find() but returns a BeanCollection.
 	 *
 	 * @param string $type       type of beans you are looking for
-	 * @param string $addSQL     SQL to be used in query
 	 * @param array  $bindings   whether you prefer to use a WHERE clause or not (TRUE = not)
+	 * @param string $sql
 	 *
-	 * @return array
+	 * @return BeanCollection
 	 *
 	 * @throws SQL
 	 */
@@ -8222,7 +8212,6 @@ 
 	 * A simple setter function to set the association manager to be used for storage and
 	 * more.
 	 *
-	 * @param AssociationManager $assoc sets the association manager to be used
 	 *
 	 * @return void
 	 */
@@ -8685,7 +8674,6 @@ 
 	 * @note instead of an SQL query you can pass a result array as well.
 	 *
 	 * @param string|array $types         a list of types (either array or comma separated string)
-	 * @param string|array $sqlOrArr      an SQL query or an array of prefetched records
 	 * @param array        $bindings      optional, bindings for SQL query
 	 * @param array        $remappings    optional, an array of remapping arrays
 	 * @param string       $queryTemplate optional, query template
@@ -8936,7 +8924,7 @@ 
 	 * two in a link table. Instead of two single beans this method also accepts
 	 * two sets of beans. Returns the ID or the IDs of the linking beans.
 	 * 
-	 * @param OODBBean|array $beans1 one or more beans to form the association
+	 * @param OODBBean $beans1 one or more beans to form the association
 	 * @param OODBBean|array $beans2 one or more beans to form the association
 	 *
 	 * @return array
@@ -8969,7 +8957,7 @@ 
 	 * with reference bean(s) $bean. The query can be tuned using an
 	 * SQL snippet for additional filtering.
 	 *
-	 * @param OODBBean|array $bean     a bean object or an array of beans
+	 * @param OODBBean $bean     a bean object or an array of beans
 	 * @param string                 $type     type of bean you're interested in
 	 * @param string                 $sql      SQL snippet (optional)
 	 * @param array                  $bindings bindings for your SQL string
@@ -9010,8 +8998,8 @@ 
 	 * set to boolean TRUE this method will remove the beans without their consent,
 	 * bypassing FUSE. This can be used to improve performance.
 	 *
-	 * @param OODBBean $bean1 first bean
-	 * @param OODBBean $bean2 second bean
+	 * @param OODBBean $beans1 first bean
+	 * @param OODBBean $beans2 second bean
 	 * @param boolean          $fast  If TRUE, removes the entries by query without FUSE
 	 *
 	 * @return void
@@ -9093,7 +9081,6 @@ 
 	 * @param string                 $type      the type of beans you want
 	 * @param string                 $sql       SQL snippet for extra filtering
 	 * @param array                  $bindings  values to be inserted in SQL slots
-	 * @param boolean                $glue      whether the SQL should be prefixed with WHERE
 	 *
 	 * @return array
 	 */
@@ -10337,7 +10324,6 @@ 
 	 * Let's call this chilly mode, it's just like fluid mode except that
 	 * certain types (i.e. tables) aren't touched.
 	 *
-	 * @param boolean|array $trueFalse
 	 */
 	public static function freeze( $tf = TRUE )
 	{
@@ -10412,7 +10398,6 @@ 
 	 * in the latter case this method will attempt to load the specified bean
 	 * and THEN trash it.
 	 *
-	 * @param string|OODBBean|SimpleModel $bean bean you want to remove from database
 	 * @param integer $id (optional)
 	 *
 	 * @return void
@@ -10428,7 +10413,6 @@ 
 	 * the rest of the methods.
 	 *
 	 * @param string|array $typeOrBeanArray   type or bean array to import
-	 * @param integer      $number            number of beans to dispense
 	 * @param boolean	     $alwaysReturnArray if TRUE always returns the result as an array
 	 *
 	 * @return array|OODBBean
@@ -10630,7 +10614,6 @@ 
 	 * @see Finder::findMulti()
 	 *
 	 * @param array|string $types      a list of bean types to find
-	 * @param string|array $sqlOrArr   SQL query string or result set array
 	 * @param array        $bindings   SQL bindings
 	 * @param array        $remappings An array of remapping arrays containing closures
 	 *
@@ -10787,7 +10770,7 @@ 
 	 * Returns the insert ID for databases that support/require this
 	 * functionality. Alias for R::getAdapter()->getInsertID().
 	 *
-	 * @return mixed
+	 * @return integer
 	 */
 	public static function getInsertID()
 	{
@@ -10816,9 +10799,8 @@ 
 	 * @param OODBBean $bean  bean to be copied
 	 * @param array    $trail for internal usage, pass array()
 	 * @param boolean  $pid   for internal usage
-	 * @param array	   $white white list filter with bean types to duplicate
 	 *
-	 * @return array
+	 * @return OODBBean
 	 */
 	public static function dup( $bean, $trail = array(), $pid = FALSE, $filters = array() )
 	{
@@ -10846,9 +10828,8 @@ 
 	 * This is a simplified version of the deprecated R::dup() function.
 	 *
 	 * @param OODBBean $bean  bean to be copied
-	 * @param array	   $white white list filter with bean types to duplicate
 	 *
-	 * @return array
+	 * @return OODBBean
 	 */
 	public static function duplicate( $bean, $filters = array() )
 	{
@@ -11926,7 +11907,7 @@ 
 	 *
 	 * @param string $typeName bean type name
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	private function getListNames( $typeName )
 	{

Braces +281 added lines, -95 removed lines

@@ -82,7 +82,9 @@ 
 	 */
 	public function log()
 	{
-		if ( func_num_args() < 1 ) return;
+		if ( func_num_args() < 1 ) {
+		    return;
+		}
 
 		foreach ( func_get_args() as $argument ) {
 			if ( is_array( $argument ) ) {
@@ -100,7 +102,9 @@ 
 				}
 			}
 
-			if ( $this->mode === self::C_LOGGER_ECHO ) echo "<br>\n";
+			if ( $this->mode === self::C_LOGGER_ECHO ) {
+			    echo "<br>\n";
+			}
 		}
 	}
 	
@@ -161,7 +165,9 @@ 
 	{
 		$found = array();
 		foreach( $this->logs as $logEntry ) {
-			if ( strpos( $logEntry, $needle ) !== FALSE ) $found[] = $logEntry;
+			if ( strpos( $logEntry, $needle ) !== FALSE ) {
+			    $found[] = $logEntry;
+			}
 		}
 		return $found;
 	}
@@ -231,7 +237,9 @@ 
 	 */
 	protected function fillInValue( $value )
 	{
-		if ( is_null( $value ) ) $value = 'NULL';
+		if ( is_null( $value ) ) {
+		    $value = 'NULL';
+		}
 
 		$value = strval( $value );
 		if ( strlen( $value ) > ( $this->strLen ) ) {
@@ -257,7 +265,9 @@ 
 	protected function output( $str )
 	{
 		$this->logs[] = $str;
-		if ( !$this->mode ) echo $str .'<br />';
+		if ( !$this->mode ) {
+		    echo $str .'<br />';
+		}
 	}
 
 	/**
@@ -317,7 +327,9 @@ 
 	 */
 	public function log()
 	{
-		if ( func_num_args() < 1 ) return;
+		if ( func_num_args() < 1 ) {
+		    return;
+		}
 
 		$sql = func_get_arg( 0 );
 
@@ -684,7 +696,9 @@ 
 			//Unfortunately the code field is supposed to be int by default (php)
 			//So we need a property to convey the SQL State code.
 			$err = $e->getMessage();
-			if ( $this->loggingEnabled && $this->logger ) $this->logger->log( 'An error occurred: ' . $err );
+			if ( $this->loggingEnabled && $this->logger ) {
+			    $this->logger->log( 'An error occurred: ' . $err );
+			}
 			$exception = new SQL( $err, 0 );
 			$exception->setSQLState( $e->getCode() );
 			throw $exception;
@@ -784,7 +798,9 @@ 
 	 */
 	public function connect()
 	{
-		if ( $this->isConnected ) return;
+		if ( $this->isConnected ) {
+		    return;
+		}
 		try {
 			$user = $this->connectInfo['user'];
 			$pass = $this->connectInfo['pass'];
@@ -865,11 +881,19 @@ 
 	{
 		$arr = $this->GetAll( $sql, $bindings );
 		$res = NULL;
-		if ( !is_array( $arr ) ) return NULL;
-		if ( count( $arr ) === 0 ) return NULL;
+		if ( !is_array( $arr ) ) {
+		    return NULL;
+		}
+		if ( count( $arr ) === 0 ) {
+		    return NULL;
+		}
 		$row1 = array_shift( $arr );
-		if ( !is_array( $row1 ) ) return NULL;
-		if ( count( $row1 ) === 0 ) return NULL;
+		if ( !is_array( $row1 ) ) {
+		    return NULL;
+		}
+		if ( count( $row1 ) === 0 ) {
+		    return NULL;
+		}
 		$col1 = array_shift( $row1 );
 		return $col1;
 	}
@@ -1205,7 +1229,9 @@ 
 			&& $mode !== self::C_ERR_EXCEPTION
 			&& $mode !== self::C_ERR_FUNC
 			&& $mode !== self::C_ERR_FATAL
-		) throw new \Exception( 'Invalid error mode selected' );
+		) {
+		    throw new \Exception( 'Invalid error mode selected' );
+		}
 
 		if ( $mode === self::C_ERR_FUNC && !is_callable( $func ) ) {
 			throw new \Exception( 'Invalid error handler' );
@@ -1322,7 +1348,9 @@ 
 	public static function setMetaAll( $beans, $property, $value )
 	{
 		foreach( $beans as $bean ) {
-			if ( $bean instanceof OODBBean ) $bean->__info[ $property ] = $value;
+			if ( $bean instanceof OODBBean ) {
+			    $bean->__info[ $property ] = $value;
+			}
 		}
 
 		return $beans;
@@ -1645,7 +1673,9 @@ 
 
 		if ( $parents ) {
 			foreach ( $this as $key => $value ) {
-				if ( substr( $key, -3 ) != '_id' ) continue;
+				if ( substr( $key, -3 ) != '_id' ) {
+				    continue;
+				}
 
 				$prop = substr( $key, 0, strlen( $key ) - 3 );
 				$this->$prop;
@@ -1659,13 +1689,17 @@ 
 				$vn = array();
 
 				foreach ( $value as $i => $b ) {
-					if ( !( $b instanceof OODBBean ) ) continue;
+					if ( !( $b instanceof OODBBean ) ) {
+					    continue;
+					}
 					$vn[] = $b->export( $meta, FALSE, FALSE, $filters );
 					$value = $vn;
 				}
 			} elseif ( $value instanceof OODBBean ) {
 				if ( $hasFilters ) {
-					if ( !in_array( strtolower( $value->getMeta( 'type' ) ), $filters ) ) continue;
+					if ( !in_array( strtolower( $value->getMeta( 'type' ) ), $filters ) ) {
+					    continue;
+					}
 				}
 
 				$value = $value->export( $meta, $parents, FALSE, $filters );
@@ -1728,7 +1762,9 @@ 
 		unset( $this->properties[$property] );
 
 		$shadowKey = 'sys.shadow.'.$property;
-		if ( isset( $this->__info[ $shadowKey ] ) ) unset( $this->__info[$shadowKey] );
+		if ( isset( $this->__info[ $shadowKey ] ) ) {
+		    unset( $this->__info[$shadowKey] );
+		}
 
 		//also clear modifiers
 		$this->withSql    = '';
@@ -1895,7 +1931,9 @@ 
 	{
 		static $beautifulColumns = array();
 
-		if ( ctype_lower( $property ) ) return $property;
+		if ( ctype_lower( $property ) ) {
+		    return $property;
+		}
 
 		if (
 			( strpos( $property, 'own' ) === 0 && ctype_upper( substr( $property, 3, 1 ) ) )
@@ -2479,7 +2517,9 @@ 
 		}
 
 		if ( !is_null( $maxDepth ) ) {
-			if ( !$maxDepth-- ) return $this;
+			if ( !$maxDepth-- ) {
+			    return $this;
+			}
 		}
 
 		$oldFetchType = $this->fetchType;
@@ -2489,9 +2529,13 @@ 
 
 		$beans = $this->$property;
 
-		if ( $beans === NULL ) return $this;
+		if ( $beans === NULL ) {
+		    return $this;
+		}
 
-		if ( !is_array( $beans ) ) $beans = array( $beans );
+		if ( !is_array( $beans ) ) {
+		    $beans = array( $beans );
+		}
 
 		foreach( $beans as $bean ) {
 
@@ -2641,11 +2685,17 @@ 
 	 */
 	public function hasListChanged( $property )
 	{
-		if ( !array_key_exists( $property, $this->properties ) ) return FALSE;
+		if ( !array_key_exists( $property, $this->properties ) ) {
+		    return FALSE;
+		}
 		$diffAdded = array_diff_assoc( $this->properties[$property], $this->__info['sys.shadow.'.$property] );
-		if ( count( $diffAdded ) ) return TRUE;
+		if ( count( $diffAdded ) ) {
+		    return TRUE;
+		}
 		$diffMissing = array_diff_assoc( $this->__info['sys.shadow.'.$property], $this->properties[$property] );
-		if ( count( $diffMissing ) ) return TRUE;
+		if ( count( $diffMissing ) ) {
+		    return TRUE;
+		}
 		return FALSE;
 	}
 
@@ -2856,11 +2906,19 @@ 
 		$this->via = NULL;
 		$ids = $beanIndex = $references = array();
 
-		if ( strlen( $list ) < 4 ) throw new RedException('Invalid own-list.');
-		if ( strpos( $list, 'own') !== 0 ) throw new RedException('Only own-lists can be aggregated.');
-		if ( !ctype_upper( substr( $list, 3, 1 ) ) ) throw new RedException('Invalid own-list.');
+		if ( strlen( $list ) < 4 ) {
+		    throw new RedException('Invalid own-list.');
+		}
+		if ( strpos( $list, 'own') !== 0 ) {
+		    throw new RedException('Only own-lists can be aggregated.');
+		}
+		if ( !ctype_upper( substr( $list, 3, 1 ) ) ) {
+		    throw new RedException('Invalid own-list.');
+		}
 
-		if ( is_null( $type ) ) $type = $property;
+		if ( is_null( $type ) ) {
+		    $type = $property;
+		}
 
 		foreach( $this->$list as $bean ) {
 			$field = $property . '_id';
@@ -3320,7 +3378,9 @@ 
 		}
 
 		foreach ( $rows as $row ) {
-			if ( empty( $row ) ) continue;
+			if ( empty( $row ) ) {
+			    continue;
+			}
 
 			if ( count( $row ) > 2 ) {
             $key   = array_shift( $row );
@@ -3357,7 +3417,9 @@ 
 	{
 		$this->sql = $sql;
 
-		if ( !$noSignal ) $this->signal( 'sql_exec', $this );
+		if ( !$noSignal ) {
+		    $this->signal( 'sql_exec', $this );
+		}
 
 		return $this->db->GetOne( $sql, $bindings );
 	}
@@ -4257,7 +4319,9 @@ 
 	public static function renameAssociation( $from, $to = NULL )
 	{
 		if ( is_array( $from ) ) {
-			foreach ( $from as $key => $value ) self::$renames[$key] = $value;
+			foreach ( $from as $key => $value ) {
+			    self::$renames[$key] = $value;
+			}
 
 			return;
 		}
@@ -4438,7 +4502,9 @@ 
 	private function putResultInCache( $cacheTag, $key, $values )
 	{
 		if ( isset( $this->cache[$cacheTag] ) ) {
-			if ( count( $this->cache[$cacheTag] ) > $this->maxCacheSizePerType ) array_shift( $this->cache[$cacheTag] );
+			if ( count( $this->cache[$cacheTag] ) > $this->maxCacheSizePerType ) {
+			    array_shift( $this->cache[$cacheTag] );
+			}
 		} else {
 			$this->cache[$cacheTag] = array();
 		}
@@ -4470,12 +4536,16 @@ 
 
 		$sqlConditions = array();
 		foreach ( $conditions as $column => $values ) {
-			if ( !count( $values ) ) continue;
+			if ( !count( $values ) ) {
+			    continue;
+			}
 
 			$sql = $this->esc( $column );
 			$sql .= ' IN ( ';
 
-			if ( !is_array( $values ) ) $values = array( $values );
+			if ( !is_array( $values ) ) {
+			    $values = array( $values );
+			}
 
 			// If it's safe to skip bindings, do so...
 			if ( ctype_digit( implode( '', $values ) ) ) {
@@ -4516,7 +4586,9 @@ 
 			$sql = implode( ' AND ', $sqlConditions );
 			$sql = " WHERE ( $sql ) ";
 
-			if ( $addSql ) $sql .= $addSql;
+			if ( $addSql ) {
+			    $sql .= $addSql;
+			}
 		} elseif ( $addSql ) {
 			$sql = $addSql;
 		}
@@ -4570,7 +4642,9 @@ 
 		}
 
 		foreach( $map as $key ) {
-			if ( $key['from'] === $property ) return $key;
+			if ( $key['from'] === $property ) {
+			    return $key;
+			}
 		}
 		return NULL;
 	}
@@ -4781,7 +4855,9 @@ 
 			$result = $this->adapter->getCell( "INSERT INTO $table (id) VALUES($default) $suffix" );
 		}
 
-		if ( $suffix ) return $result;
+		if ( $suffix ) {
+		    return $result;
+		}
 
 		$last_id = $this->adapter->getInsertID();
 
@@ -4939,8 +5015,9 @@ 
 	 */
 	public function writeJoin( $type, $targetType, $leftRight = 'LEFT' )
 	{
-		if ( $leftRight !== 'LEFT' && $leftRight !== 'RIGHT' && $leftRight !== 'INNER' )
-			throw new RedException( 'Invalid JOIN.' );
+		if ( $leftRight !== 'LEFT' && $leftRight !== 'RIGHT' && $leftRight !== 'INNER' ) {
+					throw new RedException( 'Invalid JOIN.' );
+		}
 
 		$table = $this->esc( $type );
 		$targetTable = $this->esc( $targetType );
@@ -5209,7 +5286,9 @@ 
 	 */
 	public function widenColumn( $type, $property, $dataType )
 	{
-		if ( !isset($this->typeno_sqltype[$dataType]) ) return FALSE;
+		if ( !isset($this->typeno_sqltype[$dataType]) ) {
+		    return FALSE;
+		}
 
 		$table   = $this->esc( $type );
 		$column  = $this->esc( $property );
@@ -5316,7 +5395,9 @@ 
 		foreach( $keys as $key ) {
 			if (
 				$key['from'] === $field
-			) return $key['table'];
+			) {
+			    return $key['table'];
+			}
 		}
 		return NULL;
 	}
@@ -5512,8 +5593,12 @@ 
 	{
 		$this->svalue = $value;
 
-		if ( is_null( $value ) ) return MySQL::C_DATATYPE_BOOL;
-		if ( $value === INF ) return MySQL::C_DATATYPE_TEXT7;
+		if ( is_null( $value ) ) {
+		    return MySQL::C_DATATYPE_BOOL;
+		}
+		if ( $value === INF ) {
+		    return MySQL::C_DATATYPE_TEXT7;
+		}
 
 		if ( $flagSpecial ) {
 			if ( preg_match( '/^\d{4}\-\d\d-\d\d$/', $value ) ) {
@@ -5538,7 +5623,9 @@ 
 			return MySQL::C_DATATYPE_BOOL;
 		}
 
-		if ( is_float( $value ) ) return self::C_DATATYPE_DOUBLE;
+		if ( is_float( $value ) ) {
+		    return self::C_DATATYPE_DOUBLE;
+		}
 
 		if ( !$this->startsWithZeros( $value ) ) {
 
@@ -5595,7 +5682,9 @@ 
 	{
 		$tableNoQ = $this->esc( $type, TRUE );
 		$columns = array();
-		foreach( $properties as $key => $column ) $columns[$key] = $this->esc( $column );
+		foreach( $properties as $key => $column ) {
+		    $columns[$key] = $this->esc( $column );
+		}
 		$table = $this->esc( $type );
 		sort( $columns ); // Else we get multiple indexes due to order-effects
 		$name = 'UQ_' . sha1( implode( ',', $columns ) );
@@ -5640,7 +5729,9 @@ 
 		$targetFieldNoQ = $this->esc( $targetProperty, TRUE );
 		$tableNoQ = $this->esc( $type, TRUE );
 		$fieldNoQ = $this->esc( $property, TRUE );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) {
+		    return FALSE;
+		}
 
 		//Widen the column if it's incapable of representing a foreign key (at least INT).
 		$columns = $this->getColumns( $tableNoQ );
@@ -5792,7 +5883,9 @@ 
 
 		$oldColumnNames = array_keys( $this->getColumns( $table ) );
 
-		foreach ( $oldColumnNames as $k => $v ) $oldColumnNames[$k] = "`$v`";
+		foreach ( $oldColumnNames as $k => $v ) {
+		    $oldColumnNames[$k] = "`$v`";
+		}
 
 		$q[] = "CREATE TEMPORARY TABLE tmp_backup(" . implode( ",", $oldColumnNames ) . ");";
 		$q[] = "INSERT INTO tmp_backup SELECT * FROM `$table`;";
@@ -5818,16 +5911,22 @@ 
 		foreach ( $tableMap['indexes'] as $name => $index ) {
 			if ( strpos( $name, 'UQ_' ) === 0 ) {
 				$cols = explode( '__', substr( $name, strlen( 'UQ_' . $table ) ) );
-				foreach ( $cols as $k => $v ) $cols[$k] = "`$v`";
+				foreach ( $cols as $k => $v ) {
+				    $cols[$k] = "`$v`";
+				}
 				$q[] = "CREATE UNIQUE INDEX $name ON `$table` (" . implode( ',', $cols ) . ")";
-			} else $q[] = "CREATE INDEX $name ON `$table` ({$index['name']}) ";
+			} else {
+			    $q[] = "CREATE INDEX $name ON `$table` ({$index['name']}) ";
+			}
 		}
 
 		$q[] = "INSERT INTO `$table` SELECT * FROM tmp_backup;";
 		$q[] = "DROP TABLE tmp_backup;";
 		$q[] = "PRAGMA foreign_keys = 1 ";
 
-		foreach ( $q as $sq ) $this->adapter->exec( $sq );
+		foreach ( $q as $sq ) {
+		    $this->adapter->exec( $sq );
+		}
 	}
 
 	/**
@@ -5874,9 +5973,13 @@ 
 		$targetColumn    = $this->esc( $targetProperty, TRUE );
 
 		$tables = $this->getTables();
-		if ( !in_array( $targetTable, $tables ) ) return FALSE;
+		if ( !in_array( $targetTable, $tables ) ) {
+		    return FALSE;
+		}
 
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $table, $column ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $table, $column ) ) ) {
+		    return FALSE;
+		}
 		$t = $this->getTable( $table );
 		$consSQL = ( $constraint ? 'CASCADE' : 'SET NULL' );
 		$label   = 'from_' . $column . '_to_table_' . $targetTable . '_col_' . $targetColumn;
@@ -5953,14 +6056,24 @@ 
 	{
 		$this->svalue = $value;
 
-		if ( $value === NULL ) return self::C_DATATYPE_INTEGER;
-		if ( $value === INF ) return self::C_DATATYPE_TEXT;
+		if ( $value === NULL ) {
+		    return self::C_DATATYPE_INTEGER;
+		}
+		if ( $value === INF ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
-		if ( $this->startsWithZeros( $value ) ) return self::C_DATATYPE_TEXT;
+		if ( $this->startsWithZeros( $value ) ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
-		if ( $value === TRUE || $value === FALSE )  return self::C_DATATYPE_INTEGER;
+		if ( $value === TRUE || $value === FALSE ) {
+		    return self::C_DATATYPE_INTEGER;
+		}
 		
-		if ( is_numeric( $value ) && ( intval( $value ) == $value ) && $value < 2147483648 && $value > -2147483648 ) return self::C_DATATYPE_INTEGER;
+		if ( is_numeric( $value ) && ( intval( $value ) == $value ) && $value < 2147483648 && $value > -2147483648 ) {
+		    return self::C_DATATYPE_INTEGER;
+		}
 
 		if ( ( is_numeric( $value ) && $value < 2147483648 && $value > -2147483648)
 			|| preg_match( '/\d{4}\-\d\d\-\d\d/', $value )
@@ -6037,7 +6150,9 @@ 
 		$columnsRaw = $this->adapter->get( "PRAGMA table_info('$table')" );
 
 		$columns    = array();
-		foreach ( $columnsRaw as $r ) $columns[$r['name']] = $r['type'];
+		foreach ( $columnsRaw as $r ) {
+		    $columns[$r['name']] = $r['type'];
+		}
 
 		return $columns;
 	}
@@ -6078,7 +6193,9 @@ 
 	public function addIndex( $type, $name, $column )
 	{
 		$columns = $this->getColumns( $type );
-		if ( !isset( $columns[$column] ) ) return FALSE;
+		if ( !isset( $columns[$column] ) ) {
+		    return FALSE;
+		}
 
 		$table  = $this->esc( $type );
 		$name   = preg_replace( '/\W/', '', $name );
@@ -6337,7 +6454,9 @@ 
 	{
 		$this->svalue = $value;
 
-		if ( $value === INF ) return self::C_DATATYPE_TEXT;
+		if ( $value === INF ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
 		if ( $flagSpecial && $value ) {
 			if ( preg_match( '/^\d{4}\-\d\d-\d\d$/', $value ) ) {
@@ -6369,9 +6488,13 @@ 
 			}
 		}
 
-		if ( is_float( $value ) ) return self::C_DATATYPE_DOUBLE;
+		if ( is_float( $value ) ) {
+		    return self::C_DATATYPE_DOUBLE;
+		}
 
-		if ( $this->startsWithZeros( $value ) ) return self::C_DATATYPE_TEXT;
+		if ( $this->startsWithZeros( $value ) ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 		
 		if ( $value === FALSE || $value === TRUE || $value === NULL || ( is_numeric( $value )
 				&& AQueryWriter::canBeTreatedAsInt( $value )
@@ -6393,7 +6516,9 @@ 
 	{
 		$r = ( isset( $this->sqltype_typeno[$typedescription] ) ) ? $this->sqltype_typeno[$typedescription] : 99;
 
-		if ( $includeSpecials ) return $r;
+		if ( $includeSpecials ) {
+		    return $r;
+		}
 
 		if ( $r >= QueryWriter::C_DATATYPE_RANGE_SPECIAL ) {
 			return self::C_DATATYPE_SPECIFIED;
@@ -6425,7 +6550,9 @@ 
 	{
 		$tableNoQ = $this->esc( $type, TRUE );
 		$columns = array();
-		foreach( $properties as $key => $column ) $columns[$key] = $this->esc( $column );
+		foreach( $properties as $key => $column ) {
+		    $columns[$key] = $this->esc( $column );
+		}
 		$table = $this->esc( $type );
 		sort( $columns ); //else we get multiple indexes due to order-effects
 		$name = "UQ_" . sha1( $table . implode( ',', $columns ) );
@@ -6481,7 +6608,9 @@ 
 		$targetField = $this->esc( $targetProperty );
 		$tableNoQ = $this->esc( $type, TRUE );
 		$fieldNoQ = $this->esc( $property, TRUE );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) {
+		    return FALSE;
+		}
 		try{
 			$delRule = ( $isDep ? 'CASCADE' : 'SET NULL' );
 			$this->adapter->exec( "ALTER TABLE {$table}
@@ -6787,7 +6916,9 @@ 
 
 			$myFieldLink = $bean->getMeta( 'type' ) . '_id';
 			$alias = $bean->getMeta( 'sys.alias.' . $trash->getMeta( 'type' ) );
-			if ( $alias ) $myFieldLink = $alias . '_id';
+			if ( $alias ) {
+			    $myFieldLink = $alias . '_id';
+			}
 
 			if ( $trash->getMeta( 'sys.garbage' ) === true ) {
 				$this->trash( $trash );
@@ -6864,7 +6995,9 @@ 
 	{
 		$linkField        = $property . '_id';
 		$id = $this->prepareEmbeddedBean( $value );
-		if ($bean->$linkField != $id) $bean->$linkField = $id;
+		if ($bean->$linkField != $id) {
+		    $bean->$linkField = $id;
+		}
 		$bean->setMeta( 'cast.' . $linkField, 'id' );
 		$embeddedBeans[$linkField] = $value;
 		unset( $bean->$property );
@@ -7367,7 +7500,9 @@ 
 
 				$myFieldLink = $beanType . '_id';
 				$alias = $bean->getMeta( 'sys.alias.' . $addition->getMeta( 'type' ) );
-				if ( $alias ) $myFieldLink = $alias . '_id';
+				if ( $alias ) {
+				    $myFieldLink = $alias . '_id';
+				}
 
 				$addition->$myFieldLink = $bean->id;
 				$addition->setMeta( 'cast.' . $myFieldLink, 'id' );
@@ -7629,7 +7764,9 @@ 
 
 				$myFieldLink = $beanType . '_id';
 				$alias = $bean->getMeta( 'sys.alias.' . $addition->getMeta( 'type' ) );
-				if ( $alias ) $myFieldLink = $alias . '_id';
+				if ( $alias ) {
+				    $myFieldLink = $alias . '_id';
+				}
 
 				$addition->$myFieldLink = $bean->id;
 				$addition->setMeta( 'cast.' . $myFieldLink, 'id' );
@@ -7948,7 +8085,9 @@ 
 	public function dispense( $type, $number = 1, $alwaysReturnArray = FALSE )
 	{
 		if ( $number < 1 ) {
-			if ( $alwaysReturnArray ) return array();
+			if ( $alwaysReturnArray ) {
+			    return array();
+			}
 			return NULL;
 		}
 
@@ -8258,8 +8397,12 @@ 
 		list( $type, $property ) = explode( '.', $field );
 		$mode = ($mode === 'write') ? QueryWriter::C_SQLFILTER_WRITE : QueryWriter::C_SQLFILTER_READ;
 
-		if ( !isset( self::$sqlFilters[$mode] ) ) self::$sqlFilters[$mode] = array();
-		if ( !isset( self::$sqlFilters[$mode][$type] ) ) self::$sqlFilters[$mode][$type] = array();
+		if ( !isset( self::$sqlFilters[$mode] ) ) {
+		    self::$sqlFilters[$mode] = array();
+		}
+		if ( !isset( self::$sqlFilters[$mode][$type] ) ) {
+		    self::$sqlFilters[$mode][$type] = array();
+		}
 
 		if ( is_null( $function ) ) {
 			unset( self::$sqlFilters[$mode][$type][$property] );
@@ -8619,7 +8762,9 @@ 
 	{
 		if ( count( $conditions ) > 0 ) {
 			foreach( $conditions as $key => $condition ) {
-				if ( !count( $condition ) ) unset( $conditions[$key] );
+				if ( !count( $condition ) ) {
+				    unset( $conditions[$key] );
+				}
 			}
 		}
 
@@ -8694,7 +8839,9 @@ 
 	 */
 	public function findMulti( $types, $sql, $bindings = array(), $remappings = array(), $queryTemplate = ' %s.%s AS %s__%s' )
 	{
-		if ( !is_array( $types ) ) $types = explode( ',', $types );
+		if ( !is_array( $types ) ) {
+		    $types = explode( ',', $types );
+		}
 		if ( !is_array( $sql ) ) {
 			$writer = $this->toolbox->getWriter();
 			$adapter = $this->toolbox->getDatabaseAdapter();
@@ -8732,8 +8879,12 @@ 
 						$wannaBean[$property] = $value;
 					}
 				}
-				if ( !isset( $wannaBean['id'] ) ) continue;
-				if ( is_null( $wannaBean['id'] ) ) continue;
+				if ( !isset( $wannaBean['id'] ) ) {
+				    continue;
+				}
+				if ( is_null( $wannaBean['id'] ) ) {
+				    continue;
+				}
 				$wannaBeans[$type][$wannaBean['id']] = $wannaBean;
 			}
 		}
@@ -8752,7 +8903,9 @@ 
 			$do      = $remapping['do'];
 			foreach( $beans[$a] as $bean ) {
 				foreach( $beans[$b] as $putBean ) {
-					if ( $matcher( $bean, $putBean, $beans ) ) $do( $bean, $putBean, $beans, $remapping );
+					if ( $matcher( $bean, $putBean, $beans ) ) {
+					    $do( $bean, $putBean, $beans, $remapping );
+					}
 				}
 			}
 		}
@@ -9865,7 +10018,9 @@ 
 		}
 		
 		foreach( $values as $enumItem ) {
-				if ( $enumItem->name === $value ) return $enumItem;	
+				if ( $enumItem->name === $value ) {
+				    return $enumItem;
+				}
 		}
 		
 		$newEnumItems = $this->dispenseLabels( $type, array( $value ) );
@@ -10062,7 +10217,9 @@ 
 	 */
 	public static function testConnection()
 	{
-		if ( !isset( self::$adapter ) ) return FALSE;
+		if ( !isset( self::$adapter ) ) {
+		    return FALSE;
+		}
 
 		$database = self::$adapter->getDatabase();
 		try {
@@ -10212,7 +10369,9 @@ 
                   );
 
 		$wkey = trim( strtolower( $dbType ) );
-		if ( !isset( $writers[$wkey] ) ) trigger_error( 'Unsupported DSN: '.$wkey );
+		if ( !isset( $writers[$wkey] ) ) {
+		    trigger_error( 'Unsupported DSN: '.$wkey );
+		}
 		$writerClass = '\\RedBeanPHP\\QueryWriter\\'.$writers[$wkey];
 		$writer      = new $writerClass( $adapter );
 		$redbean     = new OODB( $writer, $frozen );
@@ -10419,7 +10578,9 @@ 
 	 */
 	public static function trash( $beanOrType, $id = NULL )
 	{
-		if ( is_string( $beanOrType ) ) return self::trash( self::load( $beanOrType, $id ) );
+		if ( is_string( $beanOrType ) ) {
+		    return self::trash( self::load( $beanOrType, $id ) );
+		}
 		return self::$redbean->trash( $beanOrType );
 	}
 
@@ -10441,8 +10602,12 @@ 
 
 			if ( !isset( $typeOrBeanArray['_type'] ) ) {
 				$list = array();
-				foreach( $typeOrBeanArray as $beanArray ) if ( !( is_array( $beanArray ) && isset( $beanArray['_type'] ) ) ) throw new RedException( 'Invalid Array Bean' );
-				foreach( $typeOrBeanArray as $beanArray ) $list[] = self::dispense( $beanArray );
+				foreach( $typeOrBeanArray as $beanArray ) {
+				    if ( !( is_array( $beanArray ) && isset( $beanArray['_type'] ) ) ) throw new RedException( 'Invalid Array Bean' );
+				}
+				foreach( $typeOrBeanArray as $beanArray ) {
+				    $list[] = self::dispense( $beanArray );
+				}
 				return $list;
 			}
 
@@ -10894,7 +11059,9 @@ 
 	 */
 	public static function useExportCase( $caseStyle = 'default' )
 	{
-		if ( !in_array( $caseStyle, array( 'default', 'camel', 'dolphin' ) ) ) throw new RedException( 'Invalid case selected.' );
+		if ( !in_array( $caseStyle, array( 'default', 'camel', 'dolphin' ) ) ) {
+		    throw new RedException( 'Invalid case selected.' );
+		}
 		self::$exportCaseStyle = $caseStyle;
 	}
 
@@ -11095,7 +11262,9 @@ 
 	 */
 	public static function begin()
 	{
-		if ( !self::$redbean->isFrozen() ) return FALSE;
+		if ( !self::$redbean->isFrozen() ) {
+		    return FALSE;
+		}
 
 		self::$adapter->startTransaction();
 
@@ -11110,7 +11279,9 @@ 
 	 */
 	public static function commit()
 	{
-		if ( !self::$redbean->isFrozen() ) return FALSE;
+		if ( !self::$redbean->isFrozen() ) {
+		    return FALSE;
+		}
 
 		self::$adapter->commit();
 
@@ -11125,7 +11296,9 @@ 
 	 */
 	public static function rollback()
 	{
-		if ( !self::$redbean->isFrozen() ) return FALSE;
+		if ( !self::$redbean->isFrozen() ) {
+		    return FALSE;
+		}
 
 		self::$adapter->rollback();
 
@@ -11170,8 +11343,11 @@ 
 	public static function flat( $array, $result = array() )
 	{
 		foreach( $array as $value ) {
-			if ( is_array( $value ) ) $result = self::flat( $value, $result );
-			else $result[] = $value;
+			if ( is_array( $value ) ) {
+			    $result = self::flat( $value, $result );
+			} else {
+			    $result[] = $value;
+			}
 		}
 		return $result;
 	}
@@ -11350,7 +11526,9 @@ 
 	 */
 	public static function isoDateTime( $time = NULL )
 	{
-		if ( !$time ) $time = time();
+		if ( !$time ) {
+		    $time = time();
+		}
 
 		return @date( 'Y-m-d H:i:s', $time );
 	}
@@ -11975,7 +12153,9 @@ 
 	 */
 	protected function duplicate( OODBBean $bean, $trail = array(), $preserveIDs = FALSE )
 	{
-		if ( $this->inTrailOrAdd( $trail, $bean ) ) return $bean;
+		if ( $this->inTrailOrAdd( $trail, $bean ) ) {
+		    return $bean;
+		}
 
 		$type = $bean->getMeta( 'type' );
 
@@ -11983,7 +12163,9 @@ 
 		foreach ( $this->tables as $table ) {
 
 			if ( !empty( $this->filters ) ) {
-				if ( !in_array( $table, $this->filters ) ) continue;
+				if ( !in_array( $table, $this->filters ) ) {
+				    continue;
+				}
 			}
 
 			list( $owned, $shared ) = $this->getListNames( $table );
@@ -12216,8 +12398,12 @@ 
 			$array[]   = $duplicate->export( FALSE, $parents, FALSE, $filters );
 		}
 
-		if ( $caseStyle === 'camel' ) $array = $this->camelfy( $array );
-		if ( $caseStyle === 'dolphin' ) $array = $this->camelfy( $array, true );
+		if ( $caseStyle === 'camel' ) {
+		    $array = $this->camelfy( $array );
+		}
+		if ( $caseStyle === 'dolphin' ) {
+		    $array = $this->camelfy( $array, true );
+		}
 
 		return $array;
 	}

Sistema/Nucleo/CFBasedatos.php

Doc Comments +6 added lines

@@ -62,10 +62,16 @@
         }
     }
 
+    /**
+     * @param string $query
+     */
     public function consulta($query) {
         $this->stmt = $this->dbh->prepare($query);
     }
 
+    /**
+     * @param string $param
+     */
     public function enlace($param, $value, $type = null) {//bind
         if (is_null($type)) {
             switch (true) {

vendor/composer/ClassLoader.php

Doc Comments +4 added lines

@@ -341,6 +341,10 @@
         return $file;
     }
 
+    /**
+     * @param string $class
+     * @param string $ext
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup

vendor/symfony/console/Symfony/Component/Console/Application.php

Doc Comments +6 added lines

@@ -1098,6 +1098,9 @@ 
         $this->defaultCommand = $commandName;
     }
 
+    /**
+     * @param string $string
+     */
     private function stringWidth($string)
     {
         if (!function_exists('mb_strwidth')) {
@@ -1111,6 +1114,9 @@ 
         return mb_strwidth($string, $encoding);
     }
 
+    /**
+     * @param integer $width
+     */
     private function splitStringByWidth($string, $width)
     {
         // str_split is not suitable for multi-byte characters, we should use preg_split to get char array properly.