webcol / Calima

Sistema/librerias/rb.php

Unused Use Statements -23 removed lines

@@ -38,7 +38,6 @@ 
 
 use RedBeanPHP\Logger as Logger;
 use RedBeanPHP\RedException as RedException;
-use RedBeanPHP\RedException\Security as Security;
 
 /**
  * Logger. Provides a basic logging function for RedBeanPHP.
@@ -172,8 +171,6 @@ 
 
 use RedBeanPHP\Logger as Logger;
 use RedBeanPHP\Logger\RDefault as RDefault;
-use RedBeanPHP\RedException as RedException;
-use RedBeanPHP\RedException\Security as Security;
 
 /**
  * Debug logger.
@@ -524,7 +521,6 @@ 
 use RedBeanPHP\QueryWriter\AQueryWriter as AQueryWriter;
 use RedBeanPHP\RedException\SQL as SQL;
 use RedBeanPHP\Logger\RDefault as RDefault;
-use RedBeanPHP\PDOCompatible as PDOCompatible;
 use RedBeanPHP\Cursor\PDOCursor as PDOCursor;
 
 /**
@@ -4151,7 +4147,6 @@ 
 use RedBeanPHP\Adapter\DBAdapter as DBAdapter;
 use RedBeanPHP\RedException as RedException;
 use RedBeanPHP\QueryWriter as QueryWriter;
-use RedBeanPHP\OODBBean as OODBBean;
 use RedBeanPHP\RedException\SQL as SQLException;
 
 /**
@@ -6594,17 +6589,13 @@ 
 namespace RedBeanPHP {
 
 use RedBeanPHP\OODBBean as OODBBean;
-use RedBeanPHP\Observable as Observable;
 use RedBeanPHP\Adapter\DBAdapter as DBAdapter;
-use RedBeanPHP\BeanHelper\FacadeBeanHelper as FacadeBeanHelper;
 use RedBeanPHP\QueryWriter as QueryWriter;
 use RedBeanPHP\RedException\Security as Security;
 use RedBeanPHP\SimpleModel as SimpleModel;
-use RedBeanPHP\BeanHelper as BeanHelper;
 use RedBeanPHP\RedException\SQL as SQLException;
 use RedBeanPHP\QueryWriter\AQueryWriter as AQueryWriter;
 use RedBeanPHP\OODB as OODB;
-use RedBeanPHP\Cursor as Cursor;
 use RedBeanPHP\Cursor\NullCursor as NullCursor;
 
 /**
@@ -7205,16 +7196,10 @@ 
 namespace RedBeanPHP\Repository {
 
 use RedBeanPHP\OODBBean as OODBBean;
-use RedBeanPHP\Observable as Observable;
-use RedBeanPHP\Adapter\DBAdapter as DBAdapter;
-use RedBeanPHP\BeanHelper\FacadeBeanHelper as FacadeBeanHelper;
 use RedBeanPHP\QueryWriter as QueryWriter;
 use RedBeanPHP\RedException as RedException;
 use RedBeanPHP\RedException\Security as Security;
-use RedBeanPHP\SimpleModel as SimpleModel;
-use RedBeanPHP\BeanHelper as BeanHelper;
 use RedBeanPHP\RedException\SQL as SQLException;
-use RedBeanPHP\QueryWriter\AQueryWriter as AQueryWriter;
 use RedBeanPHP\Repository as Repository;
 
 /**
@@ -7530,16 +7515,10 @@ 
 namespace RedBeanPHP\Repository {
 
 use RedBeanPHP\OODBBean as OODBBean;
-use RedBeanPHP\Observable as Observable;
-use RedBeanPHP\Adapter\DBAdapter as DBAdapter;
-use RedBeanPHP\BeanHelper\FacadeBeanHelper as FacadeBeanHelper;
 use RedBeanPHP\QueryWriter as QueryWriter;
 use RedBeanPHP\RedException as RedException;
 use RedBeanPHP\RedException\Security as Security;
-use RedBeanPHP\SimpleModel as SimpleModel;
-use RedBeanPHP\BeanHelper as BeanHelper;
 use RedBeanPHP\RedException\SQL as SQLException;
-use RedBeanPHP\QueryWriter\AQueryWriter as AQueryWriter;
 use RedBeanPHP\Repository as Repository;
 
 /**
@@ -9184,7 +9163,6 @@ 
 use RedBeanPHP\BeanHelper as BeanHelper;
 use RedBeanPHP\Facade as Facade;
 use RedBeanPHP\OODBBean as OODBBean;
-use RedBeanPHP\SimpleModelHelper as SimpleModelHelper;
 
 /**
  * Bean Helper.
@@ -9410,7 +9388,6 @@ 
 namespace RedBeanPHP {
 
 use RedBeanPHP\Observer as Observer;
-use RedBeanPHP\OODBBean as OODBBean;
 use RedBeanPHP\Observable as Observable;
 
 /**

Spacing +1847 added lines, -1847 removed lines

@@ -82,25 +82,25 @@ 
 	 */
 	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 ) ) {
-				$log = print_r( $argument, TRUE );
-				if ( $this->mode === self::C_LOGGER_ECHO ) {
+		foreach (func_get_args() as $argument) {
+			if (is_array($argument)) {
+				$log = print_r($argument, TRUE);
+				if ($this->mode === self::C_LOGGER_ECHO) {
 					echo $log;
 				} else {
 					$this->logs[] = $log;
 				}
 			} else {
-				if ( $this->mode === self::C_LOGGER_ECHO ) {
+				if ($this->mode === self::C_LOGGER_ECHO) {
 					echo $argument;
 				} else {
 					$this->logs[] = $argument;
 				}
 			}
 
-			if ( $this->mode === self::C_LOGGER_ECHO ) echo "<br>\n";
+			if ($this->mode === self::C_LOGGER_ECHO) echo "<br>\n";
 		}
 	}
 	
@@ -138,10 +138,10 @@ 
 	 * 
 	 * @return self
 	 */
-	public function setMode( $mode )
+	public function setMode($mode)
 	{
-		if ($mode !== self::C_LOGGER_ARRAY && $mode !== self::C_LOGGER_ECHO ) {
-			throw new RedException( 'Invalid mode selected for logger, use C_LOGGER_ARRAY or C_LOGGER_ECHO.' );
+		if ($mode !== self::C_LOGGER_ARRAY && $mode !== self::C_LOGGER_ECHO) {
+			throw new RedException('Invalid mode selected for logger, use C_LOGGER_ARRAY or C_LOGGER_ECHO.');
 		}
 		$this->mode = $mode;
 		return $this;
@@ -157,11 +157,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function grep( $needle )
+	public function grep($needle)
 	{
 		$found = array();
-		foreach( $this->logs as $logEntry ) {
-			if ( strpos( $logEntry, $needle ) !== FALSE ) $found[] = $logEntry;
+		foreach ($this->logs as $logEntry) {
+			if (strpos($logEntry, $needle) !== FALSE) $found[] = $logEntry;
 		}
 		return $found;
 	}
@@ -205,17 +205,17 @@ 
 	 *
 	 * @return string
 	 */
-	private function writeQuery( $newSql, $newBindings )
+	private function writeQuery($newSql, $newBindings)
 	{
 		//avoid str_replace collisions: slot1 and slot10 (issue 407).
-		uksort( $newBindings, function( $a, $b ) {
-			return ( strlen( $b ) - strlen( $a ) );
+		uksort($newBindings, function($a, $b) {
+			return (strlen($b) - strlen($a));
 		} );
 
 		$newStr = $newSql;
-		foreach( $newBindings as $slot => $value ) {
-			if ( strpos( $slot, ':' ) === 0 ) {
-				$newStr = str_replace( $slot, $this->fillInValue( $value ), $newStr );
+		foreach ($newBindings as $slot => $value) {
+			if (strpos($slot, ':') === 0) {
+				$newStr = str_replace($slot, $this->fillInValue($value), $newStr);
 			}
 		}
 		return $newStr;
@@ -229,17 +229,17 @@ 
 	 *
 	 * @return string
 	 */
-	protected function fillInValue( $value )
+	protected function fillInValue($value)
 	{
-		if ( is_null( $value ) ) $value = 'NULL';
+		if (is_null($value)) $value = 'NULL';
 
-		$value = strval( $value );
-		if ( strlen( $value ) > ( $this->strLen ) ) {
-			$value = substr( $value, 0, ( $this->strLen ) ).'... ';
+		$value = strval($value);
+		if (strlen($value) > ($this->strLen)) {
+			$value = substr($value, 0, ($this->strLen)) . '... ';
 		}
 
-		if ( !is_numeric( $value ) && $value !== 'NULL') {
-			$value = '\''.$value.'\'';
+		if (!is_numeric($value) && $value !== 'NULL') {
+			$value = '\'' . $value . '\'';
 		}
 
 		return $value;
@@ -254,10 +254,10 @@ 
 	 *
 	 * @return void
 	 */
-	protected function output( $str )
+	protected function output($str)
 	{
 		$this->logs[] = $str;
-		if ( !$this->mode ) echo $str .'<br />';
+		if (!$this->mode) echo $str . '<br />';
 	}
 
 	/**
@@ -268,15 +268,15 @@ 
 	 *
 	 * @return string
 	 */
-	protected function normalizeSlots( $sql )
+	protected function normalizeSlots($sql)
 	{
 		$i = 0;
 		$newSql = $sql;
-		while($i < 20 && strpos($newSql, '?') !== FALSE ){
-			$pos   = strpos( $newSql, '?' );
-			$slot  = ':slot'.$i;
-			$begin = substr( $newSql, 0, $pos );
-			$end   = substr( $newSql, $pos+1 );
+		while ($i < 20 && strpos($newSql, '?') !== FALSE) {
+			$pos   = strpos($newSql, '?');
+			$slot  = ':slot' . $i;
+			$begin = substr($newSql, 0, $pos);
+			$end   = substr($newSql, $pos + 1);
 			$newSql = $begin . $slot . $end;
 			$i++;
 		}
@@ -291,13 +291,13 @@ 
 	 *
 	 * @return array
 	 */
-	protected function normalizeBindings( $bindings )
+	protected function normalizeBindings($bindings)
 	{
 		$i = 0;
 		$newBindings = array();
-		foreach( $bindings as $key => $value ) {
-			if ( is_numeric($key) ) {
-				$newKey = ':slot'.$i;
+		foreach ($bindings as $key => $value) {
+			if (is_numeric($key)) {
+				$newKey = ':slot' . $i;
 				$newBindings[$newKey] = $value;
 				$i++;
 			} else {
@@ -317,24 +317,24 @@ 
 	 */
 	public function log()
 	{
-		if ( func_num_args() < 1 ) return;
+		if (func_num_args() < 1) return;
 
-		$sql = func_get_arg( 0 );
+		$sql = func_get_arg(0);
 
-		if ( func_num_args() < 2) {
+		if (func_num_args() < 2) {
 			$bindings = array();
 		} else {
-			$bindings = func_get_arg( 1 );
+			$bindings = func_get_arg(1);
 		}
 
-		if ( !is_array( $bindings ) ) {
-			return $this->output( $sql );
+		if (!is_array($bindings)) {
+			return $this->output($sql);
 		}
 
-		$newSql = $this->normalizeSlots( $sql );
-		$newBindings = $this->normalizeBindings( $bindings );
-		$newStr = $this->writeQuery( $newSql, $newBindings );
-		$this->output( $newStr );
+		$newSql = $this->normalizeSlots($sql);
+		$newBindings = $this->normalizeBindings($bindings);
+		$newStr = $this->writeQuery($newSql, $newBindings);
+		$this->output($newStr);
 	}
 
 	/**
@@ -346,7 +346,7 @@ 
 	 *
 	 * @return self
 	 */
-	public function setParamStringLength( $len = 20 )
+	public function setParamStringLength($len = 20)
 	{
 		$this->strLen = max(0, $len);
 		return $this;
@@ -380,7 +380,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function GetAll( $sql, $bindings = array() );
+	public function GetAll($sql, $bindings = array());
 
 	/**
 	 * Runs a query and fetches results as a column.
@@ -390,7 +390,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function GetCol( $sql, $bindings = array() );
+	public function GetCol($sql, $bindings = array());
 
 	/**
 	 * Runs a query and returns results as a single cell.
@@ -400,7 +400,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function GetOne( $sql, $bindings = array() );
+	public function GetOne($sql, $bindings = array());
 	
 	/**
 	 * Runs a query and returns results as an associative array
@@ -411,7 +411,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function GetAssocRow( $sql, $bindings = array() );
+	public function GetAssocRow($sql, $bindings = array());
 	
 	/**
 	 * Runs a query and returns a flat array containing the values of
@@ -422,7 +422,7 @@ 
 	 * 
 	 * @return array
 	 */
-	public function GetRow( $sql, $bindings = array() );
+	public function GetRow($sql, $bindings = array());
 
 	/**
 	 * Executes SQL code and allows key-value binding.
@@ -439,7 +439,7 @@ 
 	 *
 	 * @return array Affected Rows
 	 */
-	public function Execute( $sql, $bindings = array() );
+	public function Execute($sql, $bindings = array());
 
 	/**
 	 * Returns the latest insert ID if driver does support this
@@ -465,7 +465,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function GetCursor( $sql, $bindings = array() );
+	public function GetCursor($sql, $bindings = array());
 
 	/**
 	 * Toggles debug mode. In debug mode the driver will print all
@@ -478,7 +478,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setDebugMode( $tf );
+	public function setDebugMode($tf);
 
 	/**
 	 * Starts a transaction.
@@ -614,24 +614,24 @@ 
 	 *
 	 * @return void
 	 */
-	protected function bindParams( $statement, $bindings )
+	protected function bindParams($statement, $bindings)
 	{
-		foreach ( $bindings as $key => &$value ) {
-			if ( is_integer( $key ) ) {
-				if ( is_null( $value ) ) {
-					$statement->bindValue( $key + 1, NULL, \PDO::PARAM_NULL );
-				} elseif ( !$this->flagUseStringOnlyBinding && AQueryWriter::canBeTreatedAsInt( $value ) && abs( $value ) <= $this->max ) {
-					$statement->bindParam( $key + 1, $value, \PDO::PARAM_INT );
+		foreach ($bindings as $key => &$value) {
+			if (is_integer($key)) {
+				if (is_null($value)) {
+					$statement->bindValue($key + 1, NULL, \PDO::PARAM_NULL);
+				} elseif (!$this->flagUseStringOnlyBinding && AQueryWriter::canBeTreatedAsInt($value) && abs($value) <= $this->max) {
+					$statement->bindParam($key + 1, $value, \PDO::PARAM_INT);
 				} else {
-					$statement->bindParam( $key + 1, $value, \PDO::PARAM_STR );
+					$statement->bindParam($key + 1, $value, \PDO::PARAM_STR);
 				}
 			} else {
-				if ( is_null( $value ) ) {
-					$statement->bindValue( $key, NULL, \PDO::PARAM_NULL );
-				} elseif ( !$this->flagUseStringOnlyBinding && AQueryWriter::canBeTreatedAsInt( $value ) && abs( $value ) <= $this->max ) {
-					$statement->bindParam( $key, $value, \PDO::PARAM_INT );
+				if (is_null($value)) {
+					$statement->bindValue($key, NULL, \PDO::PARAM_NULL);
+				} elseif (!$this->flagUseStringOnlyBinding && AQueryWriter::canBeTreatedAsInt($value) && abs($value) <= $this->max) {
+					$statement->bindParam($key, $value, \PDO::PARAM_INT);
 				} else {
-					$statement->bindParam( $key, $value, \PDO::PARAM_STR );
+					$statement->bindParam($key, $value, \PDO::PARAM_STR);
 				}
 			}
 		}
@@ -651,42 +651,42 @@ 
 	 *
 	 * @throws SQL
 	 */
-	protected function runQuery( $sql, $bindings, $options = array() )
+	protected function runQuery($sql, $bindings, $options = array())
 	{
 		$this->connect();
-		if ( $this->loggingEnabled && $this->logger ) {
-			$this->logger->log( $sql, $bindings );
+		if ($this->loggingEnabled && $this->logger) {
+			$this->logger->log($sql, $bindings);
 		}
 		try {
-			if ( strpos( 'pgsql', $this->dsn ) === 0 ) {
-				$statement = $this->pdo->prepare( $sql, array( \PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT => TRUE ) );
+			if (strpos('pgsql', $this->dsn) === 0) {
+				$statement = $this->pdo->prepare($sql, array(\PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT => TRUE));
 			} else {
-				$statement = $this->pdo->prepare( $sql );
+				$statement = $this->pdo->prepare($sql);
 			}
-			$this->bindParams( $statement, $bindings );
+			$this->bindParams($statement, $bindings);
 			$statement->execute();
-			$this->queryCounter ++;
+			$this->queryCounter++;
 			$this->affectedRows = $statement->rowCount();
-			if ( $statement->columnCount() ) {
-				$fetchStyle = ( isset( $options['fetchStyle'] ) ) ? $options['fetchStyle'] : NULL;
-				if ( isset( $options['noFetch'] ) && $options['noFetch'] ) {
+			if ($statement->columnCount()) {
+				$fetchStyle = (isset($options['fetchStyle'])) ? $options['fetchStyle'] : NULL;
+				if (isset($options['noFetch']) && $options['noFetch']) {
 					$this->resultArray = array();
 					return $statement;
 				}
-				$this->resultArray = $statement->fetchAll( $fetchStyle );
-				if ( $this->loggingEnabled && $this->logger ) {
-					$this->logger->log( 'resultset: ' . count( $this->resultArray ) . ' rows' );
+				$this->resultArray = $statement->fetchAll($fetchStyle);
+				if ($this->loggingEnabled && $this->logger) {
+					$this->logger->log('resultset: ' . count($this->resultArray) . ' rows');
 				}
 			} else {
 				$this->resultArray = array();
 			}
-		} catch (\PDOException $e ) {
+		} catch (\PDOException $e) {
 			//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 );
-			$exception = new SQL( $err, 0 );
-			$exception->setSQLState( $e->getCode() );
+			if ($this->loggingEnabled && $this->logger) $this->logger->log('An error occurred: ' . $err);
+			$exception = new SQL($err, 0);
+			$exception->setSQLState($e->getCode());
 			throw $exception;
 		}
 	}
@@ -699,12 +699,12 @@ 
 	 */
 	protected function setEncoding()
 	{
-		$driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME );
-		$version = floatval( $this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION ) );
+		$driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
+		$version = floatval($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION));
 		if ($driver === 'mysql') {
 			$encoding = ($version >= 5.5) ? 'utf8mb4' : 'utf8';
-			$this->pdo->setAttribute(\PDO::MYSQL_ATTR_INIT_COMMAND, 'SET NAMES '.$encoding ); //on every re-connect
-			$this->pdo->exec(' SET NAMES '. $encoding); //also for current connection
+			$this->pdo->setAttribute(\PDO::MYSQL_ATTR_INIT_COMMAND, 'SET NAMES ' . $encoding); //on every re-connect
+			$this->pdo->exec(' SET NAMES ' . $encoding); //also for current connection
 			$this->mysqlEncoding = $encoding;
 		}
 	}
@@ -722,25 +722,25 @@ 
 	 * @param string        $pass   optional, password for connection login
 	 *
 	 */
-	public function __construct( $dsn, $user = NULL, $pass = NULL )
+	public function __construct($dsn, $user = NULL, $pass = NULL)
 	{
-		if ( is_object( $dsn ) ) {
+		if (is_object($dsn)) {
 			$this->pdo = $dsn;
 			$this->isConnected = TRUE;
 			$this->setEncoding();
-			$this->pdo->setAttribute(\PDO::ATTR_ERRMODE,\PDO::ERRMODE_EXCEPTION );
-			$this->pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE,\PDO::FETCH_ASSOC );
+			$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+			$this->pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
 			// make sure that the dsn at least contains the type
 			$this->dsn = $this->getDatabaseType();
 		} else {
 			$this->dsn = $dsn;
-			$this->connectInfo = array( 'pass' => $pass, 'user' => $user );
+			$this->connectInfo = array('pass' => $pass, 'user' => $user);
 		}
 
 		//PHP 5.3 PDO SQLite has a bug with large numbers:
-		if ( ( strpos( $this->dsn, 'sqlite' ) === 0 && PHP_MAJOR_VERSION === 5 && PHP_MINOR_VERSION === 3 ) || $this->dsn === 'test-sqlite-53' ) {
+		if ((strpos($this->dsn, 'sqlite') === 0 && PHP_MAJOR_VERSION === 5 && PHP_MINOR_VERSION === 3) || $this->dsn === 'test-sqlite-53') {
 			$this->max = 2147483647; //otherwise you get -2147483648 ?! demonstrated in build #603 on Travis.
-		} elseif ( strpos( $this->dsn, 'cubrid' ) === 0 ) {
+		} elseif (strpos($this->dsn, 'cubrid') === 0) {
 			$this->max = 2147483647; //bindParam in pdo_cubrid also fails...
 		} else {
 			$this->max = PHP_INT_MAX; //the normal value of course (makes it possible to use large numbers in LIMIT clause)
@@ -766,7 +766,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setUseStringOnlyBinding( $yesNo )
+	public function setUseStringOnlyBinding($yesNo)
 	{
 		$this->flagUseStringOnlyBinding = (boolean) $yesNo;
 	}
@@ -784,7 +784,7 @@ 
 	 */
 	public function connect()
 	{
-		if ( $this->isConnected ) return;
+		if ($this->isConnected) return;
 		try {
 			$user = $this->connectInfo['user'];
 			$pass = $this->connectInfo['pass'];
@@ -794,15 +794,15 @@ 
 				$pass
 			);
 			$this->setEncoding();
-			$this->pdo->setAttribute( \PDO::ATTR_STRINGIFY_FETCHES, TRUE );
+			$this->pdo->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, TRUE);
 			//cant pass these as argument to constructor, CUBRID driver does not understand...
-			$this->pdo->setAttribute( \PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION );
-			$this->pdo->setAttribute( \PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC );
+			$this->pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+			$this->pdo->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_ASSOC);
 			$this->isConnected = TRUE;
-		} catch ( \PDOException $exception ) {
+		} catch (\PDOException $exception) {
 			$matches = array();
-			$dbname  = ( preg_match( '/dbname=(\w+)/', $this->dsn, $matches ) ) ? $matches[1] : '?';
-			throw new \PDOException( 'Could not connect to database (' . $dbname . ').', $exception->getCode() );
+			$dbname  = (preg_match('/dbname=(\w+)/', $this->dsn, $matches)) ? $matches[1] : '?';
+			throw new \PDOException('Could not connect to database (' . $dbname . ').', $exception->getCode());
 		}
 	}
 
@@ -817,25 +817,25 @@ 
 	 *
 	 * @return void
 	 */
-	public function setPDO( \PDO $pdo ) {
+	public function setPDO(\PDO $pdo) {
 		$this->pdo = $pdo;
 	}
 
 	/**
 	 * @see Driver::GetAll
 	 */
-	public function GetAll( $sql, $bindings = array() )
+	public function GetAll($sql, $bindings = array())
 	{
-		$this->runQuery( $sql, $bindings );
+		$this->runQuery($sql, $bindings);
 		return $this->resultArray;
 	}
 
 	/**
 	 * @see Driver::GetAssocRow
 	 */
-	public function GetAssocRow( $sql, $bindings = array() )
+	public function GetAssocRow($sql, $bindings = array())
 	{
-		$this->runQuery( $sql, $bindings, array(
+		$this->runQuery($sql, $bindings, array(
 				'fetchStyle' => \PDO::FETCH_ASSOC
 			)
 		);
@@ -845,13 +845,13 @@ 
 	/**
 	 * @see Driver::GetCol
 	 */
-	public function GetCol( $sql, $bindings = array() )
+	public function GetCol($sql, $bindings = array())
 	{
-		$rows = $this->GetAll( $sql, $bindings );
+		$rows = $this->GetAll($sql, $bindings);
 		$cols = array();
-		if ( $rows && is_array( $rows ) && count( $rows ) > 0 ) {
-			foreach ( $rows as $row ) {
-				$cols[] = array_shift( $row );
+		if ($rows && is_array($rows) && count($rows) > 0) {
+			foreach ($rows as $row) {
+				$cols[] = array_shift($row);
 			}
 		}
 
@@ -861,16 +861,16 @@ 
 	/**
 	 * @see Driver::GetOne
 	 */
-	public function GetOne( $sql, $bindings = array() )
+	public function GetOne($sql, $bindings = array())
 	{
-		$arr = $this->GetAll( $sql, $bindings );
+		$arr = $this->GetAll($sql, $bindings);
 		$res = 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;
-		$col1 = array_shift( $row1 );
+		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;
+		$col1 = array_shift($row1);
 		return $col1;
 	}
 
@@ -883,26 +883,26 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function GetCell( $sql, $bindings = array() )
+	public function GetCell($sql, $bindings = array())
 	{
-		return $this->GetOne( $sql, $bindings );
+		return $this->GetOne($sql, $bindings);
 	}
 
 	/**
 	 * @see Driver::GetRow
 	 */
-	public function GetRow( $sql, $bindings = array() )
+	public function GetRow($sql, $bindings = array())
 	{
-		$arr = $this->GetAll( $sql, $bindings );
-		return array_shift( $arr );
+		$arr = $this->GetAll($sql, $bindings);
+		return array_shift($arr);
 	}
 
 	/**
 	 * @see Driver::Excecute
 	 */
-	public function Execute( $sql, $bindings = array() )
+	public function Execute($sql, $bindings = array())
 	{
-		$this->runQuery( $sql, $bindings );
+		$this->runQuery($sql, $bindings);
 		return $this->affectedRows;
 	}
 
@@ -919,10 +919,10 @@ 
 	/**
 	 * @see Driver::GetCursor
 	 */
-	public function GetCursor( $sql, $bindings = array() )
+	public function GetCursor($sql, $bindings = array())
 	{
-		$statement = $this->runQuery( $sql, $bindings, array( 'noFetch' => TRUE ) );
-		$cursor = new PDOCursor( $statement, \PDO::FETCH_ASSOC );
+		$statement = $this->runQuery($sql, $bindings, array('noFetch' => TRUE));
+		$cursor = new PDOCursor($statement, \PDO::FETCH_ASSOC);
 		return $cursor;
 	}
 
@@ -945,14 +945,14 @@ 
 	 *
 	 * @return void
 	 */
-	public function setDebugMode( $tf, $logger = NULL )
+	public function setDebugMode($tf, $logger = NULL)
 	{
 		$this->connect();
 		$this->loggingEnabled = (bool) $tf;
-		if ( $this->loggingEnabled and !$logger ) {
+		if ($this->loggingEnabled and !$logger) {
 			$logger = new RDefault();
 		}
-		$this->setLogger( $logger );
+		$this->setLogger($logger);
 	}
 
 	/**
@@ -963,7 +963,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setLogger( Logger $logger )
+	public function setLogger(Logger $logger)
 	{
 		$this->logger = $logger;
 	}
@@ -1017,7 +1017,7 @@ 
 	{
 		$this->connect();
 
-		return $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME );
+		return $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
 	}
 
 	/**
@@ -1028,7 +1028,7 @@ 
 	public function getDatabaseVersion()
 	{
 		$this->connect();
-		return $this->pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION );
+		return $this->pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION);
 	}
 
 	/**
@@ -1070,7 +1070,7 @@ 
 	 *
 	 * @return self
 	 */
-	public function setEnableLogging( $enable )
+	public function setEnableLogging($enable)
 	{
 		$this->loggingEnabled = (boolean) $enable;
 	}
@@ -1137,7 +1137,7 @@ 
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */
-class OODBBean implements\IteratorAggregate,\ArrayAccess,\Countable
+class OODBBean implements\IteratorAggregate, \ArrayAccess, \Countable
 {
 	/**
 	 * FUSE error modes.
@@ -1205,15 +1205,15 @@ 
 			&& $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' );
+		if ($mode === self::C_ERR_FUNC && !is_callable($func)) {
+			throw new \Exception('Invalid error handler');
 		}
 
-		$old = array( self::$errorHandlingFUSE, self::$errorHandler );
+		$old = array(self::$errorHandlingFUSE, self::$errorHandler);
 		self::$errorHandlingFUSE = $mode;
-		if ( is_callable( $func ) ) {
+		if (is_callable($func)) {
 			self::$errorHandler = $func;
 		} else {
 			self::$errorHandler = NULL;
@@ -1228,7 +1228,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function aliases( $list )
+	public static function aliases($list)
 	{
 		self::$aliases = $list;
 	}
@@ -1243,7 +1243,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setAutoResolve( $automatic = TRUE )
+	public static function setAutoResolve($automatic = TRUE)
 	{
 		self::$autoResolve = (boolean) $automatic;
 	}
@@ -1319,10 +1319,10 @@ 
 	 *
 	 * @return array
 	 */
-	public static function setMetaAll( $beans, $property, $value )
+	public static function setMetaAll($beans, $property, $value)
 	{
-		foreach( $beans as $bean ) {
-			if ( $bean instanceof OODBBean ) $bean->__info[ $property ] = $value;
+		foreach ($beans as $bean) {
+			if ($bean instanceof OODBBean) $bean->__info[$property] = $value;
 		}
 
 		return $beans;
@@ -1346,24 +1346,24 @@ 
 	 *
 	 * @return string $joinSql
 	 */
-	private function parseJoin( $type )
+	private function parseJoin($type)
 	{
 		$joinSql = '';
 		$joins = array();
-		if ( strpos($this->withSql, '@joined.' ) !== FALSE ) {
+		if (strpos($this->withSql, '@joined.') !== FALSE) {
 			$writer   = $this->beanHelper->getToolBox()->getWriter();
-			$oldParts = $parts = explode( '@joined.', $this->withSql );
-			array_shift( $parts );
-			foreach($parts as $part) {
-				$explosion = explode( '.', $part );
-				$joinInfo  = array_shift( $explosion );
+			$oldParts = $parts = explode('@joined.', $this->withSql);
+			array_shift($parts);
+			foreach ($parts as $part) {
+				$explosion = explode('.', $part);
+				$joinInfo  = array_shift($explosion);
 				//Dont join more than once..
-				if ( !isset( $joins[$joinInfo] ) ) {
-					$joins[ $joinInfo ] = true;
-					$joinSql  .= $writer->writeJoin( $type, $joinInfo, 'LEFT' );
+				if (!isset($joins[$joinInfo])) {
+					$joins[$joinInfo] = true;
+					$joinSql .= $writer->writeJoin($type, $joinInfo, 'LEFT');
 				}
 			}
-			$this->withSql = implode( '', $oldParts );
+			$this->withSql = implode('', $oldParts);
 			$joinSql      .= ' WHERE ';
 		}
 		return $joinSql;
@@ -1377,24 +1377,24 @@ 
 	 *
 	 * @return array
 	 */
-	private function getSharedList( $type, $redbean, $toolbox )
+	private function getSharedList($type, $redbean, $toolbox)
 	{
 		$writer = $toolbox->getWriter();
 
-		if ( $this->via ) {
-			$oldName = $writer->getAssocTable( array( $this->__info['type'], $type ) );
-			if ( $oldName !== $this->via ) {
+		if ($this->via) {
+			$oldName = $writer->getAssocTable(array($this->__info['type'], $type));
+			if ($oldName !== $this->via) {
 				//set the new renaming rule
-				$writer->renameAssocTable( $oldName, $this->via );
+				$writer->renameAssocTable($oldName, $this->via);
 			}
 			$this->via = NULL;
 		}
 
 		$beans = array();
 		if ($this->getID()) {
-			$type             = $this->beau( $type );
+			$type             = $this->beau($type);
 			$assocManager     = $redbean->getAssociationManager();
-			$beans            = $assocManager->related( $this, $type, $this->withSql, $this->withParams );
+			$beans            = $assocManager->related($this, $type, $this->withSql, $this->withParams);
 		}
 
 		$this->withSql    = '';
@@ -1412,11 +1412,11 @@ 
 	 *
 	 * @return array
 	 */
-	private function getOwnList( $type, $redbean )
+	private function getOwnList($type, $redbean)
 	{
-		$type = $this->beau( $type );
+		$type = $this->beau($type);
 
-		if ( $this->aliasName ) {
+		if ($this->aliasName) {
 			$parentField = $this->aliasName;
 			$myFieldLink = $parentField . '_id';
 
@@ -1430,33 +1430,33 @@ 
 
 		$beans = array();
 
-		if ( $this->getID() ) {
+		if ($this->getID()) {
 
 			$firstKey = NULL;
-			if ( count( $this->withParams ) > 0 ) {
-				reset( $this->withParams );
+			if (count($this->withParams) > 0) {
+				reset($this->withParams);
 
-				$firstKey = key( $this->withParams );
+				$firstKey = key($this->withParams);
 			}
 
-			$joinSql = $this->parseJoin( $type );
+			$joinSql = $this->parseJoin($type);
 
-			if ( !is_numeric( $firstKey ) || $firstKey === NULL ) {
+			if (!is_numeric($firstKey) || $firstKey === NULL) {
 				$bindings           = $this->withParams;
 				$bindings[':slot0'] = $this->getID();
 
-				$beans = $redbean->find( $type, array(), " {$joinSql} $myFieldLink = :slot0 " . $this->withSql, $bindings );
+				$beans = $redbean->find($type, array(), " {$joinSql} $myFieldLink = :slot0 " . $this->withSql, $bindings);
 			} else {
-				$bindings = array_merge( array( $this->getID() ), $this->withParams );
+				$bindings = array_merge(array($this->getID()), $this->withParams);
 
-				$beans = $redbean->find( $type, array(), " {$joinSql} $myFieldLink = ? " . $this->withSql, $bindings );
+				$beans = $redbean->find($type, array(), " {$joinSql} $myFieldLink = ? " . $this->withSql, $bindings);
 			}
 		}
 
 		$this->withSql    = '';
 		$this->withParams = array();
 
-		foreach ( $beans as $beanFromList ) {
+		foreach ($beans as $beanFromList) {
 			$beanFromList->__info['sys.parentcache.' . $parentField] = $this;
 		}
 
@@ -1474,12 +1474,12 @@ 
 	 *
 	 * @return void
 	 */
-	public function initializeForDispense( $type, BeanHelper $beanhelper )
+	public function initializeForDispense($type, BeanHelper $beanhelper)
 	{
 		$this->beanHelper         = $beanhelper;
 		$this->__info['type']     = $type;
 		$this->__info['sys.id']   = 'id';
-		$this->__info['sys.orig'] = array( 'id' => 0 );
+		$this->__info['sys.orig'] = array('id' => 0);
 		$this->__info['tainted']  = TRUE;
 		$this->__info['changed']  = TRUE;
 		$this->properties['id']   = 0;
@@ -1496,7 +1496,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setBeanHelper( BeanHelper $helper )
+	public function setBeanHelper(BeanHelper $helper)
 	{
 		$this->beanHelper = $helper;
 	}
@@ -1515,7 +1515,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new\ArrayIterator( $this->properties );
+		return new\ArrayIterator($this->properties);
 	}
 
 	/**
@@ -1532,35 +1532,35 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function import( $array, $selection = FALSE, $notrim = FALSE )
+	public function import($array, $selection = FALSE, $notrim = FALSE)
 	{
-		if ( is_string( $selection ) ) {
-			$selection = explode( ',', $selection );
+		if (is_string($selection)) {
+			$selection = explode(',', $selection);
 		}
 
-		if ( !$notrim && is_array( $selection ) ) {
-			foreach ( $selection as $key => $selected ) {
-				$selection[$key] = trim( $selected );
+		if (!$notrim && is_array($selection)) {
+			foreach ($selection as $key => $selected) {
+				$selection[$key] = trim($selected);
 			}
 		}
 
-		foreach ( $array as $key => $value ) {
-			if ( $key != '__info' ) {
-				if ( !$selection || ( $selection && in_array( $key, $selection ) ) ) {
-					if ( is_array($value ) ) {
-						if ( isset( $value['_type'] ) ) {
-							$bean = $this->beanHelper->getToolbox()->getRedBean()->dispense( $value['_type'] );
-							unset( $value['_type'] );
+		foreach ($array as $key => $value) {
+			if ($key != '__info') {
+				if (!$selection || ($selection && in_array($key, $selection))) {
+					if (is_array($value)) {
+						if (isset($value['_type'])) {
+							$bean = $this->beanHelper->getToolbox()->getRedBean()->dispense($value['_type']);
+							unset($value['_type']);
 							$bean->import($value);
 							$this->$key = $bean;
 						} else {
 							$listBeans = array();
-							foreach( $value as $listKey => $listItem ) {
-								$bean = $this->beanHelper->getToolbox()->getRedBean()->dispense( $listItem['_type'] );
-								unset( $listItem['_type'] );
+							foreach ($value as $listKey => $listItem) {
+								$bean = $this->beanHelper->getToolbox()->getRedBean()->dispense($listItem['_type']);
+								unset($listItem['_type']);
 								$bean->import($listItem);
 								$list = &$this->$key;
-								$list[ $listKey ] = $bean;
+								$list[$listKey] = $bean;
 							}
 						}
 					} else {
@@ -1581,7 +1581,7 @@ 
 	*
 	* @return self
 	*/
-	public function importRow( $row )
+	public function importRow($row)
 	{
 		$this->properties = $row;
 		$this->__info['sys.orig'] = $row;
@@ -1598,7 +1598,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function importFrom( OODBBean $sourceBean )
+	public function importFrom(OODBBean $sourceBean)
 	{
 		$this->__info['tainted'] = TRUE;
 		$this->__info['changed'] = TRUE;
@@ -1616,11 +1616,11 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function inject( OODBBean $otherBean )
+	public function inject(OODBBean $otherBean)
 	{
 		$myID = $this->properties['id'];
 
-		$this->import( $otherBean->export() );
+		$this->import($otherBean->export());
 
 		$this->id = $myID;
 
@@ -1639,42 +1639,42 @@ 
 	 *
 	 * @return array
 	 */
-	public function export( $meta = FALSE, $parents = FALSE, $onlyMe = FALSE, $filters = array() )
+	public function export($meta = FALSE, $parents = FALSE, $onlyMe = FALSE, $filters = array())
 	{
 		$arr = array();
 
-		if ( $parents ) {
-			foreach ( $this as $key => $value ) {
-				if ( substr( $key, -3 ) != '_id' ) continue;
+		if ($parents) {
+			foreach ($this as $key => $value) {
+				if (substr($key, -3) != '_id') continue;
 
-				$prop = substr( $key, 0, strlen( $key ) - 3 );
+				$prop = substr($key, 0, strlen($key) - 3);
 				$this->$prop;
 			}
 		}
 
-		$hasFilters = is_array( $filters ) && count( $filters );
+		$hasFilters = is_array($filters) && count($filters);
 
-		foreach ( $this as $key => $value ) {
-			if ( !$onlyMe && is_array( $value ) ) {
+		foreach ($this as $key => $value) {
+			if (!$onlyMe && is_array($value)) {
 				$vn = array();
 
-				foreach ( $value as $i => $b ) {
-					if ( !( $b instanceof OODBBean ) ) continue;
-					$vn[] = $b->export( $meta, FALSE, FALSE, $filters );
+				foreach ($value as $i => $b) {
+					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;
+			} elseif ($value instanceof OODBBean) {
+				if ($hasFilters) {
+					if (!in_array(strtolower($value->getMeta('type')), $filters)) continue;
 				}
 
-				$value = $value->export( $meta, $parents, FALSE, $filters );
+				$value = $value->export($meta, $parents, FALSE, $filters);
 			}
 
 			$arr[$key] = $value;
 		}
 
-		if ( $meta ) {
+		if ($meta) {
 			$arr['__info'] = $this->__info;
 		}
 
@@ -1688,14 +1688,14 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function __isset( $property )
+	public function __isset($property)
 	{
-		$property = $this->beau( $property );
+		$property = $this->beau($property);
 
-		if ( strpos( $property, 'xown' ) === 0 && ctype_upper( substr( $property, 4, 1 ) ) ) {
+		if (strpos($property, 'xown') === 0 && ctype_upper(substr($property, 4, 1))) {
 			$property = substr($property, 1);
 		}
-		return isset( $this->properties[$property] );
+		return isset($this->properties[$property]);
 	}
 
 	/**
@@ -1705,7 +1705,7 @@ 
 	 */
 	public function getID()
 	{
-		return ( isset( $this->properties['id'] ) ) ? (string) $this->properties['id'] : NULL;
+		return (isset($this->properties['id'])) ? (string) $this->properties['id'] : NULL;
 	}
 
 	/**
@@ -1717,18 +1717,18 @@ 
 	 *
 	 * @return void
 	 */
-	public function __unset( $property )
+	public function __unset($property)
 	{
-		$property = $this->beau( $property );
+		$property = $this->beau($property);
 
-		if ( strpos( $property, 'xown' ) === 0 && ctype_upper( substr( $property, 4, 1 ) ) ) {
+		if (strpos($property, 'xown') === 0 && ctype_upper(substr($property, 4, 1))) {
 			$property = substr($property, 1);
 		}
 
-		unset( $this->properties[$property] );
+		unset($this->properties[$property]);
 
-		$shadowKey = 'sys.shadow.'.$property;
-		if ( isset( $this->__info[ $shadowKey ] ) ) unset( $this->__info[$shadowKey] );
+		$shadowKey = 'sys.shadow.' . $property;
+		if (isset($this->__info[$shadowKey])) unset($this->__info[$shadowKey]);
 
 		//also clear modifiers
 		$this->withSql    = '';
@@ -1758,7 +1758,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function with( $sql, $bindings = array() )
+	public function with($sql, $bindings = array())
 	{
 		$this->withSql    = $sql;
 		$this->withParams = $bindings;
@@ -1780,7 +1780,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function withCondition( $sql, $bindings = array() )
+	public function withCondition($sql, $bindings = array())
 	{
 		$this->withSql    = ' AND ' . $sql;
 		$this->withParams = $bindings;
@@ -1843,9 +1843,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function alias( $aliasName )
+	public function alias($aliasName)
 	{
-		$this->aliasName = $this->beau( $aliasName );
+		$this->aliasName = $this->beau($aliasName);
 
 		return $this;
 	}
@@ -1875,7 +1875,7 @@ 
 	 */
 	public function getPropertiesAndType()
 	{
-		return array( $this->properties, $this->__info['type'] );
+		return array($this->properties, $this->__info['type']);
 	}
 
 	/**
@@ -1891,24 +1891,24 @@ 
 	 *
 	 * @return string
 	 */
-	public function beau( $property )
+	public function beau($property)
 	{
 		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 ) ) )
-			|| ( strpos( $property, 'xown' ) === 0 && ctype_upper( substr( $property, 4, 1 ) ) )
-			|| ( strpos( $property, 'shared' ) === 0 && ctype_upper( substr( $property, 6, 1 ) ) )
+			(strpos($property, 'own') === 0 && ctype_upper(substr($property, 3, 1)))
+			|| (strpos($property, 'xown') === 0 && ctype_upper(substr($property, 4, 1)))
+			|| (strpos($property, 'shared') === 0 && ctype_upper(substr($property, 6, 1)))
 		) {
 
-			$property = preg_replace( '/List$/', '', $property );
+			$property = preg_replace('/List$/', '', $property);
 			return $property;
 		}
 
-		if ( !isset( $beautifulColumns[$property] ) ) {
-			$beautifulColumns[$property] = AQueryWriter::camelsSnake( $property );
+		if (!isset($beautifulColumns[$property])) {
+			$beautifulColumns[$property] = AQueryWriter::camelsSnake($property);
 		}
 
 		return $beautifulColumns[$property];
@@ -1940,17 +1940,17 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function isListInExclusiveMode( $listName )
+	public function isListInExclusiveMode($listName)
 	{
-		$listName = $this->beau( $listName );
+		$listName = $this->beau($listName);
 
-		if ( strpos( $listName, 'xown' ) === 0 && ctype_upper( substr( $listName, 4, 1 ) ) ) {
+		if (strpos($listName, 'xown') === 0 && ctype_upper(substr($listName, 4, 1))) {
 			$listName = substr($listName, 1);
 		}
 
-		$listName = lcfirst( substr( $listName, 3 ) );
+		$listName = lcfirst(substr($listName, 3));
 
-		return ( isset( $this->__info['sys.exclusive-'.$listName] ) && $this->__info['sys.exclusive-'.$listName] );
+		return (isset($this->__info['sys.exclusive-' . $listName]) && $this->__info['sys.exclusive-' . $listName]);
 	}
 
 	/**
@@ -1964,33 +1964,33 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function &__get( $property )
+	public function &__get($property)
 	{
 		$isEx          = FALSE;
 		$isOwn         = FALSE;
 		$isShared      = FALSE;
 
-		if ( !ctype_lower( $property ) ) {
-			$property = $this->beau( $property );
-			if ( strpos( $property, 'xown' ) === 0 && ctype_upper( substr( $property, 4, 1 ) ) ) {
+		if (!ctype_lower($property)) {
+			$property = $this->beau($property);
+			if (strpos($property, 'xown') === 0 && ctype_upper(substr($property, 4, 1))) {
 				$property = substr($property, 1);
-				$listName = lcfirst( substr( $property, 3 ) );
+				$listName = lcfirst(substr($property, 3));
 				$isEx     = TRUE;
 				$isOwn    = TRUE;
-				$this->__info['sys.exclusive-'.$listName] = TRUE;
-			} elseif ( strpos( $property, 'own' ) === 0 && ctype_upper( substr( $property, 3, 1 ) ) )  {
+				$this->__info['sys.exclusive-' . $listName] = TRUE;
+			} elseif (strpos($property, 'own') === 0 && ctype_upper(substr($property, 3, 1))) {
 				$isOwn    = TRUE;
-				$listName = lcfirst( substr( $property, 3 ) );
-			} elseif ( strpos( $property, 'shared' ) === 0 && ctype_upper( substr( $property, 6, 1 ) ) ) {
+				$listName = lcfirst(substr($property, 3));
+			} elseif (strpos($property, 'shared') === 0 && ctype_upper(substr($property, 6, 1))) {
 				$isShared = TRUE;
 			}
 		}
 
 		$fieldLink      = $property . '_id';
-		$exists         = isset( $this->properties[$property] );
+		$exists         = isset($this->properties[$property]);
 
 		//If not exists and no field link and no list, bail out.
-		if ( !$exists && !isset($this->$fieldLink) && (!$isOwn && !$isShared )) {
+		if (!$exists && !isset($this->$fieldLink) && (!$isOwn && !$isShared)) {
 
 			$this->withSql    = '';
 			$this->withParams = array();
@@ -2005,13 +2005,13 @@ 
 		}
 
 		$hasAlias       = (!is_null($this->aliasName));
-		$differentAlias = ($hasAlias && $isOwn && isset($this->__info['sys.alias.'.$listName])) ?
-								($this->__info['sys.alias.'.$listName] !== $this->aliasName) : FALSE;
+		$differentAlias = ($hasAlias && $isOwn && isset($this->__info['sys.alias.' . $listName])) ?
+								($this->__info['sys.alias.' . $listName] !== $this->aliasName) : FALSE;
 		$hasSQL         = ($this->withSql !== '' || $this->via !== NULL);
 		$hasAll         = (boolean) ($this->all);
 
 		//If exists and no list or exits and list not changed, bail out.
-		if ( $exists && ((!$isOwn && !$isShared ) ||  (!$hasSQL && !$differentAlias && !$hasAll)) ) {
+		if ($exists && ((!$isOwn && !$isShared) || (!$hasSQL && !$differentAlias && !$hasAll))) {
 
 			$this->withSql    = '';
 			$this->withParams = array();
@@ -2024,30 +2024,30 @@ 
 		}
 
 
-		list( $redbean, , , $toolbox ) = $this->beanHelper->getExtractedToolbox();
+		list($redbean,,, $toolbox) = $this->beanHelper->getExtractedToolbox();
 
-		if ( isset( $this->$fieldLink ) ) {
+		if (isset($this->$fieldLink)) {
 			$this->__info['tainted'] = TRUE;
 
-			if ( isset( $this->__info["sys.parentcache.$property"] ) ) {
+			if (isset($this->__info["sys.parentcache.$property"])) {
 				$bean = $this->__info["sys.parentcache.$property"];
 			} else {
-				if ( isset( self::$aliases[$property] ) ) {
+				if (isset(self::$aliases[$property])) {
 					$type = self::$aliases[$property];
-				} elseif ( $this->fetchType ) {
+				} elseif ($this->fetchType) {
 					$type = $this->fetchType;
 					$this->fetchType = NULL;
 				} else {
 					$type = $property;
 				}
 				$bean = NULL;
-				if ( !is_null( $this->properties[$fieldLink] ) ) {
-					$bean = $redbean->load( $type, $this->properties[$fieldLink] );
+				if (!is_null($this->properties[$fieldLink])) {
+					$bean = $redbean->load($type, $this->properties[$fieldLink]);
 					//If the IDs dont match, we failed to load, so try autoresolv in that case...
-					if ( $bean->id !== $this->properties[$fieldLink] && self::$autoResolve ) {
-						$type = $this->beanHelper->getToolbox()->getWriter()->inferFetchType( $this->__info['type'], $property );
-						if ( !is_null( $type) ) {
-							$bean = $redbean->load( $type, $this->properties[$fieldLink] );
+					if ($bean->id !== $this->properties[$fieldLink] && self::$autoResolve) {
+						$type = $this->beanHelper->getToolbox()->getWriter()->inferFetchType($this->__info['type'], $property);
+						if (!is_null($type)) {
+							$bean = $redbean->load($type, $this->properties[$fieldLink]);
 							$this->__info["sys.autoresolved.{$property}"] = $type;
 						}
 					}
@@ -2067,12 +2067,12 @@ 
 
 		}
 		//Implicit: elseif ( $isOwn || $isShared ) {
-		if ( $this->noLoad ) {
+		if ($this->noLoad) {
 			$beans = array();
-		} elseif ( $isOwn ) {
-			$beans = $this->getOwnList( $listName, $redbean );
+		} elseif ($isOwn) {
+			$beans = $this->getOwnList($listName, $redbean);
 		} else {
-			$beans = $this->getSharedList( lcfirst( substr( $property, 6 ) ), $redbean, $toolbox );
+			$beans = $this->getSharedList(lcfirst(substr($property, 6)), $redbean, $toolbox);
 		}
 
 		$this->properties[$property]          = $beans;
@@ -2104,43 +2104,43 @@ 
 	 *
 	 * @throws Security
 	 */
-	public function __set( $property, $value )
+	public function __set($property, $value)
 	{
 		$isEx          = FALSE;
 		$isOwn         = FALSE;
 		$isShared      = FALSE;
 
-		if ( !ctype_lower( $property ) ) {
-			$property = $this->beau( $property );
-			if ( strpos( $property, 'xown' ) === 0 && ctype_upper( substr( $property, 4, 1 ) ) ) {
+		if (!ctype_lower($property)) {
+			$property = $this->beau($property);
+			if (strpos($property, 'xown') === 0 && ctype_upper(substr($property, 4, 1))) {
 				$property = substr($property, 1);
-				$listName = lcfirst( substr( $property, 3 ) );
+				$listName = lcfirst(substr($property, 3));
 				$isEx     = TRUE;
 				$isOwn    = TRUE;
-				$this->__info['sys.exclusive-'.$listName] = TRUE;
-			} elseif ( strpos( $property, 'own' ) === 0 && ctype_upper( substr( $property, 3, 1 ) ) )  {
+				$this->__info['sys.exclusive-' . $listName] = TRUE;
+			} elseif (strpos($property, 'own') === 0 && ctype_upper(substr($property, 3, 1))) {
 				$isOwn    = TRUE;
-				$listName = lcfirst( substr( $property, 3 ) );
-			} elseif ( strpos( $property, 'shared' ) === 0 && ctype_upper( substr( $property, 6, 1 ) ) ) {
+				$listName = lcfirst(substr($property, 3));
+			} elseif (strpos($property, 'shared') === 0 && ctype_upper(substr($property, 6, 1))) {
 				$isShared = TRUE;
 			}
 		}
 
 		$hasAlias       = (!is_null($this->aliasName));
-		$differentAlias = ($hasAlias && $isOwn && isset($this->__info['sys.alias.'.$listName])) ?
-								($this->__info['sys.alias.'.$listName] !== $this->aliasName) : FALSE;
+		$differentAlias = ($hasAlias && $isOwn && isset($this->__info['sys.alias.' . $listName])) ?
+								($this->__info['sys.alias.' . $listName] !== $this->aliasName) : FALSE;
 		$hasSQL         = ($this->withSql !== '' || $this->via !== NULL);
-		$exists         = isset( $this->properties[$property] );
+		$exists         = isset($this->properties[$property]);
 		$fieldLink      = $property . '_id';
 
-		if ( ($isOwn || $isShared) &&  (!$exists || $hasSQL || $differentAlias) ) {
+		if (($isOwn || $isShared) && (!$exists || $hasSQL || $differentAlias)) {
 
-			if ( !$this->noLoad ) {
-				list( $redbean, , , $toolbox ) = $this->beanHelper->getExtractedToolbox();
-				if ( $isOwn ) {
-					$beans = $this->getOwnList( $listName, $redbean );
+			if (!$this->noLoad) {
+				list($redbean,,, $toolbox) = $this->beanHelper->getExtractedToolbox();
+				if ($isOwn) {
+					$beans = $this->getOwnList($listName, $redbean);
 				} else {
-					$beans = $this->getSharedList( lcfirst( substr( $property, 6 ) ), $redbean, $toolbox );
+					$beans = $this->getSharedList(lcfirst(substr($property, 6)), $redbean, $toolbox);
 				}
 				$this->__info["sys.shadow.$property"] = $beans;
 			}
@@ -2157,24 +2157,24 @@ 
 		$this->__info['tainted'] = TRUE;
 		$this->__info['changed'] = TRUE;
 
-		if ( array_key_exists( $fieldLink, $this->properties ) && !( $value instanceof OODBBean ) ) {
-			if ( is_null( $value ) || $value === FALSE ) {
+		if (array_key_exists($fieldLink, $this->properties) && !($value instanceof OODBBean)) {
+			if (is_null($value) || $value === FALSE) {
 
-				unset( $this->properties[ $property ]);
-				$this->properties[ $fieldLink ] = NULL;
+				unset($this->properties[$property]);
+				$this->properties[$fieldLink] = NULL;
 
 				return;
 			} else {
-				throw new RedException( 'Cannot cast to bean.' );
+				throw new RedException('Cannot cast to bean.');
 			}
 		}
 
-		if ( $value === FALSE ) {
+		if ($value === FALSE) {
 			$value = '0';
-		} elseif ( $value === TRUE ) {
+		} elseif ($value === TRUE) {
 			$value = '1';
-		} elseif ( $value instanceof \DateTime ) {
-			$value = $value->format( 'Y-m-d H:i:s' );
+		} elseif ($value instanceof \DateTime) {
+			$value = $value->format('Y-m-d H:i:s');
 		}
 
 		$this->properties[$property] = $value;
@@ -2190,15 +2190,15 @@ 
 	 *
 	 * @return void
 	 */
-	public function setProperty( $property, $value, $updateShadow = FALSE, $taint = FALSE )
+	public function setProperty($property, $value, $updateShadow = FALSE, $taint = FALSE)
 	{
 		$this->properties[$property] = $value;
 
-		if ( $updateShadow ) {
+		if ($updateShadow) {
 			$this->__info['sys.shadow.' . $property] = $value;
 		}
 
-		if ( $taint ) {
+		if ($taint) {
 			$this->__info['tainted'] = TRUE;
 			$this->__info['changed'] = TRUE;
 		}
@@ -2223,9 +2223,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function getMeta( $path, $default = NULL )
+	public function getMeta($path, $default = NULL)
 	{
-		return ( isset( $this->__info[$path] ) ) ? $this->__info[$path] : $default;
+		return (isset($this->__info[$path])) ? $this->__info[$path] : $default;
 	}
 
 	/**
@@ -2239,11 +2239,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function moveMeta( $path, $value = NULL )
+	public function moveMeta($path, $value = NULL)
 	{
-		if ( isset( $this->__info[$path] ) ) {
-			$value = $this->__info[ $path ];
-			unset( $this->__info[ $path ] );
+		if (isset($this->__info[$path])) {
+			$value = $this->__info[$path];
+			unset($this->__info[$path]);
 		}
 		return $value;
 	}
@@ -2261,7 +2261,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function setMeta( $path, $value )
+	public function setMeta($path, $value)
 	{
 		$this->__info[$path] = $value;
 
@@ -2277,7 +2277,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function copyMetaFrom( OODBBean $bean )
+	public function copyMetaFrom(OODBBean $bean)
 	{
 		$this->__info = $bean->__info;
 
@@ -2292,40 +2292,40 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __call( $method, $args )
+	public function __call($method, $args)
 	{
-		if ( !isset( $this->__info['model'] ) ) {
-			$model = $this->beanHelper->getModelForBean( $this );
+		if (!isset($this->__info['model'])) {
+			$model = $this->beanHelper->getModelForBean($this);
 
-			if ( !$model ) {
+			if (!$model) {
 				return NULL;
 			}
 
 			$this->__info['model'] = $model;
 		}
-		if ( !method_exists( $this->__info['model'], $method ) ) {
+		if (!method_exists($this->__info['model'], $method)) {
 
-			if ( self::$errorHandlingFUSE === FALSE ) {
+			if (self::$errorHandlingFUSE === FALSE) {
 				return NULL;
 			}
 
-			if ( in_array( $method, array( 'update', 'open', 'delete', 'after_delete', 'after_update', 'dispense' ), TRUE ) ) {
+			if (in_array($method, array('update', 'open', 'delete', 'after_delete', 'after_update', 'dispense'), TRUE)) {
 				return NULL;
 			}
 
 			$message = "FUSE: method does not exist in model: $method";
-			if ( self::$errorHandlingFUSE === self::C_ERR_LOG ) {
-				error_log( $message );
+			if (self::$errorHandlingFUSE === self::C_ERR_LOG) {
+				error_log($message);
 				return NULL;
-			} elseif ( self::$errorHandlingFUSE === self::C_ERR_NOTICE ) {
-				trigger_error( $message, E_USER_NOTICE );
+			} elseif (self::$errorHandlingFUSE === self::C_ERR_NOTICE) {
+				trigger_error($message, E_USER_NOTICE);
 				return NULL;
-			} elseif ( self::$errorHandlingFUSE === self::C_ERR_WARN ) {
-				trigger_error( $message, E_USER_WARNING );
+			} elseif (self::$errorHandlingFUSE === self::C_ERR_WARN) {
+				trigger_error($message, E_USER_WARNING);
 				return NULL;
-			} elseif ( self::$errorHandlingFUSE === self::C_ERR_EXCEPTION ) {
-				throw new \Exception( $message );
-			} elseif ( self::$errorHandlingFUSE === self::C_ERR_FUNC ) {
+			} elseif (self::$errorHandlingFUSE === self::C_ERR_EXCEPTION) {
+				throw new \Exception($message);
+			} elseif (self::$errorHandlingFUSE === self::C_ERR_FUNC) {
 				$func = self::$errorHandler;
 				return $func(array(
 					'message' => $message,
@@ -2334,11 +2334,11 @@ 
 					'bean' => $this
 				));
 			}
-			trigger_error( $message, E_USER_ERROR );
+			trigger_error($message, E_USER_ERROR);
 			return NULL;
 		}
 
-		return call_user_func_array( array( $this->__info['model'], $method ), $args );
+		return call_user_func_array(array($this->__info['model'], $method), $args);
 	}
 
 	/**
@@ -2353,10 +2353,10 @@ 
 	 */
 	public function __toString()
 	{
-		$string = $this->__call( '__toString', array() );
+		$string = $this->__call('__toString', array());
 
-		if ( $string === NULL ) {
-			return json_encode( $this->properties );
+		if ($string === NULL) {
+			return json_encode($this->properties);
 		} else {
 			return $string;
 		}
@@ -2372,9 +2372,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetSet( $offset, $value )
+	public function offsetSet($offset, $value)
 	{
-		$this->__set( $offset, $value );
+		$this->__set($offset, $value);
 	}
 
 	/**
@@ -2389,9 +2389,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function offsetExists( $offset )
+	public function offsetExists($offset)
 	{
-		return $this->__isset( $offset );
+		return $this->__isset($offset);
 	}
 
 	/**
@@ -2407,9 +2407,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetUnset( $offset )
+	public function offsetUnset($offset)
 	{
-		$this->__unset( $offset );
+		$this->__unset($offset);
 	}
 
 	/**
@@ -2425,9 +2425,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function &offsetGet( $offset )
+	public function &offsetGet($offset)
 	{
-		return $this->__get( $offset );
+		return $this->__get($offset);
 	}
 
 	/**
@@ -2439,7 +2439,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function fetchAs( $type )
+	public function fetchAs($type)
 	{
 		$this->fetchType = $type;
 
@@ -2454,9 +2454,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function poly( $field )
+	public function poly($field)
 	{
-		return $this->fetchAs( $this->$field );
+		return $this->fetchAs($this->$field);
 	}
 
 	/**
@@ -2471,15 +2471,15 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function traverse( $property, $function, $maxDepth = NULL )
+	public function traverse($property, $function, $maxDepth = NULL)
 	{
 		$this->via = NULL;
-		if ( strpos( $property, 'shared' ) !== FALSE ) {
-			throw new RedException( 'Traverse only works with (x)own-lists.' );
+		if (strpos($property, 'shared') !== FALSE) {
+			throw new RedException('Traverse only works with (x)own-lists.');
 		}
 
-		if ( !is_null( $maxDepth ) ) {
-			if ( !$maxDepth-- ) return $this;
+		if (!is_null($maxDepth)) {
+			if (!$maxDepth--) return $this;
 		}
 
 		$oldFetchType = $this->fetchType;
@@ -2489,20 +2489,20 @@ 
 
 		$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 ) {
+		foreach ($beans as $bean) {
 
-			$function( $bean );
+			$function($bean);
 
 			$bean->fetchType  = $oldFetchType;
 			$bean->aliasName  = $oldAliasName;
 			$bean->withSql    = $oldWith;
 			$bean->withParams = $oldBindings;
 
-			$bean->traverse( $property, $function, $maxDepth );
+			$bean->traverse($property, $function, $maxDepth);
 		}
 
 		return $this;
@@ -2516,7 +2516,7 @@ 
 	 */
 	public function count()
 	{
-		return count( $this->properties );
+		return count($this->properties);
 	}
 
 	/**
@@ -2529,11 +2529,11 @@ 
 	public function isEmpty()
 	{
 		$empty = TRUE;
-		foreach ( $this->properties as $key => $value ) {
-			if ( $key == 'id' ) {
+		foreach ($this->properties as $key => $value) {
+			if ($key == 'id') {
 				continue;
 			}
-			if ( !empty( $value ) ) {
+			if (!empty($value)) {
 				$empty = FALSE;
 			}
 		}
@@ -2549,7 +2549,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function setAttr( $property, $value )
+	public function setAttr($property, $value)
 	{
 		$this->$property = $value;
 
@@ -2564,11 +2564,11 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function unsetAll( $properties )
+	public function unsetAll($properties)
 	{
-		foreach ( $properties as $prop ) {
-			if ( isset( $this->properties[$prop] ) ) {
-				unset( $this->properties[$prop] );
+		foreach ($properties as $prop) {
+			if (isset($this->properties[$prop])) {
+				unset($this->properties[$prop]);
 			}
 		}
 
@@ -2584,11 +2584,11 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function old( $property )
+	public function old($property)
 	{
-		$old = $this->getMeta( 'sys.orig', array() );
+		$old = $this->getMeta('sys.orig', array());
 
-		if ( array_key_exists( $property, $old ) ) {
+		if (array_key_exists($property, $old)) {
 			return $old[$property];
 		}
 
@@ -2608,7 +2608,7 @@ 
 	 */
 	public function isTainted()
 	{
-		return $this->getMeta( 'tainted' );
+		return $this->getMeta('tainted');
 	}
 
 	/**
@@ -2624,10 +2624,10 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function hasChanged( $property )
+	public function hasChanged($property)
 	{
-		return ( array_key_exists( $property, $this->properties ) ) ?
-			$this->old( $property ) != $this->properties[$property] : FALSE;
+		return (array_key_exists($property, $this->properties)) ?
+			$this->old($property) != $this->properties[$property] : FALSE;
 	}
 
 	/**
@@ -2639,13 +2639,13 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function hasListChanged( $property )
+	public function hasListChanged($property)
 	{
-		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;
-		$diffMissing = array_diff_assoc( $this->__info['sys.shadow.'.$property], $this->properties[$property] );
-		if ( count( $diffMissing ) ) return TRUE;
+		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;
+		$diffMissing = array_diff_assoc($this->__info['sys.shadow.' . $property], $this->properties[$property]);
+		if (count($diffMissing)) return TRUE;
 		return FALSE;
 	}
 
@@ -2658,11 +2658,11 @@ 
 	public function clearHistory()
 	{
 		$this->__info['sys.orig'] = array();
-		foreach( $this->properties as $key => $value ) {
-			if ( is_scalar($value) ) {
+		foreach ($this->properties as $key => $value) {
+			if (is_scalar($value)) {
 				$this->__info['sys.orig'][$key] = $value;
 			} else {
-				$this->__info['sys.shadow.'.$key] = $value;
+				$this->__info['sys.shadow.' . $key] = $value;
 			}
 		}
 		return $this;
@@ -2693,30 +2693,30 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function link( $typeOrBean, $qualification = array() )
+	public function link($typeOrBean, $qualification = array())
 	{
-		if ( is_string( $typeOrBean ) ) {
+		if (is_string($typeOrBean)) {
 
-			$typeOrBean = AQueryWriter::camelsSnake( $typeOrBean );
+			$typeOrBean = AQueryWriter::camelsSnake($typeOrBean);
 
-			$bean = $this->beanHelper->getToolBox()->getRedBean()->dispense( $typeOrBean );
+			$bean = $this->beanHelper->getToolBox()->getRedBean()->dispense($typeOrBean);
 
-			if ( is_string( $qualification ) ) {
-				$data = json_decode( $qualification, TRUE );
+			if (is_string($qualification)) {
+				$data = json_decode($qualification, TRUE);
 			} else {
 				$data = $qualification;
 			}
 
-			foreach ( $data as $key => $value ) {
+			foreach ($data as $key => $value) {
 				$bean->$key = $value;
 			}
 		} else {
 			$bean = $typeOrBean;
 		}
 
-		$list = 'own' . ucfirst( $bean->getMeta( 'type' ) );
+		$list = 'own' . ucfirst($bean->getMeta('type'));
 
-		array_push( $this->$list, $bean );
+		array_push($this->$list, $bean);
 
 		return $bean;
 	}
@@ -2728,7 +2728,7 @@ 
 	 */
 	public function fresh()
 	{
-		return $this->beanHelper->getToolbox()->getRedBean()->load( $this->getMeta( 'type' ), $this->properties['id'] );
+		return $this->beanHelper->getToolbox()->getRedBean()->load($this->getMeta('type'), $this->properties['id']);
 	}
 
 	/**
@@ -2738,9 +2738,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function via( $via )
+	public function via($via)
 	{
-		$this->via = AQueryWriter::camelsSnake( $via );
+		$this->via = AQueryWriter::camelsSnake($via);
 
 		return $this;
 	}
@@ -2753,11 +2753,11 @@ 
 	 *
 	 * @return integer
 	 */
-	public function countOwn( $type )
+	public function countOwn($type)
 	{
-		$type = $this->beau( $type );
+		$type = $this->beau($type);
 
-		if ( $this->aliasName ) {
+		if ($this->aliasName) {
 			$myFieldLink     = $this->aliasName . '_id';
 
 			$this->aliasName = NULL;
@@ -2767,23 +2767,23 @@ 
 
 		$count = 0;
 
-		if ( $this->getID() ) {
+		if ($this->getID()) {
 
 			$firstKey = NULL;
-			if ( count( $this->withParams ) > 0 ) {
-				reset( $this->withParams );
-				$firstKey = key( $this->withParams );
+			if (count($this->withParams) > 0) {
+				reset($this->withParams);
+				$firstKey = key($this->withParams);
 			}
 
-			$joinSql = $this->parseJoin( $type );
+			$joinSql = $this->parseJoin($type);
 
-			if ( !is_numeric( $firstKey ) || $firstKey === NULL ) {
+			if (!is_numeric($firstKey) || $firstKey === NULL) {
 					$bindings           = $this->withParams;
 					$bindings[':slot0'] = $this->getID();
-					$count              = $this->beanHelper->getToolbox()->getWriter()->queryRecordCount( $type, array(), " {$joinSql} $myFieldLink = :slot0 " . $this->withSql, $bindings );
+					$count              = $this->beanHelper->getToolbox()->getWriter()->queryRecordCount($type, array(), " {$joinSql} $myFieldLink = :slot0 " . $this->withSql, $bindings);
 			} else {
-					$bindings = array_merge( array( $this->getID() ), $this->withParams );
-					$count    = $this->beanHelper->getToolbox()->getWriter()->queryRecordCount( $type, array(), " {$joinSql} $myFieldLink = ? " . $this->withSql, $bindings );
+					$bindings = array_merge(array($this->getID()), $this->withParams);
+					$count    = $this->beanHelper->getToolbox()->getWriter()->queryRecordCount($type, array(), " {$joinSql} $myFieldLink = ? " . $this->withSql, $bindings);
 			}
 
 		}
@@ -2800,27 +2800,27 @@ 
 	 *
 	 * @return integer
 	 */
-	public function countShared( $type )
+	public function countShared($type)
 	{
 		$toolbox = $this->beanHelper->getToolbox();
 		$redbean = $toolbox->getRedBean();
 		$writer  = $toolbox->getWriter();
 
-		if ( $this->via ) {
-			$oldName = $writer->getAssocTable( array( $this->__info['type'], $type ) );
+		if ($this->via) {
+			$oldName = $writer->getAssocTable(array($this->__info['type'], $type));
 
-			if ( $oldName !== $this->via ) {
+			if ($oldName !== $this->via) {
 				//set the new renaming rule
-				$writer->renameAssocTable( $oldName, $this->via );
+				$writer->renameAssocTable($oldName, $this->via);
 				$this->via = NULL;
 			}
 		}
 
-		$type  = $this->beau( $type );
+		$type  = $this->beau($type);
 		$count = 0;
 
-		if ( $this->getID() ) {
-			$count = $redbean->getAssociationManager()->relatedCount( $this, $type, $this->withSql, $this->withParams, TRUE );
+		if ($this->getID()) {
+			$count = $redbean->getAssociationManager()->relatedCount($this, $type, $this->withSql, $this->withParams, TRUE);
 		}
 
 		$this->clearModifiers();
@@ -2851,33 +2851,33 @@ 
 	 *
 	 * @return array
 	 */
-	public function &aggr( $list, $property, $type = NULL )
+	public function &aggr($list, $property, $type = NULL)
 	{
 		$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 ) {
+		foreach ($this->$list as $bean) {
 			$field = $property . '_id';
-			if ( isset( $bean->$field)  ) {
+			if (isset($bean->$field)) {
 				$ids[] = $bean->$field;
 				$beanIndex[$bean->$field] = $bean;
 			}
 		}
 
-		$beans = $this->beanHelper->getToolBox()->getRedBean()->batch( $type, $ids );
+		$beans = $this->beanHelper->getToolBox()->getRedBean()->batch($type, $ids);
 
 		//now preload the beans as well
-		foreach( $beans as $bean ) {
-			$beanIndex[$bean->id]->setProperty( $property, $bean );
+		foreach ($beans as $bean) {
+			$beanIndex[$bean->id]->setProperty($property, $bean);
 		}
 
-		foreach( $beanIndex as $indexedBean ) {
+		foreach ($beanIndex as $indexedBean) {
 			$references[] = $indexedBean->$property;
 		}
 
@@ -2894,8 +2894,8 @@ 
 	public function equals(OODBBean $bean)
 	{
 		return (bool) (
-			   ( (string) $this->properties['id'] === (string) $bean->properties['id'] )
-			&& ( (string) $this->__info['type']   === (string) $bean->__info['type']   )
+			   ((string) $this->properties['id'] === (string) $bean->properties['id'])
+			&& ((string) $this->__info['type'] === (string) $bean->__info['type'])
 		);
 	}
 }
@@ -2937,14 +2937,14 @@ 
 	 *
 	 * @return void
 	 */
-	public function addEventListener( $eventname, Observer $observer )
+	public function addEventListener($eventname, Observer $observer)
 	{
-		if ( !isset( $this->observers[$eventname] ) ) {
+		if (!isset($this->observers[$eventname])) {
 			$this->observers[$eventname] = array();
 		}
 
-		foreach ( $this->observers[$eventname] as $o ) {
-			if ( $o == $observer ) {
+		foreach ($this->observers[$eventname] as $o) {
+			if ($o == $observer) {
 				return;
 			}
 		}
@@ -2963,14 +2963,14 @@ 
 	 *
 	 * @return void
 	 */
-	public function signal( $eventname, $info )
+	public function signal($eventname, $info)
 	{
-		if ( !isset( $this->observers[$eventname] ) ) {
+		if (!isset($this->observers[$eventname])) {
 			$this->observers[$eventname] = array();
 		}
 
-		foreach ( $this->observers[$eventname] as $observer ) {
-			$observer->onEvent( $eventname, $info );
+		foreach ($this->observers[$eventname] as $observer) {
+			$observer->onEvent($eventname, $info);
 		}
 	}
 }
@@ -3007,7 +3007,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function onEvent( $eventname, $bean );
+	public function onEvent($eventname, $bean);
 }
 } 
 
@@ -3047,7 +3047,7 @@ 
 	 * @param array   $bindings values
 	 * @param boolean $noevent  no event firing
 	 */
-	public function exec( $sql, $bindings = array(), $noevent = FALSE );
+	public function exec($sql, $bindings = array(), $noevent = FALSE);
 
 	/**
 	 * Executes an SQL Query and returns a resultset.
@@ -3060,7 +3060,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function get( $sql, $bindings = array() );
+	public function get($sql, $bindings = array());
 
 	/**
 	 * Executes an SQL Query and returns a resultset.
@@ -3073,7 +3073,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getRow( $sql, $bindings = array() );
+	public function getRow($sql, $bindings = array());
 
 	/**
 	 * Executes an SQL Query and returns a resultset.
@@ -3086,7 +3086,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getCol( $sql, $bindings = array() );
+	public function getCol($sql, $bindings = array());
 
 	/**
 	 * Executes an SQL Query and returns a resultset.
@@ -3099,7 +3099,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCell( $sql, $bindings = array() );
+	public function getCell($sql, $bindings = array());
 
 	/**
 	 * Executes the SQL query specified in $sql and takes
@@ -3114,7 +3114,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getAssoc( $sql, $bindings = array() );
+	public function getAssoc($sql, $bindings = array());
 	
 	/**
 	 * Executes the SQL query specified in $sql and indexes
@@ -3125,7 +3125,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getAssocRow( $sql, $bindings = array() );
+	public function getAssocRow($sql, $bindings = array());
 
 	/**
 	 * Returns the latest insert ID.
@@ -3150,7 +3150,7 @@ 
 	 *
 	 * @return Cursor
 	 */
-	public function getCursor( $sql, $bindings = array() );
+	public function getCursor($sql, $bindings = array());
 
 	/**
 	 * Returns the original database resource. This is useful if you want to
@@ -3244,7 +3244,7 @@ 
 	 *
 	 * @param Driver $database ADO Compatible DB Instance
 	 */
-	public function __construct( $database )
+	public function __construct($database)
 	{
 		$this->db = $database;
 	}
@@ -3260,76 +3260,76 @@ 
 	/**
 	 * @see Adapter::exec
 	 */
-	public function exec( $sql, $bindings = array(), $noevent = FALSE )
+	public function exec($sql, $bindings = array(), $noevent = FALSE)
 	{
-		if ( !$noevent ) {
+		if (!$noevent) {
 			$this->sql = $sql;
-			$this->signal( 'sql_exec', $this );
+			$this->signal('sql_exec', $this);
 		}
 
-		return $this->db->Execute( $sql, $bindings );
+		return $this->db->Execute($sql, $bindings);
 	}
 
 	/**
 	 * @see Adapter::get
 	 */
-	public function get( $sql, $bindings = array() )
+	public function get($sql, $bindings = array())
 	{
 		$this->sql = $sql;
-		$this->signal( 'sql_exec', $this );
+		$this->signal('sql_exec', $this);
 
-		return $this->db->GetAll( $sql, $bindings );
+		return $this->db->GetAll($sql, $bindings);
 	}
 
 	/**
 	 * @see Adapter::getRow
 	 */
-	public function getRow( $sql, $bindings = array() )
+	public function getRow($sql, $bindings = array())
 	{
 		$this->sql = $sql;
-		$this->signal( 'sql_exec', $this );
+		$this->signal('sql_exec', $this);
 
-		return $this->db->GetRow( $sql, $bindings );
+		return $this->db->GetRow($sql, $bindings);
 	}
 
 	/**
 	 * @see Adapter::getCol
 	 */
-	public function getCol( $sql, $bindings = array() )
+	public function getCol($sql, $bindings = array())
 	{
 		$this->sql = $sql;
-		$this->signal( 'sql_exec', $this );
+		$this->signal('sql_exec', $this);
 
-		return $this->db->GetCol( $sql, $bindings );
+		return $this->db->GetCol($sql, $bindings);
 	}
 
 	/**
 	 * @see Adapter::getAssoc
 	 */
-	public function getAssoc( $sql, $bindings = array() )
+	public function getAssoc($sql, $bindings = array())
 	{
 		$this->sql = $sql;
 
-		$this->signal( 'sql_exec', $this );
+		$this->signal('sql_exec', $this);
 
-		$rows  = $this->db->GetAll( $sql, $bindings );
+		$rows  = $this->db->GetAll($sql, $bindings);
 
 		$assoc = array();
-		if ( !$rows ) {
+		if (!$rows) {
 			return $assoc;
 		}
 
-		foreach ( $rows as $row ) {
-			if ( empty( $row ) ) continue;
+		foreach ($rows as $row) {
+			if (empty($row)) continue;
 
-			if ( count( $row ) > 2 ) {
-            $key   = array_shift( $row );
+			if (count($row) > 2) {
+            $key   = array_shift($row);
             $value = $row;
-        } elseif ( count( $row ) > 1 ) {
-				$key   = array_shift( $row );
-				$value = array_shift( $row );
+        } elseif (count($row) > 1) {
+				$key   = array_shift($row);
+				$value = array_shift($row);
 			} else {
-				$key   = array_shift( $row );
+				$key   = array_shift($row);
 				$value = $key;
 			}
 
@@ -3345,29 +3345,29 @@ 
 	public function getAssocRow($sql, $bindings = array())
 	{
 		$this->sql = $sql;
-		$this->signal( 'sql_exec', $this );
+		$this->signal('sql_exec', $this);
 
-		return $this->db->GetAssocRow( $sql, $bindings );
+		return $this->db->GetAssocRow($sql, $bindings);
 	}
 
 	/**
 	 * @see Adapter::getCell
 	 */
-	public function getCell( $sql, $bindings = array(), $noSignal = NULL )
+	public function getCell($sql, $bindings = array(), $noSignal = NULL)
 	{
 		$this->sql = $sql;
 
-		if ( !$noSignal ) $this->signal( 'sql_exec', $this );
+		if (!$noSignal) $this->signal('sql_exec', $this);
 
-		return $this->db->GetOne( $sql, $bindings );
+		return $this->db->GetOne($sql, $bindings);
 	}
 
 	/**
 	 * @see Adapter::getCursor
 	 */
-	public function getCursor( $sql, $bindings = array() )
+	public function getCursor($sql, $bindings = array())
 	{
-		return $this->db->GetCursor( $sql, $bindings );
+		return $this->db->GetCursor($sql, $bindings);
 	}
 
 	/**
@@ -3502,7 +3502,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function __construct( \PDOStatement $res, $fetchStyle )
+	public function __construct(\PDOStatement $res, $fetchStyle)
 	{
 		$this->res = $res;
 		$this->fetchStyle = $fetchStyle;
@@ -3618,7 +3618,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function __construct( $type, Repository $repository, Cursor $cursor )
+	public function __construct($type, Repository $repository, Cursor $cursor)
 	{
 		$this->type = $type;
 		$this->cursor = $cursor;
@@ -3636,9 +3636,9 @@ 
 	public function next()
 	{
 		$row = $this->cursor->getNextItem();
-		if ( $row ) {
-			$beans = $this->repository->convertToBeans( $this->type, array( $row ) );
-			$bean = array_shift( $beans );
+		if ($row) {
+			$beans = $this->repository->convertToBeans($this->type, array($row));
+			$bean = array_shift($beans);
 			return $bean;
 		}
 		return NULL;
@@ -3732,7 +3732,7 @@ 
 	 *
 	 * @return string $joinSQLSnippet
 	 */
-	public function writeJoin( $type, $targetType, $joinType );
+	public function writeJoin($type, $targetType, $joinType);
 
 	/**
 	 * Glues an SQL snippet to the beginning of a WHERE clause.
@@ -3765,7 +3765,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function glueSQLCondition( $sql, $glue = NULL );
+	public function glueSQLCondition($sql, $glue = NULL);
 
 	/**
 	 * Determines if there is a LIMIT 1 clause in the SQL.
@@ -3778,7 +3778,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function glueLimitOne( $sql );
+	public function glueLimitOne($sql);
 
 	/**
 	 * Returns the tables that are in the database.
@@ -3795,7 +3795,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function createTable( $type );
+	public function createTable($type);
 
 	/**
 	 * Returns an array containing all the columns of the specified type.
@@ -3809,7 +3809,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getColumns( $type );
+	public function getColumns($type);
 
 	/**
 	 * Returns the Column Type Code (integer) that corresponds
@@ -3820,7 +3820,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function scanType( $value, $alsoScanSpecialForTypes = FALSE );
+	public function scanType($value, $alsoScanSpecialForTypes = FALSE);
 
 	/**
 	 * This method will add a column to a table.
@@ -3832,7 +3832,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function addColumn( $type, $column, $field );
+	public function addColumn($type, $column, $field);
 
 	/**
 	 * Returns the Type Code for a Column Description.
@@ -3846,7 +3846,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function code( $typedescription, $includeSpecials = FALSE );
+	public function code($typedescription, $includeSpecials = FALSE);
 
 	/**
 	 * This method will widen the column to the specified data type.
@@ -3858,7 +3858,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function widenColumn( $type, $column, $datatype );
+	public function widenColumn($type, $column, $datatype);
 
 	/**
 	 * Selects records from the database.
@@ -3872,7 +3872,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function queryRecord( $type, $conditions = array(), $addSql = NULL, $bindings = array() );
+	public function queryRecord($type, $conditions = array(), $addSql = NULL, $bindings = array());
 
 	/**
 	 * Selects records from the database and returns a cursor.
@@ -3886,7 +3886,7 @@ 
 	 *
 	 * @return Cursor
 	 */
-	public function queryRecordWithCursor( $type, $addSql = NULL, $bindings = array() );
+	public function queryRecordWithCursor($type, $addSql = NULL, $bindings = array());
 
 	/**
 	 * Returns records through an intermediate type. This method is used to obtain records using a link table and
@@ -3900,7 +3900,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function queryRecordRelated( $sourceType, $destType, $linkID, $addSql = '', $bindings = array() );
+	public function queryRecordRelated($sourceType, $destType, $linkID, $addSql = '', $bindings = array());
 
 	/**
 	 * Returns the row that links $sourceType $sourcID to $destType $destID in an N-M relation.
@@ -3912,7 +3912,7 @@ 
 	 *
 	 * @return array|null
 	 */
-	public function queryRecordLink( $sourceType, $destType, $sourceID, $destID );
+	public function queryRecordLink($sourceType, $destType, $sourceID, $destID);
 
 	/**
 	 * Counts the number of records in the database that match the
@@ -3925,7 +3925,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function queryRecordCount( $type, $conditions = array(), $addSql = NULL, $bindings = array() );
+	public function queryRecordCount($type, $conditions = array(), $addSql = NULL, $bindings = array());
 
 	/**
 	 * Returns the number of records linked through $linkType and satisfying the SQL in $addSQL/$bindings.
@@ -3938,7 +3938,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function queryRecordCountRelated( $sourceType, $targetType, $linkID, $addSQL = '', $bindings = array() );
+	public function queryRecordCountRelated($sourceType, $targetType, $linkID, $addSQL = '', $bindings = array());
 
 	/**
 	 * Returns all rows of specified type that have been tagged with one of the
@@ -3955,7 +3955,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function queryTagged( $type, $tagList, $all = FALSE, $addSql = '', $bindings = array() );
+	public function queryTagged($type, $tagList, $all = FALSE, $addSql = '', $bindings = array());
 
 	/**
 	 * This method should update (or insert a record), it takes
@@ -3971,7 +3971,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function updateRecord( $type, $updatevalues, $id = NULL );
+	public function updateRecord($type, $updatevalues, $id = NULL);
 
 	/**
 	 * Deletes records from the database.
@@ -3984,7 +3984,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function deleteRecord( $type, $conditions = array(), $addSql = '', $bindings = array() );
+	public function deleteRecord($type, $conditions = array(), $addSql = '', $bindings = array());
 
 	/**
 	 * Deletes all links between $sourceType and $destType in an N-M relation.
@@ -3995,12 +3995,12 @@ 
 	 *
 	 * @return void
 	 */
-	public function deleteRelations( $sourceType, $destType, $sourceID );
+	public function deleteRelations($sourceType, $destType, $sourceID);
 
 	/**
 	 * @see QueryWriter::addUniqueConstaint
 	 */
-	public function addUniqueIndex( $type, $columns );
+	public function addUniqueIndex($type, $columns);
 
 	/**
 	 * This method will add a UNIQUE constraint index to a table on columns $columns.
@@ -4011,7 +4011,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function addUniqueConstraint( $type, $columns );
+	public function addUniqueConstraint($type, $columns);
 
 	/**
 	 * This method will check whether the SQL state is in the list of specified states
@@ -4025,7 +4025,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function sqlStateIn( $state, $list );
+	public function sqlStateIn($state, $list);
 
 	/**
 	 * This method will remove all beans of a certain type.
@@ -4035,7 +4035,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function wipe( $type );
+	public function wipe($type);
 
 	/**
 	 * This method will add a foreign key from type and field to
@@ -4055,7 +4055,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function addFK( $type, $targetType, $property, $targetProperty, $isDep = false );
+	public function addFK($type, $targetType, $property, $targetProperty, $isDep = false);
 
 	/**
 	 * This method will add an index to a type and field with name
@@ -4068,7 +4068,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function addIndex( $type, $name, $property );
+	public function addIndex($type, $name, $property);
 
 	/**
 	 * Checks and filters a database structure element like a table of column
@@ -4082,7 +4082,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function esc( $databaseStructure, $dontQuote = FALSE );
+	public function esc($databaseStructure, $dontQuote = FALSE);
 
 	/**
 	 * Removes all tables and views from the database.
@@ -4112,7 +4112,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function renameAssocTable( $fromType, $toType = NULL );
+	public function renameAssocTable($fromType, $toType = NULL);
 
 	/**
 	 * Returns the format for link tables.
@@ -4125,7 +4125,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getAssocTable( $types );
+	public function getAssocTable($types);
 
 	/**
 	 * Given a bean type and a property, this method
@@ -4142,7 +4142,7 @@ 
 	 *
 	 * @return string|NULL
 	 */
-	public function inferFetchType( $type, $property );
+	public function inferFetchType($type, $property);
 }
 }
 
@@ -4234,30 +4234,30 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function canBeTreatedAsInt( $value )
+	public static function canBeTreatedAsInt($value)
 	{
-		return (bool) ( strval( $value ) === strval( intval( $value ) ) );
+		return (bool) (strval($value) === strval(intval($value)));
 	}
 
 	/**
 	 * @see QueryWriter::getAssocTableFormat
 	 */
-	public static function getAssocTableFormat( $types )
+	public static function getAssocTableFormat($types)
 	{
-		sort( $types );
+		sort($types);
 
-		$assoc = implode( '_', $types );
+		$assoc = implode('_', $types);
 
-		return ( isset( self::$renames[$assoc] ) ) ? self::$renames[$assoc] : $assoc;
+		return (isset(self::$renames[$assoc])) ? self::$renames[$assoc] : $assoc;
 	}
 
 	/**
 	 * @see QueryWriter::renameAssociation
 	 */
-	public static function renameAssociation( $from, $to = NULL )
+	public static function renameAssociation($from, $to = NULL)
 	{
-		if ( is_array( $from ) ) {
-			foreach ( $from as $key => $value ) self::$renames[$key] = $value;
+		if (is_array($from)) {
+			foreach ($from as $key => $value) self::$renames[$key] = $value;
 
 			return;
 		}
@@ -4273,9 +4273,9 @@ 
 	 *
 	 * @return string
 	 */
-	public static function camelsSnake( $camel )
+	public static function camelsSnake($camel)
 	{
-		return strtolower( preg_replace( '/(?<=[a-z])([A-Z])|([A-Z])(?=[a-z])/', '_$1$2', $camel ) );
+		return strtolower(preg_replace('/(?<=[a-z])([A-Z])|([A-Z])(?=[a-z])/', '_$1$2', $camel));
 	}
 
 	/**
@@ -4308,7 +4308,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setNarrowFieldMode( $narrowField )
+	public static function setNarrowFieldMode($narrowField)
 	{
 		self::$flagNarrowFieldMode = (boolean) $narrowField;
 	}
@@ -4342,7 +4342,7 @@ 
 	 *
 	 * @param array
 	 */
-	public static function setSQLFilters( $sqlFilters, $safeMode = false )
+	public static function setSQLFilters($sqlFilters, $safeMode = false)
 	{
 		self::$flagSQLFilterSafeMode = (boolean) $safeMode;
 		self::$sqlFilters = $sqlFilters;
@@ -4370,9 +4370,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function getCacheKey( $keyValues )
+	private function getCacheKey($keyValues)
 	{
-		return json_encode( $keyValues );
+		return json_encode($keyValues);
 	}
 
 	/**
@@ -4383,12 +4383,12 @@ 
 	 *
 	 * @return mixed
 	 */
-	private function getCached( $cacheTag, $key )
+	private function getCached($cacheTag, $key)
 	{
 		$sql = $this->adapter->getSQL();
 
 		if ($this->updateCache()) {
-			if ( isset( $this->cache[$cacheTag][$key] ) ) {
+			if (isset($this->cache[$cacheTag][$key])) {
 				return $this->cache[$cacheTag][$key];
 			}
 		}
@@ -4408,7 +4408,7 @@ 
 	private function updateCache()
 	{
 		$sql = $this->adapter->getSQL();
-		if ( strpos( $sql, '-- keep-cache' ) !== strlen( $sql ) - 13 ) {
+		if (strpos($sql, '-- keep-cache') !== strlen($sql) - 13) {
 			// If SQL has been taken place outside of this method then something else then
 			// a select query might have happened! (or instruct to keep cache)
 			$this->cache = array();
@@ -4435,10 +4435,10 @@ 
 	 *
 	 * @return void
 	 */
-	private function putResultInCache( $cacheTag, $key, $values )
+	private function putResultInCache($cacheTag, $key, $values)
 	{
-		if ( isset( $this->cache[$cacheTag] ) ) {
-			if ( count( $this->cache[$cacheTag] ) > $this->maxCacheSizePerType ) array_shift( $this->cache[$cacheTag] );
+		if (isset($this->cache[$cacheTag])) {
+			if (count($this->cache[$cacheTag]) > $this->maxCacheSizePerType) array_shift($this->cache[$cacheTag]);
 		} else {
 			$this->cache[$cacheTag] = array();
 		}
@@ -4461,63 +4461,63 @@ 
 	 *
 	 * @return string
 	 */
-	private function makeSQLFromConditions( $conditions, &$bindings, $addSql = '' )
+	private function makeSQLFromConditions($conditions, &$bindings, $addSql = '')
 	{
-		reset( $bindings );
-		$firstKey       = key( $bindings );
-		$paramTypeIsNum = ( is_numeric( $firstKey ) );
+		reset($bindings);
+		$firstKey       = key($bindings);
+		$paramTypeIsNum = (is_numeric($firstKey));
 		$counter        = 0;
 
 		$sqlConditions = array();
-		foreach ( $conditions as $column => $values ) {
-			if ( !count( $values ) ) continue;
+		foreach ($conditions as $column => $values) {
+			if (!count($values)) continue;
 
-			$sql = $this->esc( $column );
+			$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 ) ) ) {
-				$sql .= implode( ',', $values ) . ' ) ';
+			if (ctype_digit(implode('', $values))) {
+				$sql .= implode(',', $values) . ' ) ';
 
 				// only numeric, cant do much harm
 				$sqlConditions[] = $sql;
 			} else {
 
-				if ( $paramTypeIsNum ) {
-					$sql .= implode( ',', array_fill( 0, count( $values ), '?' ) ) . ' ) ';
+				if ($paramTypeIsNum) {
+					$sql .= implode(',', array_fill(0, count($values), '?')) . ' ) ';
 
 					array_unshift($sqlConditions, $sql);
 
-					foreach ( $values as $k => $v ) {
-						$values[$k] = strval( $v );
+					foreach ($values as $k => $v) {
+						$values[$k] = strval($v);
 
-						array_unshift( $bindings, $v );
+						array_unshift($bindings, $v);
 					}
 				} else {
 
 					$slots = array();
 
-					foreach( $values as $k => $v ) {
-						$slot            = ':slot'.$counter++;
+					foreach ($values as $k => $v) {
+						$slot            = ':slot' . $counter++;
 						$slots[]         = $slot;
-						$bindings[$slot] = strval( $v );
+						$bindings[$slot] = strval($v);
 					}
 
-					$sql .= implode( ',', $slots ).' ) ';
+					$sql .= implode(',', $slots) . ' ) ';
 					$sqlConditions[] = $sql;
 				}
 			}
 		}
 
 		$sql = '';
-		if ( is_array( $sqlConditions ) && count( $sqlConditions ) > 0 ) {
-			$sql = implode( ' AND ', $sqlConditions );
+		if (is_array($sqlConditions) && count($sqlConditions) > 0) {
+			$sql = implode(' AND ', $sqlConditions);
 			$sql = " WHERE ( $sql ) ";
 
-			if ( $addSql ) $sql .= $addSql;
-		} elseif ( $addSql ) {
+			if ($addSql) $sql .= $addSql;
+		} elseif ($addSql) {
 			$sql = $addSql;
 		}
 
@@ -4533,21 +4533,21 @@ 
 	 *
 	 * @return array
 	 */
-	private function getRelationalTablesAndColumns( $sourceType, $destType, $noQuote = FALSE )
+	private function getRelationalTablesAndColumns($sourceType, $destType, $noQuote = FALSE)
 	{
-		$linkTable   = $this->esc( $this->getAssocTable( array( $sourceType, $destType ) ), $noQuote );
-		$sourceCol   = $this->esc( $sourceType . '_id', $noQuote );
+		$linkTable   = $this->esc($this->getAssocTable(array($sourceType, $destType)), $noQuote);
+		$sourceCol   = $this->esc($sourceType . '_id', $noQuote);
 
-		if ( $sourceType === $destType ) {
-			$destCol = $this->esc( $destType . '2_id', $noQuote );
+		if ($sourceType === $destType) {
+			$destCol = $this->esc($destType . '2_id', $noQuote);
 		} else {
-			$destCol = $this->esc( $destType . '_id', $noQuote );
+			$destCol = $this->esc($destType . '_id', $noQuote);
 		}
 
-		$sourceTable = $this->esc( $sourceType, $noQuote );
-		$destTable   = $this->esc( $destType, $noQuote );
+		$sourceTable = $this->esc($sourceType, $noQuote);
+		$destTable   = $this->esc($destType, $noQuote);
 
-		return array( $sourceTable, $destTable, $linkTable, $sourceCol, $destCol );
+		return array($sourceTable, $destTable, $linkTable, $sourceCol, $destCol);
 	}
 
 	/**
@@ -4559,18 +4559,18 @@ 
 	 *
 	 * @return array|NULL
 	 */
-	protected function getForeignKeyForTypeProperty( $type, $property )
+	protected function getForeignKeyForTypeProperty($type, $property)
 	{
-		$property = $this->esc( $property, TRUE );
+		$property = $this->esc($property, TRUE);
 
 		try {
-			$map = $this->getKeyMapForType( $type );
-		} catch ( SQLException $e ) {
+			$map = $this->getKeyMapForType($type);
+		} catch (SQLException $e) {
 			return NULL;
 		}
 
-		foreach( $map as $key ) {
-			if ( $key['from'] === $property ) return $key;
+		foreach ($map as $key) {
+			if ($key['from'] === $property) return $key;
 		}
 		return NULL;
 	}
@@ -4596,7 +4596,7 @@ 
 	 *
 	 * @return array
 	 */
-	protected function getKeyMapForType( $type )
+	protected function getKeyMapForType($type)
 	{
 		return array();
 	}
@@ -4627,22 +4627,22 @@ 
 	 *
 	 * @return string
 	 */
-	protected function getSQLFilterSnippet( $type )
+	protected function getSQLFilterSnippet($type)
 	{
 		$existingCols = array();
 		if (self::$flagSQLFilterSafeMode) {
-			$existingCols = $this->getColumns( $type );
+			$existingCols = $this->getColumns($type);
 		}
 
 		$sqlFilters = array();
-		if ( isset( self::$sqlFilters[QueryWriter::C_SQLFILTER_READ][$type] ) ) {
-			foreach( self::$sqlFilters[QueryWriter::C_SQLFILTER_READ][$type] as $property => $sqlFilter ) {
-				if ( !self::$flagSQLFilterSafeMode || isset( $existingCols[$property] ) ) {
-					$sqlFilters[] = $sqlFilter.' AS '.$property.' ';
+		if (isset(self::$sqlFilters[QueryWriter::C_SQLFILTER_READ][$type])) {
+			foreach (self::$sqlFilters[QueryWriter::C_SQLFILTER_READ][$type] as $property => $sqlFilter) {
+				if (!self::$flagSQLFilterSafeMode || isset($existingCols[$property])) {
+					$sqlFilters[] = $sqlFilter . ' AS ' . $property . ' ';
 				}
 			}
 		}
-		$sqlFilterStr = ( count($sqlFilters) ) ? ( ','.implode( ',', $sqlFilters ) ) : '';
+		$sqlFilterStr = (count($sqlFilters)) ? (',' . implode(',', $sqlFilters)) : '';
 		return $sqlFilterStr;
 	}
 
@@ -4662,20 +4662,20 @@ 
 	 *
 	 * @return string
 	 */
-	protected function getParametersForInClause( &$valueList, $otherBindings, $offset = 0 )
+	protected function getParametersForInClause(&$valueList, $otherBindings, $offset = 0)
 	{
-		if ( is_array( $otherBindings ) && count( $otherBindings ) > 0 ) {
-			reset( $otherBindings );
+		if (is_array($otherBindings) && count($otherBindings) > 0) {
+			reset($otherBindings);
 
-			$key = key( $otherBindings );
+			$key = key($otherBindings);
 
-			if ( !is_numeric($key) ) {
+			if (!is_numeric($key)) {
 				$filler  = array();
 				$newList = (!$offset) ? array() : $valueList;
 				$counter = $offset;
 
-				foreach( $valueList as $value ) {
-					$slot           = ':slot' . ( $counter++ );
+				foreach ($valueList as $value) {
+					$slot           = ':slot' . ($counter++);
 					$filler[]       = $slot;
 					$newList[$slot] = $value;
 				}
@@ -4683,11 +4683,11 @@ 
 				// Change the keys!
 				$valueList = $newList;
 
-				return implode( ',', $filler );
+				return implode(',', $filler);
 			}
 		}
 
-		return implode( ',', array_fill( 0, count( $valueList ), '?' ) );
+		return implode(',', array_fill(0, count($valueList), '?'));
 	}
 
 	/**
@@ -4700,10 +4700,10 @@ 
 	 *
 	 * @return self
 	 */
-	protected function addDataType( $dataTypeID, $SQLDefinition )
+	protected function addDataType($dataTypeID, $SQLDefinition)
 	{
-		$this->typeno_sqltype[ $dataTypeID ] = $SQLDefinition;
-		$this->sqltype_typeno[ $SQLDefinition ] = $dataTypeID;
+		$this->typeno_sqltype[$dataTypeID] = $SQLDefinition;
+		$this->sqltype_typeno[$SQLDefinition] = $dataTypeID;
 		return $this;
 	}
 
@@ -4714,7 +4714,7 @@ 
 	 *
 	 * @return string
 	 */
-	protected function getInsertSuffix( $table )
+	protected function getInsertSuffix($table)
 	{
 		return '';
 	}
@@ -4728,11 +4728,11 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function startsWithZeros( $value )
+	protected function startsWithZeros($value)
 	{
-		$value = strval( $value );
+		$value = strval($value);
 
-		if ( strlen( $value ) > 1 && strpos( $value, '0' ) === 0 && strpos( $value, '0.' ) !== 0 ) {
+		if (strlen($value) > 1 && strpos($value, '0') === 0 && strpos($value, '0.') !== 0) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -4749,17 +4749,17 @@ 
 	 *
 	 * @return integer
 	 */
-	protected function insertRecord( $type, $insertcolumns, $insertvalues )
+	protected function insertRecord($type, $insertcolumns, $insertvalues)
 	{
 		$default = $this->defaultValue;
-		$suffix  = $this->getInsertSuffix( $type );
-		$table   = $this->esc( $type );
+		$suffix  = $this->getInsertSuffix($type);
+		$table   = $this->esc($type);
 
-		if ( count( $insertvalues ) > 0 && is_array( $insertvalues[0] ) && count( $insertvalues[0] ) > 0 ) {
+		if (count($insertvalues) > 0 && is_array($insertvalues[0]) && count($insertvalues[0]) > 0) {
 
 			$insertSlots = array();
-			foreach ( $insertcolumns as $k => $v ) {
-				$insertcolumns[$k] = $this->esc( $v );
+			foreach ($insertcolumns as $k => $v) {
+				$insertcolumns[$k] = $this->esc($v);
 
 				if (isset(self::$sqlFilters['w'][$type][$v])) {
 					$insertSlots[] = self::$sqlFilters['w'][$type][$v];
@@ -4768,20 +4768,20 @@ 
 				}
 			}
 
-			$insertSQL = "INSERT INTO $table ( id, " . implode( ',', $insertcolumns ) . " ) VALUES
-			( $default, " . implode( ',', $insertSlots ) . " ) $suffix";
+			$insertSQL = "INSERT INTO $table ( id, " . implode(',', $insertcolumns) . " ) VALUES
+			( $default, " . implode(',', $insertSlots) . " ) $suffix";
 
 			$ids = array();
-			foreach ( $insertvalues as $i => $insertvalue ) {
-				$ids[] = $this->adapter->getCell( $insertSQL, $insertvalue, $i );
+			foreach ($insertvalues as $i => $insertvalue) {
+				$ids[] = $this->adapter->getCell($insertSQL, $insertvalue, $i);
 			}
 
-			$result = count( $ids ) === 1 ? array_pop( $ids ) : $ids;
+			$result = count($ids) === 1 ? array_pop($ids) : $ids;
 		} else {
-			$result = $this->adapter->getCell( "INSERT INTO $table (id) VALUES($default) $suffix" );
+			$result = $this->adapter->getCell("INSERT INTO $table (id) VALUES($default) $suffix");
 		}
 
-		if ( $suffix ) return $result;
+		if ($suffix) return $result;
 
 		$last_id = $this->adapter->getInsertID();
 
@@ -4797,10 +4797,10 @@ 
 	 *
 	 * @throws Security
 	 */
-	protected function check( $struct )
+	protected function check($struct)
 	{
-		if ( !is_string( $struct ) || !preg_match( '/^[a-zA-Z0-9_]+$/', $struct ) ) {
-			throw new RedException( 'Identifier does not conform to RedBeanPHP security policies.' );
+		if (!is_string($struct) || !preg_match('/^[a-zA-Z0-9_]+$/', $struct)) {
+			throw new RedException('Identifier does not conform to RedBeanPHP security policies.');
 		}
 
 		return $struct;
@@ -4814,40 +4814,40 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function tableExists( $table )
+	public function tableExists($table)
 	{
 		$tables = $this->getTables();
 
-		return in_array( $table, $tables );
+		return in_array($table, $tables);
 	}
 
 	/**
 	 * @see QueryWriter::glueSQLCondition
 	 */
-	public function glueSQLCondition( $sql, $glue = NULL )
+	public function glueSQLCondition($sql, $glue = NULL)
 	{
 		static $snippetCache = array();
 
-		if ( trim( $sql ) === '' ) {
+		if (trim($sql) === '') {
 			return $sql;
 		}
 
 		$key = $glue . '|' . $sql;
 
-		if ( isset( $snippetCache[$key] ) ) {
+		if (isset($snippetCache[$key])) {
 			return $snippetCache[$key];
 		}
 
-		$lsql = ltrim( $sql );
+		$lsql = ltrim($sql);
 
-		if ( preg_match( '/^(INNER|LEFT|RIGHT|JOIN|AND|OR|WHERE|ORDER|GROUP|HAVING|LIMIT|OFFSET)\s+/i', $lsql ) ) {
-			if ( $glue === QueryWriter::C_GLUE_WHERE && stripos( $lsql, 'AND' ) === 0 ) {
-				$snippetCache[$key] = ' WHERE ' . substr( $lsql, 3 );
+		if (preg_match('/^(INNER|LEFT|RIGHT|JOIN|AND|OR|WHERE|ORDER|GROUP|HAVING|LIMIT|OFFSET)\s+/i', $lsql)) {
+			if ($glue === QueryWriter::C_GLUE_WHERE && stripos($lsql, 'AND') === 0) {
+				$snippetCache[$key] = ' WHERE ' . substr($lsql, 3);
 			} else {
 				$snippetCache[$key] = $sql;
 			}
 		} else {
-			$snippetCache[$key] = ( ( $glue === QueryWriter::C_GLUE_AND ) ? ' AND ' : ' WHERE ') . $sql;
+			$snippetCache[$key] = (($glue === QueryWriter::C_GLUE_AND) ? ' AND ' : ' WHERE ') . $sql;
 		}
 
 		return $snippetCache[$key];
@@ -4856,80 +4856,80 @@ 
 	/**
 	 * @see QueryWriter::glueLimitOne
 	 */
-	public function glueLimitOne( $sql = '')
+	public function glueLimitOne($sql = '')
 	{
-		return ( strpos( $sql, 'LIMIT' ) === FALSE ) ? ( $sql . ' LIMIT 1 ' ) : $sql;
+		return (strpos($sql, 'LIMIT') === FALSE) ? ($sql . ' LIMIT 1 ') : $sql;
 	}
 
 	/**
 	 * @see QueryWriter::esc
 	 */
-	public function esc( $dbStructure, $dontQuote = FALSE )
+	public function esc($dbStructure, $dontQuote = FALSE)
 	{
-		$this->check( $dbStructure );
+		$this->check($dbStructure);
 
-		return ( $dontQuote ) ? $dbStructure : $this->quoteCharacter . $dbStructure . $this->quoteCharacter;
+		return ($dontQuote) ? $dbStructure : $this->quoteCharacter . $dbStructure . $this->quoteCharacter;
 	}
 
 	/**
 	 * @see QueryWriter::addColumn
 	 */
-	public function addColumn( $type, $column, $field )
+	public function addColumn($type, $column, $field)
 	{
 		$table  = $type;
 		$type   = $field;
-		$table  = $this->esc( $table );
-		$column = $this->esc( $column );
+		$table  = $this->esc($table);
+		$column = $this->esc($column);
 
-		$type = ( isset( $this->typeno_sqltype[$type] ) ) ? $this->typeno_sqltype[$type] : '';
+		$type = (isset($this->typeno_sqltype[$type])) ? $this->typeno_sqltype[$type] : '';
 
-		$this->adapter->exec( "ALTER TABLE $table ADD $column $type " );
+		$this->adapter->exec("ALTER TABLE $table ADD $column $type ");
 	}
 
 	/**
 	 * @see QueryWriter::updateRecord
 	 */
-	public function updateRecord( $type, $updatevalues, $id = NULL )
+	public function updateRecord($type, $updatevalues, $id = NULL)
 	{
 		$table = $type;
 
-		if ( !$id ) {
+		if (!$id) {
 			$insertcolumns = $insertvalues = array();
 
-			foreach ( $updatevalues as $pair ) {
+			foreach ($updatevalues as $pair) {
 				$insertcolumns[] = $pair['property'];
 				$insertvalues[]  = $pair['value'];
 			}
 
 			//Otherwise psql returns string while MySQL/SQLite return numeric causing problems with additions (array_diff)
-			return (string) $this->insertRecord( $table, $insertcolumns, array( $insertvalues ) );
+			return (string) $this->insertRecord($table, $insertcolumns, array($insertvalues));
 		}
 
-		if ( $id && !count( $updatevalues ) ) {
+		if ($id && !count($updatevalues)) {
 			return $id;
 		}
 
-		$table = $this->esc( $table );
+		$table = $this->esc($table);
 		$sql   = "UPDATE $table SET ";
 
 		$p = $v = array();
 
-		foreach ( $updatevalues as $uv ) {
+		foreach ($updatevalues as $uv) {
 
-			if ( isset( self::$sqlFilters['w'][$type][$uv['property']] ) ) {
-				$p[] = " {$this->esc( $uv["property"] )} = ". self::$sqlFilters['w'][$type][$uv['property']];
+			if (isset(self::$sqlFilters['w'][$type][$uv['property']])) {
+				$p[] = " {$this->esc($uv["property"])} = " . self::$sqlFilters['w'][$type][$uv['property']];
 			} else {
-				$p[] = " {$this->esc( $uv["property"] )} = ? ";
+				$p[] = " {$this->esc($uv["property"])} = ? ";
 			}
 
 			$v[] = $uv['value'];
 		}
 
-		$sql .= implode( ',', $p ) . ' WHERE id = ? ';
+		$sql .= implode(',', $p) . ' WHERE id = ? ';
 
 		$v[] = $id;
 
-		$this->adapter->exec( $sql, $v );
+		$this->adapter->exec($sql, $v);
 
 		return $id;
 	}
@@ -4937,50 +4937,50 @@ 
 	/**
 	 * @see QueryWriter::writeJoin
 	 */
-	public function writeJoin( $type, $targetType, $leftRight = 'LEFT' )
+	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 );
-		$field = $this->esc( $targetType, TRUE );
+		$table = $this->esc($type);
+		$targetTable = $this->esc($targetType);
+		$field = $this->esc($targetType, TRUE);
 		return " {$leftRight} JOIN {$targetTable} ON {$targetTable}.id = {$table}.{$field}_id ";
 	}
 
 	/**
 	 * @see QueryWriter::queryRecord
 	 */
-	public function queryRecord( $type, $conditions = array(), $addSql = NULL, $bindings = array() )
+	public function queryRecord($type, $conditions = array(), $addSql = NULL, $bindings = array())
 	{
-		$addSql = $this->glueSQLCondition( $addSql, ( count($conditions) > 0) ? QueryWriter::C_GLUE_AND : NULL );
+		$addSql = $this->glueSQLCondition($addSql, (count($conditions) > 0) ? QueryWriter::C_GLUE_AND : NULL);
 
 		$key = NULL;
-		if ( $this->flagUseCache ) {
-			$key = $this->getCacheKey( array( $conditions, $addSql, $bindings, 'select' ) );
+		if ($this->flagUseCache) {
+			$key = $this->getCacheKey(array($conditions, $addSql, $bindings, 'select'));
 
-			if ( $cached = $this->getCached( $type, $key ) ) {
+			if ($cached = $this->getCached($type, $key)) {
 				return $cached;
 			}
 		}
 
-		$table = $this->esc( $type );
+		$table = $this->esc($type);
 
 		$sqlFilterStr = '';
-		if ( count( self::$sqlFilters ) ) {
-			$sqlFilterStr = $this->getSQLFilterSnippet( $type );
+		if (count(self::$sqlFilters)) {
+			$sqlFilterStr = $this->getSQLFilterSnippet($type);
 		}
 
-		$sql   = $this->makeSQLFromConditions( $conditions, $bindings, $addSql );
+		$sql   = $this->makeSQLFromConditions($conditions, $bindings, $addSql);
 
-		$fieldSelection = ( self::$flagNarrowFieldMode ) ? "{$table}.*" : '*';
+		$fieldSelection = (self::$flagNarrowFieldMode) ? "{$table}.*" : '*';
 		$sql   = "SELECT {$fieldSelection} {$sqlFilterStr} FROM {$table} {$sql} -- keep-cache";
 
-		$rows  = $this->adapter->get( $sql, $bindings );
+		$rows  = $this->adapter->get($sql, $bindings);
 
 
-		if ( $this->flagUseCache && $key ) {
-			$this->putResultInCache( $type, $key, $rows );
+		if ($this->flagUseCache && $key) {
+			$this->putResultInCache($type, $key, $rows);
 		}
 
 		return $rows;
@@ -4989,38 +4989,38 @@ 
 	/**
 	 * @see QueryWriter::queryRecordWithCursor
 	 */
-	public function queryRecordWithCursor( $type, $addSql = NULL, $bindings = array() )
+	public function queryRecordWithCursor($type, $addSql = NULL, $bindings = array())
 	{
-		$sql = $this->glueSQLCondition( $addSql, NULL );
-		$table = $this->esc( $type );
+		$sql = $this->glueSQLCondition($addSql, NULL);
+		$table = $this->esc($type);
 		$sql   = "SELECT {$table}.* FROM {$table} {$sql}";
-		return $this->adapter->getCursor( $sql, $bindings );
+		return $this->adapter->getCursor($sql, $bindings);
 	}
 
 	/**
 	 * @see QueryWriter::queryRecordRelated
 	 */
-	public function queryRecordRelated( $sourceType, $destType, $linkIDs, $addSql = '', $bindings = array() )
+	public function queryRecordRelated($sourceType, $destType, $linkIDs, $addSql = '', $bindings = array())
 	{
-		$addSql = $this->glueSQLCondition( $addSql, QueryWriter::C_GLUE_WHERE );
+		$addSql = $this->glueSQLCondition($addSql, QueryWriter::C_GLUE_WHERE);
 
-		list( $sourceTable, $destTable, $linkTable, $sourceCol, $destCol ) = $this->getRelationalTablesAndColumns( $sourceType, $destType );
+		list($sourceTable, $destTable, $linkTable, $sourceCol, $destCol) = $this->getRelationalTablesAndColumns($sourceType, $destType);
 
-		$key = $this->getCacheKey( array( $sourceType, $destType, implode( ',', $linkIDs ), $addSql, $bindings ) );
+		$key = $this->getCacheKey(array($sourceType, $destType, implode(',', $linkIDs), $addSql, $bindings));
 
-		if ( $this->flagUseCache && $cached = $this->getCached( $destType, $key ) ) {
+		if ($this->flagUseCache && $cached = $this->getCached($destType, $key)) {
 			return $cached;
 		}
 
-		$inClause = $this->getParametersForInClause( $linkIDs, $bindings );
+		$inClause = $this->getParametersForInClause($linkIDs, $bindings);
 
 		$sqlFilterStr = '';
-		if ( count( self::$sqlFilters ) ) {
-			$sqlFilterStr = $this->getSQLFilterSnippet( $destType );
+		if (count(self::$sqlFilters)) {
+			$sqlFilterStr = $this->getSQLFilterSnippet($destType);
 		}
 
-		if ( $sourceType === $destType ) {
-			$inClause2 = $this->getParametersForInClause( $linkIDs, $bindings, count( $bindings ) ); //for some databases
+		if ($sourceType === $destType) {
+			$inClause2 = $this->getParametersForInClause($linkIDs, $bindings, count($bindings)); //for some databases
 			$sql = "
 			SELECT
 				{$destTable}.* {$sqlFilterStr} ,
@@ -5034,7 +5034,7 @@ 
 			{$addSql}
 			-- keep-cache";
 
-			$linkIDs = array_merge( $linkIDs, $linkIDs );
+			$linkIDs = array_merge($linkIDs, $linkIDs);
 		} else {
 			$sql = "
 			SELECT
@@ -5047,11 +5047,11 @@ 
 			-- keep-cache";
 		}
 
-		$bindings = array_merge( $linkIDs, $bindings );
+		$bindings = array_merge($linkIDs, $bindings);
 
-		$rows = $this->adapter->get( $sql, $bindings );
+		$rows = $this->adapter->get($sql, $bindings);
 
-		$this->putResultInCache( $destType, $key, $rows );
+		$this->putResultInCache($destType, $key, $rows);
 
 		return $rows;
 	}
@@ -5059,33 +5059,33 @@ 
 	/**
 	 * @see QueryWriter::queryRecordLink
 	 */
-	public function queryRecordLink( $sourceType, $destType, $sourceID, $destID )
+	public function queryRecordLink($sourceType, $destType, $sourceID, $destID)
 	{
-		list( $sourceTable, $destTable, $linkTable, $sourceCol, $destCol ) = $this->getRelationalTablesAndColumns( $sourceType, $destType );
+		list($sourceTable, $destTable, $linkTable, $sourceCol, $destCol) = $this->getRelationalTablesAndColumns($sourceType, $destType);
 
-		$key = $this->getCacheKey( array( $sourceType, $destType, $sourceID, $destID ) );
+		$key = $this->getCacheKey(array($sourceType, $destType, $sourceID, $destID));
 
-		if ( $this->flagUseCache && $cached = $this->getCached( $linkTable, $key ) ) {
+		if ($this->flagUseCache && $cached = $this->getCached($linkTable, $key)) {
 			return $cached;
 		}
 
 		$sqlFilterStr = '';
-		if ( count( self::$sqlFilters ) ) {
-			$sqlFilterStr = $this->getSQLFilterSnippet( $destType );
+		if (count(self::$sqlFilters)) {
+			$sqlFilterStr = $this->getSQLFilterSnippet($destType);
 		}
 
-		if ( $sourceTable === $destTable ) {
+		if ($sourceTable === $destTable) {
 			$sql = "SELECT {$linkTable}.* {$sqlFilterStr} FROM {$linkTable}
 				WHERE ( {$sourceCol} = ? AND {$destCol} = ? ) OR
 				 ( {$destCol} = ? AND {$sourceCol} = ? ) -- keep-cache";
-			$row = $this->adapter->getRow( $sql, array( $sourceID, $destID, $sourceID, $destID ) );
+			$row = $this->adapter->getRow($sql, array($sourceID, $destID, $sourceID, $destID));
 		} else {
 			$sql = "SELECT {$linkTable}.* {$sqlFilterStr} FROM {$linkTable}
 				WHERE {$sourceCol} = ? AND {$destCol} = ? -- keep-cache";
-			$row = $this->adapter->getRow( $sql, array( $sourceID, $destID ) );
+			$row = $this->adapter->getRow($sql, array($sourceID, $destID));
 		}
 
-		$this->putResultInCache( $linkTable, $key, $row );
+		$this->putResultInCache($linkTable, $key, $row);
 
 		return $row;
 	}
@@ -5093,14 +5093,14 @@ 
 	/**
 	 * @see QueryWriter::queryTagged
 	 */
-	public function queryTagged( $type, $tagList, $all = FALSE, $addSql = '', $bindings = array() )
+	public function queryTagged($type, $tagList, $all = FALSE, $addSql = '', $bindings = array())
 	{
-		$assocType = $this->getAssocTable( array( $type, 'tag' ) );
-		$assocTable = $this->esc( $assocType );
+		$assocType = $this->getAssocTable(array($type, 'tag'));
+		$assocTable = $this->esc($assocType);
 		$assocField = $type . '_id';
-		$table = $this->esc( $type );
-		$slots = implode( ',', array_fill( 0, count( $tagList ), '?' ) );
-		$score = ( $all ) ? count( $tagList ) : 1;
+		$table = $this->esc($type);
+		$slots = implode(',', array_fill(0, count($tagList), '?'));
+		$score = ($all) ? count($tagList) : 1;
 
 		$sql = "
 			SELECT {$table}.*, count({$table}.id) FROM {$table}
@@ -5112,38 +5112,38 @@ 
 			{$addSql}
 		";
 
-		$bindings = array_merge( $tagList, array( $score ), $bindings );
-		$rows = $this->adapter->get( $sql, $bindings );
+		$bindings = array_merge($tagList, array($score), $bindings);
+		$rows = $this->adapter->get($sql, $bindings);
 		return $rows;
 	}
 
 	/**
 	 * @see QueryWriter::queryRecordCount
 	 */
-	public function queryRecordCount( $type, $conditions = array(), $addSql = NULL, $bindings = array() )
+	public function queryRecordCount($type, $conditions = array(), $addSql = NULL, $bindings = array())
 	{
-		$addSql = $this->glueSQLCondition( $addSql );
+		$addSql = $this->glueSQLCondition($addSql);
 
-		$table  = $this->esc( $type );
+		$table  = $this->esc($type);
 
 		$this->updateCache(); //check if cache chain has been broken
 
-		$sql    = $this->makeSQLFromConditions( $conditions, $bindings, $addSql );
+		$sql    = $this->makeSQLFromConditions($conditions, $bindings, $addSql);
 		$sql    = "SELECT COUNT(*) FROM {$table} {$sql} -- keep-cache";
 
-		return (int) $this->adapter->getCell( $sql, $bindings );
+		return (int) $this->adapter->getCell($sql, $bindings);
 	}
 
 	/**
 	 * @see QueryWriter::queryRecordCountRelated
 	 */
-	public function queryRecordCountRelated( $sourceType, $destType, $linkID, $addSql = '', $bindings = array() )
+	public function queryRecordCountRelated($sourceType, $destType, $linkID, $addSql = '', $bindings = array())
 	{
-		list( $sourceTable, $destTable, $linkTable, $sourceCol, $destCol ) = $this->getRelationalTablesAndColumns( $sourceType, $destType );
+		list($sourceTable, $destTable, $linkTable, $sourceCol, $destCol) = $this->getRelationalTablesAndColumns($sourceType, $destType);
 
 		$this->updateCache(); //check if cache chain has been broken
 
-		if ( $sourceType === $destType ) {
+		if ($sourceType === $destType) {
 			$sql = "
 			SELECT COUNT(*) FROM {$linkTable}
 			INNER JOIN {$destTable} ON
@@ -5152,7 +5152,7 @@ 
 			{$addSql}
 			-- keep-cache";
 
-			$bindings = array_merge( array( $linkID, $linkID ), $bindings );
+			$bindings = array_merge(array($linkID, $linkID), $bindings);
 		} else {
 			$sql = "
 			SELECT COUNT(*) FROM {$linkTable}
@@ -5161,62 +5161,62 @@ 
 			{$addSql}
 			-- keep-cache";
 
-			$bindings = array_merge( array( $linkID ), $bindings );
+			$bindings = array_merge(array($linkID), $bindings);
 		}
 
-		return (int) $this->adapter->getCell( $sql, $bindings );
+		return (int) $this->adapter->getCell($sql, $bindings);
 	}
 
 	/**
 	 * @see QueryWriter::deleteRecord
 	 */
-	public function deleteRecord( $type, $conditions = array(), $addSql = NULL, $bindings = array() )
+	public function deleteRecord($type, $conditions = array(), $addSql = NULL, $bindings = array())
 	{
-		$addSql = $this->glueSQLCondition( $addSql );
+		$addSql = $this->glueSQLCondition($addSql);
 
-		$table  = $this->esc( $type );
+		$table  = $this->esc($type);
 
-		$sql    = $this->makeSQLFromConditions( $conditions, $bindings, $addSql );
+		$sql    = $this->makeSQLFromConditions($conditions, $bindings, $addSql);
 		$sql    = "DELETE FROM {$table} {$sql}";
 
-		$this->adapter->exec( $sql, $bindings );
+		$this->adapter->exec($sql, $bindings);
 	}
 
 	/**
 	 * @see QueryWriter::deleteRelations
 	 */
-	public function deleteRelations( $sourceType, $destType, $sourceID )
+	public function deleteRelations($sourceType, $destType, $sourceID)
 	{
-		list( $sourceTable, $destTable, $linkTable, $sourceCol, $destCol ) = $this->getRelationalTablesAndColumns( $sourceType, $destType );
+		list($sourceTable, $destTable, $linkTable, $sourceCol, $destCol) = $this->getRelationalTablesAndColumns($sourceType, $destType);
 
-		if ( $sourceTable === $destTable ) {
+		if ($sourceTable === $destTable) {
 			$sql = "DELETE FROM {$linkTable}
 				WHERE ( {$sourceCol} = ? ) OR
 				( {$destCol} = ?  )
 			";
 
-			$this->adapter->exec( $sql, array( $sourceID, $sourceID ) );
+			$this->adapter->exec($sql, array($sourceID, $sourceID));
 		} else {
 			$sql = "DELETE FROM {$linkTable}
 				WHERE {$sourceCol} = ? ";
 
-			$this->adapter->exec( $sql, array( $sourceID ) );
+			$this->adapter->exec($sql, array($sourceID));
 		}
 	}
 
 	/**
 	 * @see QueryWriter::widenColumn
 	 */
-	public function widenColumn( $type, $property, $dataType )
+	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 );
+		$table   = $this->esc($type);
+		$column  = $this->esc($property);
 
 		$newType = $this->typeno_sqltype[$dataType];
 
-		$this->adapter->exec( "ALTER TABLE $table CHANGE $column $column $newType " );
+		$this->adapter->exec("ALTER TABLE $table CHANGE $column $column $newType ");
 
 		return TRUE;
 	}
@@ -5224,27 +5224,27 @@ 
 	/**
 	 * @see QueryWriter::wipe
 	 */
-	public function wipe( $type )
+	public function wipe($type)
 	{
-		$table = $this->esc( $type );
+		$table = $this->esc($type);
 
-		$this->adapter->exec( "TRUNCATE $table " );
+		$this->adapter->exec("TRUNCATE $table ");
 	}
 
 	/**
 	 * @see QueryWriter::renameAssocTable
 	 */
-	public function renameAssocTable( $from, $to = NULL )
+	public function renameAssocTable($from, $to = NULL)
 	{
-		self::renameAssociation( $from, $to );
+		self::renameAssociation($from, $to);
 	}
 
 	/**
 	 * @see QueryWriter::getAssocTable
 	 */
-	public function getAssocTable( $types )
+	public function getAssocTable($types)
 	{
-		return self::getAssocTableFormat( $types );
+		return self::getAssocTableFormat($types);
 	}
 
 	/**
@@ -5254,7 +5254,7 @@ 
 	 *
 	 * @param boolean
 	 */
-	public function setUseCache( $yesNo )
+	public function setUseCache($yesNo)
 	{
 		$this->flushCache();
 
@@ -5268,12 +5268,12 @@ 
 	 *
 	 * @return integer
 	 */
-	public function flushCache( $newMaxCacheSizePerType = NULL )
+	public function flushCache($newMaxCacheSizePerType = NULL)
 	{
-		if ( !is_null( $newMaxCacheSizePerType ) && $newMaxCacheSizePerType > 0 ) {
+		if (!is_null($newMaxCacheSizePerType) && $newMaxCacheSizePerType > 0) {
 			$this->maxCacheSizePerType = $newMaxCacheSizePerType;
 		}
-		$count = count( $this->cache, COUNT_RECURSIVE );
+		$count = count($this->cache, COUNT_RECURSIVE);
 		$this->cache = array();
 		return $count;
 	}
@@ -5286,9 +5286,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function safeColumn( $column, $noQuotes = FALSE )
+	public function safeColumn($column, $noQuotes = FALSE)
 	{
-		return $this->esc( $column, $noQuotes );
+		return $this->esc($column, $noQuotes);
 	}
 
 	/**
@@ -5299,21 +5299,21 @@ 
 	 *
 	 * @return string
 	 */
-	public function safeTable( $table, $noQuotes = FALSE )
+	public function safeTable($table, $noQuotes = FALSE)
 	{
-		return $this->esc( $table, $noQuotes );
+		return $this->esc($table, $noQuotes);
 	}
 
 	/**
 	 * @see QueryWriter::inferFetchType
 	 */
-	public function inferFetchType( $type, $property )
+	public function inferFetchType($type, $property)
 	{
-		$type = $this->esc( $type, TRUE );
-		$field = $this->esc( $property, TRUE ) . '_id';
-		$keys = $this->getKeyMapForType( $type );
+		$type = $this->esc($type, TRUE);
+		$field = $this->esc($property, TRUE) . '_id';
+		$keys = $this->getKeyMapForType($type);
 
-		foreach( $keys as $key ) {
+		foreach ($keys as $key) {
 			if (
 				$key['from'] === $field
 			) return $key['table'];
@@ -5324,9 +5324,9 @@ 
 	/**
 	 * @see QueryWriter::addUniqueConstraint
 	 */
-	public function addUniqueIndex( $type, $properties )
+	public function addUniqueIndex($type, $properties)
 	{
-		return $this->addUniqueConstraint( $type, $properties );
+		return $this->addUniqueConstraint($type, $properties);
 	}
 }
 }
@@ -5371,7 +5371,7 @@ 
 	const C_DATATYPE_SPECIAL_LINESTRING = 91;
 	const C_DATATYPE_SPECIAL_POLYGON    = 92;
 
-	const C_DATATYPE_SPECIFIED        = 99;
+	const C_DATATYPE_SPECIFIED = 99;
 
 	/**
 	 * @var DBAdapter
@@ -5386,9 +5386,9 @@ 
 	/**
 	 * @see AQueryWriter::getKeyMapForType
 	 */
-	protected function getKeyMapForType( $type )
+	protected function getKeyMapForType($type)
 	{
-		$table = $this->esc( $type, TRUE );
+		$table = $this->esc($type, TRUE);
 		$keys = $this->adapter->get('
 			SELECT
 				information_schema.key_column_usage.constraint_name AS `name`,
@@ -5411,8 +5411,8 @@ 
 				AND information_schema.key_column_usage.referenced_table_name IS NOT NULL
 		', array($table));
 		$keyInfoList = array();
-		foreach ( $keys as $k ) {
-			$label = $this->makeFKLabel( $k['from'], $k['table'], $k['to'] );
+		foreach ($keys as $k) {
+			$label = $this->makeFKLabel($k['from'], $k['table'], $k['to']);
 			$keyInfoList[$label] = array(
 				'name'          => $k['name'],
 				'from'          => $k['from'],
@@ -5430,7 +5430,7 @@ 
 	 *
 	 * @param Adapter $adapter Database Adapter
 	 */
-	public function __construct( Adapter $adapter )
+	public function __construct(Adapter $adapter)
 	{
 		$this->typeno_sqltype = array(
 			MySQL::C_DATATYPE_BOOL             => ' TINYINT(1) UNSIGNED ',
@@ -5449,8 +5449,8 @@ 
 
 		$this->sqltype_typeno = array();
 
-		foreach ( $this->typeno_sqltype as $k => $v ) {
-			$this->sqltype_typeno[trim( strtolower( $v ) )] = $k;
+		foreach ($this->typeno_sqltype as $k => $v) {
+			$this->sqltype_typeno[trim(strtolower($v))] = $k;
 		}
 
 		$this->adapter = $adapter;
@@ -5474,31 +5474,31 @@ 
 	 */
 	public function getTables()
 	{
-		return $this->adapter->getCol( 'show tables' );
+		return $this->adapter->getCol('show tables');
 	}
 
 	/**
 	 * @see QueryWriter::createTable
 	 */
-	public function createTable( $table )
+	public function createTable($table)
 	{
-		$table = $this->esc( $table );
+		$table = $this->esc($table);
 
 		$encoding = $this->adapter->getDatabase()->getMysqlEncoding();
 		$sql   = "CREATE TABLE $table (id INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT, PRIMARY KEY ( id )) ENGINE = InnoDB DEFAULT CHARSET={$encoding} COLLATE={$encoding}_unicode_ci ";
 
-		$this->adapter->exec( $sql );
+		$this->adapter->exec($sql);
 	}
 
 	/**
 	 * @see QueryWriter::getColumns
 	 */
-	public function getColumns( $table )
+	public function getColumns($table)
 	{
-		$columnsRaw = $this->adapter->get( "DESCRIBE " . $this->esc( $table ) );
+		$columnsRaw = $this->adapter->get("DESCRIBE " . $this->esc($table));
 
 		$columns = array();
-		foreach ( $columnsRaw as $r ) {
+		foreach ($columnsRaw as $r) {
 			$columns[$r['Field']] = $r['Type'];
 		}
 
@@ -5508,58 +5508,58 @@ 
 	/**
 	 * @see QueryWriter::scanType
 	 */
-	public function scanType( $value, $flagSpecial = FALSE )
+	public function scanType($value, $flagSpecial = FALSE)
 	{
 		$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 ) ) {
+		if ($flagSpecial) {
+			if (preg_match('/^\d{4}\-\d\d-\d\d$/', $value)) {
 				return MySQL::C_DATATYPE_SPECIAL_DATE;
 			}
-			if ( preg_match( '/^\d{4}\-\d\d-\d\d\s\d\d:\d\d:\d\d$/', $value ) ) {
+			if (preg_match('/^\d{4}\-\d\d-\d\d\s\d\d:\d\d:\d\d$/', $value)) {
 				return MySQL::C_DATATYPE_SPECIAL_DATETIME;
 			}
-			if ( preg_match( '/^POINT\(/', $value ) ) {
+			if (preg_match('/^POINT\(/', $value)) {
 				return MySQL::C_DATATYPE_SPECIAL_POINT;
 			}
-			if ( preg_match( '/^LINESTRING\(/', $value ) ) {
+			if (preg_match('/^LINESTRING\(/', $value)) {
 				return MySQL::C_DATATYPE_SPECIAL_LINESTRING;
 			}
-			if ( preg_match( '/^POLYGON\(/', $value ) ) {
+			if (preg_match('/^POLYGON\(/', $value)) {
 				return MySQL::C_DATATYPE_SPECIAL_POLYGON;
 			}
 		}
 
 		//setter turns TRUE FALSE into 0 and 1 because database has no real bools (TRUE and FALSE only for test?).
-		if ( $value === FALSE || $value === TRUE || $value === '0' || $value === '1' ) {
+		if ($value === FALSE || $value === TRUE || $value === '0' || $value === '1') {
 			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 ) ) {
+		if (!$this->startsWithZeros($value)) {
 
-			if ( is_numeric( $value ) && ( floor( $value ) == $value ) && $value >= 0 && $value <= 4294967295 ) {
+			if (is_numeric($value) && (floor($value) == $value) && $value >= 0 && $value <= 4294967295) {
 				return MySQL::C_DATATYPE_UINT32;
 			}
 
-			if ( is_numeric( $value ) ) {
+			if (is_numeric($value)) {
 				return MySQL::C_DATATYPE_DOUBLE;
 			}
 		}
 
-		if ( mb_strlen( $value, 'UTF-8' ) <= 191 ) {
+		if (mb_strlen($value, 'UTF-8') <= 191) {
 			return MySQL::C_DATATYPE_TEXT7;
 		}
 
-		if ( mb_strlen( $value, 'UTF-8' ) <= 255 ) {
+		if (mb_strlen($value, 'UTF-8') <= 255) {
 			return MySQL::C_DATATYPE_TEXT8;
 		}
 
-		if ( mb_strlen( $value, 'UTF-8' ) <= 65535 ) {
+		if (mb_strlen($value, 'UTF-8') <= 65535) {
 			return MySQL::C_DATATYPE_TEXT16;
 		}
 
@@ -5569,19 +5569,19 @@ 
 	/**
 	 * @see QueryWriter::code
 	 */
-	public function code( $typedescription, $includeSpecials = FALSE )
+	public function code($typedescription, $includeSpecials = FALSE)
 	{
-		if ( isset( $this->sqltype_typeno[$typedescription] ) ) {
+		if (isset($this->sqltype_typeno[$typedescription])) {
 			$r = $this->sqltype_typeno[$typedescription];
 		} else {
 			$r = self::C_DATATYPE_SPECIFIED;
 		}
 
-		if ( $includeSpecials ) {
+		if ($includeSpecials) {
 			return $r;
 		}
 
-		if ( $r >= QueryWriter::C_DATATYPE_RANGE_SPECIAL ) {
+		if ($r >= QueryWriter::C_DATATYPE_RANGE_SPECIAL) {
 			return self::C_DATATYPE_SPECIFIED;
 		}
 
@@ -5591,19 +5591,19 @@ 
 	/**
 	 * @see QueryWriter::addUniqueIndex
 	 */
-	public function addUniqueConstraint( $type, $properties )
+	public function addUniqueConstraint($type, $properties)
 	{
-		$tableNoQ = $this->esc( $type, TRUE );
+		$tableNoQ = $this->esc($type, TRUE);
 		$columns = array();
-		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 ) );
+		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));
 		try {
 			$sql = "ALTER TABLE $table
-						 ADD UNIQUE INDEX $name (" . implode( ',', $columns ) . ")";
-			$this->adapter->exec( $sql );
-		} catch ( SQLException $e ) {
+						 ADD UNIQUE INDEX $name (" . implode(',', $columns) . ")";
+			$this->adapter->exec($sql);
+		} catch (SQLException $e) {
 			//do nothing, dont use alter table ignore, this will delete duplicate records in 3-ways!
 			return FALSE;
 		}
@@ -5613,15 +5613,15 @@ 
 	/**
 	 * @see QueryWriter::addIndex
 	 */
-	public function addIndex( $type, $name, $property )
+	public function addIndex($type, $name, $property)
 	{
 		try {
-			$table  = $this->esc( $type );
-			$name   = preg_replace( '/\W/', '', $name );
-			$column = $this->esc( $property );
-			$this->adapter->exec( "CREATE INDEX $name ON $table ($column) " );
+			$table  = $this->esc($type);
+			$name   = preg_replace('/\W/', '', $name);
+			$column = $this->esc($property);
+			$this->adapter->exec("CREATE INDEX $name ON $table ($column) ");
 			return TRUE;
-		} catch ( SQLException $e ) {
+		} catch (SQLException $e) {
 			return FALSE;
 		}
 	}
@@ -5629,35 +5629,35 @@ 
 	/**
 	 * @see QueryWriter::addFK
 	 */
-	public function addFK( $type, $targetType, $property, $targetProperty, $isDependent = FALSE )
+	public function addFK($type, $targetType, $property, $targetProperty, $isDependent = FALSE)
 	{
-		$table = $this->esc( $type );
-		$targetTable = $this->esc( $targetType );
-		$targetTableNoQ = $this->esc( $targetType, TRUE );
-		$field = $this->esc( $property );
-		$fieldNoQ = $this->esc( $property, TRUE );
-		$targetField = $this->esc( $targetProperty );
-		$targetFieldNoQ = $this->esc( $targetProperty, TRUE );
-		$tableNoQ = $this->esc( $type, TRUE );
-		$fieldNoQ = $this->esc( $property, TRUE );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) return FALSE;
+		$table = $this->esc($type);
+		$targetTable = $this->esc($targetType);
+		$targetTableNoQ = $this->esc($targetType, TRUE);
+		$field = $this->esc($property);
+		$fieldNoQ = $this->esc($property, TRUE);
+		$targetField = $this->esc($targetProperty);
+		$targetFieldNoQ = $this->esc($targetProperty, TRUE);
+		$tableNoQ = $this->esc($type, TRUE);
+		$fieldNoQ = $this->esc($property, TRUE);
+		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 );
+		$columns = $this->getColumns($tableNoQ);
 		$idType = $this->getTypeForID();
-		if ( $this->code( $columns[$fieldNoQ] ) !==  $idType ) {
-			$this->widenColumn( $type, $property, $idType );
+		if ($this->code($columns[$fieldNoQ]) !== $idType) {
+			$this->widenColumn($type, $property, $idType);
 		}
 
-		$fkName = 'fk_'.($tableNoQ.'_'.$fieldNoQ);
-		$cName = 'c_'.$fkName;
+		$fkName = 'fk_' . ($tableNoQ . '_' . $fieldNoQ);
+		$cName = 'c_' . $fkName;
 		try {
-			$this->adapter->exec( "
+			$this->adapter->exec("
 				ALTER TABLE {$table}
 				ADD CONSTRAINT $cName
 				FOREIGN KEY $fkName ( {$fieldNoQ} ) REFERENCES {$targetTableNoQ}
-				({$targetFieldNoQ}) ON DELETE " . ( $isDependent ? 'CASCADE' : 'SET NULL' ) . ' ON UPDATE '.( $isDependent ? 'CASCADE' : 'SET NULL' ).';');
-		} catch ( SQLException $e ) {
+				({$targetFieldNoQ}) ON DELETE " . ($isDependent ? 'CASCADE' : 'SET NULL') . ' ON UPDATE ' . ($isDependent ? 'CASCADE' : 'SET NULL') . ';');
+		} catch (SQLException $e) {
 			// Failure of fk-constraints is not a problem
 		}
 	}
@@ -5665,7 +5665,7 @@ 
 	/**
 	 * @see QueryWriter::sqlStateIn
 	 */
-	public function sqlStateIn( $state, $list )
+	public function sqlStateIn($state, $list)
 	{
 		$stateMap = array(
 			'42S02' => QueryWriter::C_SQLSTATE_NO_SUCH_TABLE,
@@ -5673,7 +5673,7 @@ 
 			'23000' => QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION
 		);
 
-		return in_array( ( isset( $stateMap[$state] ) ? $stateMap[$state] : '0' ), $list );
+		return in_array((isset($stateMap[$state]) ? $stateMap[$state] : '0'), $list);
 	}
 
 	/**
@@ -5681,21 +5681,21 @@ 
 	 */
 	public function wipeAll()
 	{
-		$this->adapter->exec( 'SET FOREIGN_KEY_CHECKS = 0;' );
+		$this->adapter->exec('SET FOREIGN_KEY_CHECKS = 0;');
 
-		foreach ( $this->getTables() as $t ) {
+		foreach ($this->getTables() as $t) {
 			try {
-				$this->adapter->exec( "DROP TABLE IF EXISTS `$t`" );
-			} catch ( SQLException $e ) {
+				$this->adapter->exec("DROP TABLE IF EXISTS `$t`");
+			} catch (SQLException $e) {
 			}
 
 			try {
-				$this->adapter->exec( "DROP VIEW IF EXISTS `$t`" );
-			} catch ( SQLException $e ) {
+				$this->adapter->exec("DROP VIEW IF EXISTS `$t`");
+			} catch (SQLException $e) {
 			}
 		}
 
-		$this->adapter->exec( 'SET FOREIGN_KEY_CHECKS = 1;' );
+		$this->adapter->exec('SET FOREIGN_KEY_CHECKS = 1;');
 	}
 }
 } 
@@ -5757,12 +5757,12 @@ 
 	 *
 	 * @return array $info
 	 */
-	protected function getTable( $type )
+	protected function getTable($type)
 	{
-		$tableName = $this->esc( $type, TRUE );
-		$columns   = $this->getColumns( $type );
-		$indexes   = $this->getIndexes( $type );
-		$keys      = $this->getKeyMapForType( $type );
+		$tableName = $this->esc($type, TRUE);
+		$columns   = $this->getColumns($type);
+		$indexes   = $this->getIndexes($type);
+		$keys      = $this->getKeyMapForType($type);
 
 		$table = array(
 			'columns' => $columns,
@@ -5784,30 +5784,30 @@ 
 	 *
 	 * @param array $tableMap information array
 	 */
-	protected function putTable( $tableMap )
+	protected function putTable($tableMap)
 	{
 		$table = $tableMap['name'];
 		$q     = array();
 		$q[]   = "DROP TABLE IF EXISTS tmp_backup;";
 
-		$oldColumnNames = array_keys( $this->getColumns( $table ) );
+		$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[] = "CREATE TEMPORARY TABLE tmp_backup(" . implode(",", $oldColumnNames) . ");";
 		$q[] = "INSERT INTO tmp_backup SELECT * FROM `$table`;";
 		$q[] = "PRAGMA foreign_keys = 0 ";
 		$q[] = "DROP TABLE `$table`;";
 
 		$newTableDefStr = '';
-		foreach ( $tableMap['columns'] as $column => $type ) {
-			if ( $column != 'id' ) {
+		foreach ($tableMap['columns'] as $column => $type) {
+			if ($column != 'id') {
 				$newTableDefStr .= ",`$column` $type";
 			}
 		}
 
 		$fkDef = '';
-		foreach ( $tableMap['keys'] as $key ) {
+		foreach ($tableMap['keys'] as $key) {
 			$fkDef .= ", FOREIGN KEY(`{$key['from']}`)
 						 REFERENCES `{$key['table']}`(`{$key['to']}`)
 						 ON DELETE {$key['on_delete']} ON UPDATE {$key['on_update']}";
@@ -5815,11 +5815,11 @@ 
 
 		$q[] = "CREATE TABLE `$table` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT  $newTableDefStr  $fkDef );";
 
-		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`";
-				$q[] = "CREATE UNIQUE INDEX $name ON `$table` (" . implode( ',', $cols ) . ")";
+		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`";
+				$q[] = "CREATE UNIQUE INDEX $name ON `$table` (" . implode(',', $cols) . ")";
 			} else $q[] = "CREATE INDEX $name ON `$table` ({$index['name']}) ";
 		}
 
@@ -5827,7 +5827,7 @@ 
 		$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);
 	}
 
 	/**
@@ -5837,14 +5837,14 @@ 
 	 *
 	 * @return array $indexInfo index information
 	 */
-	protected function getIndexes( $type )
+	protected function getIndexes($type)
 	{
-		$table   = $this->esc( $type, TRUE );
-		$indexes = $this->adapter->get( "PRAGMA index_list('$table')" );
+		$table   = $this->esc($type, TRUE);
+		$indexes = $this->adapter->get("PRAGMA index_list('$table')");
 
 		$indexInfoList = array();
-		foreach ( $indexes as $i ) {
-			$indexInfoList[$i['name']] = $this->adapter->getRow( "PRAGMA index_info('{$i['name']}') " );
+		foreach ($indexes as $i) {
+			$indexInfoList[$i['name']] = $this->adapter->getRow("PRAGMA index_info('{$i['name']}') ");
 
 			$indexInfoList[$i['name']]['unique'] = $i['unique'];
 		}
@@ -5866,19 +5866,19 @@ 
 	 * @note: cant put this in try-catch because that can hide the fact
 	 *      that database has been damaged.
 	 */
-	protected function buildFK( $type, $targetType, $property, $targetProperty, $constraint = FALSE )
+	protected function buildFK($type, $targetType, $property, $targetProperty, $constraint = FALSE)
 	{
-		$table           = $this->esc( $type, TRUE );
-		$targetTable     = $this->esc( $targetType, TRUE );
-		$column          = $this->esc( $property, TRUE );
-		$targetColumn    = $this->esc( $targetProperty, TRUE );
+		$table           = $this->esc($type, TRUE);
+		$targetTable     = $this->esc($targetType, TRUE);
+		$column          = $this->esc($property, TRUE);
+		$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;
-		$t = $this->getTable( $table );
-		$consSQL = ( $constraint ? 'CASCADE' : 'SET NULL' );
+		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;
 		$t['keys'][$label] = array(
 			'table'     => $targetTable,
@@ -5887,20 +5887,20 @@ 
 			'on_update' => $consSQL,
 			'on_delete' => $consSQL
 		);
-		$this->putTable( $t );
+		$this->putTable($t);
 		return TRUE;
 	}
 
 	/**
 	 * @see AQueryWriter::getKeyMapForType
 	 */
-	protected function getKeyMapForType( $type )
+	protected function getKeyMapForType($type)
 	{
-		$table = $this->esc( $type, TRUE );
-		$keys  = $this->adapter->get( "PRAGMA foreign_key_list('$table')" );
+		$table = $this->esc($type, TRUE);
+		$keys  = $this->adapter->get("PRAGMA foreign_key_list('$table')");
 		$keyInfoList = array();
-		foreach ( $keys as $k ) {
-			$label = $this->makeFKLabel( $k['from'], $k['table'], $k['to'] );
+		foreach ($keys as $k) {
+			$label = $this->makeFKLabel($k['from'], $k['table'], $k['to']);
 			$keyInfoList[$label] = array(
 				'name'          => $label,
 				'from'          => $k['from'],
@@ -5918,7 +5918,7 @@ 
 	 *
 	 * @param Adapter $adapter Database Adapter
 	 */
-	public function __construct( Adapter $adapter )
+	public function __construct(Adapter $adapter)
 	{
 		$this->typeno_sqltype = array(
 			SQLiteT::C_DATATYPE_INTEGER => 'INTEGER',
@@ -5928,7 +5928,7 @@ 
 
 		$this->sqltype_typeno = array();
 
-		foreach ( $this->typeno_sqltype as $k => $v ) {
+		foreach ($this->typeno_sqltype as $k => $v) {
 			$this->sqltype_typeno[$v] = $k;
 		}
 
@@ -5949,22 +5949,22 @@ 
 	/**
 	 * @see QueryWriter::scanType
 	 */
-	public function scanType( $value, $flagSpecial = FALSE )
+	public function scanType($value, $flagSpecial = FALSE)
 	{
 		$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 )
-			|| preg_match( '/\d{4}\-\d\d\-\d\d\s\d\d:\d\d:\d\d/', $value )
+		if ((is_numeric($value) && $value < 2147483648 && $value > -2147483648)
+			|| preg_match('/\d{4}\-\d\d\-\d\d/', $value)
+			|| preg_match('/\d{4}\-\d\d\-\d\d\s\d\d:\d\d:\d\d/', $value)
 		) {
 			return self::C_DATATYPE_NUMERIC;
 		}
@@ -5975,21 +5975,21 @@ 
 	/**
 	 * @see QueryWriter::addColumn
 	 */
-	public function addColumn( $table, $column, $type )
+	public function addColumn($table, $column, $type)
 	{
-		$column = $this->check( $column );
-		$table  = $this->check( $table );
+		$column = $this->check($column);
+		$table  = $this->check($table);
 		$type   = $this->typeno_sqltype[$type];
 
-		$this->adapter->exec( "ALTER TABLE `$table` ADD `$column` $type " );
+		$this->adapter->exec("ALTER TABLE `$table` ADD `$column` $type ");
 	}
 
 	/**
 	 * @see QueryWriter::code
 	 */
-	public function code( $typedescription, $includeSpecials = FALSE )
+	public function code($typedescription, $includeSpecials = FALSE)
 	{
-		$r = ( ( isset( $this->sqltype_typeno[$typedescription] ) ) ? $this->sqltype_typeno[$typedescription] : 99 );
+		$r = ((isset($this->sqltype_typeno[$typedescription])) ? $this->sqltype_typeno[$typedescription] : 99);
 		
 		return $r;
 	}
@@ -5997,13 +5997,13 @@ 
 	/**
 	 * @see QueryWriter::widenColumn
 	 */
-	public function widenColumn( $type, $column, $datatype )
+	public function widenColumn($type, $column, $datatype)
 	{
-		$t = $this->getTable( $type );
+		$t = $this->getTable($type);
 
 		$t['columns'][$column] = $this->typeno_sqltype[$datatype];
 
-		$this->putTable( $t );
+		$this->putTable($t);
 	}
 
 	/**
@@ -6011,33 +6011,33 @@ 
 	 */
 	public function getTables()
 	{
-		return $this->adapter->getCol( "SELECT name FROM sqlite_master
+		return $this->adapter->getCol("SELECT name FROM sqlite_master
 			WHERE type='table' AND name!='sqlite_sequence';" );
 	}
 
 	/**
 	 * @see QueryWriter::createTable
 	 */
-	public function createTable( $table )
+	public function createTable($table)
 	{
-		$table = $this->esc( $table );
+		$table = $this->esc($table);
 
 		$sql   = "CREATE TABLE $table ( id INTEGER PRIMARY KEY AUTOINCREMENT ) ";
 
-		$this->adapter->exec( $sql );
+		$this->adapter->exec($sql);
 	}
 
 	/**
 	 * @see QueryWriter::getColumns
 	 */
-	public function getColumns( $table )
+	public function getColumns($table)
 	{
-		$table      = $this->esc( $table, TRUE );
+		$table      = $this->esc($table, TRUE);
 
-		$columnsRaw = $this->adapter->get( "PRAGMA table_info('$table')" );
+		$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;
 	}
@@ -6045,15 +6045,15 @@ 
 	/**
 	 * @see QueryWriter::addUniqueIndex
 	 */
-	public function addUniqueConstraint( $type, $properties )
+	public function addUniqueConstraint($type, $properties)
 	{
-		$tableNoQ = $this->esc( $type, TRUE );
-		$name  = 'UQ_' . $this->esc( $type, TRUE ) . implode( '__', $properties );
-		$t     = $this->getTable( $type );
-		$t['indexes'][$name] = array( 'name' => $name );
+		$tableNoQ = $this->esc($type, TRUE);
+		$name  = 'UQ_' . $this->esc($type, TRUE) . implode('__', $properties);
+		$t     = $this->getTable($type);
+		$t['indexes'][$name] = array('name' => $name);
 		try {
-			$this->putTable( $t );
-		} catch( SQLException $e ) {
+			$this->putTable($t);
+		} catch (SQLException $e) {
 			return FALSE;
 		}
 		return TRUE;
@@ -6062,34 +6062,34 @@ 
 	/**
 	 * @see QueryWriter::sqlStateIn
 	 */
-	public function sqlStateIn( $state, $list )
+	public function sqlStateIn($state, $list)
 	{
 		$stateMap = array(
 			'HY000' => QueryWriter::C_SQLSTATE_NO_SUCH_TABLE,
 			'23000' => QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION
 		);
 
-		return in_array( ( isset( $stateMap[$state] ) ? $stateMap[$state] : '0' ), $list );
+		return in_array((isset($stateMap[$state]) ? $stateMap[$state] : '0'), $list);
 	}
 
 	/**
 	 * @see QueryWriter::addIndex
 	 */
-	public function addIndex( $type, $name, $column )
+	public function addIndex($type, $name, $column)
 	{
-		$columns = $this->getColumns( $type );
-		if ( !isset( $columns[$column] ) ) return FALSE;
+		$columns = $this->getColumns($type);
+		if (!isset($columns[$column])) return FALSE;
 
-		$table  = $this->esc( $type );
-		$name   = preg_replace( '/\W/', '', $name );
-		$column = $this->esc( $column, TRUE );
+		$table  = $this->esc($type);
+		$name   = preg_replace('/\W/', '', $name);
+		$column = $this->esc($column, TRUE);
 
 		try {
-			$t = $this->getTable( $type );
-			$t['indexes'][$name] = array( 'name' => $column );
-			$this->putTable( $t );
+			$t = $this->getTable($type);
+			$t['indexes'][$name] = array('name' => $column);
+			$this->putTable($t);
 			return TRUE;
-		} catch( SQLException $exception ) {
+		} catch (SQLException $exception) {
 			return FALSE;
 		}
 	}
@@ -6097,19 +6097,19 @@ 
 	/**
 	 * @see QueryWriter::wipe
 	 */
-	public function wipe( $type )
+	public function wipe($type)
 	{
-		$table = $this->esc( $type );
+		$table = $this->esc($type);
 		
-		$this->adapter->exec( "DELETE FROM $table " );
+		$this->adapter->exec("DELETE FROM $table ");
 	}
 
 	/**
 	 * @see QueryWriter::addFK
 	 */
-	public function addFK( $type, $targetType, $property, $targetProperty, $isDep = FALSE )
+	public function addFK($type, $targetType, $property, $targetProperty, $isDep = FALSE)
 	{
-		return $this->buildFK( $type, $targetType, $property, $targetProperty, $isDep );
+		return $this->buildFK($type, $targetType, $property, $targetProperty, $isDep);
 	}
 
 	/**
@@ -6117,21 +6117,21 @@ 
 	 */
 	public function wipeAll()
 	{
-		$this->adapter->exec( 'PRAGMA foreign_keys = 0 ' );
+		$this->adapter->exec('PRAGMA foreign_keys = 0 ');
 
-		foreach ( $this->getTables() as $t ) {
+		foreach ($this->getTables() as $t) {
 			try {
-				$this->adapter->exec( "DROP TABLE IF EXISTS `$t`" );
-			} catch ( SQLException $e ) {
+				$this->adapter->exec("DROP TABLE IF EXISTS `$t`");
+			} catch (SQLException $e) {
 			}
 
 			try {
-				$this->adapter->exec( "DROP TABLE IF EXISTS `$t`" );
-			} catch ( SQLException $e ) {
+				$this->adapter->exec("DROP TABLE IF EXISTS `$t`");
+			} catch (SQLException $e) {
 			}
 		}
 
-		$this->adapter->exec( 'PRAGMA foreign_keys = 1 ' );
+		$this->adapter->exec('PRAGMA foreign_keys = 1 ');
 	}
 }
 }
@@ -6197,7 +6197,7 @@ 
 	 *
 	 * @return  string $sql SQL Snippet
 	 */
-	protected function getInsertSuffix( $table )
+	protected function getInsertSuffix($table)
 	{
 		return 'RETURNING id ';
 	}
@@ -6205,10 +6205,10 @@ 
 	/**
 	 * @see AQueryWriter::getKeyMapForType
 	 */
-	protected function getKeyMapForType( $type )
+	protected function getKeyMapForType($type)
 	{
-		$table = $this->esc( $type, TRUE );
-		$keys = $this->adapter->get( '
+		$table = $this->esc($type, TRUE);
+		$keys = $this->adapter->get('
 			SELECT
 			information_schema.key_column_usage.constraint_name AS "name",
 			information_schema.key_column_usage.column_name AS "from",
@@ -6239,10 +6239,10 @@ 
 				information_schema.key_column_usage.table_catalog = current_database()
 				AND information_schema.key_column_usage.table_schema = ANY( current_schemas( FALSE ) )
 				AND information_schema.key_column_usage.table_name = ?
-		', array( $type ) );
+		', array($type));
 		$keyInfoList = array();
-		foreach ( $keys as $k ) {
-			$label = $this->makeFKLabel( $k['from'], $k['table'], $k['to'] );
+		foreach ($keys as $k) {
+			$label = $this->makeFKLabel($k['from'], $k['table'], $k['to']);
 			$keyInfoList[$label] = array(
 				'name'          => $k['name'],
 				'from'          => $k['from'],
@@ -6260,7 +6260,7 @@ 
 	 *
 	 * @param Adapter $adapter Database Adapter
 	 */
-	public function __construct( Adapter $adapter )
+	public function __construct(Adapter $adapter)
 	{
 		$this->typeno_sqltype = array(
 			self::C_DATATYPE_INTEGER          => ' integer ',
@@ -6277,8 +6277,8 @@ 
 
 		$this->sqltype_typeno = array();
 
-		foreach ( $this->typeno_sqltype as $k => $v ) {
-			$this->sqltype_typeno[trim( strtolower( $v ) )] = $k;
+		foreach ($this->typeno_sqltype as $k => $v) {
+			$this->sqltype_typeno[trim(strtolower($v))] = $k;
 		}
 
 		$this->adapter = $adapter;
@@ -6300,30 +6300,30 @@ 
 	 */
 	public function getTables()
 	{
-		return $this->adapter->getCol( 'SELECT table_name FROM information_schema.tables WHERE table_schema = ANY( current_schemas( FALSE ) )' );
+		return $this->adapter->getCol('SELECT table_name FROM information_schema.tables WHERE table_schema = ANY( current_schemas( FALSE ) )');
 	}
 
 	/**
 	 * @see QueryWriter::createTable
 	 */
-	public function createTable( $table )
+	public function createTable($table)
 	{
-		$table = $this->esc( $table );
+		$table = $this->esc($table);
 
-		$this->adapter->exec( " CREATE TABLE $table (id SERIAL PRIMARY KEY); " );
+		$this->adapter->exec(" CREATE TABLE $table (id SERIAL PRIMARY KEY); ");
 	}
 
 	/**
 	 * @see QueryWriter::getColumns
 	 */
-	public function getColumns( $table )
+	public function getColumns($table)
 	{
-		$table      = $this->esc( $table, TRUE );
+		$table      = $this->esc($table, TRUE);
 
-		$columnsRaw = $this->adapter->get( "SELECT column_name, data_type FROM information_schema.columns WHERE table_name='$table'" );
+		$columnsRaw = $this->adapter->get("SELECT column_name, data_type FROM information_schema.columns WHERE table_name='$table'");
 
 		$columns = array();
-		foreach ( $columnsRaw as $r ) {
+		foreach ($columnsRaw as $r) {
 			$columns[$r['column_name']] = $r['data_type'];
 		}
 
@@ -6333,53 +6333,53 @@ 
 	/**
 	 * @see QueryWriter::scanType
 	 */
-	public function scanType( $value, $flagSpecial = FALSE )
+	public function scanType($value, $flagSpecial = FALSE)
 	{
 		$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 ) ) {
+		if ($flagSpecial && $value) {
+			if (preg_match('/^\d{4}\-\d\d-\d\d$/', $value)) {
 				return PostgreSQL::C_DATATYPE_SPECIAL_DATE;
 			}
 
-			if ( preg_match( '/^\d{4}\-\d\d-\d\d\s\d\d:\d\d:\d\d(\.\d{1,6})?$/', $value ) ) {
+			if (preg_match('/^\d{4}\-\d\d-\d\d\s\d\d:\d\d:\d\d(\.\d{1,6})?$/', $value)) {
 				return PostgreSQL::C_DATATYPE_SPECIAL_DATETIME;
 			}
 
-			if ( preg_match( '/^\([\d\.]+,[\d\.]+\)$/', $value ) ) {
+			if (preg_match('/^\([\d\.]+,[\d\.]+\)$/', $value)) {
 				return PostgreSQL::C_DATATYPE_SPECIAL_POINT;
 			}
 
-			if ( preg_match( '/^\[\([\d\.]+,[\d\.]+\),\([\d\.]+,[\d\.]+\)\]$/', $value ) ) {
+			if (preg_match('/^\[\([\d\.]+,[\d\.]+\),\([\d\.]+,[\d\.]+\)\]$/', $value)) {
 				return PostgreSQL::C_DATATYPE_SPECIAL_LSEG;
 			}
 
-			if ( preg_match( '/^\<\([\d\.]+,[\d\.]+\),[\d\.]+\>$/', $value ) ) {
+			if (preg_match('/^\<\([\d\.]+,[\d\.]+\),[\d\.]+\>$/', $value)) {
 				return PostgreSQL::C_DATATYPE_SPECIAL_CIRCLE;
 			}
 
-			if ( preg_match( '/^\((\([\d\.]+,[\d\.]+\),?)+\)$/', $value ) ) {
+			if (preg_match('/^\((\([\d\.]+,[\d\.]+\),?)+\)$/', $value)) {
 				return PostgreSQL::C_DATATYPE_SPECIAL_POLYGON;
 			}
 
-			if ( preg_match( '/^\-?(\$|€|¥|£)[\d,\.]+$/', $value ) ) {
+			if (preg_match('/^\-?(\$|€|¥|£)[\d,\.]+$/', $value)) {
 				return PostgreSQL::C_DATATYPE_SPECIAL_MONEY;
 			}
 		}
 
-		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 )
+		if ($value === FALSE || $value === TRUE || $value === NULL || (is_numeric($value)
+				&& AQueryWriter::canBeTreatedAsInt($value)
 				&& $value < 2147483648
-				&& $value > -2147483648 )
+				&& $value > -2147483648)
 		) {
 			return self::C_DATATYPE_INTEGER;
-		} elseif ( is_numeric( $value ) ) {
+		} elseif (is_numeric($value)) {
 			return self::C_DATATYPE_DOUBLE;
 		} else {
 			return self::C_DATATYPE_TEXT;
@@ -6389,13 +6389,13 @@ 
 	/**
 	 * @see QueryWriter::code
 	 */
-	public function code( $typedescription, $includeSpecials = FALSE )
+	public function code($typedescription, $includeSpecials = FALSE)
 	{
-		$r = ( isset( $this->sqltype_typeno[$typedescription] ) ) ? $this->sqltype_typeno[$typedescription] : 99;
+		$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 ) {
+		if ($r >= QueryWriter::C_DATATYPE_RANGE_SPECIAL) {
 			return self::C_DATATYPE_SPECIFIED;
 		}
 
@@ -6405,35 +6405,35 @@ 
 	/**
 	 * @see QueryWriter::widenColumn
 	 */
-	public function widenColumn( $type, $column, $datatype )
+	public function widenColumn($type, $column, $datatype)
 	{
 		$table   = $type;
 		$type    = $datatype;
 
-		$table   = $this->esc( $table );
-		$column  = $this->esc( $column );
+		$table   = $this->esc($table);
+		$column  = $this->esc($column);
 
 		$newtype = $this->typeno_sqltype[$type];
 
-		$this->adapter->exec( "ALTER TABLE $table \n\t ALTER COLUMN $column TYPE $newtype " );
+		$this->adapter->exec("ALTER TABLE $table \n\t ALTER COLUMN $column TYPE $newtype ");
 	}
 
 	/**
 	 * @see QueryWriter::addUniqueIndex
 	 */
-	public function addUniqueConstraint( $type, $properties )
+	public function addUniqueConstraint($type, $properties)
 	{
-		$tableNoQ = $this->esc( $type, TRUE );
+		$tableNoQ = $this->esc($type, TRUE);
 		$columns = array();
-		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 ) );
+		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));
 		$sql = "ALTER TABLE {$table}
-                ADD CONSTRAINT $name UNIQUE (" . implode( ',', $columns ) . ")";
+                ADD CONSTRAINT $name UNIQUE (" . implode(',', $columns) . ")";
 		try {
-			$this->adapter->exec( $sql );
-		} catch( SQLException $e ) {
+			$this->adapter->exec($sql);
+		} catch (SQLException $e) {
 			return FALSE;
 		}
 		return TRUE;
@@ -6442,7 +6442,7 @@ 
 	/**
 	 * @see QueryWriter::sqlStateIn
 	 */
-	public function sqlStateIn( $state, $list )
+	public function sqlStateIn($state, $list)
 	{
 		$stateMap = array(
 			'42P01' => QueryWriter::C_SQLSTATE_NO_SUCH_TABLE,
@@ -6450,22 +6450,22 @@ 
 			'23505' => QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION
 		);
 
-		return in_array( ( isset( $stateMap[$state] ) ? $stateMap[$state] : '0' ), $list );
+		return in_array((isset($stateMap[$state]) ? $stateMap[$state] : '0'), $list);
 	}
 
 	/**
 	 * @see QueryWriter::addIndex
 	 */
-	public function addIndex( $type, $name, $property )
+	public function addIndex($type, $name, $property)
 	{
-		$table  = $this->esc( $type );
-		$name   = preg_replace( '/\W/', '', $name );
-		$column = $this->esc( $property );
+		$table  = $this->esc($type);
+		$name   = preg_replace('/\W/', '', $name);
+		$column = $this->esc($property);
 
 		try {
-			$this->adapter->exec( "CREATE INDEX {$name} ON $table ({$column}) " );
+			$this->adapter->exec("CREATE INDEX {$name} ON $table ({$column}) ");
 			return TRUE;
-		} catch ( SQLException $e ) {
+		} catch (SQLException $e) {
 			return FALSE;
 		}
 	}
@@ -6473,22 +6473,22 @@ 
 	/**
 	 * @see QueryWriter::addFK
 	 */
-	public function addFK( $type, $targetType, $property, $targetProperty, $isDep = FALSE )
-	{
-		$table = $this->esc( $type );
-		$targetTable = $this->esc( $targetType );
-		$field = $this->esc( $property );
-		$targetField = $this->esc( $targetProperty );
-		$tableNoQ = $this->esc( $type, TRUE );
-		$fieldNoQ = $this->esc( $property, TRUE );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) return FALSE;
-		try{
-			$delRule = ( $isDep ? 'CASCADE' : 'SET NULL' );
-			$this->adapter->exec( "ALTER TABLE {$table}
+	public function addFK($type, $targetType, $property, $targetProperty, $isDep = FALSE)
+	{
+		$table = $this->esc($type);
+		$targetTable = $this->esc($targetType);
+		$field = $this->esc($property);
+		$targetField = $this->esc($targetProperty);
+		$tableNoQ = $this->esc($type, TRUE);
+		$fieldNoQ = $this->esc($property, TRUE);
+		if (!is_null($this->getForeignKeyForTypeProperty($tableNoQ, $fieldNoQ))) return FALSE;
+		try {
+			$delRule = ($isDep ? 'CASCADE' : 'SET NULL');
+			$this->adapter->exec("ALTER TABLE {$table}
 				ADD FOREIGN KEY ( {$field} ) REFERENCES  {$targetTable}
-				({$targetField}) ON DELETE {$delRule} ON UPDATE {$delRule} DEFERRABLE ;" );
+				({$targetField}) ON DELETE {$delRule} ON UPDATE {$delRule} DEFERRABLE ;");
 			return TRUE;
-		} catch ( SQLException $e ) {
+		} catch (SQLException $e) {
 			return FALSE;
 		}
 	}
@@ -6498,15 +6498,15 @@ 
 	 */
 	public function wipeAll()
 	{
-		$this->adapter->exec( 'SET CONSTRAINTS ALL DEFERRED' );
+		$this->adapter->exec('SET CONSTRAINTS ALL DEFERRED');
 
-		foreach ( $this->getTables() as $t ) {
-			$t = $this->esc( $t );
+		foreach ($this->getTables() as $t) {
+			$t = $this->esc($t);
 
-			$this->adapter->exec( "DROP TABLE IF EXISTS $t CASCADE " );
+			$this->adapter->exec("DROP TABLE IF EXISTS $t CASCADE ");
 		}
 
-		$this->adapter->exec( 'SET CONSTRAINTS ALL IMMEDIATE' );
+		$this->adapter->exec('SET CONSTRAINTS ALL IMMEDIATE');
 	}
 }
 } 
@@ -6573,7 +6573,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setSQLState( $sqlState )
+	public function setSQLState($sqlState)
 	{
 		$this->sqlState = $sqlState;
 	}
@@ -6585,7 +6585,7 @@ 
 	 */
 	public function __toString()
 	{
-		return '[' . $this->getSQLState() . '] - ' . $this->getMessage()."\n".
+		return '[' . $this->getSQLState() . '] - ' . $this->getMessage() . "\n" .
 				'trace: ' . $this->getTraceAsString();
 	}
 }
@@ -6650,37 +6650,37 @@ 
 	 *
 	 * @return void
 	 */
-	protected function storeBeanWithLists( OODBBean $bean )
+	protected function storeBeanWithLists(OODBBean $bean)
 	{
 		$sharedAdditions = $sharedTrashcan = $sharedresidue = $sharedItems = $ownAdditions = $ownTrashcan = $ownresidue = $embeddedBeans = array(); //Define groups
-		foreach ( $bean as $property => $value ) {
-			$value = ( $value instanceof SimpleModel ) ? $value->unbox() : $value;
-			if ( $value instanceof OODBBean ) {
-				$this->processEmbeddedBean( $embeddedBeans, $bean, $property, $value );
+		foreach ($bean as $property => $value) {
+			$value = ($value instanceof SimpleModel) ? $value->unbox() : $value;
+			if ($value instanceof OODBBean) {
+				$this->processEmbeddedBean($embeddedBeans, $bean, $property, $value);
 				$bean->setMeta("sys.typeof.{$property}", $value->getMeta('type'));
-			} elseif ( is_array( $value ) ) {
-				$originals = $bean->moveMeta( 'sys.shadow.' . $property, array() );
-				if ( strpos( $property, 'own' ) === 0 ) {
-					list( $ownAdditions, $ownTrashcan, $ownresidue ) = $this->processGroups( $originals, $value, $ownAdditions, $ownTrashcan, $ownresidue );
-					$listName = lcfirst( substr( $property, 3 ) );
-					if ($bean->moveMeta( 'sys.exclusive-'.  $listName ) ) {
-						OODBBean::setMetaAll( $ownTrashcan, 'sys.garbage', TRUE );
-						OODBBean::setMetaAll( $ownAdditions, 'sys.buildcommand.fkdependson', $bean->getMeta( 'type' ) );
+			} elseif (is_array($value)) {
+				$originals = $bean->moveMeta('sys.shadow.' . $property, array());
+				if (strpos($property, 'own') === 0) {
+					list($ownAdditions, $ownTrashcan, $ownresidue) = $this->processGroups($originals, $value, $ownAdditions, $ownTrashcan, $ownresidue);
+					$listName = lcfirst(substr($property, 3));
+					if ($bean->moveMeta('sys.exclusive-' . $listName)) {
+						OODBBean::setMetaAll($ownTrashcan, 'sys.garbage', TRUE);
+						OODBBean::setMetaAll($ownAdditions, 'sys.buildcommand.fkdependson', $bean->getMeta('type'));
 					}
-					unset( $bean->$property );
-				} elseif ( strpos( $property, 'shared' ) === 0 ) {
-					list( $sharedAdditions, $sharedTrashcan, $sharedresidue ) = $this->processGroups( $originals, $value, $sharedAdditions, $sharedTrashcan, $sharedresidue );
-					unset( $bean->$property );
+					unset($bean->$property);
+				} elseif (strpos($property, 'shared') === 0) {
+					list($sharedAdditions, $sharedTrashcan, $sharedresidue) = $this->processGroups($originals, $value, $sharedAdditions, $sharedTrashcan, $sharedresidue);
+					unset($bean->$property);
 				}
 			}
 		}
-		$this->storeBean( $bean );
-		$this->processTrashcan( $bean, $ownTrashcan );
-		$this->processAdditions( $bean, $ownAdditions );
-		$this->processResidue( $ownresidue );
-		$this->processSharedTrashcan( $bean, $sharedTrashcan );
-		$this->processSharedAdditions( $bean, $sharedAdditions );
-		$this->processSharedResidue( $bean, $sharedresidue );
+		$this->storeBean($bean);
+		$this->processTrashcan($bean, $ownTrashcan);
+		$this->processAdditions($bean, $ownAdditions);
+		$this->processResidue($ownresidue);
+		$this->processSharedTrashcan($bean, $sharedTrashcan);
+		$this->processSharedAdditions($bean, $sharedAdditions);
+		$this->processSharedResidue($bean, $sharedresidue);
 	}
 
 	/**
@@ -6698,12 +6698,12 @@ 
 	 *
 	 * @return array
 	 */
-	protected function processGroups( $originals, $current, $additions, $trashcan, $residue )
+	protected function processGroups($originals, $current, $additions, $trashcan, $residue)
 	{
 		return array(
-			array_merge( $additions, array_diff( $current, $originals ) ),
-			array_merge( $trashcan, array_diff( $originals, $current ) ),
-			array_merge( $residue, array_intersect( $current, $originals ) )
+			array_merge($additions, array_diff($current, $originals)),
+			array_merge($trashcan, array_diff($originals, $current)),
+			array_merge($residue, array_intersect($current, $originals))
 		);
 	}
 
@@ -6714,10 +6714,10 @@ 
 	 *
 	 * @return integer
 	 */
-	protected function prepareEmbeddedBean( $embeddedBean )
+	protected function prepareEmbeddedBean($embeddedBean)
 	{
-		if ( !$embeddedBean->id || $embeddedBean->getMeta( 'tainted' ) ) {
-			$this->store( $embeddedBean );
+		if (!$embeddedBean->id || $embeddedBean->getMeta('tainted')) {
+			$this->store($embeddedBean);
 		}
 
 		return $embeddedBean->id;
@@ -6734,13 +6734,13 @@ 
 	 *
 	 * @throws Security
 	 */
-	protected function processSharedAdditions( $bean, $sharedAdditions )
+	protected function processSharedAdditions($bean, $sharedAdditions)
 	{
-		foreach ( $sharedAdditions as $addition ) {
-			if ( $addition instanceof OODBBean ) {
-				$this->oodb->getAssociationManager()->associate( $addition, $bean );
+		foreach ($sharedAdditions as $addition) {
+			if ($addition instanceof OODBBean) {
+				$this->oodb->getAssociationManager()->associate($addition, $bean);
 			} else {
-				throw new RedException( 'Array may only contain OODBBeans' );
+				throw new RedException('Array may only contain OODBBeans');
 			}
 		}
 	}
@@ -6757,11 +6757,11 @@ 
 	 *
 	 * @return void
 	 */
-	protected function processResidue( $ownresidue )
+	protected function processResidue($ownresidue)
 	{
-		foreach ( $ownresidue as $residue ) {
-			if ( $residue->getMeta( 'tainted' ) ) {
-				$this->store( $residue );
+		foreach ($ownresidue as $residue) {
+			if ($residue->getMeta('tainted')) {
+				$this->store($residue);
 			}
 		}
 	}
@@ -6780,20 +6780,20 @@ 
 	 *
 	 * @return void
 	 */
-	protected function processTrashcan( $bean, $ownTrashcan )
+	protected function processTrashcan($bean, $ownTrashcan)
 	{
 
-		foreach ( $ownTrashcan as $trash ) {
+		foreach ($ownTrashcan as $trash) {
 
-			$myFieldLink = $bean->getMeta( 'type' ) . '_id';
-			$alias = $bean->getMeta( 'sys.alias.' . $trash->getMeta( 'type' ) );
-			if ( $alias ) $myFieldLink = $alias . '_id';
+			$myFieldLink = $bean->getMeta('type') . '_id';
+			$alias = $bean->getMeta('sys.alias.' . $trash->getMeta('type'));
+			if ($alias) $myFieldLink = $alias . '_id';
 
-			if ( $trash->getMeta( 'sys.garbage' ) === true ) {
-				$this->trash( $trash );
+			if ($trash->getMeta('sys.garbage') === true) {
+				$this->trash($trash);
 			} else {
 				$trash->$myFieldLink = NULL;
-				$this->store( $trash );
+				$this->store($trash);
 			}
 		}
 	}
@@ -6806,10 +6806,10 @@ 
 	 *
 	 * @return void
 	 */
-	protected function processSharedTrashcan( $bean, $sharedTrashcan )
+	protected function processSharedTrashcan($bean, $sharedTrashcan)
 	{
-		foreach ( $sharedTrashcan as $trash ) {
-			$this->oodb->getAssociationManager()->unassociate( $trash, $bean );
+		foreach ($sharedTrashcan as $trash) {
+			$this->oodb->getAssociationManager()->unassociate($trash, $bean);
 		}
 	}
 
@@ -6821,10 +6821,10 @@ 
 	 *
 	 * @return void
 	 */
-	protected function processSharedResidue( $bean, $sharedresidue )
+	protected function processSharedResidue($bean, $sharedresidue)
 	{
-		foreach ( $sharedresidue as $residue ) {
-			$this->store( $residue );
+		foreach ($sharedresidue as $residue) {
+			$this->store($residue);
 		}
 	}
 
@@ -6837,11 +6837,11 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function hasListsOrObjects( OODBBean $bean )
+	protected function hasListsOrObjects(OODBBean $bean)
 	{
 		$processLists = FALSE;
-		foreach ( $bean as $value ) {
-			if ( is_array( $value ) || is_object( $value ) ) {
+		foreach ($bean as $value) {
+			if (is_array($value) || is_object($value)) {
 				$processLists = TRUE;
 				break;
 			}
@@ -6860,14 +6860,14 @@ 
 	 * @param string           $property      property that contains the embedded bean
 	 * @param OODBBean $value         embedded bean itself
 	 */
-	protected function processEmbeddedBean( &$embeddedBeans, $bean, $property, OODBBean $value )
+	protected function processEmbeddedBean(&$embeddedBeans, $bean, $property, OODBBean $value)
 	{
-		$linkField        = $property . '_id';
-		$id = $this->prepareEmbeddedBean( $value );
+		$linkField = $property . '_id';
+		$id = $this->prepareEmbeddedBean($value);
 		if ($bean->$linkField != $id) $bean->$linkField = $id;
-		$bean->setMeta( 'cast.' . $linkField, 'id' );
+		$bean->setMeta('cast.' . $linkField, 'id');
 		$embeddedBeans[$linkField] = $value;
-		unset( $bean->$property );
+		unset($bean->$property);
 	}
 
 
@@ -6876,7 +6876,7 @@ 
 	 *
 	 * @param QueryWriter $writer writer
 	 */
-	public function __construct( OODB $oodb, QueryWriter $writer )
+	public function __construct(OODB $oodb, QueryWriter $writer)
 	{
 		$this->writer = $writer;
 		$this->oodb = $oodb;
@@ -6893,33 +6893,33 @@ 
 	 *
 	 * @throws Security $exception
 	 */
-	public function check( OODBBean $bean )
+	public function check(OODBBean $bean)
 	{
 		//Is all meta information present?
-		if ( !isset( $bean->id ) ) {
-			throw new RedException( 'Bean has incomplete Meta Information id ' );
+		if (!isset($bean->id)) {
+			throw new RedException('Bean has incomplete Meta Information id ');
 		}
-		if ( !( $bean->getMeta( 'type' ) ) ) {
-			throw new RedException( 'Bean has incomplete Meta Information II' );
+		if (!($bean->getMeta('type'))) {
+			throw new RedException('Bean has incomplete Meta Information II');
 		}
 		//Pattern of allowed characters
 		$pattern = '/[^a-z0-9_]/i';
 		//Does the type contain invalid characters?
-		if ( preg_match( $pattern, $bean->getMeta( 'type' ) ) ) {
-			throw new RedException( 'Bean Type is invalid' );
+		if (preg_match($pattern, $bean->getMeta('type'))) {
+			throw new RedException('Bean Type is invalid');
 		}
 		//Are the properties and values valid?
-		foreach ( $bean as $prop => $value ) {
+		foreach ($bean as $prop => $value) {
 			if (
-				is_array( $value )
-				|| ( is_object( $value ) )
+				is_array($value)
+				|| (is_object($value))
 			) {
-				throw new RedException( "Invalid Bean value: property $prop" );
+				throw new RedException("Invalid Bean value: property $prop");
 			} else if (
-				strlen( $prop ) < 1
-				|| preg_match( $pattern, $prop )
+				strlen($prop) < 1
+				|| preg_match($pattern, $prop)
 			) {
-				throw new RedException( "Invalid Bean property: property $prop" );
+				throw new RedException("Invalid Bean property: property $prop");
 			}
 		}
 	}
@@ -6949,21 +6949,21 @@ 
 	 * @return array
 	 *
 	 */
-	public function find( $type, $conditions = array(), $sql = NULL, $bindings = array() )
+	public function find($type, $conditions = array(), $sql = NULL, $bindings = array())
 	{
 		//for backward compatibility, allow mismatch arguments:
-		if ( is_array( $sql ) ) {
-			if ( isset( $sql[1] ) ) {
+		if (is_array($sql)) {
+			if (isset($sql[1])) {
 				$bindings = $sql[1];
 			}
 			$sql = $sql[0];
 		}
 		try {
-			$beans = $this->convertToBeans( $type, $this->writer->queryRecord( $type, $conditions, $sql, $bindings ) );
+			$beans = $this->convertToBeans($type, $this->writer->queryRecord($type, $conditions, $sql, $bindings));
 
 			return $beans;
-		} catch ( SQLException $exception ) {
-			$this->handleException( $exception );
+		} catch (SQLException $exception) {
+			$this->handleException($exception);
 		}
 
 		return array();
@@ -6978,15 +6978,15 @@ 
 	 *
 	 * @return BeanCollection
 	 */
-	public function findCollection( $type, $sql, $bindings = array() )
+	public function findCollection($type, $sql, $bindings = array())
 	{
 		try {
-			$cursor = $this->writer->queryRecordWithCursor( $type, $sql, $bindings );
-			return new BeanCollection( $type, $this, $cursor );
-		} catch ( SQLException $exception ) {
-			$this->handleException( $exception );
+			$cursor = $this->writer->queryRecordWithCursor($type, $sql, $bindings);
+			return new BeanCollection($type, $this, $cursor);
+		} catch (SQLException $exception) {
+			$this->handleException($exception);
 		}
-		return new BeanCollection( $type, $this, new NullCursor );
+		return new BeanCollection($type, $this, new NullCursor);
 	}
 
 	/**
@@ -7009,22 +7009,22 @@ 
 	 *
 	 * @return integer|string
 	 */
-	public function store( $bean )
+	public function store($bean)
 	{
-		$processLists = $this->hasListsOrObjects( $bean );
-		if ( !$processLists && !$bean->getMeta( 'tainted' ) ) {
+		$processLists = $this->hasListsOrObjects($bean);
+		if (!$processLists && !$bean->getMeta('tainted')) {
 			return $bean->getID(); //bail out!
 		}
-		$this->oodb->signal( 'update', $bean );
-		$processLists = $this->hasListsOrObjects( $bean ); //check again, might have changed by model!
-		if ( $processLists ) {
-			$this->storeBeanWithLists( $bean );
+		$this->oodb->signal('update', $bean);
+		$processLists = $this->hasListsOrObjects($bean); //check again, might have changed by model!
+		if ($processLists) {
+			$this->storeBeanWithLists($bean);
 		} else {
-			$this->storeBean( $bean );
+			$this->storeBean($bean);
 		}
-		$this->oodb->signal( 'after_update', $bean );
+		$this->oodb->signal('after_update', $bean);
 
-		return ( (string) $bean->id === (string) (int) $bean->id ) ? (int) $bean->id : (string) $bean->id;
+		return ((string) $bean->id === (string) (int) $bean->id) ? (int) $bean->id : (string) $bean->id;
 	}
 
 	/**
@@ -7041,27 +7041,27 @@ 
 	 *
 	 * @return array
 	 */
-	public function batch( $type, $ids )
+	public function batch($type, $ids)
 	{
-		if ( !$ids ) {
+		if (!$ids) {
 			return array();
 		}
 		$collection = array();
 		try {
-			$rows = $this->writer->queryRecord( $type, array( 'id' => $ids ) );
-		} catch ( SQLException $e ) {
-			$this->handleException( $e );
+			$rows = $this->writer->queryRecord($type, array('id' => $ids));
+		} catch (SQLException $e) {
+			$this->handleException($e);
 			$rows = FALSE;
 		}
 		$this->stash[$this->nesting] = array();
-		if ( !$rows ) {
+		if (!$rows) {
 			return array();
 		}
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$this->stash[$this->nesting][$row['id']] = $row;
 		}
-		foreach ( $ids as $id ) {
-			$collection[$id] = $this->load( $type, $id );
+		foreach ($ids as $id) {
+			$collection[$id] = $this->load($type, $id);
 		}
 		$this->stash[$this->nesting] = NULL;
 
@@ -7079,14 +7079,14 @@ 
 	 *
 	 * @return array
 	 */
-	public function convertToBeans( $type, $rows )
+	public function convertToBeans($type, $rows)
 	{
 		$collection                  = array();
 		$this->stash[$this->nesting] = array();
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$id                               = $row['id'];
 			$this->stash[$this->nesting][$id] = $row;
-			$collection[$id]                  = $this->load( $type, $id );
+			$collection[$id]                  = $this->load($type, $id);
 		}
 		$this->stash[$this->nesting] = NULL;
 
@@ -7106,19 +7106,19 @@ 
 	 *
 	 * @throws SQLException
 	 */
-	public function count( $type, $addSQL = '', $bindings = array() )
+	public function count($type, $addSQL = '', $bindings = array())
 	{
-		$type = AQueryWriter::camelsSnake( $type );
-		if ( count( explode( '_', $type ) ) > 2 ) {
-			throw new RedException( 'Invalid type for count.' );
+		$type = AQueryWriter::camelsSnake($type);
+		if (count(explode('_', $type)) > 2) {
+			throw new RedException('Invalid type for count.');
 		}
 
 		try {
-			return (int) $this->writer->queryRecordCount( $type, array(), $addSQL, $bindings );
-		} catch ( SQLException $exception ) {
-			if ( !$this->writer->sqlStateIn( $exception->getSQLState(), array(
+			return (int) $this->writer->queryRecordCount($type, array(), $addSQL, $bindings);
+		} catch (SQLException $exception) {
+			if (!$this->writer->sqlStateIn($exception->getSQLState(), array(
 				 QueryWriter::C_SQLSTATE_NO_SUCH_TABLE,
-				 QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN ) ) ) {
+				 QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN ))) {
 				throw $exception;
 			}
 		}
@@ -7137,28 +7137,28 @@ 
 	 *
 	 * @throws SQLException
 	 */
-	public function trash( $bean )
+	public function trash($bean)
 	{
-		$this->oodb->signal( 'delete', $bean );
-		foreach ( $bean as $property => $value ) {
-			if ( $value instanceof OODBBean ) {
-				unset( $bean->$property );
+		$this->oodb->signal('delete', $bean);
+		foreach ($bean as $property => $value) {
+			if ($value instanceof OODBBean) {
+				unset($bean->$property);
 			}
-			if ( is_array( $value ) ) {
-				if ( strpos( $property, 'own' ) === 0 ) {
-					unset( $bean->$property );
-				} elseif ( strpos( $property, 'shared' ) === 0 ) {
-					unset( $bean->$property );
+			if (is_array($value)) {
+				if (strpos($property, 'own') === 0) {
+					unset($bean->$property);
+				} elseif (strpos($property, 'shared') === 0) {
+					unset($bean->$property);
 				}
 			}
 		}
 		try {
-			$this->writer->deleteRecord( $bean->getMeta( 'type' ), array( 'id' => array( $bean->id ) ), NULL );
-		} catch ( SQLException $exception ) {
-			$this->handleException( $exception );
+			$this->writer->deleteRecord($bean->getMeta('type'), array('id' => array($bean->id)), NULL);
+		} catch (SQLException $exception) {
+			$this->handleException($exception);
 		}
 		$bean->id = 0;
-		$this->oodb->signal( 'after_delete', $bean );
+		$this->oodb->signal('after_delete', $bean);
 	}
 
 	/**
@@ -7171,9 +7171,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function tableExists( $table )
+	public function tableExists($table)
 	{
-		return $this->writer->tableExists( $table );
+		return $this->writer->tableExists($table);
 	}
 
 	/**
@@ -7185,14 +7185,14 @@ 
 	 *
 	 * @throws SQLException
 	 */
-	public function wipe( $type )
+	public function wipe($type)
 	{
 		try {
-			$this->writer->wipe( $type );
+			$this->writer->wipe($type);
 
 			return TRUE;
-		} catch ( SQLException $exception ) {
-			if ( !$this->writer->sqlStateIn( $exception->getSQLState(), array( QueryWriter::C_SQLSTATE_NO_SUCH_TABLE ) ) ) {
+		} catch (SQLException $exception) {
+			if (!$this->writer->sqlStateIn($exception->getSQLState(), array(QueryWriter::C_SQLSTATE_NO_SUCH_TABLE))) {
 				throw $exception;
 			}
 
@@ -7246,16 +7246,16 @@ 
 	 *
 	 * @throws Security
 	 */
-	private function getTypeFromCast( $cast )
+	private function getTypeFromCast($cast)
 	{
-		if ( $cast == 'string' ) {
-			$typeno = $this->writer->scanType( 'STRING' );
-		} elseif ( $cast == 'id' ) {
+		if ($cast == 'string') {
+			$typeno = $this->writer->scanType('STRING');
+		} elseif ($cast == 'id') {
 			$typeno = $this->writer->getTypeForID();
-		} elseif ( isset( $this->writer->sqltype_typeno[$cast] ) ) {
+		} elseif (isset($this->writer->sqltype_typeno[$cast])) {
 			$typeno = $this->writer->sqltype_typeno[$cast];
 		} else {
-			throw new RedException( 'Invalid Cast' );
+			throw new RedException('Invalid Cast');
 		}
 
 		return $typeno;
@@ -7270,12 +7270,12 @@ 
 	 *
 	 * @return void
 	 */
-	private function createTableIfNotExists( OODBBean $bean, $table )
+	private function createTableIfNotExists(OODBBean $bean, $table)
 	{
 		//Does table exist? If not, create
-		if ( !$this->tableExists( $this->writer->esc( $table, TRUE ) ) ) {
-			$this->writer->createTable( $table );
-			$bean->setMeta( 'buildreport.flags.created', TRUE );
+		if (!$this->tableExists($this->writer->esc($table, TRUE))) {
+			$this->writer->createTable($table);
+			$bean->setMeta('buildreport.flags.created', TRUE);
 		}
 	}
 
@@ -7295,48 +7295,48 @@ 
 	 *
 	 * @return void
 	 */
-	private function modifySchema( OODBBean $bean, $property, $value )
+	private function modifySchema(OODBBean $bean, $property, $value)
 	{
 		$doFKStuff = FALSE;
-		$table   = $bean->getMeta( 'type' );
-		$columns = $this->writer->getColumns( $table );
-		$columnNoQ = $this->writer->esc( $property, TRUE );
-		if ( !$this->oodb->isChilled( $bean->getMeta( 'type' ) ) ) {
-			if ( $bean->getMeta( "cast.$property", -1 ) !== -1 ) { //check for explicitly specified types
-				$cast   = $bean->getMeta( "cast.$property" );
-				$typeno = $this->getTypeFromCast( $cast );
+		$table   = $bean->getMeta('type');
+		$columns = $this->writer->getColumns($table);
+		$columnNoQ = $this->writer->esc($property, TRUE);
+		if (!$this->oodb->isChilled($bean->getMeta('type'))) {
+			if ($bean->getMeta("cast.$property", -1) !== -1) { //check for explicitly specified types
+				$cast   = $bean->getMeta("cast.$property");
+				$typeno = $this->getTypeFromCast($cast);
 			} else {
 				$cast   = FALSE;
-				$typeno = $this->writer->scanType( $value, TRUE );
+				$typeno = $this->writer->scanType($value, TRUE);
 			}
-			if ( isset( $columns[$this->writer->esc( $property, TRUE )] ) ) { //Is this property represented in the table ?
-				if ( !$cast ) { //rescan without taking into account special types >80
-					$typeno = $this->writer->scanType( $value, FALSE );
+			if (isset($columns[$this->writer->esc($property, TRUE)])) { //Is this property represented in the table ?
+				if (!$cast) { //rescan without taking into account special types >80
+					$typeno = $this->writer->scanType($value, FALSE);
 				}
-				$sqlt = $this->writer->code( $columns[$this->writer->esc( $property, TRUE )] );
-				if ( $typeno > $sqlt ) { //no, we have to widen the database column type
-					$this->writer->widenColumn( $table, $property, $typeno );
-					$bean->setMeta( 'buildreport.flags.widen', TRUE );
+				$sqlt = $this->writer->code($columns[$this->writer->esc($property, TRUE)]);
+				if ($typeno > $sqlt) { //no, we have to widen the database column type
+					$this->writer->widenColumn($table, $property, $typeno);
+					$bean->setMeta('buildreport.flags.widen', TRUE);
 					$doFKStuff = TRUE;
 				}
 			} else {
-				$this->writer->addColumn( $table, $property, $typeno );
-				$bean->setMeta( 'buildreport.flags.addcolumn', TRUE );
+				$this->writer->addColumn($table, $property, $typeno);
+				$bean->setMeta('buildreport.flags.addcolumn', TRUE);
 				$doFKStuff = TRUE;
 			}
 			if ($doFKStuff) {
-				if (strrpos($columnNoQ, '_id')===(strlen($columnNoQ)-3)) {
-					$destinationColumnNoQ = substr($columnNoQ, 0, strlen($columnNoQ)-3);
+				if (strrpos($columnNoQ, '_id') === (strlen($columnNoQ) - 3)) {
+					$destinationColumnNoQ = substr($columnNoQ, 0, strlen($columnNoQ) - 3);
 					$indexName = "index_foreignkey_{$table}_{$destinationColumnNoQ}";
 					$this->writer->addIndex($table, $indexName, $columnNoQ);
 					$typeof = $bean->getMeta("sys.typeof.{$destinationColumnNoQ}", $destinationColumnNoQ);
-					$isLink = $bean->getMeta( 'sys.buildcommand.unique', FALSE );
+					$isLink = $bean->getMeta('sys.buildcommand.unique', FALSE);
 					//Make FK CASCADING if part of exclusive list (dependson=typeof) or if link bean
-					$isDep = ( $bean->moveMeta( 'sys.buildcommand.fkdependson' ) === $typeof || is_array( $isLink ) );
-					$result = $this->writer->addFK( $table, $typeof, $columnNoQ, 'id', $isDep );
+					$isDep = ($bean->moveMeta('sys.buildcommand.fkdependson') === $typeof || is_array($isLink));
+					$result = $this->writer->addFK($table, $typeof, $columnNoQ, 'id', $isDep);
 					//If this is a link bean and all unique columns have been added already, then apply unique constraint
-					if ( is_array( $isLink ) && !count( array_diff( $isLink, array_keys( $this->writer->getColumns( $table ) ) ) ) ) {
-						$this->writer->addUniqueConstraint( $table, $bean->moveMeta('sys.buildcommand.unique') );
+					if (is_array($isLink) && !count(array_diff($isLink, array_keys($this->writer->getColumns($table))))) {
+						$this->writer->addUniqueConstraint($table, $bean->moveMeta('sys.buildcommand.unique'));
 						$bean->setMeta("sys.typeof.{$destinationColumnNoQ}", NULL);
 					}
 				}
@@ -7358,29 +7358,29 @@ 
 	 *
 	 * @throws Security
 	 */
-	protected function processAdditions( $bean, $ownAdditions )
+	protected function processAdditions($bean, $ownAdditions)
 	{
-		$beanType = $bean->getMeta( 'type' );
+		$beanType = $bean->getMeta('type');
 
-		foreach ( $ownAdditions as $addition ) {
-			if ( $addition instanceof OODBBean ) {
+		foreach ($ownAdditions as $addition) {
+			if ($addition instanceof OODBBean) {
 
 				$myFieldLink = $beanType . '_id';
-				$alias = $bean->getMeta( 'sys.alias.' . $addition->getMeta( 'type' ) );
-				if ( $alias ) $myFieldLink = $alias . '_id';
+				$alias = $bean->getMeta('sys.alias.' . $addition->getMeta('type'));
+				if ($alias) $myFieldLink = $alias . '_id';
 
 				$addition->$myFieldLink = $bean->id;
-				$addition->setMeta( 'cast.' . $myFieldLink, 'id' );
+				$addition->setMeta('cast.' . $myFieldLink, 'id');
 
 				if ($alias) {
-					$addition->setMeta( "sys.typeof.{$alias}", $beanType );
+					$addition->setMeta("sys.typeof.{$alias}", $beanType);
 				} else {
-					$addition->setMeta( "sys.typeof.{$beanType}", $beanType );
+					$addition->setMeta("sys.typeof.{$beanType}", $beanType);
 				}
 
-				$this->store( $addition );
+				$this->store($addition);
 			} else {
-				throw new RedException( 'Array may only contain OODBBeans' );
+				throw new RedException('Array may only contain OODBBeans');
 			}
 		}
 	}
@@ -7395,27 +7395,27 @@ 
 	 *
 	 * @return void
 	 */
-	protected function storeBean( OODBBean $bean )
+	protected function storeBean(OODBBean $bean)
 	{
-		if ( $bean->getMeta( 'changed' ) ) {
-			$this->check( $bean );
-			$table = $bean->getMeta( 'type' );
-			$this->createTableIfNotExists( $bean, $table );
+		if ($bean->getMeta('changed')) {
+			$this->check($bean);
+			$table = $bean->getMeta('type');
+			$this->createTableIfNotExists($bean, $table);
 
 			$updateValues = array();
-			foreach ( $bean as $property => $value ) {
-				if ( $property !== 'id' ) {
-					$this->modifySchema( $bean, $property, $value );
+			foreach ($bean as $property => $value) {
+				if ($property !== 'id') {
+					$this->modifySchema($bean, $property, $value);
 				}
-				if ( $property !== 'id' ) {
-					$updateValues[] = array( 'property' => $property, 'value' => $value );
+				if ($property !== 'id') {
+					$updateValues[] = array('property' => $property, 'value' => $value);
 				}
 			}
 
-			$bean->id = $this->writer->updateRecord( $table, $updateValues, $bean->id );
-			$bean->setMeta( 'changed', FALSE );
+			$bean->id = $this->writer->updateRecord($table, $updateValues, $bean->id);
+			$bean->setMeta('changed', FALSE);
 		}
-		$bean->setMeta( 'tainted', FALSE );
+		$bean->setMeta('tainted', FALSE);
 	}
 
 	/**
@@ -7427,12 +7427,12 @@ 
 	 *
 	 * @throws\Exception
 	 */
-	protected function handleException( \Exception $exception )
+	protected function handleException(\Exception $exception)
 	{
-		if ( !$this->writer->sqlStateIn( $exception->getSQLState(),
+		if (!$this->writer->sqlStateIn($exception->getSQLState(),
 			array(
 				QueryWriter::C_SQLSTATE_NO_SUCH_TABLE,
-				QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN ) )
+				QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN ))
 		) {
 			throw $exception;
 		}
@@ -7453,19 +7453,19 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function dispense( $type, $number = 1, $alwaysReturnArray = FALSE )
+	public function dispense($type, $number = 1, $alwaysReturnArray = FALSE)
 	{
-		$OODBBEAN = defined( 'REDBEAN_OODBBEAN_CLASS' ) ? REDBEAN_OODBBEAN_CLASS : '\RedBeanPHP\OODBBean';
+		$OODBBEAN = defined('REDBEAN_OODBBEAN_CLASS') ? REDBEAN_OODBBEAN_CLASS : '\RedBeanPHP\OODBBean';
 		$beans = array();
-		for ( $i = 0; $i < $number; $i++ ) {
+		for ($i = 0; $i < $number; $i++) {
 			$bean = new $OODBBEAN;
-			$bean->initializeForDispense( $type, $this->oodb->getBeanHelper() );
-			$this->check( $bean );
-			$this->oodb->signal( 'dispense', $bean );
+			$bean->initializeForDispense($type, $this->oodb->getBeanHelper());
+			$this->check($bean);
+			$this->oodb->signal('dispense', $bean);
 			$beans[] = $bean;
 		}
 
-		return ( count( $beans ) === 1 && !$alwaysReturnArray ) ? array_pop( $beans ) : $beans;
+		return (count($beans) === 1 && !$alwaysReturnArray) ? array_pop($beans) : $beans;
 	}
 
 	/**
@@ -7493,16 +7493,16 @@ 
 	 * @return OODBBean
 	 *
 	 */
-	public function load( $type, $id )
+	public function load($type, $id)
 	{
-		$bean = $this->dispense( $type );
-		if ( isset( $this->stash[$this->nesting][$id] ) ) {
+		$bean = $this->dispense($type);
+		if (isset($this->stash[$this->nesting][$id])) {
 			$row = $this->stash[$this->nesting][$id];
 		} else {
 			try {
-				$rows = $this->writer->queryRecord( $type, array( 'id' => array( $id ) ) );
-			} catch ( SQLException $exception ) {
-				if ( $this->writer->sqlStateIn( $exception->getSQLState(),
+				$rows = $this->writer->queryRecord($type, array('id' => array($id)));
+			} catch (SQLException $exception) {
+				if ($this->writer->sqlStateIn($exception->getSQLState(),
 					array(
 						QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN,
 						QueryWriter::C_SQLSTATE_NO_SUCH_TABLE )
@@ -7512,17 +7512,17 @@ 
 
 				}
 			}
-			if ( empty( $rows ) ) {
+			if (empty($rows)) {
 				return $bean;
 			}
-			$row = array_pop( $rows );
+			$row = array_pop($rows);
 		}
-		$bean->importRow( $row );
+		$bean->importRow($row);
 		$this->nesting++;
-		$this->oodb->signal( 'open', $bean );
+		$this->oodb->signal('open', $bean);
 		$this->nesting--;
 
-		return $bean->setMeta( 'tainted', FALSE );
+		return $bean->setMeta('tainted', FALSE);
 	}
 }
 }
@@ -7571,7 +7571,7 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	protected function handleException( \Exception $exception )
+	protected function handleException(\Exception $exception)
 	{
 		throw $exception;
 	}
@@ -7586,23 +7586,23 @@ 
 	 *
 	 * @return void
 	 */
-	protected function storeBean( OODBBean $bean )
+	protected function storeBean(OODBBean $bean)
 	{
-		if ( $bean->getMeta( 'changed' ) ) {
+		if ($bean->getMeta('changed')) {
 
-			list( $properties, $table ) = $bean->getPropertiesAndType();
+			list($properties, $table) = $bean->getPropertiesAndType();
 			$id = $properties['id'];
 			unset($properties['id']);
 			$updateValues = array();
 			$k1 = 'property';
 			$k2 = 'value';
-			foreach( $properties as $key => $value ) {
-				$updateValues[] = array( $k1 => $key, $k2 => $value );
+			foreach ($properties as $key => $value) {
+				$updateValues[] = array($k1 => $key, $k2 => $value);
 			}
-			$bean->id = $this->writer->updateRecord( $table, $updateValues, $id );
-			$bean->setMeta( 'changed', FALSE );
+			$bean->id = $this->writer->updateRecord($table, $updateValues, $id);
+			$bean->setMeta('changed', FALSE);
 		}
-		$bean->setMeta( 'tainted', FALSE );
+		$bean->setMeta('tainted', FALSE);
 	}
 
 	/**
@@ -7619,24 +7619,24 @@ 
 	 *
 	 * @throws Security
 	 */
-	protected function processAdditions( $bean, $ownAdditions )
+	protected function processAdditions($bean, $ownAdditions)
 	{
-		$beanType = $bean->getMeta( 'type' );
+		$beanType = $bean->getMeta('type');
 
 		$cachedIndex = array();
-		foreach ( $ownAdditions as $addition ) {
-			if ( $addition instanceof OODBBean ) {
+		foreach ($ownAdditions as $addition) {
+			if ($addition instanceof OODBBean) {
 
 				$myFieldLink = $beanType . '_id';
-				$alias = $bean->getMeta( 'sys.alias.' . $addition->getMeta( 'type' ) );
-				if ( $alias ) $myFieldLink = $alias . '_id';
+				$alias = $bean->getMeta('sys.alias.' . $addition->getMeta('type'));
+				if ($alias) $myFieldLink = $alias . '_id';
 
 				$addition->$myFieldLink = $bean->id;
-				$addition->setMeta( 'cast.' . $myFieldLink, 'id' );
-				$this->store( $addition );
+				$addition->setMeta('cast.' . $myFieldLink, 'id');
+				$this->store($addition);
 
 			} else {
-				throw new RedException( 'Array may only contain OODBBeans' );
+				throw new RedException('Array may only contain OODBBeans');
 			}
 		}
 	}
@@ -7656,18 +7656,18 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function dispense( $type, $number = 1, $alwaysReturnArray = FALSE )
+	public function dispense($type, $number = 1, $alwaysReturnArray = FALSE)
 	{
-		$OODBBEAN = defined( 'REDBEAN_OODBBEAN_CLASS' ) ? REDBEAN_OODBBEAN_CLASS : '\RedBeanPHP\OODBBean';
+		$OODBBEAN = defined('REDBEAN_OODBBEAN_CLASS') ? REDBEAN_OODBBEAN_CLASS : '\RedBeanPHP\OODBBean';
 		$beans = array();
-		for ( $i = 0; $i < $number; $i++ ) {
+		for ($i = 0; $i < $number; $i++) {
 			$bean = new $OODBBEAN;
-			$bean->initializeForDispense( $type, $this->oodb->getBeanHelper() );
-			$this->oodb->signal( 'dispense', $bean );
+			$bean->initializeForDispense($type, $this->oodb->getBeanHelper());
+			$this->oodb->signal('dispense', $bean);
 			$beans[] = $bean;
 		}
 
-		return ( count( $beans ) === 1 && !$alwaysReturnArray ) ? array_pop( $beans ) : $beans;
+		return (count($beans) === 1 && !$alwaysReturnArray) ? array_pop($beans) : $beans;
 	}
 
 	/**
@@ -7695,16 +7695,16 @@ 
 	 * @return OODBBean
 	 *
 	 */
-	public function load( $type, $id )
+	public function load($type, $id)
 	{
-		$bean = $this->dispense( $type );
-		if ( isset( $this->stash[$this->nesting][$id] ) ) {
+		$bean = $this->dispense($type);
+		if (isset($this->stash[$this->nesting][$id])) {
 			$row = $this->stash[$this->nesting][$id];
 		} else {
 			try {
-				$rows = $this->writer->queryRecord( $type, array( 'id' => array( $id ) ) );
-			} catch ( SQLException $exception ) {
-				if ( $this->writer->sqlStateIn( $exception->getSQLState(),
+				$rows = $this->writer->queryRecord($type, array('id' => array($id)));
+			} catch (SQLException $exception) {
+				if ($this->writer->sqlStateIn($exception->getSQLState(),
 					array(
 						QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN,
 						QueryWriter::C_SQLSTATE_NO_SUCH_TABLE )
@@ -7713,17 +7713,17 @@ 
 					throw $exception; //only throw if frozen
 				}
 			}
-			if ( empty( $rows ) ) {
+			if (empty($rows)) {
 				return $bean;
 			}
-			$row = array_pop( $rows );
+			$row = array_pop($rows);
 		}
-		$bean->importRow( $row );
+		$bean->importRow($row);
 		$this->nesting++;
-		$this->oodb->signal( 'open', $bean );
+		$this->oodb->signal('open', $bean);
 		$this->nesting--;
 
-		return $bean->setMeta( 'tainted', FALSE );
+		return $bean->setMeta('tainted', FALSE);
 	}
 }
 }
@@ -7830,13 +7830,13 @@ 
 	 *
 	 * @throws Security
 	 */
-	protected function unboxIfNeeded( $bean )
+	protected function unboxIfNeeded($bean)
 	{
-		if ( $bean instanceof SimpleModel ) {
+		if ($bean instanceof SimpleModel) {
 			$bean = $bean->unbox();
 		}
-		if ( !( $bean instanceof OODBBean ) ) {
-			throw new RedException( 'OODB Store requires a bean, got: ' . gettype( $bean ) );
+		if (!($bean instanceof OODBBean)) {
+			throw new RedException('OODB Store requires a bean, got: ' . gettype($bean));
 		}
 
 		return $bean;
@@ -7848,13 +7848,13 @@ 
 	 * @param QueryWriter   $writer writer
 	 * @param array|boolean $frozen mode of operation: TRUE (frozen), FALSE (default, fluid) or ARRAY (chilled)
 	 */
-	public function __construct( QueryWriter $writer, $frozen = FALSE )
+	public function __construct(QueryWriter $writer, $frozen = FALSE)
 	{
-		if ( $writer instanceof QueryWriter ) {
+		if ($writer instanceof QueryWriter) {
 			$this->writer = $writer;
 		}
 
-		$this->freeze( $frozen );
+		$this->freeze($frozen);
 	}
 
 	/**
@@ -7870,32 +7870,32 @@ 
 	 *
 	 * @return void
 	 */
-	public function freeze( $toggle )
+	public function freeze($toggle)
 	{
-		if ( is_array( $toggle ) ) {
+		if (is_array($toggle)) {
 			$this->chillList = $toggle;
 			$this->isFrozen  = FALSE;
 		} else {
 			$this->isFrozen = (boolean) $toggle;
 		}
 
-		if ( $this->isFrozen ) {
-			if ( !$this->frozenRepository ) {
-				$this->frozenRepository = new FrozenRepo( $this, $this->writer );
+		if ($this->isFrozen) {
+			if (!$this->frozenRepository) {
+				$this->frozenRepository = new FrozenRepo($this, $this->writer);
 			}
 
 			$this->repository = $this->frozenRepository;
 
 		} else {
-			if ( !$this->fluidRepository ) {
-				$this->fluidRepository = new FluidRepo( $this, $this->writer );
+			if (!$this->fluidRepository) {
+				$this->fluidRepository = new FluidRepo($this, $this->writer);
 			}
 
 			$this->repository = $this->fluidRepository;
 		}
 
-		if ( count( self::$sqlFilters ) ) {
-			AQueryWriter::setSQLFilters( self::$sqlFilters, ( !$this->isFrozen ) );
+		if (count(self::$sqlFilters)) {
+			AQueryWriter::setSQLFilters(self::$sqlFilters, (!$this->isFrozen));
 		}
 
 	}
@@ -7925,9 +7925,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function isChilled( $type )
+	public function isChilled($type)
 	{
-		return (boolean) ( in_array( $type, $this->chillList ) );
+		return (boolean) (in_array($type, $this->chillList));
 	}
 
 	/**
@@ -7945,14 +7945,14 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function dispense( $type, $number = 1, $alwaysReturnArray = FALSE )
+	public function dispense($type, $number = 1, $alwaysReturnArray = FALSE)
 	{
-		if ( $number < 1 ) {
-			if ( $alwaysReturnArray ) return array();
+		if ($number < 1) {
+			if ($alwaysReturnArray) return array();
 			return NULL;
 		}
 
-		return $this->repository->dispense( $type, $number, $alwaysReturnArray );
+		return $this->repository->dispense($type, $number, $alwaysReturnArray);
 	}
 
 	/**
@@ -7963,7 +7963,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setBeanHelper( BeanHelper $beanhelper )
+	public function setBeanHelper(BeanHelper $beanhelper)
 	{
 		$this->beanhelper = $beanhelper;
 	}
@@ -7990,9 +7990,9 @@ 
 	 *
 	 * @throws Security $exception
 	 */
-	public function check( OODBBean $bean )
+	public function check(OODBBean $bean)
 	{
-		$this->repository->check( $bean );
+		$this->repository->check($bean);
 	}
 
 	/**
@@ -8021,9 +8021,9 @@ 
 	 *
 	 * @throws SQL
 	 */
-	public function find( $type, $conditions = array(), $sql = NULL, $bindings = array() )
+	public function find($type, $conditions = array(), $sql = NULL, $bindings = array())
 	{
-		return $this->repository->find( $type, $conditions, $sql, $bindings );
+		return $this->repository->find($type, $conditions, $sql, $bindings);
 	}
 
 	/**
@@ -8037,9 +8037,9 @@ 
 	 *
 	 * @throws SQL
 	 */
-	public function findCollection(  $type, $sql = NULL, $bindings = array() )
+	public function findCollection($type, $sql = NULL, $bindings = array())
 	{
-		return $this->repository->findCollection( $type, $sql, $bindings );
+		return $this->repository->findCollection($type, $sql, $bindings);
 	}
 
 	/**
@@ -8052,9 +8052,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function tableExists( $table )
+	public function tableExists($table)
 	{
-		return $this->repository->tableExists( $table );
+		return $this->repository->tableExists($table);
 	}
 
 	/**
@@ -8079,10 +8079,10 @@ 
 	 *
 	 * @throws Security
 	 */
-	public function store( $bean )
+	public function store($bean)
 	{
-		$bean = $this->unboxIfNeeded( $bean );
-		return $this->repository->store( $bean );
+		$bean = $this->unboxIfNeeded($bean);
+		return $this->repository->store($bean);
 	}
 
 	/**
@@ -8110,9 +8110,9 @@ 
 	 * @return OODBBean
 	 *
 	 */
-	public function load( $type, $id )
+	public function load($type, $id)
 	{
-		return $this->repository->load( $type, $id );
+		return $this->repository->load($type, $id);
 	}
 
 	/**
@@ -8126,10 +8126,10 @@ 
 	 *
 	 * @throws Security
 	 */
-	public function trash( $bean )
+	public function trash($bean)
 	{
-		$bean = $this->unboxIfNeeded( $bean );
-		return $this->repository->trash( $bean );
+		$bean = $this->unboxIfNeeded($bean);
+		return $this->repository->trash($bean);
 	}
 
 	/**
@@ -8146,9 +8146,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function batch( $type, $ids )
+	public function batch($type, $ids)
 	{
-		return $this->repository->batch( $type, $ids );
+		return $this->repository->batch($type, $ids);
 	}
 
 	/**
@@ -8162,9 +8162,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function convertToBeans( $type, $rows )
+	public function convertToBeans($type, $rows)
 	{
-		return $this->repository->convertToBeans( $type, $rows );
+		return $this->repository->convertToBeans($type, $rows);
 	}
 
 	/**
@@ -8180,9 +8180,9 @@ 
 	 *
 	 * @throws SQL
 	 */
-	public function count( $type, $addSQL = '', $bindings = array() )
+	public function count($type, $addSQL = '', $bindings = array())
 	{
-		return $this->repository->count( $type, $addSQL, $bindings );
+		return $this->repository->count($type, $addSQL, $bindings);
 	}
 
 	/**
@@ -8194,9 +8194,9 @@ 
 	 *
 	 * @throws SQL
 	 */
-	public function wipe( $type )
+	public function wipe($type)
 	{
-		return $this->repository->wipe( $type );
+		return $this->repository->wipe($type);
 	}
 
 	/**
@@ -8210,8 +8210,8 @@ 
 	 */
 	public function getAssociationManager()
 	{
-		if ( !isset( $this->assocManager ) ) {
-			throw new RedException( 'No association manager available.' );
+		if (!isset($this->assocManager)) {
+			throw new RedException('No association manager available.');
 		}
 
 		return $this->assocManager;
@@ -8226,7 +8226,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setAssociationManager( AssociationManager $assocManager )
+	public function setAssociationManager(AssociationManager $assocManager)
 	{
 		$this->assocManager = $assocManager;
 	}
@@ -8253,25 +8253,25 @@ 
 	 * @param string $field
 	 * @param string $function
 	 */
-	public function bindFunc( $mode, $field, $function )
+	public function bindFunc($mode, $field, $function)
 	{
-		list( $type, $property ) = explode( '.', $field );
+		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] );
+		if (is_null($function)) {
+			unset(self::$sqlFilters[$mode][$type][$property]);
 		} else {
 			if ($mode === QueryWriter::C_SQLFILTER_WRITE) {
-				self::$sqlFilters[$mode][$type][$property] = $function.'(?)';
+				self::$sqlFilters[$mode][$type][$property] = $function . '(?)';
 			} else {
-				self::$sqlFilters[$mode][$type][$property] = $function."($field)";
+				self::$sqlFilters[$mode][$type][$property] = $function . "($field)";
 			}
 		}
 
-		AQueryWriter::setSQLFilters( self::$sqlFilters, ( !$this->isFrozen ) );
+		AQueryWriter::setSQLFilters(self::$sqlFilters, (!$this->isFrozen));
 	}
 }
 } 
@@ -8333,7 +8333,7 @@ 
 	 *
 	 * @return ToolBox
 	 */
-	public function __construct( OODB $oodb, Adapter $adapter, QueryWriter $writer )
+	public function __construct(OODB $oodb, Adapter $adapter, QueryWriter $writer)
 	{
 		$this->oodb    = $oodb;
 		$this->adapter = $adapter;
@@ -8422,7 +8422,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 		$this->redbean = $toolbox->getRedBean();
@@ -8443,15 +8443,15 @@ 
 	 *
 	 * @throws Security
 	 */
-	public function find( $type, $sql = NULL, $bindings = array() )
+	public function find($type, $sql = NULL, $bindings = array())
 	{
-		if ( !is_array( $bindings ) ) {
+		if (!is_array($bindings)) {
 			throw new RedException(
-				'Expected array, ' . gettype( $bindings ) . ' given.'
+				'Expected array, ' . gettype($bindings) . ' given.'
 			);
 		}
 
-		return $this->redbean->find( $type, array(), $sql, $bindings );
+		return $this->redbean->find($type, array(), $sql, $bindings);
 	}
 
 	/**
@@ -8465,10 +8465,10 @@ 
 	 *
 	 * @return array
 	 */
-	public function findAndExport( $type, $sql = NULL, $bindings = array() )
+	public function findAndExport($type, $sql = NULL, $bindings = array())
 	{
 		$arr = array();
-		foreach ( $this->find( $type, $sql, $bindings ) as $key => $item ) {
+		foreach ($this->find($type, $sql, $bindings) as $key => $item) {
 			$arr[] = $item->export();
 		}
 
@@ -8487,17 +8487,17 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function findOne( $type, $sql = NULL, $bindings = array() )
+	public function findOne($type, $sql = NULL, $bindings = array())
 	{
-		$sql = $this->toolbox->getWriter()->glueLimitOne( $sql );
+		$sql = $this->toolbox->getWriter()->glueLimitOne($sql);
 		
-		$items = $this->find( $type, $sql, $bindings );
+		$items = $this->find($type, $sql, $bindings);
 
-		if ( empty($items) ) {
+		if (empty($items)) {
 			return NULL;
 		}
 
-		return reset( $items );
+		return reset($items);
 	}
 
 	/**
@@ -8512,15 +8512,15 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function findLast( $type, $sql = NULL, $bindings = array() )
+	public function findLast($type, $sql = NULL, $bindings = array())
 	{
-		$items = $this->find( $type, $sql, $bindings );
+		$items = $this->find($type, $sql, $bindings);
 
-		if ( empty($items) ) {
+		if (empty($items)) {
 			return NULL;
 		}
 
-		return end( $items );
+		return end($items);
 	}
 
 	/**
@@ -8535,12 +8535,12 @@ 
 	 *
 	 * @return array
 	 */
-	public function findOrDispense( $type, $sql = NULL, $bindings = array() )
+	public function findOrDispense($type, $sql = NULL, $bindings = array())
 	{
-		$foundBeans = $this->find( $type, $sql, $bindings );
+		$foundBeans = $this->find($type, $sql, $bindings);
 
-		if ( empty( $foundBeans ) ) {
-			return array( $this->redbean->dispense( $type ) );
+		if (empty($foundBeans)) {
+			return array($this->redbean->dispense($type));
 		} else {
 			return $foundBeans;
 		}
@@ -8558,9 +8558,9 @@ 
 	 *
 	 * @return BeanCollection
 	 */
-	public function findCollection( $type, $sql, $bindings = array() )
+	public function findCollection($type, $sql, $bindings = array())
 	{
-		return $this->redbean->findCollection( $type, $sql, $bindings );
+		return $this->redbean->findCollection($type, $sql, $bindings);
 	}
 
 	/**
@@ -8580,17 +8580,17 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function findOrCreate( $type, $like = array() )
+	public function findOrCreate($type, $like = array())
 	{
-			$beans = $this->findLike( $type, $like );
-			if ( count( $beans ) ) {
-				$bean = reset( $beans );
+			$beans = $this->findLike($type, $like);
+			if (count($beans)) {
+				$bean = reset($beans);
 				return $bean;
 			}
 
-			$bean = $this->redbean->dispense( $type );
-			$bean->import( $like );
-			$this->redbean->store( $bean );
+			$bean = $this->redbean->dispense($type);
+			$bean->import($like);
+			$this->redbean->store($bean);
 			return $bean;
 	}
 
@@ -8615,15 +8615,15 @@ 
 	 *
 	 * @return array
 	 */
-	public function findLike( $type, $conditions = array(), $sql = '' )
+	public function findLike($type, $conditions = array(), $sql = '')
 	{
-		if ( count( $conditions ) > 0 ) {
-			foreach( $conditions as $key => $condition ) {
-				if ( !count( $condition ) ) unset( $conditions[$key] );
+		if (count($conditions) > 0) {
+			foreach ($conditions as $key => $condition) {
+				if (!count($condition)) unset($conditions[$key]);
 			}
 		}
 
-		return $this->redbean->find( $type, $conditions, $sql );
+		return $this->redbean->find($type, $conditions, $sql);
 	}
 
 	/**
@@ -8692,67 +8692,67 @@ 
 	 *
 	 * @return array
 	 */
-	public function findMulti( $types, $sql, $bindings = array(), $remappings = array(), $queryTemplate = ' %s.%s AS %s__%s' )
+	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( $sql ) ) {
+		if (!is_array($types)) $types = explode(',', $types);
+		if (!is_array($sql)) {
 			$writer = $this->toolbox->getWriter();
 			$adapter = $this->toolbox->getDatabaseAdapter();
 
 			//Repair the query, replace book.* with book.id AS book_id etc..
-			foreach( $types as $type ) {
+			foreach ($types as $type) {
 				$pattern = " {$type}.*";
-				if ( strpos( $sql, $pattern ) !== FALSE ) {
+				if (strpos($sql, $pattern) !== FALSE) {
 					$newSelectorArray = array();
-					$columns = $writer->getColumns( $type );
-					foreach( $columns as $column => $definition ) {
-						$newSelectorArray[] = sprintf( $queryTemplate, $type, $column, $type, $column );
+					$columns = $writer->getColumns($type);
+					foreach ($columns as $column => $definition) {
+						$newSelectorArray[] = sprintf($queryTemplate, $type, $column, $type, $column);
 					}
-					$newSelector = implode( ',', $newSelectorArray );
-					$sql = str_replace( $pattern, $newSelector, $sql );
+					$newSelector = implode(',', $newSelectorArray);
+					$sql = str_replace($pattern, $newSelector, $sql);
 				}
 			}
 
-			$rows = $adapter->get( $sql, $bindings );
+			$rows = $adapter->get($sql, $bindings);
 		} else {
 			$rows = $sql;
 		}
 
 		//Gather the bean data from the query results using the prefix
 		$wannaBeans = array();
-		foreach( $types as $type ) {
+		foreach ($types as $type) {
 			$wannaBeans[$type] = array();
 			$prefix            = "{$type}__";
-			foreach( $rows as $rowkey=>$row ) {
+			foreach ($rows as $rowkey=>$row) {
 				$wannaBean = array();
-				foreach( $row as $cell => $value ) {
-					if ( strpos( $cell, $prefix ) === 0 ) {
-						$property = substr( $cell, strlen( $prefix ) );
-						unset( $rows[$rowkey][$cell] );
+				foreach ($row as $cell => $value) {
+					if (strpos($cell, $prefix) === 0) {
+						$property = substr($cell, strlen($prefix));
+						unset($rows[$rowkey][$cell]);
 						$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;
 			}
 		}
 
 		//Turn the rows into beans
 		$beans = array();
-		foreach( $wannaBeans as $type => $wannabees ) {
-			$beans[$type] = $this->redbean->convertToBeans( $type, $wannabees );
+		foreach ($wannaBeans as $type => $wannabees) {
+			$beans[$type] = $this->redbean->convertToBeans($type, $wannabees);
 		}
 
 		//Apply additional re-mappings
-		foreach($remappings as $remapping) {
+		foreach ($remappings as $remapping) {
 			$a       = $remapping['a'];
 			$b       = $remapping['b'];
 			$matcher = $remapping['matcher'];
 			$do      = $remapping['do'];
-			foreach( $beans[$a] as $bean ) {
-				foreach( $beans[$b] as $putBean ) {
-					if ( $matcher( $bean, $putBean, $beans ) ) $do( $bean, $putBean, $beans, $remapping );
+			foreach ($beans[$a] as $bean) {
+				foreach ($beans[$b] as $putBean) {
+					if ($matcher($bean, $putBean, $beans)) $do($bean, $putBean, $beans, $remapping);
 				}
 			}
 		}
@@ -8812,9 +8812,9 @@ 
 	 *
 	 * @throws\Exception
 	 */
-	private function handleException(\Exception $exception )
+	private function handleException(\Exception $exception)
 	{
-		if ( $this->oodb->isFrozen() || !$this->writer->sqlStateIn( $exception->getSQLState(),
+		if ($this->oodb->isFrozen() || !$this->writer->sqlStateIn($exception->getSQLState(),
 			array(
 				QueryWriter::C_SQLSTATE_NO_SUCH_TABLE,
 				QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN )
@@ -8839,14 +8839,14 @@ 
 	 * @throws Security
 	 * @throws SQL
 	 */
-	private function relatedRows( $bean, $type, $sql = '', $bindings = array() )
+	private function relatedRows($bean, $type, $sql = '', $bindings = array())
 	{
-		$ids = array( $bean->id );
-		$sourceType = $bean->getMeta( 'type' );
+		$ids = array($bean->id);
+		$sourceType = $bean->getMeta('type');
 		try {
-			return $this->writer->queryRecordRelated( $sourceType, $type, $ids, $sql, $bindings );
-		} catch ( SQLException $exception ) {
-			$this->handleException( $exception );
+			return $this->writer->queryRecordRelated($sourceType, $type, $ids, $sql, $bindings);
+		} catch (SQLException $exception) {
+			$this->handleException($exception);
 			return array();
 		}
 	}
@@ -8865,34 +8865,34 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function associateBeans( OODBBean $bean1, OODBBean $bean2, OODBBean $bean )
+	protected function associateBeans(OODBBean $bean1, OODBBean $bean2, OODBBean $bean)
 	{
-		$type      = $bean->getMeta( 'type' );
-		$property1 = $bean1->getMeta( 'type' ) . '_id';
-		$property2 = $bean2->getMeta( 'type' ) . '_id';
+		$type      = $bean->getMeta('type');
+		$property1 = $bean1->getMeta('type') . '_id';
+		$property2 = $bean2->getMeta('type') . '_id';
 
-		if ( $property1 == $property2 ) {
-			$property2 = $bean2->getMeta( 'type' ) . '2_id';
+		if ($property1 == $property2) {
+			$property2 = $bean2->getMeta('type') . '2_id';
 		}
 
-		$this->oodb->store( $bean1 );
-		$this->oodb->store( $bean2 );
+		$this->oodb->store($bean1);
+		$this->oodb->store($bean2);
 
-		$bean->setMeta( "cast.$property1", "id" );
-		$bean->setMeta( "cast.$property2", "id" );
-		$bean->setMeta( 'sys.buildcommand.unique', array( $property1, $property2 ) );
+		$bean->setMeta("cast.$property1", "id");
+		$bean->setMeta("cast.$property2", "id");
+		$bean->setMeta('sys.buildcommand.unique', array($property1, $property2));
 
 		$bean->$property1 = $bean1->id;
 		$bean->$property2 = $bean2->id;
 
-		$results   = array();
+		$results = array();
 
 		try {
-			$id = $this->oodb->store( $bean );
+			$id = $this->oodb->store($bean);
 			$results[] = $id;
-		} catch ( SQLException $exception ) {
-			if ( !$this->writer->sqlStateIn( $exception->getSQLState(),
-				array( QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION ) )
+		} catch (SQLException $exception) {
+			if (!$this->writer->sqlStateIn($exception->getSQLState(),
+				array(QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION))
 			) {
 				throw $exception;
 			}
@@ -8906,7 +8906,7 @@ 
 	 *
 	 * @param ToolBox $tools toolbox
 	 */
-	public function __construct( ToolBox $tools )
+	public function __construct(ToolBox $tools)
 	{
 		$this->oodb    = $tools->getRedBean();
 		$this->adapter = $tools->getDatabaseAdapter();
@@ -8925,9 +8925,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTable( $types )
+	public function getTable($types)
 	{
-		return $this->writer->getAssocTable( $types );
+		return $this->writer->getAssocTable($types);
 	}
 
 	/**
@@ -8941,26 +8941,26 @@ 
 	 *
 	 * @return array
 	 */
-	public function associate( $beans1, $beans2 )
+	public function associate($beans1, $beans2)
 	{
-		if ( !is_array( $beans1 ) ) {
-			$beans1 = array( $beans1 );
+		if (!is_array($beans1)) {
+			$beans1 = array($beans1);
 		}
 
-		if ( !is_array( $beans2 ) ) {
-			$beans2 = array( $beans2 );
+		if (!is_array($beans2)) {
+			$beans2 = array($beans2);
 		}
 
 		$results = array();
-		foreach ( $beans1 as $bean1 ) {
-			foreach ( $beans2 as $bean2 ) {
-				$table     = $this->getTable( array( $bean1->getMeta( 'type' ), $bean2->getMeta( 'type' ) ) );
-				$bean      = $this->oodb->dispense( $table );
-				$results[] = $this->associateBeans( $bean1, $bean2, $bean );
+		foreach ($beans1 as $bean1) {
+			foreach ($beans2 as $bean2) {
+				$table     = $this->getTable(array($bean1->getMeta('type'), $bean2->getMeta('type')));
+				$bean      = $this->oodb->dispense($table);
+				$results[] = $this->associateBeans($bean1, $bean2, $bean);
 			}
 		}
 
-		return ( count( $results ) > 1 ) ? $results : reset( $results );
+		return (count($results) > 1) ? $results : reset($results);
 	}
 
 	/**
@@ -8978,24 +8978,24 @@ 
 	 *
 	 * @throws Security
 	 */
-	public function relatedCount( $bean, $type, $sql = NULL, $bindings = array() )
+	public function relatedCount($bean, $type, $sql = NULL, $bindings = array())
 	{
-		if ( !( $bean instanceof OODBBean ) ) {
+		if (!($bean instanceof OODBBean)) {
 			throw new RedException(
-				'Expected array or OODBBean but got:' . gettype( $bean )
+				'Expected array or OODBBean but got:' . gettype($bean)
 			);
 		}
 
-		if ( !$bean->id ) {
+		if (!$bean->id) {
 			return 0;
 		}
 
-		$beanType = $bean->getMeta( 'type' );
+		$beanType = $bean->getMeta('type');
 
 		try {
-			return $this->writer->queryRecordCountRelated( $beanType, $type, $bean->id, $sql, $bindings );
-		} catch ( SQLException $exception ) {
-			$this->handleException( $exception );
+			return $this->writer->queryRecordCountRelated($beanType, $type, $bean->id, $sql, $bindings);
+		} catch (SQLException $exception) {
+			$this->handleException($exception);
 
 			return 0;
 		}
@@ -9016,37 +9016,37 @@ 
 	 *
 	 * @return void
 	 */
-	public function unassociate( $beans1, $beans2, $fast = NULL )
+	public function unassociate($beans1, $beans2, $fast = NULL)
 	{
-		$beans1 = ( !is_array( $beans1 ) ) ? array( $beans1 ) : $beans1;
-		$beans2 = ( !is_array( $beans2 ) ) ? array( $beans2 ) : $beans2;
+		$beans1 = (!is_array($beans1)) ? array($beans1) : $beans1;
+		$beans2 = (!is_array($beans2)) ? array($beans2) : $beans2;
 
-		foreach ( $beans1 as $bean1 ) {
-			foreach ( $beans2 as $bean2 ) {
+		foreach ($beans1 as $bean1) {
+			foreach ($beans2 as $bean2) {
 				try {
-					$this->oodb->store( $bean1 );
-					$this->oodb->store( $bean2 );
+					$this->oodb->store($bean1);
+					$this->oodb->store($bean2);
 
-					$type1 = $bean1->getMeta( 'type' );
-					$type2 = $bean2->getMeta( 'type' );
+					$type1 = $bean1->getMeta('type');
+					$type2 = $bean2->getMeta('type');
 
-					$row      = $this->writer->queryRecordLink( $type1, $type2, $bean1->id, $bean2->id );
-					$linkType = $this->getTable( array( $type1, $type2 ) );
+					$row      = $this->writer->queryRecordLink($type1, $type2, $bean1->id, $bean2->id);
+					$linkType = $this->getTable(array($type1, $type2));
 
-					if ( $fast ) {
-						$this->writer->deleteRecord( $linkType, array( 'id' => $row['id'] ) );
+					if ($fast) {
+						$this->writer->deleteRecord($linkType, array('id' => $row['id']));
 
 						return;
 					}
 
-					$beans = $this->oodb->convertToBeans( $linkType, array( $row ) );
+					$beans = $this->oodb->convertToBeans($linkType, array($row));
 
-					if ( count( $beans ) > 0 ) {
-						$bean = reset( $beans );
-						$this->oodb->trash( $bean );
+					if (count($beans) > 0) {
+						$bean = reset($beans);
+						$this->oodb->trash($bean);
 					}
-				} catch ( SQLException $exception ) {
-					$this->handleException( $exception );
+				} catch (SQLException $exception) {
+					$this->handleException($exception);
 				}
 			}
 		}
@@ -9064,13 +9064,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function clearRelations( OODBBean $bean, $type )
+	public function clearRelations(OODBBean $bean, $type)
 	{
-		$this->oodb->store( $bean );
+		$this->oodb->store($bean);
 		try {
-			$this->writer->deleteRelations( $bean->getMeta( 'type' ), $type, $bean->id );
-		} catch ( SQLException $exception ) {
-			$this->handleException( $exception );
+			$this->writer->deleteRelations($bean->getMeta('type'), $type, $bean->id);
+		} catch (SQLException $exception) {
+			$this->handleException($exception);
 		}
 	}
 
@@ -9097,27 +9097,27 @@ 
 	 *
 	 * @return array
 	 */
-	public function related( $bean, $type, $sql = '', $bindings = array() )
+	public function related($bean, $type, $sql = '', $bindings = array())
 	{
-		$sql   = $this->writer->glueSQLCondition( $sql );
+		$sql   = $this->writer->glueSQLCondition($sql);
 
-		$rows  = $this->relatedRows( $bean, $type, $sql, $bindings );
+		$rows  = $this->relatedRows($bean, $type, $sql, $bindings);
 
 		$links = array();
-		foreach ( $rows as $key => $row ) {
-			if ( !isset( $links[$row['id']] ) ) {
+		foreach ($rows as $key => $row) {
+			if (!isset($links[$row['id']])) {
 				$links[$row['id']] = array();
 			}
 
 			$links[$row['id']][] = $row['linked_by'];
 
-			unset( $rows[$key]['linked_by'] );
+			unset($rows[$key]['linked_by']);
 		}
 
-		$beans = $this->oodb->convertToBeans( $type, $rows );
+		$beans = $this->oodb->convertToBeans($type, $rows);
 
-		foreach ( $beans as $bean ) {
-			$bean->setMeta( 'sys.belongs-to', $links[$bean->id] );
+		foreach ($beans as $bean) {
+			$bean->setMeta('sys.belongs-to', $links[$bean->id]);
 		}
 
 		return $beans;
@@ -9175,7 +9175,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getModelForBean( OODBBean $bean );
+	public function getModelForBean(OODBBean $bean);
 }
 }
 
@@ -9219,10 +9219,10 @@ 
 	 *
 	 * @return SimpleModel
 	 */
-	public static function factory( $modelClassName )
+	public static function factory($modelClassName)
 	{
 		$factory = self::$factory;
-		return ( $factory ) ? $factory( $modelClassName ) : new $modelClassName();
+		return ($factory) ? $factory($modelClassName) : new $modelClassName();
 	}
 
 	/**
@@ -9233,7 +9233,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setFactoryFunction( $factory ) 
+	public static function setFactoryFunction($factory) 
 	{
 		self::$factory = $factory;
 	}
@@ -9249,37 +9249,37 @@ 
 	/**
 	 * @see BeanHelper::getModelForBean
 	 */
-	public function getModelForBean( OODBBean $bean )
+	public function getModelForBean(OODBBean $bean)
 	{
-		$model     = $bean->getMeta( 'type' );
-		$prefix    = defined( 'REDBEAN_MODEL_PREFIX' ) ? REDBEAN_MODEL_PREFIX : '\\Model_';
+		$model     = $bean->getMeta('type');
+		$prefix    = defined('REDBEAN_MODEL_PREFIX') ? REDBEAN_MODEL_PREFIX : '\\Model_';
 
-		if ( strpos( $model, '_' ) !== FALSE ) {
-			$modelParts = explode( '_', $model );
+		if (strpos($model, '_') !== FALSE) {
+			$modelParts = explode('_', $model);
 			$modelName = '';
-			foreach( $modelParts as $part ) {
-				$modelName .= ucfirst( $part );
+			foreach ($modelParts as $part) {
+				$modelName .= ucfirst($part);
 			}
 			$modelName = $prefix . $modelName;
 
-			if ( !class_exists( $modelName ) ) {
+			if (!class_exists($modelName)) {
 				//second try
-				$modelName = $prefix . ucfirst( $model );
+				$modelName = $prefix . ucfirst($model);
 				
-				if ( !class_exists( $modelName ) ) {
+				if (!class_exists($modelName)) {
 					return NULL;
 				}
 			}
 
 		} else {
 
-			$modelName = $prefix . ucfirst( $model );
-			if ( !class_exists( $modelName ) ) {
+			$modelName = $prefix . ucfirst($model);
+			if (!class_exists($modelName)) {
 				return NULL;
 			}
 		}
-		$obj = self::factory( $modelName );
-		$obj->loadBean( $bean );
+		$obj = self::factory($modelName);
+		$obj->loadBean($bean);
 
 		return $obj;
 	}
@@ -9330,7 +9330,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function loadBean( OODBBean $bean )
+	public function loadBean(OODBBean $bean)
 	{
 		$this->bean = $bean;
 	}
@@ -9346,7 +9346,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $prop )
+	public function __get($prop)
 	{
 		return $this->bean->$prop;
 	}
@@ -9360,7 +9360,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function __set( $prop, $value )
+	public function __set($prop, $value)
 	{
 		$this->bean->$prop = $value;
 	}
@@ -9373,9 +9373,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function __isset( $key )
+	public function __isset($key)
 	{
-		return isset( $this->bean->$key );
+		return isset($this->bean->$key);
 	}
 
 	/**
@@ -9434,7 +9434,7 @@ 
 	/**
 	 * @see Observer::onEvent
 	 */
-	public function onEvent( $eventName, $bean )
+	public function onEvent($eventName, $bean)
 	{
 		$bean->$eventName();
 	}
@@ -9449,10 +9449,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function attachEventListeners( Observable $observable )
+	public function attachEventListeners(Observable $observable)
 	{
-		foreach ( array( 'update', 'open', 'delete', 'after_delete', 'after_update', 'dispense' ) as $e ) {
-			$observable->addEventListener( $e, $this );
+		foreach (array('update', 'open', 'delete', 'after_delete', 'after_update', 'dispense') as $e) {
+			$observable->addEventListener($e, $this);
 		}
 	}
 }
@@ -9508,10 +9508,10 @@ 
 	 *
 	 * @return array
 	 */
-	private function extractTagsIfNeeded( $tagList )
+	private function extractTagsIfNeeded($tagList)
 	{
-		if ( $tagList !== FALSE && !is_array( $tagList ) ) {
-			$tags = explode( ',', (string) $tagList );
+		if ($tagList !== FALSE && !is_array($tagList)) {
+			$tags = explode(',', (string) $tagList);
 		} else {
 			$tags = $tagList;
 		}
@@ -9527,12 +9527,12 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	protected function findTagByTitle( $title )
+	protected function findTagByTitle($title)
 	{
-		$beans = $this->redbean->find( 'tag', array( 'title' => array( $title ) ) );
+		$beans = $this->redbean->find('tag', array('title' => array($title)));
 
-		if ( $beans ) {
-			$bean = reset( $beans );
+		if ($beans) {
+			$bean = reset($beans);
 
 			return $bean;
 		}
@@ -9547,7 +9547,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 		$this->redbean = $toolbox->getRedBean();
@@ -9573,18 +9573,18 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function hasTag( $bean, $tags, $all = FALSE )
+	public function hasTag($bean, $tags, $all = FALSE)
 	{
-		$foundtags = $this->tag( $bean );
+		$foundtags = $this->tag($bean);
 
-		$tags = $this->extractTagsIfNeeded( $tags );
-		$same = array_intersect( $tags, $foundtags );
+		$tags = $this->extractTagsIfNeeded($tags);
+		$same = array_intersect($tags, $foundtags);
 
-		if ( $all ) {
-			return ( implode( ',', $same ) === implode( ',', $tags ) );
+		if ($all) {
+			return (implode(',', $same) === implode(',', $tags));
 		}
 
-		return (bool) ( count( $same ) > 0 );
+		return (bool) (count($same) > 0);
 	}
 
 	/**
@@ -9599,13 +9599,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function untag( $bean, $tagList )
+	public function untag($bean, $tagList)
 	{
-		$tags = $this->extractTagsIfNeeded( $tagList );
+		$tags = $this->extractTagsIfNeeded($tagList);
 
-		foreach ( $tags as $tag ) {
-			if ( $t = $this->findTagByTitle( $tag ) ) {
-				$this->associationManager->unassociate( $bean, $t );
+		foreach ($tags as $tag) {
+			if ($t = $this->findTagByTitle($tag)) {
+				$this->associationManager->unassociate($bean, $t);
 			}
 		}
 	}
@@ -9626,22 +9626,22 @@ 
 	 *
 	 * @return array
 	 */
-	public function tag( OODBBean $bean, $tagList = NULL )
+	public function tag(OODBBean $bean, $tagList = NULL)
 	{
-		if ( is_null( $tagList ) ) {
+		if (is_null($tagList)) {
 			
 			$tags = $bean->sharedTag;
 			$foundTags = array();
 
-			foreach ( $tags as $tag ) {
+			foreach ($tags as $tag) {
 				$foundTags[] = $tag->title;
 			}
 
 			return $foundTags;
 		}
 
-		$this->associationManager->clearRelations( $bean, 'tag' );
-		$this->addTags( $bean, $tagList );
+		$this->associationManager->clearRelations($bean, 'tag');
+		$this->addTags($bean, $tagList);
 
 		return $tagList;
 	}
@@ -9660,23 +9660,23 @@ 
 	 *
 	 * @return void
 	 */
-	public function addTags( OODBBean $bean, $tagList )
+	public function addTags(OODBBean $bean, $tagList)
 	{
-		$tags = $this->extractTagsIfNeeded( $tagList );
+		$tags = $this->extractTagsIfNeeded($tagList);
 
-		if ( $tagList === FALSE ) {
+		if ($tagList === FALSE) {
 			return;
 		}
 
-		foreach ( $tags as $tag ) {
-			if ( !$t = $this->findTagByTitle( $tag ) ) {
-				$t        = $this->redbean->dispense( 'tag' );
+		foreach ($tags as $tag) {
+			if (!$t = $this->findTagByTitle($tag)) {
+				$t        = $this->redbean->dispense('tag');
 				$t->title = $tag;
 
-				$this->redbean->store( $t );
+				$this->redbean->store($t);
 			}
 
-			$this->associationManager->associate( $bean, $t );
+			$this->associationManager->associate($bean, $t);
 		}
 	}
 
@@ -9694,12 +9694,12 @@ 
 	 *
 	 * @return array
 	 */
-	public function tagged( $beanType, $tagList, $sql = '', $bindings = array() )
+	public function tagged($beanType, $tagList, $sql = '', $bindings = array())
 	{
-		$tags       = $this->extractTagsIfNeeded( $tagList );
-		$records    = $this->toolbox->getWriter()->queryTagged( $beanType, $tags, FALSE, $sql, $bindings );
+		$tags       = $this->extractTagsIfNeeded($tagList);
+		$records    = $this->toolbox->getWriter()->queryTagged($beanType, $tags, FALSE, $sql, $bindings);
 
-		return $this->redbean->convertToBeans( $beanType, $records );
+		return $this->redbean->convertToBeans($beanType, $records);
 	}
 
 	/**
@@ -9713,12 +9713,12 @@ 
 	 *
 	 * @return array
 	 */
-	public function taggedAll( $beanType, $tagList, $sql = '', $bindings = array() )
+	public function taggedAll($beanType, $tagList, $sql = '', $bindings = array())
 	{
-		$tags  = $this->extractTagsIfNeeded( $tagList );
-		$records    = $this->toolbox->getWriter()->queryTagged( $beanType, $tags, TRUE, $sql, $bindings );
+		$tags = $this->extractTagsIfNeeded($tagList);
+		$records = $this->toolbox->getWriter()->queryTagged($beanType, $tags, TRUE, $sql, $bindings);
 
-		return $this->redbean->convertToBeans( $beanType, $records );
+		return $this->redbean->convertToBeans($beanType, $records);
 	}
 }
 }
@@ -9757,7 +9757,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 	}
@@ -9775,11 +9775,11 @@ 
 	 *
 	 * @return array
 	 */
-	public function dispenseLabels( $type, $labels )
+	public function dispenseLabels($type, $labels)
 	{
 		$labelBeans = array();
-		foreach ( $labels as $label ) {
-			$labelBean       = $this->toolbox->getRedBean()->dispense( $type );
+		foreach ($labels as $label) {
+			$labelBean       = $this->toolbox->getRedBean()->dispense($type);
 			$labelBean->name = $label;
 			$labelBeans[]    = $labelBean;
 		}
@@ -9805,15 +9805,15 @@ 
 	 *
 	 * @return array
 	 */
-	public function gatherLabels( $beans )
+	public function gatherLabels($beans)
 	{
 		$labels = array();
 
-		foreach ( $beans as $bean ) {
+		foreach ($beans as $bean) {
 			$labels[] = $bean->name;
 		}
 
-		sort( $labels );
+		sort($labels);
 
 		return $labels;
 	}
@@ -9846,32 +9846,32 @@ 
 	 * 
 	 * @return array|OODBBean
 	 */
-	public function enum( $enum )
+	public function enum($enum)
 	{
 		$oodb = $this->toolbox->getRedBean();
 		
-		if ( strpos( $enum, ':' ) === FALSE ) {
+		if (strpos($enum, ':') === FALSE) {
 			$type  = $enum;
 			$value = FALSE;
 		} else {
-			list( $type, $value ) = explode( ':', $enum );
-			$value                = preg_replace( '/\W+/', '_', strtoupper( trim( $value ) ) );
+			list($type, $value) = explode(':', $enum);
+			$value                = preg_replace('/\W+/', '_', strtoupper(trim($value)));
 		}
 		
-		$values = $oodb->find( $type );
+		$values = $oodb->find($type);
 		
-		if ( $value === FALSE ) {
+		if ($value === FALSE) {
 			return $values;
 		}
 		
-		foreach( $values as $enumItem ) {
-				if ( $enumItem->name === $value ) return $enumItem;	
+		foreach ($values as $enumItem) {
+				if ($enumItem->name === $value) return $enumItem;	
 		}
 		
-		$newEnumItems = $this->dispenseLabels( $type, array( $value ) );
-		$newEnumItem  = reset( $newEnumItems );
+		$newEnumItems = $this->dispenseLabels($type, array($value));
+		$newEnumItem  = reset($newEnumItems);
 		
-		$oodb->store( $newEnumItem );
+		$oodb->store($newEnumItem);
 		
 		return $newEnumItem;
 	}
@@ -10016,19 +10016,19 @@ 
 	 *
 	 * @return array
 	 */
-	private static function query( $method, $sql, $bindings )
+	private static function query($method, $sql, $bindings)
 	{
-		if ( !self::$redbean->isFrozen() ) {
+		if (!self::$redbean->isFrozen()) {
 			try {
-				$rs = Facade::$adapter->$method( $sql, $bindings );
-			} catch ( SQLException $exception ) {
-				if ( self::$writer->sqlStateIn( $exception->getSQLState(),
+				$rs = Facade::$adapter->$method($sql, $bindings);
+			} catch (SQLException $exception) {
+				if (self::$writer->sqlStateIn($exception->getSQLState(),
 					array(
 						QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN,
 						QueryWriter::C_SQLSTATE_NO_SUCH_TABLE )
 					)
 				) {
-					return ( $method === 'getCell' ) ? NULL : array();
+					return ($method === 'getCell') ? NULL : array();
 				} else {
 					throw $exception;
 				}
@@ -10036,7 +10036,7 @@ 
 
 			return $rs;
 		} else {
-			return Facade::$adapter->$method( $sql, $bindings );
+			return Facade::$adapter->$method($sql, $bindings);
 		}
 	}
 
@@ -10062,12 +10062,12 @@ 
 	 */
 	public static function testConnection()
 	{
-		if ( !isset( self::$adapter ) ) return FALSE;
+		if (!isset(self::$adapter)) return FALSE;
 
 		$database = self::$adapter->getDatabase();
 		try {
 			@$database->connect();
-		} catch ( \Exception $e ) {}
+		} catch (\Exception $e) {}
 		return $database->isConnected();
 	}
 
@@ -10083,14 +10083,14 @@ 
 	 *
 	 * @return ToolBox
 	 */
-	public static function setup( $dsn = NULL, $username = NULL, $password = NULL, $frozen = FALSE )
+	public static function setup($dsn = NULL, $username = NULL, $password = NULL, $frozen = FALSE)
 	{
-		if ( is_null( $dsn ) ) {
+		if (is_null($dsn)) {
 			$dsn = 'sqlite:/' . sys_get_temp_dir() . '/red.db';
 		}
 
-		self::addDatabase( 'default', $dsn, $username, $password, $frozen );
-		self::selectDatabase( 'default' );
+		self::addDatabase('default', $dsn, $username, $password, $frozen);
+		self::selectDatabase('default');
 
 		return self::$toolbox;
 	}
@@ -10103,9 +10103,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setNarrowFieldMode( $mode )
+	public static function setNarrowFieldMode($mode)
 	{
-		AQueryWriter::setNarrowFieldMode( $mode );
+		AQueryWriter::setNarrowFieldMode($mode);
 	}
 
 	/**
@@ -10139,27 +10139,27 @@ 
 	 * @return mixed
 	 *
 	 */
-	public static function transaction( $callback )
+	public static function transaction($callback)
 	{
-		if ( !is_callable( $callback ) ) {
-			throw new RedException( 'R::transaction needs a valid callback.' );
+		if (!is_callable($callback)) {
+			throw new RedException('R::transaction needs a valid callback.');
 		}
 
 		static $depth = 0;
 		$result = null;
 		try {
-			if ( $depth == 0 ) {
+			if ($depth == 0) {
 				self::begin();
 			}
 			$depth++;
-			$result = call_user_func( $callback ); //maintain 5.2 compatibility
+			$result = call_user_func($callback); //maintain 5.2 compatibility
 			$depth--;
-			if ( $depth == 0 ) {
+			if ($depth == 0) {
 				self::commit();
 			}
-		} catch (\Exception $exception ) {
+		} catch (\Exception $exception) {
 			$depth--;
-			if ( $depth == 0 ) {
+			if ($depth == 0) {
 				self::rollback();
 			}
 			throw $exception;
@@ -10187,23 +10187,23 @@ 
 	 *
 	 * @return void
 	 */
-	public static function addDatabase( $key, $dsn, $user = NULL, $pass = NULL, $frozen = FALSE )
+	public static function addDatabase($key, $dsn, $user = NULL, $pass = NULL, $frozen = FALSE)
 	{
-		if ( isset( self::$toolboxes[$key] ) ) {
-			throw new RedException( 'A database has already be specified for this key.' );
+		if (isset(self::$toolboxes[$key])) {
+			throw new RedException('A database has already be specified for this key.');
 		}
 
-		if ( is_object($dsn) ) {
-			$db  = new RPDO( $dsn );
+		if (is_object($dsn)) {
+			$db = new RPDO($dsn);
 			$dbType = $db->getDatabaseType();
 		} else {
-			$db = new RPDO( $dsn, $user, $pass, TRUE );
-			$dbType = substr( $dsn, 0, strpos( $dsn, ':' ) );
+			$db = new RPDO($dsn, $user, $pass, TRUE);
+			$dbType = substr($dsn, 0, strpos($dsn, ':'));
 		}
 
-		$adapter = new DBAdapter( $db );
+		$adapter = new DBAdapter($db);
 
-		$writers     = array(
+		$writers = array(
                     'pgsql'  => 'PostgreSQL',
                     'sqlite' => 'SQLiteT',
                     'cubrid' => 'CUBRID',
@@ -10211,13 +10211,13 @@ 
                     'sqlsrv' => 'SQLServer',
                   );
 
-		$wkey = trim( strtolower( $dbType ) );
-		if ( !isset( $writers[$wkey] ) ) trigger_error( 'Unsupported DSN: '.$wkey );
-		$writerClass = '\\RedBeanPHP\\QueryWriter\\'.$writers[$wkey];
-		$writer      = new $writerClass( $adapter );
-		$redbean     = new OODB( $writer, $frozen );
+		$wkey = trim(strtolower($dbType));
+		if (!isset($writers[$wkey])) trigger_error('Unsupported DSN: ' . $wkey);
+		$writerClass = '\\RedBeanPHP\\QueryWriter\\' . $writers[$wkey];
+		$writer      = new $writerClass($adapter);
+		$redbean     = new OODB($writer, $frozen);
 
-		self::$toolboxes[$key] = new ToolBox( $redbean, $adapter, $writer );
+		self::$toolboxes[$key] = new ToolBox($redbean, $adapter, $writer);
 	}
 
 	/**
@@ -10234,13 +10234,13 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function selectDatabase( $key )
+	public static function selectDatabase($key)
 	{
-		if ( self::$currentDB === $key ) {
+		if (self::$currentDB === $key) {
 			return FALSE;
 		}
 
-		self::configureFacadeWithToolbox( self::$toolboxes[$key] );
+		self::configureFacadeWithToolbox(self::$toolboxes[$key]);
 		self::$currentDB = $key;
 
 		return TRUE;
@@ -10261,7 +10261,7 @@ 
 	 *
 	 * @return Logger\RDefault
 	 */
-	public static function debug( $tf = TRUE, $mode = 0 )
+	public static function debug($tf = TRUE, $mode = 0)
 	{
 		if ($mode > 1) {
 			$mode -= 2;
@@ -10270,11 +10270,11 @@ 
 			$logger = new RDefault;
 		}
 
-		if ( !isset( self::$adapter ) ) {
-			throw new RedException( 'Use R::setup() first.' );
+		if (!isset(self::$adapter)) {
+			throw new RedException('Use R::setup() first.');
 		}
 		$logger->setMode($mode);
-		self::$adapter->getDatabase()->setDebugMode( $tf, $logger );
+		self::$adapter->getDatabase()->setDebugMode($tf, $logger);
 
 		return $logger;
 	}
@@ -10282,9 +10282,9 @@ 
 	/**
 	 * Turns on the fancy debugger.
 	 */
-	public static function fancyDebug( $toggle )
+	public static function fancyDebug($toggle)
 	{
-		self::debug( $toggle, 2 );
+		self::debug($toggle, 2);
 	}
 
 	/**
@@ -10298,9 +10298,9 @@ 
 	*
 	* @return array
 	*/
-	public static function inspect( $type = NULL )
+	public static function inspect($type = NULL)
 	{
-		return ($type === NULL) ? self::$writer->getTables() : self::$writer->getColumns( $type );
+		return ($type === NULL) ? self::$writer->getTables() : self::$writer->getColumns($type);
 	}
 
 	/**
@@ -10323,9 +10323,9 @@ 
 	 *
 	 * @throws Security
 	 */
-	public static function store( $bean )
+	public static function store($bean)
 	{
-		return self::$redbean->store( $bean );
+		return self::$redbean->store($bean);
 	}
 
 	/**
@@ -10339,9 +10339,9 @@ 
 	 *
 	 * @param boolean|array $trueFalse
 	 */
-	public static function freeze( $tf = TRUE )
+	public static function freeze($tf = TRUE)
 	{
-		self::$redbean->freeze( $tf );
+		self::$redbean->freeze($tf);
 	}
 
 	/**
@@ -10357,18 +10357,18 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function loadMulti( $types, $id )
+	public static function loadMulti($types, $id)
 	{
-		if ( is_string( $types ) ) {
-			$types = explode( ',', $types );
+		if (is_string($types)) {
+			$types = explode(',', $types);
 		}
 
-		if ( !is_array( $types ) ) {
+		if (!is_array($types)) {
 			return array();
 		}
 
-		foreach ( $types as $k => $typeItem ) {
-			$types[$k] = self::$redbean->load( $typeItem, $id );
+		foreach ($types as $k => $typeItem) {
+			$types[$k] = self::$redbean->load($typeItem, $id);
 		}
 
 		return $types;
@@ -10398,9 +10398,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function load( $type, $id )
+	public static function load($type, $id)
 	{
-		return self::$redbean->load( $type, $id );
+		return self::$redbean->load($type, $id);
 	}
 
 	/**
@@ -10417,10 +10417,10 @@ 
 	 *
 	 * @return void
 	 */
-	public static function trash( $beanOrType, $id = NULL )
+	public static function trash($beanOrType, $id = NULL)
 	{
-		if ( is_string( $beanOrType ) ) return self::trash( self::load( $beanOrType, $id ) );
-		return self::$redbean->trash( $beanOrType );
+		if (is_string($beanOrType)) return self::trash(self::load($beanOrType, $id));
+		return self::$redbean->trash($beanOrType);
 	}
 
 	/**
@@ -10435,32 +10435,32 @@ 
 	 *
 	 * @throws Security
 	 */
-	public static function dispense( $typeOrBeanArray, $num = 1, $alwaysReturnArray = FALSE )
+	public static function dispense($typeOrBeanArray, $num = 1, $alwaysReturnArray = FALSE)
 	{
-		if ( is_array($typeOrBeanArray) ) {
+		if (is_array($typeOrBeanArray)) {
 
-			if ( !isset( $typeOrBeanArray['_type'] ) ) {
+			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;
 			}
 
 			$import = $typeOrBeanArray;
 			$type = $import['_type'];
-			unset( $import['_type'] );
+			unset($import['_type']);
 		} else {
 			$type = $typeOrBeanArray;
 		}
 
-		if ( !preg_match( '/^[a-z0-9]+$/', $type ) ) {
-			throw new RedException( 'Invalid type: ' . $type );
+		if (!preg_match('/^[a-z0-9]+$/', $type)) {
+			throw new RedException('Invalid type: ' . $type);
 		}
 
-		$beanOrBeans = self::$redbean->dispense( $type, $num, $alwaysReturnArray );
+		$beanOrBeans = self::$redbean->dispense($type, $num, $alwaysReturnArray);
 
-		if ( isset( $import ) ) {
-			$beanOrBeans->import( $import );
+		if (isset($import)) {
+			$beanOrBeans->import($import);
 		}
 
 		return $beanOrBeans;
@@ -10490,20 +10490,20 @@ 
 	 *
 	 * @return array
 	 */
-	public static function dispenseAll( $order, $onlyArrays = FALSE )
+	public static function dispenseAll($order, $onlyArrays = FALSE)
 	{
 
 		$list = array();
 
-		foreach( explode( ',', $order ) as $order ) {
-			if ( strpos( $order, '*' ) !== false ) {
-				list( $type, $amount ) = explode( '*', $order );
+		foreach (explode(',', $order) as $order) {
+			if (strpos($order, '*') !== false) {
+				list($type, $amount) = explode('*', $order);
 			} else {
 				$type   = $order;
 				$amount = 1;
 			}
 
-			$list[] = self::dispense( $type, $amount, $onlyArrays );
+			$list[] = self::dispense($type, $amount, $onlyArrays);
 		}
 
 		return $list;
@@ -10519,9 +10519,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function findOrDispense( $type, $sql = NULL, $bindings = array() )
+	public static function findOrDispense($type, $sql = NULL, $bindings = array())
 	{
-		return self::$finder->findOrDispense( $type, $sql, $bindings );
+		return self::$finder->findOrDispense($type, $sql, $bindings);
 	}
 
 	/**
@@ -10537,9 +10537,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function find( $type, $sql = NULL, $bindings = array() )
+	public static function find($type, $sql = NULL, $bindings = array())
 	{
-		return self::$finder->find( $type, $sql, $bindings );
+		return self::$finder->find($type, $sql, $bindings);
 	}
 
 	/**
@@ -10557,9 +10557,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function findAll( $type, $sql = NULL, $bindings = array() )
+	public static function findAll($type, $sql = NULL, $bindings = array())
 	{
-		return self::$finder->find( $type, $sql, $bindings );
+		return self::$finder->find($type, $sql, $bindings);
 	}
 
 	/**
@@ -10572,9 +10572,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function findAndExport( $type, $sql = NULL, $bindings = array() )
+	public static function findAndExport($type, $sql = NULL, $bindings = array())
 	{
-		return self::$finder->findAndExport( $type, $sql, $bindings );
+		return self::$finder->findAndExport($type, $sql, $bindings);
 	}
 
 	/**
@@ -10587,9 +10587,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function findOne( $type, $sql = NULL, $bindings = array() )
+	public static function findOne($type, $sql = NULL, $bindings = array())
 	{
-		return self::$finder->findOne( $type, $sql, $bindings );
+		return self::$finder->findOne($type, $sql, $bindings);
 	}
 
 	/**
@@ -10602,9 +10602,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function findLast( $type, $sql = NULL, $bindings = array() )
+	public static function findLast($type, $sql = NULL, $bindings = array())
 	{
-		return self::$finder->findLast( $type, $sql, $bindings );
+		return self::$finder->findLast($type, $sql, $bindings);
 	}
 
 	/**
@@ -10617,9 +10617,9 @@ 
 	 *
 	 * @return BeanCollection
 	 */
-	public static function findCollection( $type, $sql = NULL, $bindings = array() )
+	public static function findCollection($type, $sql = NULL, $bindings = array())
 	{
-		return self::$finder->findCollection( $type, $sql, $bindings );
+		return self::$finder->findCollection($type, $sql, $bindings);
 	}
 
 	/**
@@ -10636,9 +10636,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function findMulti( $types, $sql, $bindings = array(), $remappings = array() )
+	public static function findMulti($types, $sql, $bindings = array(), $remappings = array())
 	{
-		return self::$finder->findMulti( $types, $sql, $bindings, $remappings );
+		return self::$finder->findMulti($types, $sql, $bindings, $remappings);
 	}
 
 	/**
@@ -10655,9 +10655,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function batch( $type, $ids )
+	public static function batch($type, $ids)
 	{
-		return self::$redbean->batch( $type, $ids );
+		return self::$redbean->batch($type, $ids);
 	}
 
 	/**
@@ -10673,9 +10673,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function loadAll( $type, $ids )
+	public static function loadAll($type, $ids)
 	{
-		return self::$redbean->batch( $type, $ids );
+		return self::$redbean->batch($type, $ids);
 	}
 
 	/**
@@ -10687,9 +10687,9 @@ 
 	 *
 	 * @return integer
 	 */
-	public static function exec( $sql, $bindings = array() )
+	public static function exec($sql, $bindings = array())
 	{
-		return self::query( 'exec', $sql, $bindings );
+		return self::query('exec', $sql, $bindings);
 	}
 
 	/**
@@ -10701,9 +10701,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getAll( $sql, $bindings = array() )
+	public static function getAll($sql, $bindings = array())
 	{
-		return self::query( 'get', $sql, $bindings );
+		return self::query('get', $sql, $bindings);
 	}
 
 	/**
@@ -10715,9 +10715,9 @@ 
 	 *
 	 * @return string
 	 */
-	public static function getCell( $sql, $bindings = array() )
+	public static function getCell($sql, $bindings = array())
 	{
-		return self::query( 'getCell', $sql, $bindings );
+		return self::query('getCell', $sql, $bindings);
 	}
 
 	/**
@@ -10729,9 +10729,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getRow( $sql, $bindings = array() )
+	public static function getRow($sql, $bindings = array())
 	{
-		return self::query( 'getRow', $sql, $bindings );
+		return self::query('getRow', $sql, $bindings);
 	}
 
 	/**
@@ -10743,9 +10743,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getCol( $sql, $bindings = array() )
+	public static function getCol($sql, $bindings = array())
 	{
-		return self::query( 'getCol', $sql, $bindings );
+		return self::query('getCol', $sql, $bindings);
 	}
 
 	/**
@@ -10762,9 +10762,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getAssoc( $sql, $bindings = array() )
+	public static function getAssoc($sql, $bindings = array())
 	{
-		return self::query( 'getAssoc', $sql, $bindings );
+		return self::query('getAssoc', $sql, $bindings);
 	}
 
 	/**
@@ -10778,9 +10778,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getAssocRow( $sql, $bindings = array() )
+	public static function getAssocRow($sql, $bindings = array())
 	{
-		return self::query( 'getAssocRow', $sql, $bindings );
+		return self::query('getAssocRow', $sql, $bindings);
 	}
 
 	/**
@@ -10820,10 +10820,10 @@ 
 	 *
 	 * @return array
 	 */
-	public static function dup( $bean, $trail = array(), $pid = FALSE, $filters = array() )
+	public static function dup($bean, $trail = array(), $pid = FALSE, $filters = array())
 	{
-		self::$duplicationManager->setFilters( $filters );
-		return self::$duplicationManager->dup( $bean, $trail, $pid );
+		self::$duplicationManager->setFilters($filters);
+		return self::$duplicationManager->dup($bean, $trail, $pid);
 	}
 
 	/**
@@ -10850,9 +10850,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function duplicate( $bean, $filters = array() )
+	public static function duplicate($bean, $filters = array())
 	{
-		return self::dup( $bean, array(), FALSE, $filters );
+		return self::dup($bean, array(), FALSE, $filters);
 	}
 
 	/**
@@ -10869,9 +10869,9 @@ 
 	 *
 	 * @return    array
 	 */
-	public static function exportAll( $beans, $parents = FALSE, $filters = array())
+	public static function exportAll($beans, $parents = FALSE, $filters = array())
 	{
-		return self::$duplicationManager->exportAll( $beans, $parents, $filters, self::$exportCaseStyle );
+		return self::$duplicationManager->exportAll($beans, $parents, $filters, self::$exportCaseStyle);
 	}
 
 	/**
@@ -10892,9 +10892,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function useExportCase( $caseStyle = 'default' )
+	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;
 	}
 
@@ -10910,9 +10910,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function convertToBeans( $type, $rows )
+	public static function convertToBeans($type, $rows)
 	{
-		return self::$redbean->convertToBeans( $type, $rows );
+		return self::$redbean->convertToBeans($type, $rows);
 	}
 
 	/**
@@ -10931,9 +10931,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function hasTag( $bean, $tags, $all = FALSE )
+	public static function hasTag($bean, $tags, $all = FALSE)
 	{
-		return self::$tagManager->hasTag( $bean, $tags, $all );
+		return self::$tagManager->hasTag($bean, $tags, $all);
 	}
 
 	/**
@@ -10946,9 +10946,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function untag( $bean, $tagList )
+	public static function untag($bean, $tagList)
 	{
-		self::$tagManager->untag( $bean, $tagList );
+		self::$tagManager->untag($bean, $tagList);
 	}
 
 	/**
@@ -10965,9 +10965,9 @@ 
 	 *
 	 * @return string
 	 */
-	public static function tag( OODBBean $bean, $tagList = NULL )
+	public static function tag(OODBBean $bean, $tagList = NULL)
 	{
-		return self::$tagManager->tag( $bean, $tagList );
+		return self::$tagManager->tag($bean, $tagList);
 	}
 
 	/**
@@ -10982,9 +10982,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function addTags( OODBBean $bean, $tagList )
+	public static function addTags(OODBBean $bean, $tagList)
 	{
-		self::$tagManager->addTags( $bean, $tagList );
+		self::$tagManager->addTags($bean, $tagList);
 	}
 
 	/**
@@ -10998,9 +10998,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function tagged( $beanType, $tagList, $sql = '', $bindings = array() )
+	public static function tagged($beanType, $tagList, $sql = '', $bindings = array())
 	{
-		return self::$tagManager->tagged( $beanType, $tagList, $sql, $bindings );
+		return self::$tagManager->tagged($beanType, $tagList, $sql, $bindings);
 	}
 
 	/**
@@ -11014,9 +11014,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function taggedAll( $beanType, $tagList, $sql = '', $bindings = array() )
+	public static function taggedAll($beanType, $tagList, $sql = '', $bindings = array())
 	{
-		return self::$tagManager->taggedAll( $beanType, $tagList, $sql, $bindings );
+		return self::$tagManager->taggedAll($beanType, $tagList, $sql, $bindings);
 	}
 
 	/**
@@ -11026,9 +11026,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function wipe( $beanType )
+	public static function wipe($beanType)
 	{
-		return Facade::$redbean->wipe( $beanType );
+		return Facade::$redbean->wipe($beanType);
 	}
 
 	/**
@@ -11044,9 +11044,9 @@ 
 	 *
 	 * @throws SQL
 	 */
-	public static function count( $type, $addSQL = '', $bindings = array() )
+	public static function count($type, $addSQL = '', $bindings = array())
 	{
-		return Facade::$redbean->count( $type, $addSQL, $bindings );
+		return Facade::$redbean->count($type, $addSQL, $bindings);
 	}
 
 	/**
@@ -11058,7 +11058,7 @@ 
 	 *
 	 * @return ToolBox
 	 */
-	public static function configureFacadeWithToolbox( ToolBox $tb )
+	public static function configureFacadeWithToolbox(ToolBox $tb)
 	{
 		$oldTools                 = self::$toolbox;
 
@@ -11067,22 +11067,22 @@ 
 		self::$writer             = self::$toolbox->getWriter();
 		self::$adapter            = self::$toolbox->getDatabaseAdapter();
 		self::$redbean            = self::$toolbox->getRedBean();
-		self::$finder             = new Finder( self::$toolbox );
+		self::$finder             = new Finder(self::$toolbox);
 
-		self::$associationManager = new AssociationManager( self::$toolbox );
+		self::$associationManager = new AssociationManager(self::$toolbox);
 
-		self::$redbean->setAssociationManager( self::$associationManager );
+		self::$redbean->setAssociationManager(self::$associationManager);
 
-		self::$labelMaker         = new LabelMaker( self::$toolbox );
+		self::$labelMaker         = new LabelMaker(self::$toolbox);
 
 		$helper                   = new SimpleModelHelper();
 
-		$helper->attachEventListeners( self::$redbean );
+		$helper->attachEventListeners(self::$redbean);
 
-		self::$redbean->setBeanHelper( new SimpleFacadeBeanHelper );
+		self::$redbean->setBeanHelper(new SimpleFacadeBeanHelper);
 
-		self::$duplicationManager = new DuplicationManager( self::$toolbox );
-		self::$tagManager         = new TagManager( self::$toolbox );
+		self::$duplicationManager = new DuplicationManager(self::$toolbox);
+		self::$tagManager         = new TagManager(self::$toolbox);
 
 		return $oldTools;
 	}
@@ -11095,7 +11095,7 @@ 
 	 */
 	public static function begin()
 	{
-		if ( !self::$redbean->isFrozen() ) return FALSE;
+		if (!self::$redbean->isFrozen()) return FALSE;
 
 		self::$adapter->startTransaction();
 
@@ -11110,7 +11110,7 @@ 
 	 */
 	public static function commit()
 	{
-		if ( !self::$redbean->isFrozen() ) return FALSE;
+		if (!self::$redbean->isFrozen()) return FALSE;
 
 		self::$adapter->commit();
 
@@ -11125,7 +11125,7 @@ 
 	 */
 	public static function rollback()
 	{
-		if ( !self::$redbean->isFrozen() ) return FALSE;
+		if (!self::$redbean->isFrozen()) return FALSE;
 
 		self::$adapter->rollback();
 
@@ -11142,9 +11142,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getColumns( $table )
+	public static function getColumns($table)
 	{
-		return self::$writer->getColumns( $table );
+		return self::$writer->getColumns($table);
 	}
 
 	/**
@@ -11154,10 +11154,10 @@ 
 	 *
 	 * @return string
 	 */
-	public static function genSlots( $array, $template = NULL )
+	public static function genSlots($array, $template = NULL)
 	{
-		$str = count( $array ) ? implode( ',', array_fill( 0, count( $array ), '?' ) ) : '';
-		return ( is_null( $template ) ||  $str === '' ) ? $str : sprintf( $template, $str );
+		$str = count($array) ? implode(',', array_fill(0, count($array), '?')) : '';
+		return (is_null($template) || $str === '') ? $str : sprintf($template, $str);
 	}
 
 	/**
@@ -11167,10 +11167,10 @@ 
 	 *
 	 * @return array
 	 */
-	public static function flat( $array, $result = array() )
+	public static function flat($array, $result = array())
 	{
-		foreach( $array as $value ) {
-			if ( is_array( $value ) ) $result = self::flat( $value, $result );
+		foreach ($array as $value) {
+			if (is_array($value)) $result = self::flat($value, $result);
 			else $result[] = $value;
 		}
 		return $result;
@@ -11187,7 +11187,7 @@ 
 	 */
 	public static function nuke()
 	{
-		if ( !self::$redbean->isFrozen() ) {
+		if (!self::$redbean->isFrozen()) {
 			self::$writer->wipeAll();
 		}
 	}
@@ -11202,11 +11202,11 @@ 
 	 *
 	 * @return array
 	 */
-	public static function storeAll( $beans )
+	public static function storeAll($beans)
 	{
 		$ids = array();
-		foreach ( $beans as $bean ) {
-			$ids[] = self::store( $bean );
+		foreach ($beans as $bean) {
+			$ids[] = self::store($bean);
 		}
 
 		return $ids;
@@ -11221,10 +11221,10 @@ 
 	 *
 	 * @return void
 	 */
-	public static function trashAll( $beans )
+	public static function trashAll($beans)
 	{
-		foreach ( $beans as $bean ) {
-			self::trash( $bean );
+		foreach ($beans as $bean) {
+			self::trash($bean);
 		}
 	}
 
@@ -11243,9 +11243,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function useWriterCache( $yesNo )
+	public static function useWriterCache($yesNo)
 	{
-		self::getWriter()->setUseCache( $yesNo );
+		self::getWriter()->setUseCache($yesNo);
 	}
 
 
@@ -11260,9 +11260,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function dispenseLabels( $type, $labels )
+	public static function dispenseLabels($type, $labels)
 	{
-		return self::$labelMaker->dispenseLabels( $type, $labels );
+		return self::$labelMaker->dispenseLabels($type, $labels);
 	}
 
 	/**
@@ -11290,9 +11290,9 @@ 
 	 *
 	 * @return array|OODBBean
 	 */
-	public static function enum( $enum )
+	public static function enum($enum)
 	{
-		return self::$labelMaker->enum( $enum );
+		return self::$labelMaker->enum($enum);
 	}
 
 	/**
@@ -11305,9 +11305,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function gatherLabels( $beans )
+	public static function gatherLabels($beans)
 	{
-		return self::$labelMaker->gatherLabels( $beans );
+		return self::$labelMaker->gatherLabels($beans);
 	}
 
 	/**
@@ -11317,7 +11317,7 @@ 
 	 */
 	public static function close()
 	{
-		if ( isset( self::$adapter ) ) {
+		if (isset(self::$adapter)) {
 			self::$adapter->close();
 		}
 	}
@@ -11330,13 +11330,13 @@ 
 	 *
 	 * @return string
 	 */
-	public static function isoDate( $time = NULL )
+	public static function isoDate($time = NULL)
 	{
-		if ( !$time ) {
+		if (!$time) {
 			$time = time();
 		}
 
-		return @date( 'Y-m-d', $time );
+		return @date('Y-m-d', $time);
 	}
 
 	/**
@@ -11348,11 +11348,11 @@ 
 	 *
 	 * @return string
 	 */
-	public static function isoDateTime( $time = NULL )
+	public static function isoDateTime($time = NULL)
 	{
-		if ( !$time ) $time = time();
+		if (!$time) $time = time();
 
-		return @date( 'Y-m-d H:i:s', $time );
+		return @date('Y-m-d H:i:s', $time);
 	}
 
 	/**
@@ -11363,7 +11363,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setDatabaseAdapter( Adapter $adapter )
+	public static function setDatabaseAdapter(Adapter $adapter)
 	{
 		self::$adapter = $adapter;
 	}
@@ -11376,7 +11376,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setWriter( QueryWriter $writer )
+	public static function setWriter(QueryWriter $writer)
 	{
 		self::$writer = $writer;
 	}
@@ -11387,7 +11387,7 @@ 
 	 *
 	 * @param OODB $redbean
 	 */
-	public static function setRedBean( OODB $redbean )
+	public static function setRedBean(OODB $redbean)
 	{
 		self::$redbean = $redbean;
 	}
@@ -11481,9 +11481,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function renameAssociation( $from, $to = NULL )
+	public static function renameAssociation($from, $to = NULL)
 	{
-		AQueryWriter::renameAssociation( $from, $to );
+		AQueryWriter::renameAssociation($from, $to);
 	}
 
 	/**
@@ -11497,10 +11497,10 @@ 
 	 *
 	 * @return array
 	 */
-	public static function beansToArray( $beans )
+	public static function beansToArray($beans)
 	{
 		$list = array();
-		foreach( $beans as $bean ) {
+		foreach ($beans as $bean) {
 			$list[] = $bean->export();
 		}
 		return $list;
@@ -11532,9 +11532,9 @@ 
 	 * 
 	 * @return array
 	 */
-	public static function setErrorHandlingFUSE( $mode, $func = NULL )
+	public static function setErrorHandlingFUSE($mode, $func = NULL)
 	{
-		return OODBBean::setErrorHandlingFUSE( $mode, $func );
+		return OODBBean::setErrorHandlingFUSE($mode, $func);
 	}
 
 	/**
@@ -11548,23 +11548,23 @@ 
 	 * @return array
 	 *
 	 */
-	public static function dump( $data )
+	public static function dump($data)
 	{
 		$array = array();
 
-		if ( $data instanceof OODBBean ) {
-			$str = strval( $data );
+		if ($data instanceof OODBBean) {
+			$str = strval($data);
 			if (strlen($str) > 35) {
-				$beanStr = substr( $str, 0, 35 ).'... ';
+				$beanStr = substr($str, 0, 35) . '... ';
 			} else {
 				$beanStr = $str;
 			}
 			return $beanStr;
 		}
 
-		if ( is_array( $data ) ) {
-			foreach( $data as $key => $item ) {
-				$array[$key] = self::dump( $item );
+		if (is_array($data)) {
+			foreach ($data as $key => $item) {
+				$array[$key] = self::dump($item);
 			}
 		}
 
@@ -11591,9 +11591,9 @@ 
 	 * @param string $function
 	 *
 	 */
-	public static function bindFunc( $mode, $field, $function )
+	public static function bindFunc($mode, $field, $function)
 	{
-		self::$redbean->bindFunc( $mode, $field, $function );
+		self::$redbean->bindFunc($mode, $field, $function);
 	}
 
 	/**
@@ -11603,9 +11603,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function aliases( $list )
+	public static function aliases($list)
 	{
-		OODBBean::aliases( $list );
+		OODBBean::aliases($list);
 	}
 
 	/**
@@ -11621,9 +11621,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function findOrCreate( $type, $like = array() )
+	public static function findOrCreate($type, $like = array())
 	{
-		return self::$finder->findOrCreate( $type, $like );
+		return self::$finder->findOrCreate($type, $like);
 	}
 
 	/**
@@ -11639,9 +11639,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function findLike( $type, $like = array(), $sql = '' )
+	public static function findLike($type, $like = array(), $sql = '')
 	{
-		return self::$finder->findLike( $type, $like, $sql );
+		return self::$finder->findLike($type, $like, $sql);
 	}
 
 	/**
@@ -11657,7 +11657,7 @@ 
 	 */
 	public static function startLogging()
 	{
-		self::debug( TRUE, RDefault::C_LOGGER_ARRAY );
+		self::debug(TRUE, RDefault::C_LOGGER_ARRAY);
 	}
 
 	/**
@@ -11667,7 +11667,7 @@ 
 	 */
 	public static function stopLogging()
 	{
-		self::debug( FALSE );
+		self::debug(FALSE);
 	}
 
 	/**
@@ -11722,9 +11722,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setAutoResolve( $automatic = TRUE )
+	public static function setAutoResolve($automatic = TRUE)
 	{
-		OODBBean::setAutoResolve( (boolean) $automatic );
+		OODBBean::setAutoResolve((boolean) $automatic);
 	}
 
 	/**
@@ -11744,10 +11744,10 @@ 
 	 * @param string   $pluginName name of the method to call the plugin
 	 * @param callable $callable   a PHP callable
 	 */
-	public static function ext( $pluginName, $callable )
+	public static function ext($pluginName, $callable)
 	{
-		if ( !ctype_alnum( $pluginName ) ) {
-			throw new RedException( 'Plugin name may only contain alphanumeric characters.' );
+		if (!ctype_alnum($pluginName)) {
+			throw new RedException('Plugin name may only contain alphanumeric characters.');
 		}
 		self::$plugins[$pluginName] = $callable;
 	}
@@ -11761,15 +11761,15 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function __callStatic( $pluginName, $params )
+	public static function __callStatic($pluginName, $params)
 	{
-		if ( !ctype_alnum( $pluginName) ) {
-			throw new RedException( 'Plugin name may only contain alphanumeric characters.' );
+		if (!ctype_alnum($pluginName)) {
+			throw new RedException('Plugin name may only contain alphanumeric characters.');
 		}
-		if ( !isset( self::$plugins[$pluginName] ) ) {
-			throw new RedException( 'Plugin \''.$pluginName.'\' does not exist, add this plugin using: R::ext(\''.$pluginName.'\')' );
+		if (!isset(self::$plugins[$pluginName])) {
+			throw new RedException('Plugin \'' . $pluginName . '\' does not exist, add this plugin using: R::ext(\'' . $pluginName . '\')');
 		}
-		return call_user_func_array( self::$plugins[$pluginName], $params );
+		return call_user_func_array(self::$plugins[$pluginName], $params);
 	}
 }
 
@@ -11842,12 +11842,12 @@ 
 	 *
 	 * @return void
 	 */
-	private function copySharedBeans( OODBBean $copy, $shared, $beans )
+	private function copySharedBeans(OODBBean $copy, $shared, $beans)
 	{
 		$copy->$shared = array();
 
-		foreach ( $beans as $subBean ) {
-			array_push( $copy->$shared, $subBean );
+		foreach ($beans as $subBean) {
+			array_push($copy->$shared, $subBean);
 		}
 	}
 
@@ -11864,11 +11864,11 @@ 
 	 *
 	 * @return void
 	 */
-	private function copyOwnBeans( OODBBean $copy, $owned, $beans, $trail, $preserveIDs )
+	private function copyOwnBeans(OODBBean $copy, $owned, $beans, $trail, $preserveIDs)
 	{
 		$copy->$owned = array();
-		foreach ( $beans as $subBean ) {
-			array_push( $copy->$owned, $this->duplicate( $subBean, $trail, $preserveIDs ) );
+		foreach ($beans as $subBean) {
+			array_push($copy->$owned, $this->duplicate($subBean, $trail, $preserveIDs));
 		}
 	}
 
@@ -11881,14 +11881,14 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	private function createCopy( OODBBean $bean )
+	private function createCopy(OODBBean $bean)
 	{
-		$type = $bean->getMeta( 'type' );
+		$type = $bean->getMeta('type');
 
-		$copy = $this->redbean->dispense( $type );
-		$copy->setMeta( 'sys.dup-from-id', $bean->id );
-		$copy->setMeta( 'sys.old-id', $bean->id );
-		$copy->importFrom( $bean );
+		$copy = $this->redbean->dispense($type);
+		$copy->setMeta('sys.dup-from-id', $bean->id);
+		$copy->setMeta('sys.old-id', $bean->id);
+		$copy->importFrom($bean);
 		$copy->id = 0;
 
 		return $copy;
@@ -11904,12 +11904,12 @@ 
 	 *
 	 * @return boolean
 	 */
-	private function inTrailOrAdd( &$trail, OODBBean $bean )
+	private function inTrailOrAdd(&$trail, OODBBean $bean)
 	{
-		$type = $bean->getMeta( 'type' );
+		$type = $bean->getMeta('type');
 		$key  = $type . $bean->getID();
 
-		if ( isset( $trail[$key] ) ) {
+		if (isset($trail[$key])) {
 			return TRUE;
 		}
 
@@ -11928,12 +11928,12 @@ 
 	 *
 	 * @return array
 	 */
-	private function getListNames( $typeName )
+	private function getListNames($typeName)
 	{
-		$owned  = 'own' . ucfirst( $typeName );
-		$shared = 'shared' . ucfirst( $typeName );
+		$owned  = 'own' . ucfirst($typeName);
+		$shared = 'shared' . ucfirst($typeName);
 
-		return array( $owned, $shared );
+		return array($owned, $shared);
 	}
 
 	/**
@@ -11945,9 +11945,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function hasOwnList( $type, $target )
+	protected function hasOwnList($type, $target)
 	{
-		return isset( $this->columns[$target][$type . '_id'] );
+		return isset($this->columns[$target][$type . '_id']);
 	}
 
 	/**
@@ -11959,9 +11959,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function hasSharedList( $type, $target )
+	protected function hasSharedList($type, $target)
 	{
-		return in_array( AQueryWriter::getAssocTableFormat( array( $type, $target ) ), $this->tables );
+		return in_array(AQueryWriter::getAssocTableFormat(array($type, $target)), $this->tables);
 	}
 
 	/**
@@ -11973,37 +11973,37 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	protected function duplicate( OODBBean $bean, $trail = array(), $preserveIDs = FALSE )
+	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' );
+		$type = $bean->getMeta('type');
 
-		$copy = $this->createCopy( $bean );
-		foreach ( $this->tables as $table ) {
+		$copy = $this->createCopy($bean);
+		foreach ($this->tables as $table) {
 
-			if ( !empty( $this->filters ) ) {
-				if ( !in_array( $table, $this->filters ) ) continue;
+			if (!empty($this->filters)) {
+				if (!in_array($table, $this->filters)) continue;
 			}
 
-			list( $owned, $shared ) = $this->getListNames( $table );
+			list($owned, $shared) = $this->getListNames($table);
 
-			if ( $this->hasSharedList( $type, $table ) ) {
-				if ( $beans = $bean->$shared ) {
-					$this->copySharedBeans( $copy, $shared, $beans );
+			if ($this->hasSharedList($type, $table)) {
+				if ($beans = $bean->$shared) {
+					$this->copySharedBeans($copy, $shared, $beans);
 				}
-			} elseif ( $this->hasOwnList( $type, $table ) ) {
-				if ( $beans = $bean->$owned ) {
-					$this->copyOwnBeans( $copy, $owned, $beans, $trail, $preserveIDs );
+			} elseif ($this->hasOwnList($type, $table)) {
+				if ($beans = $bean->$owned) {
+					$this->copyOwnBeans($copy, $owned, $beans, $trail, $preserveIDs);
 				}
 
-				$copy->setMeta( 'sys.shadow.' . $owned, NULL );
+				$copy->setMeta('sys.shadow.' . $owned, NULL);
 			}
 
-			$copy->setMeta( 'sys.shadow.' . $shared, NULL );
+			$copy->setMeta('sys.shadow.' . $shared, NULL);
 		}
 
-		$copy->id = ( $preserveIDs ) ? $bean->id : $copy->id;
+		$copy->id = ($preserveIDs) ? $bean->id : $copy->id;
 
 		return $copy;
 	}
@@ -12014,7 +12014,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox            = $toolbox;
 		$this->redbean            = $toolbox->getRedBean();
@@ -12030,18 +12030,18 @@ 
 	 *
 	 * @return array
 	 */
-	public function camelfy( $array, $dolphinMode = false ) {
+	public function camelfy($array, $dolphinMode = false) {
 		$newArray = array();
-		foreach( $array as $key => $element ) {
-			$newKey = preg_replace_callback( '/_(\w)/', function( &$matches ){
-				return strtoupper( $matches[1] );
+		foreach ($array as $key => $element) {
+			$newKey = preg_replace_callback('/_(\w)/', function(&$matches) {
+				return strtoupper($matches[1]);
 			}, $key);
 
-			if ( $dolphinMode ) {
-				$newKey = preg_replace( '/(\w)Id$/', '$1ID', $newKey );
+			if ($dolphinMode) {
+				$newKey = preg_replace('/(\w)Id$/', '$1ID', $newKey);
 			}
 
-			$newArray[$newKey] = ( is_array($element) ) ? $this->camelfy( $element, $dolphinMode ) : $element;
+			$newArray[$newKey] = (is_array($element)) ? $this->camelfy($element, $dolphinMode) : $element;
 		}
 		return $newArray;
 	}
@@ -12063,10 +12063,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function setTables( $tables )
+	public function setTables($tables)
 	{
-		foreach ( $tables as $key => $value ) {
-			if ( is_numeric( $key ) ) {
+		foreach ($tables as $key => $value) {
+			if (is_numeric($key)) {
 				$this->tables[] = $value;
 			} else {
 				$this->tables[]      = $key;
@@ -12097,7 +12097,7 @@ 
 	 *
 	 * @param boolean $yesNo TRUE to use caching, FALSE otherwise
 	 */
-	public function setCacheTables( $yesNo )
+	public function setCacheTables($yesNo)
 	{
 		$this->cacheTables = $yesNo;
 	}
@@ -12111,10 +12111,10 @@ 
 	 *
 	 * @param array $filters list of tables to be filtered
 	 */
-	public function setFilters( $filters )
+	public function setFilters($filters)
 	{
-		if ( !is_array( $filters ) ) {
-			$filters = array( $filters );
+		if (!is_array($filters)) {
+			$filters = array($filters);
 		}
 
 		$this->filters = $filters;
@@ -12145,21 +12145,21 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function dup( OODBBean $bean, $trail = array(), $preserveIDs = FALSE )
+	public function dup(OODBBean $bean, $trail = array(), $preserveIDs = FALSE)
 	{
-		if ( !count( $this->tables ) ) {
+		if (!count($this->tables)) {
 			$this->tables = $this->toolbox->getWriter()->getTables();
 		}
 
-		if ( !count( $this->columns ) ) {
-			foreach ( $this->tables as $table ) {
-				$this->columns[$table] = $this->toolbox->getWriter()->getColumns( $table );
+		if (!count($this->columns)) {
+			foreach ($this->tables as $table) {
+				$this->columns[$table] = $this->toolbox->getWriter()->getColumns($table);
 			}
 		}
 
-		$rs = $this->duplicate( ( clone $bean ), $trail, $preserveIDs );
+		$rs = $this->duplicate((clone $bean), $trail, $preserveIDs);
 
-		if ( !$this->cacheTables ) {
+		if (!$this->cacheTables) {
 			$this->tables  = array();
 			$this->columns = array();
 		}
@@ -12200,24 +12200,24 @@ 
 	 *
 	 * @return array
 	 */
-	public function exportAll( $beans, $parents = FALSE, $filters = array(), $caseStyle = 'snake')
+	public function exportAll($beans, $parents = FALSE, $filters = array(), $caseStyle = 'snake')
 	{
 		$array = array();
 
-		if ( !is_array( $beans ) ) {
-			$beans = array( $beans );
+		if (!is_array($beans)) {
+			$beans = array($beans);
 		}
 
-		foreach ( $beans as $bean ) {
-			$this->setFilters( $filters );
+		foreach ($beans as $bean) {
+			$this->setFilters($filters);
 
-			$duplicate = $this->dup( $bean, array(), TRUE );
+			$duplicate = $this->dup($bean, array(), TRUE);
 
-			$array[]   = $duplicate->export( FALSE, $parents, FALSE, $filters );
+			$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;
 	}
@@ -12251,7 +12251,7 @@ 
 	class RedBean_SimpleModel extends \RedBeanPHP\SimpleModel {};
 
 	if (!class_exists('R')) {
-		class R extends \RedBeanPHP\Facade{};
+		class R extends \RedBeanPHP\Facade {};
 	}
 
 	
@@ -12288,7 +12288,7 @@ 
 
 	function EID($enumName)
 	{
-		return \RedBeanPHP\Facade::enum( $enumName )->id;
+		return \RedBeanPHP\Facade::enum($enumName)->id;
 	}
 
 }
@@ -12301,33 +12301,33 @@ 
  *
  * @return void
  */
-if ( !function_exists( 'dump' ) ) {
+if (!function_exists('dump')) {
 
-	function dmp( $list )
+	function dmp($list)
 	{
-		print_r( \RedBeanPHP\Facade::dump( $list ) );
+		print_r(\RedBeanPHP\Facade::dump($list));
 	}
 }
 
 /**
  * Function alias for R::genSlots().
  */
-if ( !function_exists( 'genslots' ) ) {
+if (!function_exists('genslots')) {
 
-	function genslots( $slots, $tpl = NULL )
+	function genslots($slots, $tpl = NULL)
 	{
-		return \RedBeanPHP\Facade::genSlots( $slots, $tpl );
+		return \RedBeanPHP\Facade::genSlots($slots, $tpl);
 	}
 }
 
 /**
  * Function alias for R::flat().
  */
-if ( !function_exists( 'array_flatten' ) ) {
+if (!function_exists('array_flatten')) {
 
-	function array_flatten( $array )
+	function array_flatten($array)
 	{
-		return \RedBeanPHP\Facade::flat( $array );
+		return \RedBeanPHP\Facade::flat($array);
 	}
 }
 

Sistema/Ayudantes/CFPHPAyuda.php

Spacing +16 added lines, -16 removed lines

@@ -36,17 +36,17 @@ 
     public function __construct() {
         //parent::__construct();
     
-    $this->_sesion=new \Sistema\Nucleo\CFSesion();
+    $this->_sesion = new \Sistema\Nucleo\CFSesion();
     }
-    public function enviarCorreo($para, $titulo= 'Asunto', $mensaje= 'cuerpo del correo'){
+    public function enviarCorreo($para, $titulo = 'Asunto', $mensaje = 'cuerpo del correo') {
         return mail($para, $titulo, $mensaje);
     }
     
     
      // filtros Email
     
-    function filtroEmail($email){
-        if (!filter_input(INPUT_POST, $email, FILTER_VALIDATE_EMAIL)){
+    function filtroEmail($email) {
+        if (!filter_input(INPUT_POST, $email, FILTER_VALIDATE_EMAIL)) {
             echo "E-Mail no es valido";
         }
         else
@@ -58,44 +58,44 @@ 
     
     //cadenas
     
-    function rangoTexto($texto, $inicio, $cantidad){
+    function rangoTexto($texto, $inicio, $cantidad) {
         
-        return $limite= substr($texto, $inicio, $cantidad); 
+        return $limite = substr($texto, $inicio, $cantidad); 
         
     }
     
     //Redirecionar
     
-    function Redireccion($url, $permanent = false){
+    function Redireccion($url, $permanent = false) {
     header('Location: ' . $url, true, $permanent ? 301 : 302);
 
     exit();
     }
     
-    function redireccionUrl($url){
-        $url=Cf_BASE_URL.$url;
+    function redireccionUrl($url) {
+        $url = Cf_BASE_URL . $url;
     header('Location: ' . $url);
     exit();
     }
     
-    function redireccionUrlMsj($controlador){
+    function redireccionUrlMsj($controlador) {
         $this->_sesion->iniciarSesion('_s', false);
-        $_SESSION[error_ingreso]='Error en el intento de ingreso';
-        $controlador=Cf_BASE_URL.$controlador;
+        $_SESSION[error_ingreso] = 'Error en el intento de ingreso';
+        $controlador = Cf_BASE_URL . $controlador;
     header('Location: ' . $controlador);
     exit();
     }
     
-    function redireccion_($url, $statusCode = 303){
+    function redireccion_($url, $statusCode = 303) {
     header('Location: ' . $url, true, $statusCode);
     die();
     }
     
-    function redirect($controller,$method = "index",$args = array())
+    function redirect($controller, $method = "index", $args = array())
 {
     global $core; /* Guess Obviously */
 
-    $location = $core->Cf_BASE_URL . "/" . $controller . "/" . $method . "/" . implode("/",$args);
+    $location = $core->Cf_BASE_URL . "/" . $controller . "/" . $method . "/" . implode("/", $args);
 
     /*
         * Use @header to redirect the page:
@@ -107,7 +107,7 @@ 
     
     
     //texto
-    public function filtrarEntero($int){
+    public function filtrarEntero($int) {
         
        return filter_var($int, FILTER_VALIDATE_INT);
        

Sistema/Ayudantes/CFPHPCache.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,7 @@ 
 	);
 	
 	public static function configurar($clave, $valor = null) {
-		if( is_array($clave) ) {
+		if (is_array($clave)) {
 			foreach ($clave as $config_name => $config_value) {
 				self::$configuracion[$config_name] = $config_value;
 			}
@@ -63,7 +63,7 @@ 
 	 * @param string $clave	 
 	 */
 	public static function obtener($clave, $raw = false, $tiempo_personalizado = null) {
-		if( ! self::file_expired($archivo = self::obtenerRuta($clave), $tiempo_personalizado)) {
+		if (!self::file_expired($archivo = self::obtenerRuta($clave), $tiempo_personalizado)) {
 			$contenido = file_get_contents($archivo);
 			return $raw ? $contenido : unserialize($contenido);
 		}
@@ -90,7 +90,7 @@ 
 	 * @return bool true if the data was removed successfully
 	 */
 	public static function eliminar($clave) {
-		if( ! file_exists($archivo = self::obtenerRuta($clave)) ) {
+		if (!file_exists($archivo = self::obtenerRuta($clave))) {
 			return true;
 		}
 		return @unlink($archivo);
@@ -117,7 +117,7 @@ 
 	 * @return bool if the file has expired or not
 	 */
 	public static function file_expired($archivo, $fecha = null) {
-		if( ! file_exists($archivo) ) {
+		if (!file_exists($archivo)) {
 			return true;
 		}
 		return (time() > (filemtime($archivo) + 60 * ($fecha ? $fecha : self::$configuracion['expires'])));

Sistema/Ayudantes/CFPHPFormularios.php

Spacing +31 added lines, -31 removed lines

@@ -161,7 +161,7 @@ 
 							break;
 					}
 				echo '</div>';
-			echo '</div>'.PHP_EOL;
+			echo '</div>' . PHP_EOL;
 		}
 		
 		// Closing form
@@ -191,7 +191,7 @@ 
 		
 		// Asignamos las claves conviritiendo el array
 		foreach ($data as $attr=>$value) {
-			$r .= $attr.'="'.$value.'" ';
+			$r .= $attr . '="' . $value . '" ';
 		}
 		
 		$r .= '/>';
@@ -209,7 +209,7 @@ 
 		
 		// Asignamos las claves conviritiendo el array
 		foreach ($data as $attr=>$value) {
-			$base .= $attr.'="'.$value.'" ';
+			$base .= $attr . '="' . $value . '" ';
 		}
 		
 		
@@ -221,7 +221,7 @@ 
 		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" ';
-			return $base . ' value="'.$values.'" />';
+			return $base . ' value="' . $values . '" />';
 		} 
 
 		// Por el contrario, tenemos 1 o m�s value con lo que es un posible texto
@@ -230,7 +230,7 @@ 
 		foreach ($values as $id=>$text) {
 			$r .= $base;
 			if ($selected !== null and $id == $selected) $r .= ' checked="checked" ';
-			$r .= ' value="'. $id .'" />'.$text.'</label>';
+			$r .= ' value="' . $id . '" />' . $text . '</label>';
 		}
 		
 		return $r;
@@ -249,7 +249,7 @@ 
 		$r = '<select ';
 			// Convert array to input string
 			foreach ($data as $attr=>$value) {
-				$r .= $attr.'="'.$value.'" ';
+				$r .= $attr . '="' . $value . '" ';
 			}
 			// Return end input
 		$r .= '>';
@@ -287,7 +287,7 @@ 
 		
 		// Asignamos las claves conviritiendo el array
 		foreach ($data as $attr=>$value) {
-			$r .= $attr.'="'.$value.'" ';
+			$r .= $attr . '="' . $value . '" ';
 		}
 		
 		$r .= '>';
@@ -304,14 +304,14 @@ 
 	 */
 	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 .'" ';
-	
-		return $r . '>'.PHP_EOL;
+		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;
 	}
 	
 	/**
@@ -408,14 +408,14 @@ 
 				if (isset($data['maxlength']) and is_numeric($data['maxlength']) and $data['maxlength'] > -1 
 					and strlen($readValue) > $data['maxlength']) {
 					
-					$this->log('is too long. Maximum' . ' ' . $data['maxlength'] . ' ' . 'characters', $data );
+					$this->log('is too long. Maximum' . ' ' . $data['maxlength'] . ' ' . 'characters', $data);
 					return false;
 				}
 				
 				if (isset($data['pattern']) and is_numeric($data['pattern']) and $data['maxlength'] != '' 
 					and preg_match($data['pattern'], $readValue) === FALSE) {
 					
-					$this->log('pattern error' . ' (' . $data['pattern'] . ')' , $data);
+					$this->log('pattern error' . ' (' . $data['pattern'] . ')', $data);
 					return false;
 				}
 				break;
@@ -429,20 +429,20 @@ 
 				
 				// MIN
 				if (isset($data['min']) and $readValue < $data['min']) {
-					$this->log('The number have to be greather than' . ' ' . $data['min'].'.', $data);
+					$this->log('The number have to be greather than' . ' ' . $data['min'] . '.', $data);
 					return false;
 				}
 				
 				// MAX
 				if (isset($data['max']) and $readValue > $data['max']) {
-					$this->log('The number have to be less than' . ' ' . $data['max'].'.', $data);
+					$this->log('The number have to be less than' . ' ' . $data['max'] . '.', $data);
 					return false;
 				}
 				
 				// STEP http://www.w3schools.com/tags/att_input_step.asp
 				// Value 0 ever is valid (and if you try Divide to Zero, it will take error because the result is inifinite
 				if (isset($data['step']) and $readValue != 0 and $readValue % $data['step'] !== 0) {
-					$this->log('The number have to be multiple of' . ' ' . $data['step'].'.', $data);
+					$this->log('The number have to be multiple of' . ' ' . $data['step'] . '.', $data);
 					return false;
 				}
 				
@@ -451,7 +451,7 @@ 
 				//min | max
 				echo $readValue;
 				if (!is_date($readValue)) {
-					$this->log('The date' . ' ' .$readValue.' '. 'must have format' . ' mm/dd/yyyy '.'.', $data);
+					$this->log('The date' . ' ' . $readValue . ' ' . 'must have format' . ' mm/dd/yyyy ' . '.', $data);
 					return false;
 				}
 				break;
@@ -489,14 +489,14 @@ 
 				if (is_array($value)) {
 					$this->log('Values don\'t match.', $data);
 				} else {
-					$this->log('ID ' .$value.' ' . 'don\'t match', $data);
+					$this->log('ID ' . $value . ' ' . 'don\'t match', $data);
 				}
 				return false;
 			}
 		} else {
 			// Is string
 			if ($readValue == $values) {
-				$this->log('The value' . ' ' . $value.' ' . 'is not available', $data);
+				$this->log('The value' . ' ' . $value . ' ' . 'is not available', $data);
 				return false;
 			}
 		}
@@ -605,7 +605,7 @@ 
 	 * 
 	 * @example $fr->addInput('text', 'Username', '', true, 'Type here your username', array('class'=>'text red', id => 'text1'), array())
 	 */
-	public function addInput($label = '', $type = 'text', $name = '', $value = '', $required = false, $placeholder = '',  $attributes = array()) {
+	public function addInput($label = '', $type = 'text', $name = '', $value = '', $required = false, $placeholder = '', $attributes = array()) {
 		// Creating main data
 		$data = array(
 			'type' => $type,
@@ -642,10 +642,10 @@ 
 	 * @param string $placeholder Default text to show if box is empty
 	 * @param unknown $attributes Additional attributes
 	 */
-	public function addNumber($label = '', $name = '', $value = '', $range = false, $required = false, $min = '', $max = '', $step = '',  $placeholder = '',  $attributes = array()) {
+	public function addNumber($label = '', $name = '', $value = '', $range = false, $required = false, $min = '', $max = '', $step = '', $placeholder = '', $attributes = array()) {
 		// Creating main data
 		$data = array(
-			'type' => (! $range) ? 'number' : 'range',
+			'type' => (!$range) ? 'number' : 'range',
 			'name' => $name,
 			'value' => $value,
 		);
@@ -680,7 +680,7 @@ 
 	 * @param string $placeholder Default text to show if box is empty
 	 * @param unknown $attributes Additional attributes
 	 */
-	public function addDate($label = '', $name = '', $value = '', $required = false, $min = '', $max = '', $step = '',  $placeholder = '',  $attributes = array()) {
+	public function addDate($label = '', $name = '', $value = '', $required = false, $min = '', $max = '', $step = '', $placeholder = '', $attributes = array()) {
 		// Creating main data
 		$data = array(
 			'type' => 'date',
@@ -896,7 +896,7 @@ 
 			$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 />';
 		}
@@ -913,11 +913,11 @@ 
  */
 // More examples:
 // http://us2.php.net/manual/es/function.checkdate.php
-function is_date( $str ) {
+function is_date($str) {
 	// Try to execute date creator
 	try {
-		$dt = new DateTime( trim($str) );
-	} catch( Exception $e ) {
+		$dt = new DateTime(trim($str));
+	} catch (Exception $e) {
 		// If fails, it return false, date is incorrect
 		return false;
 	}

Sistema/Ayudantes/CFPHPMenu.php

Spacing +12 added lines, -12 removed lines

@@ -53,14 +53,14 @@ 
             )
         );
         
-        $menu = '<ul class="inline" >'.  PHP_EOL;
-        foreach($items as $item)
+        $menu = '<ul class="inline" >' . PHP_EOL;
+        foreach ($items as $item)
         {
             $current = (in_array($sel, $item)) ? ' class="current"' : '';
-            $id = (!empty($item['id'])) ? ' id="'.$item['id'].'"' : '';
-            $menu .= '<li'.$current.'><a href="'.$item['link'].'"'.$id.'>'.$item['title'].'</a></li>'."\n";
+            $id = (!empty($item['id'])) ? ' id="' . $item['id'] . '"' : '';
+            $menu .= '<li' . $current . '><a href="' . $item['link'] . '"' . $id . '>' . $item['title'] . '</a></li>' . "\n";
         }
-        $menu .= '</ul>'. PHP_EOL . PHP_EOL;
+        $menu .= '</ul>' . PHP_EOL . PHP_EOL;
         return $menu;
     }
     
@@ -91,19 +91,19 @@ 
 
         $count = count($items);
         $i = 0;
-        $menu =  PHP_EOL .'<p class="bottom_nav">';
-        foreach($items as $item)
+        $menu = PHP_EOL . '<p class="bottom_nav">';
+        foreach ($items as $item)
         {
             $current = (in_array($sel, $item)) ? ' class="current"' : '';
-            $id = (!empty($item['id'])) ? ' id="'.$item['id'].'"' : '';
-            $menu .= '<a'.$current.' href="'.$item['link'].'"'.$id.'>'.$item['title'].'</a>';
+            $id = (!empty($item['id'])) ? ' id="' . $item['id'] . '"' : '';
+            $menu .= '<a' . $current . ' href="' . $item['link'] . '"' . $id . '>' . $item['title'] . '</a>';
             $i++;
-            if($count != $i)
+            if ($count != $i)
             {
-                $menu .= ' '.$separador.' ';
+                $menu .= ' ' . $separador . ' ';
             }
         }
-        $menu .= '</p>'. PHP_EOL ;
+        $menu .= '</p>' . PHP_EOL;
         return $menu;
     }
     

Sistema/Ayudantes/CFPHPPaginador.php

Spacing +18 added lines, -18 removed lines

@@ -193,27 +193,27 @@ 
 		if ($end > $this->total_pages) $end = $this->total_pages;
 		
 		// Showing all clickable pages (create div if class is defined)
-		if ($this->style != '') $r = '<div class="'.$this->style.'">';
+		if ($this->style != '') $r = '<div class="' . $this->style . '">';
 		else $r = '';
 		
 		
 		// First / previous
 		if ($this->cur_page > 1) {
-			if ($this->first != '') $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">'.$this->first.'</a> ';
-			if ($this->previous != '') $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">'.$this->previous.'</a> ';
+			if ($this->first != '') $r .= '<a class="first" href="' . $url_start . '1' . $url_end . '">' . $this->first . '</a> ';
+			if ($this->previous != '') $r .= '<a class="previous" href="' . $url_start . ($cur_page - 1) . $url_end . '">' . $this->previous . '</a> ';
 		}
 		
 		// You can optimize this separating BEFORE and AFTER current page in two for (to avoid load "if" in each loop)
 		// but it would be difficult on changes
-		for ($n=$start; $n<=$end; $n++) {
-			if ($n != $cur_page) $r .= '<a class="link" href="'. $url_start . $n . $url_end . '">'.$n.'</a> ';
-			else $r .= '<a class="current">'.$n.'</a> ';
+		for ($n = $start; $n <= $end; $n++) {
+			if ($n != $cur_page) $r .= '<a class="link" href="' . $url_start . $n . $url_end . '">' . $n . '</a> ';
+			else $r .= '<a class="current">' . $n . '</a> ';
 		}
 		
 		// next / last
 		if ($this->cur_page < $this->total_pages) {
-			if ($this->next != '') $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">'.$this->next.'</a> ';
-			if ($this->last != '') $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end .'">'.$this->last.'</a> ';
+			if ($this->next != '') $r .= '<a class="next" href="' . $url_start . ($cur_page + 1) . $url_end . '">' . $this->next . '</a> ';
+			if ($this->last != '') $r .= '<a class="last" href="' . $url_start . $this->total_pages . $url_end . '">' . $this->last . '</a> ';
 		}
 		
 		// End div (if exist)
@@ -253,7 +253,7 @@ 
 		$records = $this->records;
 		
 		// Force maxium records loaded (only if is specified by user)
-		if ($max_records  > 0 and $max_records  > $total_records) 
+		if ($max_records > 0 and $max_records > $total_records) 
 			$this->total_records = $max_records;
 		
 		// Calculate total pages that have
@@ -275,7 +275,7 @@ 
 		
 		// Saving changes
 		$this->first_record = $start;
-		$this->limit = ' LIMIT '.$start.','.$records.' ';
+		$this->limit = ' LIMIT ' . $start . ',' . $records . ' ';
 	}
 	
 	/**
@@ -296,17 +296,17 @@ 
 					// And is empty, we have to Recicle ALL GET
 					// To know that page needs to be replaced we will use the "original_page" (the real get)
 					// Cortamos "pag=2" para obtener lo que va antes y despues, as� poder modificar directamente ese pag=2 por la pagina actual
-					$query_string = explode($this->get_name.'='.$this->original_page, $_SERVER['QUERY_STRING']);
+					$query_string = explode($this->get_name . '=' . $this->original_page, $_SERVER['QUERY_STRING']);
 					
 					// How start the new URL? To know it, we need to see the last character from current string
 					if (!in_array(substr($query_string[0], -1), array('?', '&'))) {
 						// Current string haven't any at end and it isn't "&" or "?" ?
 						// If initial string have one character at least it means that not is the first index 
-						if (isset($query_string[0][0])) $this->url_start = '?'.$query_string[0].'&';
-						else $this->url_start = '?'.$query_string[0];
+						if (isset($query_string[0][0])) $this->url_start = '?' . $query_string[0] . '&';
+						else $this->url_start = '?' . $query_string[0];
 					} else {
 						// Current string already have ? or &,
-						$this->url_start = '?'.$query_string[0];
+						$this->url_start = '?' . $query_string[0];
 					}
 					
 					$this->url_end = isset($query_string[1]) ? $query_string[1] : '';
@@ -318,7 +318,7 @@ 
 					foreach ($gets as $get) {
 						if ($get != $get_name) {
 							// Trying to get the GET
-							if (isset($_GET[$get])) $tmp .= $get.'='.$_GET[$get].'&';
+							if (isset($_GET[$get])) $tmp .= $get . '=' . $_GET[$get] . '&';
 						} else {
 							// Pour the $tmp content to $tmp_start
 							if ($tmp_start == '') $tmp_start .= '?';
@@ -333,16 +333,16 @@ 
 						$this->url_start = $tmp_start;
 						$this->url_end = $tmp;
 					}
-					else $this->url_start = '?'.$tmp;
+					else $this->url_start = '?' . $tmp;
 				}
-			} else{
+			} else {
 				// Non recicle
 				$this->url_start = '?';
 				$this->url_end = ''; 
 			}
 			
 			// Add the pagination
-			$this->url_start .= $this->get_name.'=';
+			$this->url_start .= $this->get_name . '=';
 		}
 	}
 }

Sistema/Ayudantes/CFPHPSeguridad.php

Spacing +28 added lines, -28 removed lines

@@ -30,20 +30,20 @@ 
 //Seguridad
     
     //xss funciones de mitigacion
-    function xsseguro($texto,$encoding='UTF-8'){
-       return htmlspecialchars($texto,ENT_QUOTES | ENT_HTML401,$encoding);
+    function xsseguro($texto, $encoding = 'UTF-8') {
+       return htmlspecialchars($texto, ENT_QUOTES | ENT_HTML401, $encoding);
     }
-    function xecho($texto){
+    function xecho($texto) {
        echo xsseguro($texto);
     }
     
-    public function filtrarTexto($texto){
+    public function filtrarTexto($texto) {
         return strip_tags($texto);
     }
     
      
     
-    public function filtrarCaracteresEspeciales($texto){
+    public function filtrarCaracteresEspeciales($texto) {
         return htmlspecialchars($texto, ENT_QUOTES);
     }
     
@@ -59,67 +59,67 @@ 
         return $cadenaAleatoria;
     }
     // encriptacion
-    function cifrado($clave){
-        $cfi=sha1(md5($clave));
-        return $clave=Cf_KEY_MD5.$cfi;
+    function cifrado($clave) {
+        $cfi = sha1(md5($clave));
+        return $clave = Cf_KEY_MD5 . $cfi;
     }
     // Protecion CSRF
     public function generoTokenDeFormulario($formulario) {
-        $secreta =  Cf_CSRF_SECRET.$this->generarCadenaAleatoria();
+        $secreta = Cf_CSRF_SECRET . $this->generarCadenaAleatoria();
         $sid = session_id();
-        $token = md5($secreta.$sid.$formulario);
+        $token = md5($secreta . $sid . $formulario);
         return $token;
     }
     
     public function verificoTokenDeFormulario($formulario, $token) {
-        $secreta =  Cf_CSRF_SECRET.$this->generarCadenaAleatoria();
+        $secreta = Cf_CSRF_SECRET . $this->generarCadenaAleatoria();
         $sid = session_id();
-        $correcta = md5($secreta.$sid.$formulario);
+        $correcta = md5($secreta . $sid . $formulario);
         return ($token == $correcta);
     }
     
-    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'];
+    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'];
+      $ip = $_SERVER ['REMOTE_ADDR'];
 
     return $ip;
 	}
 	
-    function restringirIp($ip){
+    function restringirIp($ip) {
         $ipCliente = $this->obtenerDireccionIP();
 
-        if($ipCliente == $ip){
+        if ($ipCliente == $ip) {
         return true;
         }
-        else{
+        else {
         header('location: http://www.tusitioweb/redireccion');
         exit;
         }
     }
 	
-	function restringirConjuntoIps($ips){
+	function restringirConjuntoIps($ips) {
     $ipCliente = obtenerDireccionIP();
 
-    if (in_array($ipCliente,$ips)){
+    if (in_array($ipCliente, $ips)) {
         return true;
     }
-    else{
+    else {
         header('location: http://direccion_envio_salida');
         exit;
     }
 	}
 	
-	function restringirRango(){
+	function restringirRango() {
     $ipCliente = obtenerDireccionIP();
 
-    if(substr($ipCliente, 0, 8 ) == "150.214."){
+    if (substr($ipCliente, 0, 8) == "150.214.") {
         return true;
     }
-    else{
+    else {
         header('location: http://direccion_envio_salida');
         exit;
     }
@@ -136,7 +136,7 @@ 
  *
  */
 function emailSeguro($cadena) {
-     return  preg_replace( '((?:\n|\r|\t|%0A|%0D|%08|%09)+)i' , '', $cadena );
+     return  preg_replace('((?:\n|\r|\t|%0A|%0D|%08|%09)+)i', '', $cadena);
 }
 
 /*** example usage 

Sistema/Ayudantes/CFPHPVinculos.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 class CFPHPVinculos {
     
-    function get_dominio(){
+    function get_dominio() {
     
     $dominio = "http://www.my-site-domain.com/";
     return $dominio;

Sistema/Nucleo/CFBootstrap.php

Spacing +7 added lines, -7 removed lines

@@ -32,31 +32,31 @@
     {
         $controlador = $peticion->getControlador() . 'Controlador';
         //definimos la ruta al controlador
-        $rutaControlador = SITE_ROOT . 'mvc' . DS .'controladores' . DS . $controlador . '.php';
+        $rutaControlador = SITE_ROOT . 'mvc' . DS . 'controladores' . DS . $controlador . '.php';
         $metodo = $peticion->getMetodo();
         $args = $peticion->getArgumentos();
         
         //verifcamos que el archivo existe con la funcion de PHP is_readable
-        if(is_readable($rutaControlador)){
+        if (is_readable($rutaControlador)) {
             require_once $rutaControlador;
             $controlador = new $controlador;
             
-            if(is_callable(array($controlador, $metodo))){
+            if (is_callable(array($controlador, $metodo))) {
                 $metodo = $peticion->getMetodo();
             }
-            else{
+            else {
                 $metodo = 'index';
             }
             
-            if(isset($args)){
+            if (isset($args)) {
                 call_user_func_array(array($controlador, $metodo), $args);
             }
-            else{
+            else {
                 call_user_func(array($controlador, $metodo));
             }
             
         } else {
-            header('Location: '.  Cf_BASE_URL.'error/');           
+            header('Location: ' . Cf_BASE_URL . 'error/');           
         }
     }
 }
\ No newline at end of file