synestergates788 / OctaORM

RedBean.php

Spacing +2242 added lines, -2242 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 = var_export( $argument, TRUE );
-				if ( $this->mode === self::C_LOGGER_ECHO ) {
+		foreach (func_get_args() as $argument) {
+			if (is_array($argument)) {
+				$log = var_export($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>" . PHP_EOL;
+			if ($this->mode === self::C_LOGGER_ECHO) echo "<br>".PHP_EOL;
 		}
 	}
 
@@ -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;
 	}
@@ -212,7 +212,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setOverrideCLIOutput( $yesNo )
+	public static function setOverrideCLIOutput($yesNo)
 	{
 		self::$noCLI = $yesNo;
 	}
@@ -226,17 +226,17 @@ 
 	 *
 	 * @return string
 	 */
-	protected function writeQuery( $newSql, $newBindings )
+	protected 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;
@@ -250,16 +250,16 @@ 
 	 *
 	 * @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 ( !\RedBeanPHP\QueryWriter\AQueryWriter::canBeTreatedAsInt( $value ) && $value !== 'NULL') {
+		if (!\RedBeanPHP\QueryWriter\AQueryWriter::canBeTreatedAsInt($value) && $value !== 'NULL') {
 			$value = '\''.$value.'\'';
 		}
 
@@ -278,15 +278,15 @@ 
 	 *
 	 * @return void
 	 */
-	protected function output( $str )
+	protected function output($str)
 	{
 		$this->logs[] = $str;
-		if ( !$this->mode ) {
+		if (!$this->mode) {
 			$highlight = FALSE;
 			/* just a quick heuritsic to highlight schema changes */
-			if ( strpos( $str, 'CREATE' ) === 0
-			|| strpos( $str, 'ALTER' ) === 0
-			|| strpos( $str, 'DROP' ) === 0) {
+			if (strpos($str, 'CREATE') === 0
+			|| strpos($str, 'ALTER') === 0
+			|| strpos($str, 'DROP') === 0) {
 				$highlight = TRUE;
 			}
 			if (PHP_SAPI === 'cli' && !self::$noCLI) {
@@ -312,21 +312,21 @@ 
 	 *
 	 * @return string
 	 */
-	protected function normalizeSlots( $sql )
+	protected function normalizeSlots($sql)
 	{
 		$newSql = $sql;
 		$i = 0;
-		while(strpos($newSql, '?') !== FALSE ){
-			$pos   = strpos( $newSql, '?' );
+		while (strpos($newSql, '?') !== FALSE) {
+			$pos   = strpos($newSql, '?');
 			$slot  = ':slot'.$i;
-			$begin = substr( $newSql, 0, $pos );
-			$end   = substr( $newSql, $pos+1 );
+			$begin = substr($newSql, 0, $pos);
+			$end   = substr($newSql, $pos + 1);
 			if (PHP_SAPI === 'cli' && !self::$noCLI) {
 				$newSql = "{$begin}\e[32m{$slot}\e[39m{$end}";
 			} else {
 				$newSql = "{$begin}<b style=\"color:green\">$slot</b>{$end}";
 			}
-			$i ++;
+			$i++;
 		}
 		return $newSql;
 	}
@@ -339,12 +339,12 @@ 
 	 *
 	 * @return array
 	 */
-	protected function normalizeBindings( $bindings )
+	protected function normalizeBindings($bindings)
 	{
 		$i = 0;
 		$newBindings = array();
-		foreach( $bindings as $key => $value ) {
-			if ( is_numeric($key) ) {
+		foreach ($bindings as $key => $value) {
+			if (is_numeric($key)) {
 				$newKey = ':slot'.$i;
 				$newBindings[$newKey] = $value;
 				$i++;
@@ -365,24 +365,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);
 	}
 
 	/**
@@ -394,7 +394,7 @@ 
 	 *
 	 * @return self
 	 */
-	public function setParamStringLength( $len = 20 )
+	public function setParamStringLength($len = 20)
 	{
 		$this->strLen = max(0, $len);
 		return $this;
@@ -428,7 +428,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function GetAll( $sql, $bindings = array() );
+	public function GetAll($sql, $bindings = array());
 
 	/**
 	 * Runs a query and fetches results as a column.
@@ -438,7 +438,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.
@@ -448,7 +448,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
@@ -459,7 +459,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
@@ -470,7 +470,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function GetRow( $sql, $bindings = array() );
+	public function GetRow($sql, $bindings = array());
 
 	/**
 	 * Executes SQL code and allows key-value binding.
@@ -487,7 +487,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
@@ -513,7 +513,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
@@ -541,7 +541,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setDebugMode( $tf, $customLogger );
+	public function setDebugMode($tf, $customLogger);
 
 	/**
 	 * Starts a transaction.
@@ -693,32 +693,32 @@ 
 	 *
 	 * @return void
 	 */
-	protected function bindParams( $statement, $bindings )
+	protected function bindParams($statement, $bindings)
 	{
-		foreach ( $bindings as $key => &$value ) {
-			$k = is_integer( $key ) ? $key + 1 : $key;
+		foreach ($bindings as $key => &$value) {
+			$k = is_integer($key) ? $key + 1 : $key;
 
-			if ( is_array( $value ) && count( $value ) == 2 ) {
-				$paramType = end( $value );
-				$value = reset( $value );
+			if (is_array($value) && count($value) == 2) {
+				$paramType = end($value);
+				$value = reset($value);
 			} else {
 				$paramType = NULL;
 			}
 
-			if ( is_null( $value ) ) {
-				$statement->bindValue( $k, NULL, \PDO::PARAM_NULL );
+			if (is_null($value)) {
+				$statement->bindValue($k, NULL, \PDO::PARAM_NULL);
 				continue;
 			}
 
-			if ( $paramType != \PDO::PARAM_INT && $paramType != \PDO::PARAM_STR ) {
-				if ( !$this->flagUseStringOnlyBinding && AQueryWriter::canBeTreatedAsInt( $value ) && abs( $value ) <= $this->max ) {
+			if ($paramType != \PDO::PARAM_INT && $paramType != \PDO::PARAM_STR) {
+				if (!$this->flagUseStringOnlyBinding && AQueryWriter::canBeTreatedAsInt($value) && abs($value) <= $this->max) {
 					$paramType = \PDO::PARAM_INT;
 				} else {
 					$paramType = \PDO::PARAM_STR;
 				}
 			}
 
-			$statement->bindParam( $k, $value, $paramType );
+			$statement->bindParam($k, $value, $paramType);
 		}
 	}
 
@@ -736,44 +736,44 @@ 
 	 * @return mixed
 	 * @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 ) {
+			if (strpos('pgsql', $this->dsn) === 0) {
 				//one line because unable to test this otherwise (coverage trick).
-				if ( defined( '\PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT' ) ) { $statement = $this->pdo->prepare( $sql, array( \PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT => TRUE ) ); } else { $statement = $this->pdo->prepare( $sql ); }
+				if (defined('\PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT')) { $statement = $this->pdo->prepare($sql, array(\PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT => TRUE)); } else { $statement = $this->pdo->prepare($sql); }
 			} 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, $e );
-			$exception->setSQLState( $e->getCode() );
-			$exception->setDriverDetails( $e->errorInfo );
+			if ($this->loggingEnabled && $this->logger) $this->logger->log('An error occurred: '.$err);
+			$exception = new SQL($err, 0, $e);
+			$exception->setSQLState($e->getCode());
+			$exception->setDriverDetails($e->errorInfo);
 			throw $exception;
 		}
 	}
@@ -788,15 +788,15 @@ 
 	 */
 	protected function setEncoding()
 	{
-		$driver = $this->pdo->getAttribute( \PDO::ATTR_DRIVER_NAME );
+		$driver = $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
 		if ($driver === 'mysql') {
-			$charset = $this->hasCap( 'utf8mb4' ) ? 'utf8mb4' : 'utf8';
-			$collate = $this->hasCap( 'utf8mb4_520' ) ? '_unicode_520_ci' : '_unicode_ci';
-			$this->pdo->setAttribute(\PDO::MYSQL_ATTR_INIT_COMMAND, 'SET NAMES '. $charset ); //on every re-connect
+			$charset = $this->hasCap('utf8mb4') ? 'utf8mb4' : 'utf8';
+			$collate = $this->hasCap('utf8mb4_520') ? '_unicode_520_ci' : '_unicode_ci';
+			$this->pdo->setAttribute(\PDO::MYSQL_ATTR_INIT_COMMAND, 'SET NAMES '.$charset); //on every re-connect
 			/* #624 removed space before SET NAMES because it causes trouble with ProxySQL */
-			$this->pdo->exec('SET NAMES '. $charset); //also for current connection
+			$this->pdo->exec('SET NAMES '.$charset); //also for current connection
 			$this->mysqlCharset = $charset;
-			$this->mysqlCollate = $charset . $collate;
+			$this->mysqlCollate = $charset.$collate;
 		}
 	}
 
@@ -820,28 +820,28 @@ 
 	 *
 	 * @return int|false Whether the database feature is supported, FALSE otherwise.
 	 **/
-	protected function hasCap( $db_cap )
+	protected function hasCap($db_cap)
 	{
 		$compare = FALSE;
-		$version = $this->pdo->getAttribute( \PDO::ATTR_SERVER_VERSION );
-		switch ( strtolower( $db_cap ) ) {
+		$version = $this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION);
+		switch (strtolower($db_cap)) {
 			case 'utf8mb4':
 				//oneliner, to boost code coverage (coverage does not span versions)
-				if ( version_compare( $version, '5.5.3', '<' ) ) { return FALSE; }
-				$client_version = $this->pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION );
+				if (version_compare($version, '5.5.3', '<')) { return FALSE; }
+				$client_version = $this->pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION);
 				/*
 				 * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
 				 * mysqlnd has supported utf8mb4 since 5.0.9.
 				 */
-				if ( strpos( $client_version, 'mysqlnd' ) !== FALSE ) {
-					$client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $client_version );
-					$compare = version_compare( $client_version, '5.0.9', '>=' );
+				if (strpos($client_version, 'mysqlnd') !== FALSE) {
+					$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
+					$compare = version_compare($client_version, '5.0.9', '>=');
 				} else {
-					$compare = version_compare( $client_version, '5.5.3', '>=' );
+					$compare = version_compare($client_version, '5.5.3', '>=');
 				}
 			break;
 			case 'utf8mb4_520':
-				$compare = version_compare( $version, '5.6', '>=' );
+				$compare = version_compare($version, '5.6', '>=');
 			break;
 		}
 
@@ -877,25 +877,25 @@ 
 	 *
 	 * @return void
 	 */
-	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 ) ||  defined('HHVM_VERSION') || $this->dsn === 'test-sqlite-53' ) {
+		if ((strpos($this->dsn, 'sqlite') === 0 && PHP_MAJOR_VERSION === 5 && PHP_MINOR_VERSION === 3) || defined('HHVM_VERSION') || $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)
@@ -922,7 +922,7 @@ 
 	 *
 	 * @param boolean $bool
 	 */
-	public function stringifyFetches( $bool ) {
+	public function stringifyFetches($bool) {
 		$this->stringifyFetches = $bool;
 	}
 
@@ -943,10 +943,10 @@ 
 	 *
 	 * @return string|array
 	 */
-	public function getMysqlEncoding( $retCol = FALSE )
+	public function getMysqlEncoding($retCol = FALSE)
 	{
-		if( $retCol )
-			return array( 'charset' => $this->mysqlCharset, 'collate' => $this->mysqlCollate );
+		if ($retCol)
+			return array('charset' => $this->mysqlCharset, 'collate' => $this->mysqlCollate);
 		return $this->mysqlCharset;
 	}
 
@@ -959,7 +959,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setUseStringOnlyBinding( $yesNo )
+	public function setUseStringOnlyBinding($yesNo)
 	{
 		$this->flagUseStringOnlyBinding = (boolean) $yesNo;
 	}
@@ -976,9 +976,9 @@ 
 	 *
 	 * @return integer
 	 */
-	public function setMaxIntBind( $max )
+	public function setMaxIntBind($max)
 	{
-		if ( !is_integer( $max ) ) throw new RedException( 'Parameter has to be integer.' );
+		if (!is_integer($max)) throw new RedException('Parameter has to be integer.');
 		$oldMax = $this->max;
 		$this->max = $max;
 		return $oldMax;
@@ -995,26 +995,26 @@ 
 	 */
 	public function connect()
 	{
-		if ( $this->isConnected ) return;
+		if ($this->isConnected) return;
 		try {
 			$user = $this->connectInfo['user'];
 			$pass = $this->connectInfo['pass'];
-			$this->pdo = new \PDO( $this->dsn, $user, $pass );
+			$this->pdo = new \PDO($this->dsn, $user, $pass);
 			$this->setEncoding();
-			$this->pdo->setAttribute( \PDO::ATTR_STRINGIFY_FETCHES, $this->stringifyFetches );
+			$this->pdo->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, $this->stringifyFetches);
 			//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;
 			/* run initialisation query if any */
-			if ( $this->initSQL !== NULL ) {
-				$this->Execute( $this->initSQL );
+			if ($this->initSQL !== NULL) {
+				$this->Execute($this->initSQL);
 				$this->initSQL = NULL;
 			}
-		} 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());
 		}
 	}
 
@@ -1029,25 +1029,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
 			)
 		);
@@ -1057,17 +1057,17 @@ 
 	/**
 	 * @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);
 
-		if ( empty( $rows ) || !is_array( $rows ) ) {
+		if (empty($rows) || !is_array($rows)) {
 			return array();
 		}
 
 		$cols = array();
-		foreach ( $rows as $row ) {
-			$cols[] = reset( $row );
+		foreach ($rows as $row) {
+			$cols[] = reset($row);
 		}
 
 		return $cols;
@@ -1076,15 +1076,15 @@ 
 	/**
 	 * @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);
 
-		if ( empty( $arr[0] ) || !is_array( $arr[0] ) ) {
+		if (empty($arr[0]) || !is_array($arr[0])) {
 			return NULL;
 		}
 
-		return reset( $arr[0] );
+		return reset($arr[0]);
 	}
 
 	/**
@@ -1096,26 +1096,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 reset( $arr );
+		$arr = $this->GetAll($sql, $bindings);
+		return reset($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;
 	}
 
@@ -1132,10 +1132,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;
 	}
 
@@ -1151,14 +1151,14 @@ 
 	/**
 	 * @see Driver::setDebugMode
 	 */
-	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);
 	}
 
 	/**
@@ -1185,7 +1185,7 @@ 
 	 *
 	 * @return self
 	 */
-	public function setLogger( Logger $logger )
+	public function setLogger(Logger $logger)
 	{
 		$this->logger = $logger;
 		return $this;
@@ -1258,7 +1258,7 @@ 
 	public function getDatabaseType()
 	{
 		$this->connect();
-		return $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME );
+		return $this->pdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
 	}
 
 	/**
@@ -1290,7 +1290,7 @@ 
 	public function getDatabaseVersion()
 	{
 		$this->connect();
-		return $this->pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION );
+		return $this->pdo->getAttribute(\PDO::ATTR_CLIENT_VERSION);
 	}
 
 	/**
@@ -1354,7 +1354,7 @@ 
 	 *
 	 * @return self
 	 */
-	public function setEnableLogging( $enable )
+	public function setEnableLogging($enable)
 	{
 		$this->loggingEnabled = (boolean) $enable;
 		return $this;
@@ -1428,7 +1428,7 @@ 
 	 *
 	 * @return self
 	 */
-	public function setInitQuery( $sql ) {
+	public function setInitQuery($sql) {
 		$this->initSQL = $sql;
 		return $this;
 	}
@@ -1465,7 +1465,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,Jsonable
+class OODBBean implements\IteratorAggregate, \ArrayAccess, \Countable, Jsonable
 {
 	/**
 	 * FUSE error modes.
@@ -1582,7 +1582,7 @@ 
 	 *
 	 * @return void
 	 */
-	 public static function setEnforceUTF8encoding( $toggle )
+	 public static function setEnforceUTF8encoding($toggle)
 	 {
 		 self::$enforceUTF8encoding = (boolean) $toggle;
 	 }
@@ -1624,15 +1624,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;
@@ -1651,7 +1651,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function convertArraysToJSON( $flag )
+	public static function convertArraysToJSON($flag)
 	{
 		$old = self::$convertArraysToJSON;
 		self::$convertArraysToJSON = $flag;
@@ -1694,7 +1694,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function aliases( $list )
+	public static function aliases($list)
 	{
 		self::$aliases = $list;
 	}
@@ -1709,7 +1709,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setAutoResolve( $automatic = TRUE )
+	public static function setAutoResolve($automatic = TRUE)
 	{
 		self::$autoResolve = (boolean) $automatic;
 	}
@@ -1726,12 +1726,12 @@ 
 	 *
 	 * @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;
-			if ( $property == 'type' && !empty($bean->beanHelper)) {
-				$bean->__info['model'] = $bean->beanHelper->getModelForBean( $bean );
+		foreach ($beans as $bean) {
+			if ($bean instanceof OODBBean) $bean->__info[$property] = $value;
+			if ($property == 'type' && !empty($bean->beanHelper)) {
+				$bean->__info['model'] = $bean->beanHelper->getModelForBean($bean);
 			}
 		}
 		return $beans;
@@ -1757,27 +1757,27 @@ 
 	 *
 	 * @return string
 	 */
-	private function parseJoin( $type )
+	private function parseJoin($type)
 	{
-		if ( strpos($this->withSql, '@joined.' ) === FALSE ) {
+		if (strpos($this->withSql, '@joined.') === FALSE) {
 			return '';
 		}
 		
 		$joinSql = ' ';
 		$joins = array();
 		$writer   = $this->beanHelper->getToolBox()->getWriter();
-		$oldParts = $parts = explode( '@joined.', $this->withSql );
-		array_shift( $parts );
-		foreach($parts as $part) {
-			$explosion = explode( '.', $part );
-			$joinInfo  = reset( $explosion );
+		$oldParts = $parts = explode('@joined.', $this->withSql);
+		array_shift($parts);
+		foreach ($parts as $part) {
+			$explosion = explode('.', $part);
+			$joinInfo  = reset($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;
@@ -1807,22 +1807,22 @@ 
 	 *
 	 * @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);
 		}
 		return $beans;
 	}
@@ -1850,38 +1850,38 @@ 
 	 *
 	 * @return array
 	 */
-	private function getOwnList( $type, $redbean )
+	private function getOwnList($type, $redbean)
 	{
-		$type = $this->beau( $type );
-		if ( $this->aliasName ) {
+		$type = $this->beau($type);
+		if ($this->aliasName) {
 			$parentField = $this->aliasName;
-			$myFieldLink = $parentField . '_id';
+			$myFieldLink = $parentField.'_id';
 
-			$this->__info['sys.alias.' . $type] = $this->aliasName;
+			$this->__info['sys.alias.'.$type] = $this->aliasName;
 
 			$this->aliasName = NULL;
 		} else {
 			$parentField = $this->__info['type'];
-			$myFieldLink = $parentField . '_id';
+			$myFieldLink = $parentField.'_id';
 		}
 		$beans = array();
-		if ( $this->getID() ) {
-			reset( $this->withParams );
-			$joinSql = $this->parseJoin( $type );
-			$firstKey = count( $this->withParams ) > 0
-				? key( $this->withParams )
+		if ($this->getID()) {
+			reset($this->withParams);
+			$joinSql = $this->parseJoin($type);
+			$firstKey = count($this->withParams) > 0
+				? key($this->withParams)
 				: 0;
-			if ( is_int( $firstKey ) ) {
-				$bindings = array_merge( array( $this->getID() ), $this->withParams );
-				$beans = $redbean->find( $type, array(), "{$joinSql} $myFieldLink = ? " . $this->withSql, $bindings );
+			if (is_int($firstKey)) {
+				$bindings = array_merge(array($this->getID()), $this->withParams);
+				$beans = $redbean->find($type, array(), "{$joinSql} $myFieldLink = ? ".$this->withSql, $bindings);
 			} else {
 				$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);
 			}
 		}
-		foreach ( $beans as $beanFromList ) {
-			$beanFromList->__info['sys.parentcache.' . $parentField] = $this;
+		foreach ($beans as $beanFromList) {
+			$beanFromList->__info['sys.parentcache.'.$parentField] = $this;
 		}
 		return $beans;
 	}
@@ -1901,19 +1901,19 @@ 
 	 *
 	 * @return void
 	 */
-	public function initializeForDispense( $type, $beanhelper = NULL )
+	public function initializeForDispense($type, $beanhelper = NULL)
 	{
 		$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->__info['changelist'] = array();
-		if ( $beanhelper ) {
-			$this->__info['model'] = $this->beanHelper->getModelForBean( $this );
+		if ($beanhelper) {
+			$this->__info['model'] = $this->beanHelper->getModelForBean($this);
 		}
-		$this->properties['id']   = 0;
+		$this->properties['id'] = 0;
 	}
 
 	/**
@@ -1927,7 +1927,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setBeanHelper( BeanHelper $helper )
+	public function setBeanHelper(BeanHelper $helper)
 	{
 		$this->beanHelper = $helper;
 	}
@@ -1948,7 +1948,7 @@ 
 	 */
 	public function getIterator()
 	{
-		return new \ArrayIterator( $this->properties );
+		return new \ArrayIterator($this->properties);
 	}
 
 	/**
@@ -1965,40 +1965,40 @@ 
 	 *
 	 * @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 ( is_array( $selection ) ) {
-			if ( $notrim ) {
+		if (is_array($selection)) {
+			if ($notrim) {
 				$selected = array_flip($selection);
 			} else {
 				$selected = array();
-				foreach ( $selection as $key => $select ) {
-					$selected[trim( $select )] = TRUE;
+				foreach ($selection as $key => $select) {
+					$selected[trim($select)] = TRUE;
 				}
 			}
 		} else {
 			$selected = FALSE;
 		}
-		foreach ( $array as $key => $value ) {
-			if ( $key != '__info' ) {
-				if ( !$selected || isset( $selected[$key] ) ) {
-					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 (!$selected || isset($selected[$key])) {
+					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 {
@@ -2022,7 +2022,7 @@ 
 	*
 	* @return self
 	*/
-	public function importRow( $row )
+	public function importRow($row)
 	{
 		$this->properties = $row;
 		$this->__info['sys.orig'] = $row;
@@ -2048,7 +2048,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function importFrom( OODBBean $sourceBean )
+	public function importFrom(OODBBean $sourceBean)
 	{
 		$this->__info['tainted'] = TRUE;
 		$this->__info['changed'] = TRUE;
@@ -2066,10 +2066,10 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function inject( OODBBean $otherBean )
+	public function inject(OODBBean $otherBean)
 	{
 		$myID = $this->properties['id'];
-		$this->import( $otherBean->export( FALSE, FALSE, TRUE ) );
+		$this->import($otherBean->export(FALSE, FALSE, TRUE));
 		$this->id = $myID;
 
 		return $this;
@@ -2098,35 +2098,35 @@ 
 	 *
 	 * @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 );
-		foreach ( $this as $key => $value ) {
-			if ( !$onlyMe && is_array( $value ) ) {
+		$hasFilters = is_array($filters) && count($filters);
+		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 ) { //has to be on one line, otherwise code coverage miscounts as miss
-					if ( !in_array( strtolower( $value->getMeta( 'type' ) ), $filters ) ) continue;
+			} elseif ($value instanceof OODBBean) { if ($hasFilters) { //has to be on one line, otherwise code coverage miscounts as miss
+					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;
 		}
 		return $arr;
@@ -2150,13 +2150,13 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function __isset( $property )
+	public function __isset($property)
 	{
-		$property = $this->beau( $property );
-		if ( strpos( $property, 'xown' ) === 0 && ctype_upper( substr( $property, 4, 1 ) ) ) {
+		$property = $this->beau($property);
+		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]);
 	}
 
 	/**
@@ -2169,13 +2169,13 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function exists( $property )
+	public function exists($property)
 	{
-		$property = $this->beau( $property );
+		$property = $this->beau($property);
 		/* fixes issue #549, see Base/Bean test */
 		$hiddenRelationField = "{$property}_id";
-		if ( array_key_exists( $hiddenRelationField, $this->properties ) ) {
-			if ( !is_null( $this->properties[$hiddenRelationField] ) ) {
+		if (array_key_exists($hiddenRelationField, $this->properties)) {
+			if (!is_null($this->properties[$hiddenRelationField])) {
 				return TRUE;
 			}
 		}
@@ -2194,7 +2194,7 @@ 
 	 */
 	public function getID()
 	{
-		return ( isset( $this->properties['id'] ) ) ? (string) $this->properties['id'] : NULL;
+		return (isset($this->properties['id'])) ? (string) $this->properties['id'] : NULL;
 	}
 
 	/**
@@ -2207,16 +2207,16 @@ 
 	 *
 	 * @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] );
+		if (isset($this->__info[$shadowKey])) unset($this->__info[$shadowKey]);
 		//also clear modifiers
 		$this->clearModifiers();
 		return;
@@ -2240,7 +2240,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function with( $sql, $bindings = array() )
+	public function with($sql, $bindings = array())
 	{
 		$this->withSql    = $sql;
 		$this->withParams = $bindings;
@@ -2262,9 +2262,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function withCondition( $sql, $bindings = array() )
+	public function withCondition($sql, $bindings = array())
 	{
-		$this->withSql    = ' AND ' . $sql;
+		$this->withSql    = ' AND '.$sql;
 		$this->withParams = $bindings;
 		return $this;
 	}
@@ -2346,9 +2346,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function alias( $aliasName )
+	public function alias($aliasName)
 	{
-		$this->aliasName = $this->beau( $aliasName );
+		$this->aliasName = $this->beau($aliasName);
 		return $this;
 	}
 
@@ -2377,7 +2377,7 @@ 
 	 */
 	public function getPropertiesAndType()
 	{
-		return array( $this->properties, $this->__info['type'] );
+		return array($this->properties, $this->__info['type']);
 	}
 
 	/**
@@ -2394,22 +2394,22 @@ 
 	 *
 	 * @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];
 	}
@@ -2464,15 +2464,15 @@ 
 	 *
 	 * @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 ) );
-		return ( isset( $this->__info['sys.exclusive-'.$listName] ) && $this->__info['sys.exclusive-'.$listName] );
+		$listName = lcfirst(substr($listName, 3));
+		return (isset($this->__info['sys.exclusive-'.$listName]) && $this->__info['sys.exclusive-'.$listName]);
 	}
 
 	/**
@@ -2498,31 +2498,31 @@ 
 	 *
 	 * @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 ) ) )  {
+			} 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] );
+		$fieldLink      = $property.'_id';
+		$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->clearModifiers();
 			/**
 			 * Github issue:
@@ -2552,35 +2552,35 @@ 
 		$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->clearModifiers();
 			return $this->properties[$property];
 		}
 
-		list( $redbean, , , $toolbox ) = $this->beanHelper->getExtractedToolbox();
+		list($redbean,,, $toolbox) = $this->beanHelper->getExtractedToolbox();
 
 		//If it's another bean, then we load it and return
-		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;
 						}
 					}
@@ -2592,12 +2592,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;
 		$this->__info["sys.shadow.$property"] = $beans;
@@ -2620,47 +2620,47 @@ 
 	 *
 	 * @return void
 	 */
-	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 ) ) )  {
+			} 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;
 			}
-		} elseif ( self::$convertArraysToJSON && is_array( $value ) ) {
-			$value = json_encode( $value );
+		} elseif (self::$convertArraysToJSON && is_array($value)) {
+			$value = json_encode($value);
 		}
 
 		$hasAlias       = (!is_null($this->aliasName));
 		$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] );
-		$fieldLink      = $property . '_id';
-		$isFieldLink	= (($pos = strrpos($property, '_id')) !== FALSE) && array_key_exists( ($fieldName = substr($property, 0, $pos)), $this->properties );
+		$exists         = isset($this->properties[$property]);
+		$fieldLink      = $property.'_id';
+		$isFieldLink = (($pos = strrpos($property, '_id')) !== FALSE) && array_key_exists(($fieldName = substr($property, 0, $pos)), $this->properties);
 
 
-		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;
 			}
@@ -2670,32 +2670,32 @@ 
 
 		$this->__info['tainted'] = TRUE;
 		$this->__info['changed'] = TRUE;
-		array_push( $this->__info['changelist'], $property );
+		array_push($this->__info['changelist'], $property);
 
-		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 ( $isFieldLink ){
-			unset( $this->properties[ $fieldName ]);
-			$this->properties[ $property ] = NULL;
+		if ($isFieldLink) {
+			unset($this->properties[$fieldName]);
+			$this->properties[$property] = NULL;
 		}
 
 
-		if ( $value === FALSE ) {
+		if ($value === FALSE) {
 			$value = '0';
-		} elseif ( $value === TRUE ) {
+		} elseif ($value === TRUE) {
 			$value = '1';
 			/* for some reason there is some kind of bug in xdebug so that it doesnt count this line otherwise... */
-		} 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;
 	}
 
@@ -2717,15 +2717,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 ) {
-			$this->__info['sys.shadow.' . $property] = $value;
+		if ($updateShadow) {
+			$this->__info['sys.shadow.'.$property] = $value;
 		}
 
-		if ( $taint ) {
+		if ($taint) {
 			$this->__info['tainted'] = TRUE;
 			$this->__info['changed'] = TRUE;
 		}
@@ -2752,9 +2752,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;
 	}
 
 	/**
@@ -2768,11 +2768,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;
 	}
@@ -2790,11 +2790,11 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function setMeta( $path, $value )
+	public function setMeta($path, $value)
 	{
 		$this->__info[$path] = $value;
-		if ( $path == 'type' && !empty($this->beanHelper)) {
-			$this->__info['model'] = $this->beanHelper->getModelForBean( $this );
+		if ($path == 'type' && !empty($this->beanHelper)) {
+			$this->__info['model'] = $this->beanHelper->getModelForBean($this);
 		}
 
 		return $this;
@@ -2809,7 +2809,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function copyMetaFrom( OODBBean $bean )
+	public function copyMetaFrom(OODBBean $bean)
 	{
 		$this->__info = $bean->__info;
 
@@ -2838,41 +2838,41 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __call( $method, $args )
+	public function __call($method, $args)
 	{
-		if ( empty( $this->__info['model'] ) ) {
+		if (empty($this->__info['model'])) {
 			return NULL;
 		}
 		
 		$overrideDontFail = FALSE;
-		if ( strpos( $method, '@' ) === 0 ) {
-			$method = substr( $method, 1 );
+		if (strpos($method, '@') === 0) {
+			$method = substr($method, 1);
 			$overrideDontFail = TRUE;
 		}
 		
-		if ( !method_exists( $this->__info['model'], $method ) ) {
+		if (!method_exists($this->__info['model'], $method)) {
 
-			if ( self::$errorHandlingFUSE === FALSE || $overrideDontFail ) {
+			if (self::$errorHandlingFUSE === FALSE || $overrideDontFail) {
 				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,
@@ -2881,11 +2881,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);
 	}
 
 	/**
@@ -2900,20 +2900,20 @@ 
 	 */
 	public function __toString()
 	{
-		$string = $this->__call( '@__toString', array() );
+		$string = $this->__call('@__toString', array());
 
-		if ( $string === NULL ) {
+		if ($string === NULL) {
 			$list = array();
-			foreach($this->properties as $property => $value) {
+			foreach ($this->properties as $property => $value) {
 				if (is_scalar($value)) {
-					if ( self::$enforceUTF8encoding ) {
+					if (self::$enforceUTF8encoding) {
 						$list[$property] = mb_convert_encoding($value, 'UTF-8', 'UTF-8');
 					} else {
 						$list[$property] = $value;
 					}
 				}
 			}
-			$data = json_encode( $list );
+			$data = json_encode($list);
 			return $data;
 		} else {
 			return $string;
@@ -2930,9 +2930,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetSet( $offset, $value )
+	public function offsetSet($offset, $value)
 	{
-		$this->__set( $offset, $value );
+		$this->__set($offset, $value);
 	}
 
 	/**
@@ -2947,9 +2947,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function offsetExists( $offset )
+	public function offsetExists($offset)
 	{
-		return $this->__isset( $offset );
+		return $this->__isset($offset);
 	}
 
 	/**
@@ -2965,9 +2965,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function offsetUnset( $offset )
+	public function offsetUnset($offset)
 	{
-		$this->__unset( $offset );
+		$this->__unset($offset);
 	}
 
 	/**
@@ -2983,9 +2983,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function &offsetGet( $offset )
+	public function &offsetGet($offset)
 	{
-		return $this->__get( $offset );
+		return $this->__get($offset);
 	}
 
 	/**
@@ -2997,7 +2997,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function fetchAs( $type )
+	public function fetchAs($type)
 	{
 		$this->fetchType = $type;
 
@@ -3034,9 +3034,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function poly( $field )
+	public function poly($field)
 	{
-		return $this->fetchAs( $this->$field );
+		return $this->fetchAs($this->$field);
 	}
 
 	/**
@@ -3065,15 +3065,15 @@ 
 	 * @return OODBBean
 	 * @throws RedException
 	 */
-	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;
@@ -3083,18 +3083,18 @@ 
 
 		$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 ) {
-			$function( $bean );
+		foreach ($beans as $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;
@@ -3125,7 +3125,7 @@ 
 	 */
 	public function count()
 	{
-		return count( $this->properties );
+		return count($this->properties);
 	}
 
 	/**
@@ -3149,11 +3149,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;
 			}
 		}
@@ -3182,7 +3182,7 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function setAttr( $property, $value )
+	public function setAttr($property, $value)
 	{
 		$this->$property = $value;
 
@@ -3208,11 +3208,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]);
 			}
 		}
 		return $this;
@@ -3239,11 +3239,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];
 		}
 
@@ -3264,7 +3264,7 @@ 
 	 */
 	public function isTainted()
 	{
-		return $this->getMeta( 'tainted' );
+		return $this->getMeta('tainted');
 	}
 
 	/**
@@ -3280,10 +3280,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;
 	}
 
 	/**
@@ -3309,13 +3309,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;
 	}
 
@@ -3344,14 +3344,14 @@ 
 	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[ 'changelist' ] = array();
+		$this->__info['changelist'] = array();
 		return $this;
 	}
 
@@ -3384,24 +3384,24 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function link( $typeOrBean, $qualification = array() )
+	public function link($typeOrBean, $qualification = array())
 	{
-		if ( is_string( $typeOrBean ) ) {
-			$typeOrBean = AQueryWriter::camelsSnake( $typeOrBean );
-			$bean = $this->beanHelper->getToolBox()->getRedBean()->dispense( $typeOrBean );
-			if ( is_string( $qualification ) ) {
-				$data = json_decode( $qualification, TRUE );
+		if (is_string($typeOrBean)) {
+			$typeOrBean = AQueryWriter::camelsSnake($typeOrBean);
+			$bean = $this->beanHelper->getToolBox()->getRedBean()->dispense($typeOrBean);
+			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' ) );
-		array_push( $this->$list, $bean );
+		$list = 'own'.ucfirst($bean->getMeta('type'));
+		array_push($this->$list, $bean);
 		return $bean;
 	}
 
@@ -3427,11 +3427,11 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function one( $type ) {
+	public function one($type) {
 		return $this->beanHelper
 			->getToolBox()
 			->getRedBean()
-			->load( $type, $this->id );
+			->load($type, $this->id);
 	}
 
 	/**
@@ -3466,7 +3466,7 @@ 
 		return $this->beanHelper
 			->getToolbox()
 			->getRedBean()
-			->load( $this->getMeta( 'type' ), $this->properties['id'] );
+			->load($this->getMeta('type'), $this->properties['id']);
 	}
 
 	/**
@@ -3511,9 +3511,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function via( $via )
+	public function via($via)
 	{
-		$this->via = AQueryWriter::camelsSnake( $via );
+		$this->via = AQueryWriter::camelsSnake($via);
 
 		return $this;
 	}
@@ -3540,29 +3540,29 @@ 
 	 *
 	 * @return integer
 	 */
-	public function countOwn( $type )
+	public function countOwn($type)
 	{
-		$type = $this->beau( $type );
-		if ( $this->aliasName ) {
-			$myFieldLink     = $this->aliasName . '_id';
+		$type = $this->beau($type);
+		if ($this->aliasName) {
+			$myFieldLink     = $this->aliasName.'_id';
 			$this->aliasName = NULL;
 		} else {
-			$myFieldLink = $this->__info['type'] . '_id';
+			$myFieldLink = $this->__info['type'].'_id';
 		}
 		$count = 0;
-		if ( $this->getID() ) {
-			reset( $this->withParams );
-			$joinSql = $this->parseJoin( $type );
-			$firstKey = count( $this->withParams ) > 0
-				? key( $this->withParams )
+		if ($this->getID()) {
+			reset($this->withParams);
+			$joinSql = $this->parseJoin($type);
+			$firstKey = count($this->withParams) > 0
+				? key($this->withParams)
 				: 0;
-			if ( is_int( $firstKey ) ) {
-				$bindings = array_merge( array( $this->getID() ), $this->withParams );
-				$count    = $this->beanHelper->getToolbox()->getWriter()->queryRecordCount( $type, array(), "{$joinSql} $myFieldLink = ? " . $this->withSql, $bindings );
+			if (is_int($firstKey)) {
+				$bindings = array_merge(array($this->getID()), $this->withParams);
+				$count    = $this->beanHelper->getToolbox()->getWriter()->queryRecordCount($type, array(), "{$joinSql} $myFieldLink = ? ".$this->withSql, $bindings);
 			} else {
 				$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);
 			}
 		}
 		$this->clearModifiers();
@@ -3592,23 +3592,23 @@ 
 	 *
 	 * @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 ( $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;
 			}
 		}
-		$type  = $this->beau( $type );
+		$type  = $this->beau($type);
 		$count = 0;
-		if ( $this->getID() ) {
-			$count = $redbean->getAssociationManager()->relatedCount( $this, $type, $this->withSql, $this->withParams );
+		if ($this->getID()) {
+			$count = $redbean->getAssociationManager()->relatedCount($this, $type, $this->withSql, $this->withParams);
 		}
 		$this->clearModifiers();
 		return (integer) $count;
@@ -3640,33 +3640,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 ) {
-			$field = $property . '_id';
-			if ( isset( $bean->$field)  ) {
+		foreach ($this->$list as $bean) {
+			$field = $property.'_id';
+			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;
 		}
 
@@ -3702,8 +3702,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'])
 		);
 	}
 
@@ -3726,9 +3726,9 @@ 
 	 */
 	public function jsonSerialize()
 	{
-		$json = $this->__call( '@__jsonSerialize', array( ) );
+		$json = $this->__call('@__jsonSerialize', array( ));
 
-		if ( $json !== NULL ) {
+		if ($json !== NULL) {
 			return $json;
 		}
 
@@ -3773,13 +3773,13 @@ 
 	 *
 	 * @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();
 		}
 
-		if ( in_array( $observer, $this->observers[$eventname] ) ) {
+		if (in_array($observer, $this->observers[$eventname])) {
 			return;
 		}
 
@@ -3797,14 +3797,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);
 		}
 	}
 }
@@ -3841,7 +3841,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function onEvent( $eventname, $bean );
+	public function onEvent($eventname, $bean);
 }
 }
 
@@ -3884,7 +3884,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function exec( $sql, $bindings = array(), $noevent = FALSE );
+	public function exec($sql, $bindings = array(), $noevent = FALSE);
 
 	/**
 	 * Executes an SQL Query and returns a resultset.
@@ -3897,7 +3897,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function get( $sql, $bindings = array() );
+	public function get($sql, $bindings = array());
 
 	/**
 	 * Executes an SQL Query and returns a resultset.
@@ -3910,7 +3910,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getRow( $sql, $bindings = array() );
+	public function getRow($sql, $bindings = array());
 
 	/**
 	 * Executes an SQL Query and returns a resultset.
@@ -3923,7 +3923,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getCol( $sql, $bindings = array() );
+	public function getCol($sql, $bindings = array());
 
 	/**
 	 * Executes an SQL Query and returns a resultset.
@@ -3936,7 +3936,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getCell( $sql, $bindings = array() );
+	public function getCell($sql, $bindings = array());
 
 	/**
 	 * Executes the SQL query specified in $sql and takes
@@ -3951,7 +3951,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getAssoc( $sql, $bindings = array() );
+	public function getAssoc($sql, $bindings = array());
 
 	/**
 	 * Executes the SQL query specified in $sql and indexes
@@ -3962,7 +3962,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getAssocRow( $sql, $bindings = array() );
+	public function getAssocRow($sql, $bindings = array());
 
 	/**
 	 * Returns the latest insert ID.
@@ -3987,7 +3987,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
@@ -4045,7 +4045,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function setOption( $optionKey, $optionValue );
+	public function setOption($optionKey, $optionValue);
 }
 }
 
@@ -4120,7 +4120,7 @@ 
 	 *
 	 * @param Driver $database ADO Compatible DB Instance
 	 */
-	public function __construct( $database )
+	public function __construct($database)
 	{
 		$this->db = $database;
 	}
@@ -4146,76 +4146,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);
 
-		if ( !$rows ) {
+		if (!$rows) {
 			return array();
 		}
 
 		$assoc = array();
 		
-		foreach ( $rows as $row ) {
-			if ( empty( $row ) ) continue;
+		foreach ($rows as $row) {
+			if (empty($row)) continue;
 
-			$key   = array_shift( $row );
-			switch ( count( $row ) ) {
+			$key = array_shift($row);
+			switch (count($row)) {
 				case 0:
 					$value = $key;
 					break;
 				case 1:
-					$value = reset( $row );
+					$value = reset($row);
 					break;
 				default:
 					$value = $row;
@@ -4233,29 +4233,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);
 	}
 
 	/**
@@ -4317,9 +4317,9 @@ 
 	/**
 	 * @see Adapter::setOption
 	 */
-	public function setOption( $optionKey, $optionValue ) {
-		if ( method_exists( $this->db, $optionKey ) ) {
-			call_user_func( array( $this->db, $optionKey ), $optionValue );
+	public function setOption($optionKey, $optionValue) {
+		if (method_exists($this->db, $optionKey)) {
+			call_user_func(array($this->db, $optionKey), $optionValue);
 			return TRUE;
 		}
 		return FALSE;
@@ -4417,7 +4417,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function __construct( \PDOStatement $res, $fetchStyle )
+	public function __construct(\PDOStatement $res, $fetchStyle)
 	{
 		$this->res = $res;
 		$this->fetchStyle = $fetchStyle;
@@ -4552,7 +4552,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;
@@ -4570,9 +4570,9 @@ 
 	public function next()
 	{
 		$row = $this->cursor->getNextItem();
-		if ( $row ) {
-			$beans = $this->repository->convertToBeans( $this->type, array( $row ) );
-			return reset( $beans );
+		if ($row) {
+			$beans = $this->repository->convertToBeans($this->type, array($row));
+			return reset($beans);
 		}
 		return NULL;
 	}
@@ -4676,7 +4676,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.
@@ -4709,7 +4709,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.
@@ -4722,7 +4722,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function glueLimitOne( $sql );
+	public function glueLimitOne($sql);
 
 	/**
 	 * Returns the tables that are in the database.
@@ -4739,7 +4739,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function createTable( $type );
+	public function createTable($type);
 
 	/**
 	 * Returns an array containing all the columns of the specified type.
@@ -4753,7 +4753,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function getColumns( $type );
+	public function getColumns($type);
 
 	/**
 	 * Returns the Column Type Code (integer) that corresponds
@@ -4775,7 +4775,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function scanType( $value, $alsoScanSpecialForTypes = FALSE );
+	public function scanType($value, $alsoScanSpecialForTypes = FALSE);
 
 	/**
 	 * This method will add a column to a table.
@@ -4787,7 +4787,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function addColumn( $type, $column, $field );
+	public function addColumn($type, $column, $field);
 
 	/**
 	 * Returns the Type Code for a Column Description.
@@ -4801,7 +4801,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.
@@ -4813,7 +4813,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function widenColumn( $type, $column, $datatype );
+	public function widenColumn($type, $column, $datatype);
 
 	/**
 	 * Selects records from the database.
@@ -4827,7 +4827,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.
@@ -4841,7 +4841,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
@@ -4855,7 +4855,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.
@@ -4867,7 +4867,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
@@ -4880,7 +4880,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.
@@ -4893,7 +4893,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
@@ -4910,7 +4910,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function queryTagged( $type, $tagList, $all = FALSE, $addSql = '', $bindings = array() );
+	public function queryTagged($type, $tagList, $all = FALSE, $addSql = '', $bindings = array());
 
 	/**
 	 * Like queryTagged but only counts.
@@ -4923,7 +4923,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function queryCountTagged( $type, $tagList, $all = FALSE, $addSql = '', $bindings = array() );
+	public function queryCountTagged($type, $tagList, $all = FALSE, $addSql = '', $bindings = array());
 
 	/**
 	 * Returns all parent rows or child rows of a specified row.
@@ -4939,7 +4939,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function queryRecursiveCommonTableExpression( $type, $id, $up = TRUE, $addSql = NULL, $bindings = array() );
+	public function queryRecursiveCommonTableExpression($type, $id, $up = TRUE, $addSql = NULL, $bindings = array());
 
 	/**
 	 * This method should update (or insert a record), it takes
@@ -4955,7 +4955,7 @@ 
 	 *
 	 * @return integer
 	 */
-	public function updateRecord( $type, $updatevalues, $id = NULL );
+	public function updateRecord($type, $updatevalues, $id = NULL);
 
 	/**
 	 * Deletes records from the database.
@@ -4968,7 +4968,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.
@@ -4979,12 +4979,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.
@@ -4995,7 +4995,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
@@ -5012,7 +5012,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function sqlStateIn( $state, $list, $extraDriverDetails = array() );
+	public function sqlStateIn($state, $list, $extraDriverDetails = array());
 
 	/**
 	 * This method will remove all beans of a certain type.
@@ -5022,7 +5022,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function wipe( $type );
+	public function wipe($type);
 
 	/**
 	 * This method will add a foreign key from type and field to
@@ -5042,7 +5042,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
@@ -5055,7 +5055,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
@@ -5069,7 +5069,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function esc( $databaseStructure, $dontQuote = FALSE );
+	public function esc($databaseStructure, $dontQuote = FALSE);
 
 	/**
 	 * Removes all tables and views from the database.
@@ -5103,7 +5103,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function renameAssocTable( $fromType, $toType = NULL );
+	public function renameAssocTable($fromType, $toType = NULL);
 
 	/**
 	 * Returns the format for link tables.
@@ -5116,7 +5116,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function getAssocTable( $types );
+	public function getAssocTable($types);
 
 	/**
 	 * Given a bean type and a property, this method
@@ -5133,7 +5133,7 @@ 
 	 *
 	 * @return string|NULL
 	 */
-	public function inferFetchType( $type, $property );
+	public function inferFetchType($type, $property);
 }
 }
 
@@ -5252,7 +5252,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function useJSONColumns( $flag )
+	public static function useJSONColumns($flag)
 	{
 		$old = self::$flagUseJSONColumns;
 		self::$flagUseJSONColumns = $flag;
@@ -5268,7 +5268,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function forbidNuke( $flag ) {
+	public static function forbidNuke($flag) {
 		$old = self::$noNuke;
 		self::$noNuke = (bool) $flag;
 		return $old;
@@ -5281,30 +5281,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;
 		}
@@ -5320,9 +5320,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));
 	}
 
 	/**
@@ -5356,7 +5356,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setNarrowFieldMode( $narrowField )
+	public static function setNarrowFieldMode($narrowField)
 	{
 		self::$flagNarrowFieldMode = (boolean) $narrowField;
 	}
@@ -5396,7 +5396,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setSQLFilters( $sqlFilters, $safeMode = FALSE )
+	public static function setSQLFilters($sqlFilters, $safeMode = FALSE)
 	{
 		self::$flagSQLFilterSafeMode = (boolean) $safeMode;
 		self::$sqlFilters = $sqlFilters;
@@ -5424,9 +5424,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function getCacheKey( $keyValues )
+	private function getCacheKey($keyValues)
 	{
-		return json_encode( $keyValues );
+		return json_encode($keyValues);
 	}
 
 	/**
@@ -5437,11 +5437,11 @@ 
 	 *
 	 * @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];
 			}
 		}
@@ -5461,7 +5461,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();
@@ -5488,10 +5488,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();
 		}
@@ -5515,69 +5515,69 @@ 
 	 *
 	 * @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 ( $values === NULL ) continue;
+		foreach ($conditions as $column => $values) {
+			if ($values === NULL) continue;
 
-			if ( is_array( $values ) ) {
-				if ( empty( $values ) ) continue;
+			if (is_array($values)) {
+				if (empty($values)) continue;
 			} else {
-				$values = array( $values );
+				$values = array($values);
 			}
 
-			$checkOODB = reset( $values );
-			if ( $checkOODB instanceof OODBBean && $checkOODB->getMeta( 'type' ) === $column && substr( $column, -3 ) != '_id' )
-				$column = $column . '_id';
+			$checkOODB = reset($values);
+			if ($checkOODB instanceof OODBBean && $checkOODB->getMeta('type') === $column && substr($column, -3) != '_id')
+				$column = $column.'_id';
 
 
-			$sql = $this->esc( $column );
+			$sql = $this->esc($column);
 			$sql .= ' IN ( ';
 
-			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 ) {
-					if ( $v instanceof OODBBean ) {
+				foreach ($values as $k => $v) {
+					if ($v instanceof OODBBean) {
 						$v = $v->id;
 					}
-					$values[$k] = strval( $v );
+					$values[$k] = strval($v);
 
-					array_unshift( $bindings, $v );
+					array_unshift($bindings, $v);
 				}
 			} else {
 
 				$slots = array();
 
-				foreach( $values as $k => $v ) {
-					if ( $v instanceof OODBBean ) {
+				foreach ($values as $k => $v) {
+					if ($v instanceof OODBBean) {
 						$v = $v->id;
 					}
 					$slot            = ':slot'.$counter++;
 					$slots[]         = $slot;
-					$bindings[$slot] = strval( $v );
+					$bindings[$slot] = strval($v);
 				}
 
-				$sql .= implode( ',', $slots ).' ) ';
+				$sql .= implode(',', $slots).' ) ';
 				$sqlConditions[] = $sql;
 			}
 		}
 
 		$sql = '';
-		if ( !empty( $sqlConditions ) ) {
-			$sql .= " WHERE ( " . implode( ' AND ', $sqlConditions ) . ") ";
+		if (!empty($sqlConditions)) {
+			$sql .= " WHERE ( ".implode(' AND ', $sqlConditions).") ";
 		}
 
-		$addSql = $this->glueSQLCondition( $addSql, !empty( $sqlConditions ) ? QueryWriter::C_GLUE_AND : NULL );
-		if ( $addSql ) $sql .= $addSql;
+		$addSql = $this->glueSQLCondition($addSql, !empty($sqlConditions) ? QueryWriter::C_GLUE_AND : NULL);
+		if ($addSql) $sql .= $addSql;
 
 		return $sql;
 	}
@@ -5591,21 +5591,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);
 	}
 
 	/**
@@ -5618,7 +5618,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	protected function isJSON( $value )
+	protected function isJSON($value)
 	{
 		return (
 			is_string($value) &&
@@ -5636,18 +5636,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;
 	}
@@ -5675,7 +5675,7 @@ 
 	 *
 	 * @return array
 	 */
-	protected function getKeyMapForType( $type )
+	protected function getKeyMapForType($type)
 	{
 		return array();
 	}
@@ -5706,22 +5706,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] ) ) {
+		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;
 	}
 
@@ -5741,20 +5741,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;
 				}
@@ -5762,11 +5762,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), '?'));
 	}
 
 	/**
@@ -5779,10 +5779,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;
 	}
 
@@ -5793,7 +5793,7 @@ 
 	 *
 	 * @return string
 	 */
-	protected function getInsertSuffix( $table )
+	protected function getInsertSuffix($table)
 	{
 		return '';
 	}
@@ -5807,11 +5807,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;
@@ -5828,17 +5828,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];
@@ -5847,20 +5847,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();
 
@@ -5874,10 +5874,10 @@ 
 	 *
 	 * @return string
 	 */
-	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;
@@ -5891,40 +5891,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;
+		$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];
@@ -5933,80 +5933,80 @@ 
 	/**
 	 * @see QueryWriter::glueLimitOne
 	 */
-	public function glueLimitOne( $sql = '')
+	public function glueLimitOne($sql = '')
 	{
-		return ( strpos( strtoupper( $sql ), 'LIMIT' ) === FALSE ) ? ( $sql . ' LIMIT 1 ' ) : $sql;
+		return (strpos(strtoupper($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;
 	}
@@ -6014,14 +6014,14 @@ 
 	/**
 	 * @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 ";
 	}
 
@@ -6039,7 +6039,7 @@ 
 	 *
 	 * return self
 	 */
-	public function setSQLSelectSnippet( $sqlSelectSnippet = '' ) {
+	public function setSQLSelectSnippet($sqlSelectSnippet = '') {
 		$this->sqlSelectSnippet = $sqlSelectSnippet;
 		return $this;
 	}
@@ -6047,35 +6047,35 @@ 
 	/**
 	 * @see QueryWriter::queryRecord
 	 */
-	public function queryRecord( $type, $conditions = array(), $addSql = NULL, $bindings = array() )
+	public function queryRecord($type, $conditions = array(), $addSql = NULL, $bindings = array())
 	{
-		if ( $this->flagUseCache ) {
-			$key = $this->getCacheKey( array( $conditions, trim("$addSql {$this->sqlSelectSnippet}"), $bindings, 'select' ) );
-			if ( $cached = $this->getCached( $type, $key ) ) {
+		if ($this->flagUseCache) {
+			$key = $this->getCacheKey(array($conditions, trim("$addSql {$this->sqlSelectSnippet}"), $bindings, 'select'));
+			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);
 		}
 		
-		if ( is_array ( $conditions ) && !empty ( $conditions ) ) {
-			$sql = $this->makeSQLFromConditions( $conditions, $bindings, $addSql );
+		if (is_array($conditions) && !empty ($conditions)) {
+			$sql = $this->makeSQLFromConditions($conditions, $bindings, $addSql);
 		} else {
-			$sql = $this->glueSQLCondition( $addSql );
+			$sql = $this->glueSQLCondition($addSql);
 		}
 
-		$fieldSelection = ( self::$flagNarrowFieldMode ) ? "{$table}.*" : '*';
+		$fieldSelection = (self::$flagNarrowFieldMode) ? "{$table}.*" : '*';
 		$sql   = "SELECT {$fieldSelection} {$sqlFilterStr} FROM {$table} {$sql} {$this->sqlSelectSnippet} -- keep-cache";
 		$this->sqlSelectSnippet = '';
-		$rows  = $this->adapter->get( $sql, $bindings );
+		$rows  = $this->adapter->get($sql, $bindings);
 
-		if ( $this->flagUseCache ) {
-			$this->putResultInCache( $type, $key, $rows );
+		if ($this->flagUseCache) {
+			$this->putResultInCache($type, $key, $rows);
 		}
 
 		return $rows;
@@ -6084,47 +6084,47 @@ 
 	/**
 	 * @see QueryWriter::queryRecordWithCursor
 	 */
-	public function queryRecordWithCursor( $type, $addSql = NULL, $bindings = array() )
+	public function queryRecordWithCursor($type, $addSql = NULL, $bindings = array())
 	{
-		$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);
 		}
 
-		$fieldSelection = ( self::$flagNarrowFieldMode ) ? "{$table}.*" : '*';
+		$fieldSelection = (self::$flagNarrowFieldMode) ? "{$table}.*" : '*';
 
-		$sql = $this->glueSQLCondition( $addSql, NULL );
+		$sql = $this->glueSQLCondition($addSql, NULL);
 		$sql = "SELECT {$fieldSelection} {$sqlFilterStr} FROM {$table} {$sql} -- keep-cache";
 
-		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())
 	{
-		list( $sourceTable, $destTable, $linkTable, $sourceCol, $destCol ) = $this->getRelationalTablesAndColumns( $sourceType, $destType );
+		list($sourceTable, $destTable, $linkTable, $sourceCol, $destCol) = $this->getRelationalTablesAndColumns($sourceType, $destType);
 
-		if ( $this->flagUseCache ) {
-			$key = $this->getCacheKey( array( $sourceType, implode( ',', $linkIDs ), trim($addSql), $bindings, 'selectrelated' ) );
-			if ( $cached = $this->getCached( $destType, $key ) ) {
+		if ($this->flagUseCache) {
+			$key = $this->getCacheKey(array($sourceType, implode(',', $linkIDs), trim($addSql), $bindings, 'selectrelated'));
+			if ($cached = $this->getCached($destType, $key)) {
 				return $cached;
 			}
 		}
 
-		$addSql = $this->glueSQLCondition( $addSql, QueryWriter::C_GLUE_WHERE );
-		$inClause = $this->getParametersForInClause( $linkIDs, $bindings );
+		$addSql = $this->glueSQLCondition($addSql, QueryWriter::C_GLUE_WHERE);
+		$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} ,
@@ -6138,7 +6138,7 @@ 
 			{$addSql}
 			-- keep-cache";
 
-			$linkIDs = array_merge( $linkIDs, $linkIDs );
+			$linkIDs = array_merge($linkIDs, $linkIDs);
 		} else {
 			$sql = "
 			SELECT
@@ -6151,12 +6151,12 @@ 
 			-- keep-cache";
 		}
 
-		$bindings = array_merge( $linkIDs, $bindings );
+		$bindings = array_merge($linkIDs, $bindings);
 
-		$rows = $this->adapter->get( $sql, $bindings );
+		$rows = $this->adapter->get($sql, $bindings);
 
-		if ( $this->flagUseCache ) {
-			$this->putResultInCache( $destType, $key, $rows );
+		if ($this->flagUseCache) {
+			$this->putResultInCache($destType, $key, $rows);
 		}
 
 		return $rows;
@@ -6165,35 +6165,35 @@ 
 	/**
 	 * @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);
 
-		if ( $this->flagUseCache ) {
-			$key = $this->getCacheKey( array( $sourceType, $destType, $sourceID, $destID, 'selectlink' ) );
-			if ( $cached = $this->getCached( $linkTable, $key ) ) {
+		if ($this->flagUseCache) {
+			$key = $this->getCacheKey(array($sourceType, $destType, $sourceID, $destID, 'selectlink'));
+			if ($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));
 		}
 
-		if ( $this->flagUseCache ) {
-			$this->putResultInCache( $linkTable, $key, $row );
+		if ($this->flagUseCache) {
+			$this->putResultInCache($linkTable, $key, $row);
 		}
 
 		return $row;
@@ -6215,21 +6215,21 @@ 
 	 *
 	 * @return array
 	 */
-	private function queryTaggedGeneric( $type, $tagList, $all = FALSE, $addSql = '', $bindings = array(), $wrap = '%s' )
+	private function queryTaggedGeneric($type, $tagList, $all = FALSE, $addSql = '', $bindings = array(), $wrap = '%s')
 	{
-		if ( $this->flagUseCache ) {
-			$key = $this->getCacheKey( array( implode( ',', $tagList ), $all, trim($addSql), $bindings, 'selectTagged' ) );
-			if ( $cached = $this->getCached( $type, $key ) ) {
+		if ($this->flagUseCache) {
+			$key = $this->getCacheKey(array(implode(',', $tagList), $all, trim($addSql), $bindings, 'selectTagged'));
+			if ($cached = $this->getCached($type, $key)) {
 				return $cached;
 			}
 		}
 
-		$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;
+		$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;
 
 		$sql = "
 			SELECT {$table}.* FROM {$table}
@@ -6241,13 +6241,13 @@ 
 			{$addSql}
 			-- keep-cache
 		";
-		$sql = sprintf($wrap,$sql);
+		$sql = sprintf($wrap, $sql);
 
-		$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);
 
-		if ( $this->flagUseCache ) {
-			$this->putResultInCache( $type, $key, $rows );
+		if ($this->flagUseCache) {
+			$this->putResultInCache($type, $key, $rows);
 		}
 
 		return $rows;
@@ -6256,45 +6256,45 @@ 
 	/**
 	 * @see QueryWriter::queryTagged
 	 */
-	public function queryTagged( $type, $tagList, $all = FALSE, $addSql = '', $bindings = array() )
+	public function queryTagged($type, $tagList, $all = FALSE, $addSql = '', $bindings = array())
 	{
-		return $this->queryTaggedGeneric( $type, $tagList, $all, $addSql, $bindings );
+		return $this->queryTaggedGeneric($type, $tagList, $all, $addSql, $bindings);
 	}
 
 	/**
 	 * @see QueryWriter::queryCountTagged
 	 */
-	public function queryCountTagged( $type, $tagList, $all = FALSE, $addSql = '', $bindings = array() )
+	public function queryCountTagged($type, $tagList, $all = FALSE, $addSql = '', $bindings = array())
 	{
-		$rows = $this->queryTaggedGeneric( $type, $tagList, $all, $addSql, $bindings, 'SELECT COUNT(*) AS counted FROM (%s) AS counting' );
+		$rows = $this->queryTaggedGeneric($type, $tagList, $all, $addSql, $bindings, 'SELECT COUNT(*) AS counted FROM (%s) AS counting');
 		return intval($rows[0]['counted']);
 	}
 
 	/**
 	 * @see QueryWriter::queryRecordCount
 	 */
-	public function queryRecordCount( $type, $conditions = array(), $addSql = NULL, $bindings = array() )
+	public function queryRecordCount($type, $conditions = array(), $addSql = NULL, $bindings = array())
 	{
-		if ( $this->flagUseCache ) {
-			$key = $this->getCacheKey( array( $conditions, trim($addSql), $bindings, 'count' ) );
-			if ( $cached = $this->getCached( $type, $key ) ) {
+		if ($this->flagUseCache) {
+			$key = $this->getCacheKey(array($conditions, trim($addSql), $bindings, 'count'));
+			if ($cached = $this->getCached($type, $key)) {
 				return $cached;
 			}
 		}
 
-		$table  = $this->esc( $type );
+		$table = $this->esc($type);
 
-		if ( is_array ( $conditions ) && !empty ( $conditions ) ) {
-			$sql = $this->makeSQLFromConditions( $conditions, $bindings, $addSql );
+		if (is_array($conditions) && !empty ($conditions)) {
+			$sql = $this->makeSQLFromConditions($conditions, $bindings, $addSql);
 		} else {
-			$sql = $this->glueSQLCondition( $addSql );
+			$sql = $this->glueSQLCondition($addSql);
 		}
 
 		$sql    = "SELECT COUNT(*) FROM {$table} {$sql} -- keep-cache";
-		$count  = (int) $this->adapter->getCell( $sql, $bindings );
+		$count  = (int) $this->adapter->getCell($sql, $bindings);
 
-		if ( $this->flagUseCache ) {
-			$this->putResultInCache( $type, $key, $count );
+		if ($this->flagUseCache) {
+			$this->putResultInCache($type, $key, $count);
 		}
 
 		return $count;
@@ -6303,19 +6303,19 @@ 
 	/**
 	 * @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);
 
-		if ( $this->flagUseCache ) {
+		if ($this->flagUseCache) {
 			$cacheType = "#{$sourceType}/{$destType}";
-			$key = $this->getCacheKey( array( $sourceType, $destType, $linkID, trim($addSql), $bindings, 'countrelated' ) );
-			if ( $cached = $this->getCached( $cacheType, $key ) ) {
+			$key = $this->getCacheKey(array($sourceType, $destType, $linkID, trim($addSql), $bindings, 'countrelated'));
+			if ($cached = $this->getCached($cacheType, $key)) {
 				return $cached;
 			}
 		}
 
-		if ( $sourceType === $destType ) {
+		if ($sourceType === $destType) {
 			$sql = "
 			SELECT COUNT(*) FROM {$linkTable}
 			INNER JOIN {$destTable} ON
@@ -6324,7 +6324,7 @@ 
 			{$addSql}
 			-- keep-cache";
 
-			$bindings = array_merge( array( $linkID, $linkID ), $bindings );
+			$bindings = array_merge(array($linkID, $linkID), $bindings);
 		} else {
 			$sql = "
 			SELECT COUNT(*) FROM {$linkTable}
@@ -6333,13 +6333,13 @@ 
 			{$addSql}
 			-- keep-cache";
 
-			$bindings = array_merge( array( $linkID ), $bindings );
+			$bindings = array_merge(array($linkID), $bindings);
 		}
 
-		$count = (int) $this->adapter->getCell( $sql, $bindings );
+		$count = (int) $this->adapter->getCell($sql, $bindings);
 
-		if ( $this->flagUseCache ) {
-			$this->putResultInCache( $cacheType, $key, $count );
+		if ($this->flagUseCache) {
+			$this->putResultInCache($cacheType, $key, $count);
 		}
 
 		return $count;
@@ -6348,14 +6348,14 @@ 
 	/**
 	 * @see QueryWriter::queryRecursiveCommonTableExpression
 	 */
-	public function queryRecursiveCommonTableExpression( $type, $id, $up = TRUE, $addSql = NULL, $bindings = array() )
+	public function queryRecursiveCommonTableExpression($type, $id, $up = TRUE, $addSql = NULL, $bindings = array())
 	{
 		$alias     = $up ? 'parent' : 'child';
 		$direction = $up ? " {$alias}.{$type}_id = {$type}.id " : " {$alias}.id = {$type}.{$type}_id ";
 
-		array_unshift( $bindings, $id );
+		array_unshift($bindings, $id);
 
-		$sql = $this->glueSQLCondition( $addSql, QueryWriter::C_GLUE_WHERE );
+		$sql = $this->glueSQLCondition($addSql, QueryWriter::C_GLUE_WHERE);
 
 		$rows = $this->adapter->get("
 			WITH RECURSIVE tree AS
@@ -6376,56 +6376,56 @@ 
 	/**
 	 * @see QueryWriter::deleteRecord
 	 */
-	public function deleteRecord( $type, $conditions = array(), $addSql = NULL, $bindings = array() )
+	public function deleteRecord($type, $conditions = array(), $addSql = NULL, $bindings = array())
 	{
-		$table  = $this->esc( $type );
+		$table = $this->esc($type);
 
-		if ( is_array ( $conditions ) && !empty ( $conditions ) ) {
-			$sql = $this->makeSQLFromConditions( $conditions, $bindings, $addSql );
+		if (is_array($conditions) && !empty ($conditions)) {
+			$sql = $this->makeSQLFromConditions($conditions, $bindings, $addSql);
 		} else {
-			$sql = $this->glueSQLCondition( $addSql );
+			$sql = $this->glueSQLCondition($addSql);
 		}
 		
-		$sql    = "DELETE FROM {$table} {$sql}";
+		$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;
 	}
@@ -6433,27 +6433,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);
 	}
 
 	/**
@@ -6465,7 +6465,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setUseCache( $yesNo )
+	public function setUseCache($yesNo)
 	{
 		$this->flushCache();
 
@@ -6479,12 +6479,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;
 	}
@@ -6497,9 +6497,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);
 	}
 
 	/**
@@ -6510,21 +6510,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'];
@@ -6535,9 +6535,9 @@ 
 	/**
 	 * @see QueryWriter::addUniqueConstraint
 	 */
-	public function addUniqueIndex( $type, $properties )
+	public function addUniqueIndex($type, $properties)
 	{
-		return $this->addUniqueConstraint( $type, $properties );
+		return $this->addUniqueConstraint($type, $properties);
 	}
 }
 }
@@ -6578,14 +6578,14 @@ 
 	const C_DATATYPE_TEXT32           = 7;
 	const C_DATATYPE_SPECIAL_DATE     = 80;
 	const C_DATATYPE_SPECIAL_DATETIME = 81;
-	const C_DATATYPE_SPECIAL_TIME     = 83;  //MySQL time column (only manual)
+	const C_DATATYPE_SPECIAL_TIME     = 83; //MySQL time column (only manual)
 	const C_DATATYPE_SPECIAL_POINT    = 90;
 	const C_DATATYPE_SPECIAL_LINESTRING = 91;
 	const C_DATATYPE_SPECIAL_POLYGON    = 92;
 	const C_DATATYPE_SPECIAL_MONEY      = 93;
-	const C_DATATYPE_SPECIAL_JSON       = 94;  //JSON support (only manual)
+	const C_DATATYPE_SPECIAL_JSON       = 94; //JSON support (only manual)
 
-	const C_DATATYPE_SPECIFIED        = 99;
+	const C_DATATYPE_SPECIFIED = 99;
 
 	/**
 	 * @var DBAdapter
@@ -6600,10 +6600,10 @@ 
 	/**
 	 * @see AQueryWriter::getKeyMapForType
 	 */
-	protected function getKeyMapForType( $type )
+	protected function getKeyMapForType($type)
 	{
 		$databaseName = $this->adapter->getCell('SELECT DATABASE()');
-		$table = $this->esc( $type, TRUE );
+		$table = $this->esc($type, TRUE);
 		$keys = $this->adapter->get('
 			SELECT
 				information_schema.key_column_usage.constraint_name AS `name`,
@@ -6622,10 +6622,10 @@ 
 				AND information_schema.key_column_usage.table_name = :table
 				AND information_schema.key_column_usage.constraint_name != \'PRIMARY\'
 				AND information_schema.key_column_usage.referenced_table_name IS NOT NULL
-		', array( ':database' => $databaseName, ':table' => $table ) );
+		', array(':database' => $databaseName, ':table' => $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'],
@@ -6672,7 +6672,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 ',
@@ -6694,8 +6694,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;
@@ -6719,34 +6719,34 @@ 
 	 */
 	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);
 
-		$charset_collate = $this->adapter->getDatabase()->getMysqlEncoding( TRUE );
+		$charset_collate = $this->adapter->getDatabase()->getMysqlEncoding(TRUE);
 		$charset = $charset_collate['charset'];
 		$collate = $charset_collate['collate'];
 		
-		$sql   = "CREATE TABLE $table (id INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT, PRIMARY KEY ( id )) ENGINE = InnoDB DEFAULT CHARSET={$charset} COLLATE={$collate} ";
+		$sql = "CREATE TABLE $table (id INT( 11 ) UNSIGNED NOT NULL AUTO_INCREMENT, PRIMARY KEY ( id )) ENGINE = InnoDB DEFAULT CHARSET={$charset} COLLATE={$collate} ";
 
-		$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'];
 		}
 
@@ -6756,64 +6756,64 @@ 
 	/**
 	 * @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+\.\d{2}$/', $value ) ) {
+		if ($flagSpecial) {
+			if (preg_match('/^-?\d+\.\d{2}$/', $value)) {
 				return MySQL::C_DATATYPE_SPECIAL_MONEY;
 			}
-			if ( preg_match( '/^\d{4}\-\d\d-\d\d$/', $value ) ) {
+			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;
 			}
-			if ( self::$flagUseJSONColumns && $this->isJSON( $value ) ) {
+			if (self::$flagUseJSONColumns && $this->isJSON($value)) {
 				return self::C_DATATYPE_SPECIAL_JSON;
 			}
 		}
 
 		//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;
 		}
 
@@ -6823,19 +6823,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;
 		}
 
@@ -6845,19 +6845,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;
 		}
@@ -6867,15 +6867,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;
 		}
 	}
@@ -6884,35 +6884,35 @@ 
 	 * @see QueryWriter::addFK
 	 * @return bool
 	 */
-	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;
 		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
 		}
 		return TRUE;
@@ -6921,7 +6921,7 @@ 
 	/**
 	 * @see QueryWriter::sqlStateIn
 	 */
-	public function sqlStateIn( $state, $list, $extraDriverDetails = array() )
+	public function sqlStateIn($state, $list, $extraDriverDetails = array())
 	{
 		$stateMap = array(
 			'42S02' => QueryWriter::C_SQLSTATE_NO_SUCH_TABLE,
@@ -6929,15 +6929,15 @@ 
 			'23000' => QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION,
 		);
 
-		if ( $state == 'HY000' && !empty( $extraDriverDetails[1] ) ) {
+		if ($state == 'HY000' && !empty($extraDriverDetails[1])) {
 			$driverCode = $extraDriverDetails[1];
 
-			if ( $driverCode == '1205' && in_array( QueryWriter::C_SQLSTATE_LOCK_TIMEOUT, $list ) ) {
+			if ($driverCode == '1205' && in_array(QueryWriter::C_SQLSTATE_LOCK_TIMEOUT, $list)) {
 				return TRUE;
 			}
 		}
 
-		return in_array( ( isset( $stateMap[$state] ) ? $stateMap[$state] : '0' ), $list );
+		return in_array((isset($stateMap[$state]) ? $stateMap[$state] : '0'), $list);
 	}
 
 	/**
@@ -6946,14 +6946,14 @@ 
 	public function wipeAll()
 	{
 		if (AQueryWriter::$noNuke) throw new \Exception('The nuke() command has been disabled using noNuke() or R::feature(novice/...).');
-		$this->adapter->exec( 'SET FOREIGN_KEY_CHECKS = 0;' );
+		$this->adapter->exec('SET FOREIGN_KEY_CHECKS = 0;');
 
-		foreach ( $this->getTables() as $t ) {
-			try { $this->adapter->exec( "DROP TABLE IF EXISTS `$t`" ); } catch ( SQLException $e ) { ; }
-			try { $this->adapter->exec( "DROP VIEW IF EXISTS `$t`" ); } catch ( SQLException $e ) { ; }
+		foreach ($this->getTables() as $t) {
+			try { $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( 'SET FOREIGN_KEY_CHECKS = 1;' );
+		$this->adapter->exec('SET FOREIGN_KEY_CHECKS = 1;');
 	}
 }
 }
@@ -7015,12 +7015,12 @@ 
 	 *
 	 * @return array
 	 */
-	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,
@@ -7044,30 +7044,30 @@ 
 	 *
 	 * @return void
 	 */
-	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']}";
@@ -7075,11 +7075,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']}) ";
 		}
 
@@ -7087,7 +7087,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);
 	}
 
 	/**
@@ -7097,14 +7097,14 @@ 
 	 *
 	 * @return array
 	 */
-	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'];
 		}
@@ -7125,20 +7125,20 @@ 
 	 *
 	 * @return boolean
 	 */
-	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' );
-		$label   = 'from_' . $column . '_to_table_' . $targetTable . '_col_' . $targetColumn;
+		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,
 			'from'      => $column,
@@ -7146,20 +7146,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'],
@@ -7206,7 +7206,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',
@@ -7216,12 +7216,12 @@ 
 
 		$this->sqltype_typeno = array();
 
-		foreach ( $this->typeno_sqltype as $k => $v ) {
+		foreach ($this->typeno_sqltype as $k => $v) {
 			$this->sqltype_typeno[$v] = $k;
 		}
 
 		$this->adapter = $adapter;
-		$this->adapter->setOption( 'setInitQuery', ' PRAGMA foreign_keys = 1 ' );
+		$this->adapter->setOption('setInitQuery', ' PRAGMA foreign_keys = 1 ');
 	}
 
 	/**
@@ -7238,22 +7238,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;
 		}
@@ -7264,21 +7264,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;
 	}
@@ -7286,13 +7286,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);
 	}
 
 	/**
@@ -7300,33 +7300,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;
 	}
@@ -7334,15 +7334,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;
@@ -7351,40 +7351,40 @@ 
 	/**
 	 * @see QueryWriter::sqlStateIn
 	 */
-	public function sqlStateIn( $state, $list, $extraDriverDetails = array() )
+	public function sqlStateIn($state, $list, $extraDriverDetails = array())
 	{
 		$stateMap = array(
 			'23000' => QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION
 		);
-		if ( $state == 'HY000'
+		if ($state == 'HY000'
 		&& isset($extraDriverDetails[1])
 		&& $extraDriverDetails[1] == 1
-		&& ( in_array( QueryWriter::C_SQLSTATE_NO_SUCH_TABLE, $list )
-			|| in_array( QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN, $list )
+		&& (in_array(QueryWriter::C_SQLSTATE_NO_SUCH_TABLE, $list)
+			|| in_array(QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN, $list)
 		)) {
 			return TRUE;
 		}
-		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;
 		}
 	}
@@ -7392,19 +7392,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);
 	}
 
 	/**
@@ -7413,14 +7413,14 @@ 
 	public function wipeAll()
 	{
 		if (AQueryWriter::$noNuke) throw new \Exception('The nuke() command has been disabled using noNuke() or R::feature(novice/...).');
-		$this->adapter->exec( 'PRAGMA foreign_keys = 0 ' );
+		$this->adapter->exec('PRAGMA foreign_keys = 0 ');
 
-		foreach ( $this->getTables() as $t ) {
-			try { $this->adapter->exec( "DROP TABLE IF EXISTS `$t`" ); } catch ( SQLException $e ) { ; }
-			try { $this->adapter->exec( "DROP TABLE IF EXISTS `$t`" ); } catch ( SQLException $e ) { ; }
+		foreach ($this->getTables() as $t) {
+			try { $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( 'PRAGMA foreign_keys = 1 ' );
+		$this->adapter->exec('PRAGMA foreign_keys = 1 ');
 	}
 }
 }
@@ -7490,7 +7490,7 @@ 
 	 *
 	 * @return  string $sql SQL Snippet
 	 */
-	protected function getInsertSuffix( $table )
+	protected function getInsertSuffix($table)
 	{
 		return 'RETURNING id ';
 	}
@@ -7498,10 +7498,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",
@@ -7532,10 +7532,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'],
@@ -7582,7 +7582,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 ',
@@ -7603,8 +7603,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;
@@ -7626,30 +7626,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' AND table_schema = ANY( current_schemas( FALSE ) )" );
+		$columnsRaw = $this->adapter->get("SELECT column_name, data_type FROM information_schema.columns WHERE table_name='$table' AND table_schema = ANY( current_schemas( FALSE ) )");
 
 		$columns = array();
-		foreach ( $columnsRaw as $r ) {
+		foreach ($columnsRaw as $r) {
 			$columns[$r['column_name']] = $r['data_type'];
 		}
 
@@ -7659,60 +7659,60 @@ 
 	/**
 	 * @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 ( preg_match( '/^-?\d+\.\d{2}$/', $value ) ) {
+			if (preg_match('/^-?\d+\.\d{2}$/', $value)) {
 				return PostgreSQL::C_DATATYPE_SPECIAL_MONEY2;
 			}
-			if ( self::$flagUseJSONColumns && $this->isJSON( $value ) ) {
+			if (self::$flagUseJSONColumns && $this->isJSON($value)) {
 				return self::C_DATATYPE_SPECIAL_JSON;
 			}
 		}
 
-		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;
@@ -7722,13 +7722,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;
 		}
 
@@ -7738,35 +7738,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;
@@ -7775,7 +7775,7 @@ 
 	/**
 	 * @see QueryWriter::sqlStateIn
 	 */
-	public function sqlStateIn( $state, $list, $extraDriverDetails = array() )
+	public function sqlStateIn($state, $list, $extraDriverDetails = array())
 	{
 		$stateMap = array(
 			'42P01' => QueryWriter::C_SQLSTATE_NO_SUCH_TABLE,
@@ -7783,22 +7783,22 @@ 
 			'23505' => QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION,
 			'55P03' => QueryWriter::C_SQLSTATE_LOCK_TIMEOUT
 		);
-		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;
 		}
 	}
@@ -7806,22 +7806,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;
 		}
 	}
@@ -7832,15 +7832,15 @@ 
 	public function wipeAll()
 	{
 		if (AQueryWriter::$noNuke) throw new \Exception('The nuke() command has been disabled using noNuke() or R::feature(novice/...).');
-		$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);
 			//Some plugins (PostGIS have unremovable tables/views), avoid exceptions.
-			try { $this->adapter->exec( "DROP TABLE IF EXISTS $t CASCADE " ); }catch( \Exception $e ) {}
+			try { $this->adapter->exec("DROP TABLE IF EXISTS $t CASCADE "); } catch (\Exception $e) {}
 		}
 
-		$this->adapter->exec( 'SET CONSTRAINTS ALL IMMEDIATE' );
+		$this->adapter->exec('SET CONSTRAINTS ALL IMMEDIATE');
 	}
 }
 }
@@ -7905,22 +7905,22 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function buildFK( $type, $targetType, $property, $targetProperty, $isDep = FALSE )
+	protected function buildFK($type, $targetType, $property, $targetProperty, $isDep = FALSE)
 	{
-		$table           = $this->esc( $type );
-		$tableNoQ        = $this->esc( $type, TRUE );
-		$targetTable     = $this->esc( $targetType );
-		$targetTableNoQ  = $this->esc( $targetType, TRUE );
-		$column          = $this->esc( $property );
-		$columnNoQ       = $this->esc( $property, TRUE );
-		$targetColumn    = $this->esc( $targetProperty );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $columnNoQ ) ) ) return FALSE;
+		$table           = $this->esc($type);
+		$tableNoQ        = $this->esc($type, TRUE);
+		$targetTable     = $this->esc($targetType);
+		$targetTableNoQ  = $this->esc($targetType, TRUE);
+		$column          = $this->esc($property);
+		$columnNoQ       = $this->esc($property, TRUE);
+		$targetColumn    = $this->esc($targetProperty);
+		if (!is_null($this->getForeignKeyForTypeProperty($tableNoQ, $columnNoQ))) return FALSE;
 		$needsToDropFK   = FALSE;
-		$casc = ( $isDep ? 'CASCADE' : 'SET NULL' );
+		$casc = ($isDep ? 'CASCADE' : 'SET NULL');
 		$sql  = "ALTER TABLE $table ADD CONSTRAINT FOREIGN KEY($column) REFERENCES $targetTable($targetColumn) ON DELETE $casc ";
 		try {
-			$this->adapter->exec( $sql );
-		} catch( SQLException $e ) {
+			$this->adapter->exec($sql);
+		} catch (SQLException $e) {
 			return FALSE;
 		}
 		return TRUE;
@@ -7929,18 +7929,18 @@ 
 	/**
 	 * @see AQueryWriter::getKeyMapForType
 	 */
-	protected function getKeyMapForType( $type  )
+	protected function getKeyMapForType($type)
 	{
 		$sqlCode = $this->adapter->get("SHOW CREATE TABLE `{$type}`");
 		if (!isset($sqlCode[0])) return array();
 		$matches = array();
-		preg_match_all( '/CONSTRAINT\s+\[([\w_]+)\]\s+FOREIGN\s+KEY\s+\(\[([\w_]+)\]\)\s+REFERENCES\s+\[([\w_]+)\](\s+ON\s+DELETE\s+(CASCADE|SET\sNULL|RESTRICT|NO\sACTION)\s+ON\s+UPDATE\s+(SET\sNULL|RESTRICT|NO\sACTION))?/', $sqlCode[0]['CREATE TABLE'], $matches );
+		preg_match_all('/CONSTRAINT\s+\[([\w_]+)\]\s+FOREIGN\s+KEY\s+\(\[([\w_]+)\]\)\s+REFERENCES\s+\[([\w_]+)\](\s+ON\s+DELETE\s+(CASCADE|SET\sNULL|RESTRICT|NO\sACTION)\s+ON\s+UPDATE\s+(SET\sNULL|RESTRICT|NO\sACTION))?/', $sqlCode[0]['CREATE TABLE'], $matches);
 		$list = array();
 		if (!isset($matches[0])) return $list;
 		$max = count($matches[0]);
-		for($i = 0; $i < $max; $i++) {
-			$label = $this->makeFKLabel( $matches[2][$i], $matches[3][$i], 'id' );
-			$list[ $label ] = array(
+		for ($i = 0; $i < $max; $i++) {
+			$label = $this->makeFKLabel($matches[2][$i], $matches[3][$i], 'id');
+			$list[$label] = array(
 				'name' => $matches[1][$i],
 				'from' => $matches[2][$i],
 				'table' => $matches[3][$i],
@@ -7986,7 +7986,7 @@ 
 	 *
 	 * @param Adapter $adapter Database Adapter
 	 */
-	public function __construct( Adapter $adapter )
+	public function __construct(Adapter $adapter)
 	{
 		$this->typeno_sqltype = array(
 			CUBRID::C_DATATYPE_INTEGER          => ' INTEGER ',
@@ -7998,8 +7998,8 @@ 
 
 		$this->sqltype_typeno = array();
 
-		foreach ( $this->typeno_sqltype as $k => $v ) {
-			$this->sqltype_typeno[trim( ( $v ) )] = $k;
+		foreach ($this->typeno_sqltype as $k => $v) {
+			$this->sqltype_typeno[trim(($v))] = $k;
 		}
 
 		$this->sqltype_typeno['STRING(1073741823)'] = self::C_DATATYPE_STRING;
@@ -8023,7 +8023,7 @@ 
 	 */
 	public function getTables()
 	{
-		$rows = $this->adapter->getCol( "SELECT class_name FROM db_class WHERE is_system_class = 'NO';" );
+		$rows = $this->adapter->getCol("SELECT class_name FROM db_class WHERE is_system_class = 'NO';");
 
 		return $rows;
 	}
@@ -8031,28 +8031,28 @@ 
 	/**
 	 * @see QueryWriter::createTable
 	 */
-	public function createTable( $table )
+	public function createTable($table)
 	{
-		$sql  = 'CREATE TABLE '
-			. $this->esc( $table )
+		$sql = 'CREATE TABLE '
+			. $this->esc($table)
 			. ' ("id" integer AUTO_INCREMENT, CONSTRAINT "pk_'
-			. $this->esc( $table, TRUE )
+			. $this->esc($table, TRUE)
 			. '_id" PRIMARY KEY("id"))';
 
-		$this->adapter->exec( $sql );
+		$this->adapter->exec($sql);
 	}
 
 	/**
 	 * @see QueryWriter::getColumns
 	 */
-	public function getColumns( $table )
+	public function getColumns($table)
 	{
-		$table = $this->esc( $table );
+		$table = $this->esc($table);
 
-		$columnsRaw = $this->adapter->get( "SHOW COLUMNS FROM $table" );
+		$columnsRaw = $this->adapter->get("SHOW COLUMNS FROM $table");
 
 		$columns = array();
-		foreach ( $columnsRaw as $r ) {
+		foreach ($columnsRaw as $r) {
 			$columns[$r['Field']] = $r['Type'];
 		}
 
@@ -8062,30 +8062,30 @@ 
 	/**
 	 * @see QueryWriter::scanType
 	 */
-	public function scanType( $value, $flagSpecial = FALSE )
+	public function scanType($value, $flagSpecial = FALSE)
 	{
 		$this->svalue = $value;
 
-		if ( is_null( $value ) ) {
+		if (is_null($value)) {
 			return self::C_DATATYPE_INTEGER;
 		}
 
-		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 self::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 self::C_DATATYPE_SPECIAL_DATETIME;
 			}
 		}
 
-		$value = strval( $value );
+		$value = strval($value);
 
-		if ( !$this->startsWithZeros( $value ) ) {
-			if ( is_numeric( $value ) && ( floor( $value ) == $value ) && $value >= -2147483647 && $value <= 2147483647 ) {
+		if (!$this->startsWithZeros($value)) {
+			if (is_numeric($value) && (floor($value) == $value) && $value >= -2147483647 && $value <= 2147483647) {
 				return self::C_DATATYPE_INTEGER;
 			}
-			if ( is_numeric( $value ) ) {
+			if (is_numeric($value)) {
 				return self::C_DATATYPE_DOUBLE;
 			}
 		}
@@ -8096,15 +8096,15 @@ 
 	/**
 	 * @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] : self::C_DATATYPE_SPECIFIED );
+		$r = ((isset($this->sqltype_typeno[$typedescription])) ? $this->sqltype_typeno[$typedescription] : 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;
 		}
 
@@ -8114,34 +8114,34 @@ 
 	/**
 	 * @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   = array_key_exists( $type, $this->typeno_sqltype ) ? $this->typeno_sqltype[$type] : '';
+		$type   = array_key_exists($type, $this->typeno_sqltype) ? $this->typeno_sqltype[$type] : '';
 
-		$this->adapter->exec( "ALTER TABLE $table ADD COLUMN $column $type " );
+		$this->adapter->exec("ALTER TABLE $table ADD COLUMN $column $type ");
 	}
 
 	/**
 	 * @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 ) );
-		$sql = "ALTER TABLE $table ADD CONSTRAINT UNIQUE $name (" . 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));
+		$sql = "ALTER TABLE $table ADD CONSTRAINT UNIQUE $name (".implode(',', $columns).")";
 		try {
-			$this->adapter->exec( $sql );
-		} catch( SQLException $e ) {
+			$this->adapter->exec($sql);
+		} catch (SQLException $e) {
 			return FALSE;
 		}
 		return TRUE;
@@ -8150,27 +8150,27 @@ 
 	/**
 	 * @see QueryWriter::sqlStateIn
 	 */
-	public function sqlStateIn( $state, $list, $extraDriverDetails = array() )
+	public function sqlStateIn($state, $list, $extraDriverDetails = array())
 	{
-		return ( $state == 'HY000' ) ? ( count( array_diff( array(
+		return ($state == 'HY000') ? (count(array_diff(array(
 				QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION,
 				QueryWriter::C_SQLSTATE_NO_SUCH_COLUMN,
 				QueryWriter::C_SQLSTATE_NO_SUCH_TABLE
-			), $list ) ) !== 3 ) : FALSE;
+			), $list)) !== 3) : FALSE;
 	}
 
 	/**
 	 * @see QueryWriter::addIndex
 	 */
-	public function addIndex( $type, $name, $column )
+	public function addIndex($type, $name, $column)
 	{
 		try {
-			$table  = $this->esc( $type );
-			$name   = preg_replace( '/\W/', '', $name );
-			$column = $this->esc( $column );
-			$this->adapter->exec( "CREATE INDEX $name ON $table ($column) " );
+			$table  = $this->esc($type);
+			$name   = preg_replace('/\W/', '', $name);
+			$column = $this->esc($column);
+			$this->adapter->exec("CREATE INDEX $name ON $table ($column) ");
 			return TRUE;
-		} catch ( SQLException $e ) {
+		} catch (SQLException $e) {
 			return FALSE;
 		}
 	}
@@ -8178,9 +8178,9 @@ 
 	/**
 	 * @see QueryWriter::addFK
 	 */
-	public function addFK( $type, $targetType, $property, $targetProperty, $isDependent = FALSE )
+	public function addFK($type, $targetType, $property, $targetProperty, $isDependent = FALSE)
 	{
-		return $this->buildFK( $type, $targetType, $property, $targetProperty, $isDependent );
+		return $this->buildFK($type, $targetType, $property, $targetProperty, $isDependent);
 	}
 
 	/**
@@ -8189,34 +8189,34 @@ 
 	public function wipeAll()
 	{
 		if (AQueryWriter::$noNuke) throw new \Exception('The nuke() command has been disabled using noNuke() or R::feature(novice/...).');
-		foreach ( $this->getTables() as $t ) {
-			foreach ( $this->getKeyMapForType( $t ) as $k ) {
-				$this->adapter->exec( "ALTER TABLE \"$t\" DROP FOREIGN KEY \"{$k['name']}\"" );
+		foreach ($this->getTables() as $t) {
+			foreach ($this->getKeyMapForType($t) as $k) {
+				$this->adapter->exec("ALTER TABLE \"$t\" DROP FOREIGN KEY \"{$k['name']}\"");
 			}
 		}
-		foreach ( $this->getTables() as $t ) {
-			$this->adapter->exec( "DROP TABLE \"$t\"" );
+		foreach ($this->getTables() as $t) {
+			$this->adapter->exec("DROP TABLE \"$t\"");
 		}
 	}
 
 	/**
 	 * @see QueryWriter::esc
 	 */
-	public function esc( $dbStructure, $noQuotes = FALSE )
+	public function esc($dbStructure, $noQuotes = FALSE)
 	{
-		return parent::esc( strtolower( $dbStructure ), $noQuotes );
+		return parent::esc(strtolower($dbStructure), $noQuotes);
 	}
 
 	/**
 	 * @see QueryWriter::inferFetchType
 	 */
-	public function inferFetchType( $type, $property )
+	public function inferFetchType($type, $property)
 	{
-		$table = $this->esc( $type, TRUE );
-		$field = $this->esc( $property, TRUE ) . '_id';
-		$keys = $this->getKeyMapForType( $table );
+		$table = $this->esc($type, TRUE);
+		$field = $this->esc($property, TRUE).'_id';
+		$keys = $this->getKeyMapForType($table);
 
-		foreach( $keys as $key ) {
+		foreach ($keys as $key) {
 			if (
 				$key['from'] === $field
 			) return $key['table'];
@@ -8309,7 +8309,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setSQLState( $sqlState )
+	public function setSQLState($sqlState)
 	{
 		$this->sqlState = $sqlState;
 	}
@@ -8321,8 +8321,8 @@ 
 	 */
 	public function __toString()
 	{
-		return '[' . $this->getSQLState() . '] - ' . $this->getMessage()."\n".
-				'trace: ' . $this->getTraceAsString();
+		return '['.$this->getSQLState().'] - '.$this->getMessage()."\n".
+				'trace: '.$this->getTraceAsString();
 	}
 }
 }
@@ -8392,7 +8392,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function usePartialBeans( $yesNoBeans )
+	public function usePartialBeans($yesNoBeans)
 	{
 		$oldValue = $this->partialBeans;
 		$this->partialBeans = $yesNoBeans;
@@ -8418,40 +8418,40 @@ 
 	 *
 	 * @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 ) ) {
-				foreach($value as &$item) {
-					$item = ( $item instanceof SimpleModel ) ? $item->unbox() : $item;
+			} elseif (is_array($value)) {
+				foreach ($value as &$item) {
+					$item = ($item instanceof SimpleModel) ? $item->unbox() : $item;
 				}
-				$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' ) );
+				$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);
 	}
 
 	/**
@@ -8469,12 +8469,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))
 		);
 	}
 
@@ -8491,13 +8491,13 @@ 
 	 *
 	 * @return void
 	 */
-	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');
 			}
 		}
 	}
@@ -8516,11 +8516,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);
 			}
 		}
 	}
@@ -8539,19 +8539,19 @@ 
 	 *
 	 * @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);
 			}
 		}
 	}
@@ -8568,10 +8568,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);
 		}
 	}
 
@@ -8587,10 +8587,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);
 		}
 	}
 
@@ -8603,11 +8603,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;
 			}
@@ -8628,17 +8628,17 @@ 
 	 *
 	 * @return void
 	 */
-	protected function processEmbeddedBean( &$embeddedBeans, $bean, $property, OODBBean $value )
+	protected function processEmbeddedBean(&$embeddedBeans, $bean, $property, OODBBean $value)
 	{
-		$linkField = $property . '_id';
-		if ( !$value->id || $value->getMeta( 'tainted' ) ) {
-			$this->store( $value );
+		$linkField = $property.'_id';
+		if (!$value->id || $value->getMeta('tainted')) {
+			$this->store($value);
 		}
 		$id = $value->id;
 		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);
 	}
 
 	/**
@@ -8650,7 +8650,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function __construct( OODB $oodb, QueryWriter $writer )
+	public function __construct(OODB $oodb, QueryWriter $writer)
 	{
 		$this->writer = $writer;
 		$this->oodb = $oodb;
@@ -8672,33 +8672,33 @@ 
 	 *
 	 * @return void
 	 */
-	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");
 			}
 		}
 	}
@@ -8729,21 +8729,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();
@@ -8767,15 +8767,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);
 	}
 
 	/**
@@ -8798,22 +8798,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;
 	}
 
 	/**
@@ -8830,27 +8830,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;
 
@@ -8875,19 +8875,19 @@ 
 	 *
 	 * @return array
 	 */
-	public function convertToBeans( $type, $rows, $mask = NULL )
+	public function convertToBeans($type, $rows, $mask = NULL)
 	{
 		$masklen = 0;
-		if ( $mask !== NULL ) $masklen = mb_strlen( $mask );
+		if ($mask !== NULL) $masklen = mb_strlen($mask);
 
 		$collection                  = array();
 		$this->stash[$this->nesting] = array();
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$meta = array();
-			if ( !is_null( $mask ) ) {
-				foreach( $row as $key => $value ) {
-					if ( strpos( $key, $mask ) === 0 ) {
-						unset( $row[$key] );
+			if (!is_null($mask)) {
+				foreach ($row as $key => $value) {
+					if (strpos($key, $mask) === 0) {
+						unset($row[$key]);
 						$meta[$key] = $value;
 					}
 				}
@@ -8895,10 +8895,10 @@ 
 
 			$id                               = $row['id'];
 			$this->stash[$this->nesting][$id] = $row;
-			$collection[$id]                  = $this->load( $type, $id );
+			$collection[$id]                  = $this->load($type, $id);
 
-			if ( $mask !== NULL ) {
-				$collection[$id]->setMeta( 'data.bundle', $meta );
+			if ($mask !== NULL) {
+				$collection[$id]->setMeta('data.bundle', $meta);
 			}
 		}
 		$this->stash[$this->nesting] = NULL;
@@ -8917,20 +8917,20 @@ 
 	 *
 	 * @return integer
 	 */
-	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 ),
-				 $exception->getDriverDetails() ) ) {
+				 $exception->getDriverDetails())) {
 				throw $exception;
 			}
 		}
@@ -8947,28 +8947,28 @@ 
 	 *
 	 * @return void
 	 */
-	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);
 	}
 
 	/**
@@ -8981,9 +8981,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function tableExists( $table )
+	public function tableExists($table)
 	{
-		return $this->writer->tableExists( $table );
+		return $this->writer->tableExists($table);
 	}
 
 	/**
@@ -8997,14 +8997,14 @@ 
 	 *
 	 * @return boolean
 	 */
-	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 ), $exception->getDriverDetails() ) ) {
+		} catch (SQLException $exception) {
+			if (!$this->writer->sqlStateIn($exception->getSQLState(), array(QueryWriter::C_SQLSTATE_NO_SUCH_TABLE), $exception->getDriverDetails())) {
 				throw $exception;
 			}
 
@@ -9058,16 +9058,16 @@ 
 	 *
 	 * @return integer
 	 */
-	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;
@@ -9082,12 +9082,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);
 		}
 	}
 
@@ -9107,50 +9107,50 @@ 
 	 *
 	 * @return void
 	 */
-	private function modifySchema( OODBBean $bean, $property, $value, &$columns = NULL )
+	private function modifySchema(OODBBean $bean, $property, $value, &$columns = NULL)
 	{
 		$doFKStuff = FALSE;
-		$table   = $bean->getMeta( 'type' );
+		$table = $bean->getMeta('type');
 		if ($columns === NULL) {
-			$columns = $this->writer->getColumns( $table );
+			$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 );
+		$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);
 					}
 				}
@@ -9175,29 +9175,29 @@ 
 	 *
 	 * @return void
 	 */
-	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';
+				$myFieldLink = $beanType.'_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');
 			}
 		}
 	}
@@ -9212,36 +9212,36 @@ 
 	 *
 	 * @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();
 
-			$partial = ( $this->partialBeans === TRUE || ( is_array( $this->partialBeans ) && in_array( $table, $this->partialBeans ) ) );
-			if ( $partial ) {
-				$mask = $bean->getMeta( 'changelist' );
-				$bean->setMeta( 'changelist', array() );
+			$partial = ($this->partialBeans === TRUE || (is_array($this->partialBeans) && in_array($table, $this->partialBeans)));
+			if ($partial) {
+				$mask = $bean->getMeta('changelist');
+				$bean->setMeta('changelist', array());
 			}
 
 			$columnCache = NULL;
-			foreach ( $bean as $property => $value ) {
-				if ( $partial && !in_array( $property, $mask ) ) continue;
-				if ( $property !== 'id' ) {
-					$this->modifySchema( $bean, $property, $value, $columnCache );
+			foreach ($bean as $property => $value) {
+				if ($partial && !in_array($property, $mask)) continue;
+				if ($property !== 'id') {
+					$this->modifySchema($bean, $property, $value, $columnCache);
 				}
-				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);
 	}
 
 	/**
@@ -9263,13 +9263,13 @@ 
 	 *
 	 * @return void
 	 */
-	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 ),
-				$exception->getDriverDetails() )
+				$exception->getDriverDetails())
 		) {
 			throw $exception;
 		}
@@ -9290,19 +9290,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;
 	}
 
 	/**
@@ -9327,16 +9327,16 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function load( $type, $id )
+	public function load($type, $id)
 	{
 		$rows = array();
-		$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 ) {
+				$rows = $this->writer->queryRecord($type, array('id' => array($id)));
+			} catch (SQLException $exception) {
 				if (
 					$this->writer->sqlStateIn(
 						$exception->getSQLState(),
@@ -9352,17 +9352,17 @@ 
 					throw $exception;
 				}
 			}
-			if ( !count( $rows ) ) {
+			if (!count($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);
 	}
 }
 }
@@ -9415,7 +9415,7 @@ 
 	 *
 	 * @return void
 	 */
-	protected function handleException( \Exception $exception )
+	protected function handleException(\Exception $exception)
 	{
 		throw $exception;
 	}
@@ -9430,31 +9430,31 @@ 
 	 *
 	 * @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';
 
-			$partial = ( $this->partialBeans === TRUE || ( is_array( $this->partialBeans ) && in_array( $table, $this->partialBeans ) ) );
-			if ( $partial ) {
-				$mask = $bean->getMeta( 'changelist' );
-				$bean->setMeta( 'changelist', array() );
+			$partial = ($this->partialBeans === TRUE || (is_array($this->partialBeans) && in_array($table, $this->partialBeans)));
+			if ($partial) {
+				$mask = $bean->getMeta('changelist');
+				$bean->setMeta('changelist', array());
 			}
 
-			foreach( $properties as $key => $value ) {
-				if ( $partial && !in_array( $key, $mask ) ) continue;
-				$updateValues[] = array( $k1 => $key, $k2 => $value );
+			foreach ($properties as $key => $value) {
+				if ($partial && !in_array($key, $mask)) continue;
+				$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);
 	}
 
 	/**
@@ -9475,24 +9475,24 @@ 
 	 * @return void
 	 * @throws RedException
 	 */
-	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';
+				$myFieldLink = $beanType.'_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');
 			}
 		}
 	}
@@ -9512,19 +9512,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++) {
 			/** @var \RedBeanPHP\OODBBean $bean */
 			$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;
 	}
 
 	/**
@@ -9550,25 +9550,25 @@ 
 	 * @return OODBBean
 	 * @throws SQLException
 	 */
-	public function load( $type, $id )
+	public function load($type, $id)
 	{
 		$rows = array();
-		$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 {
-			$rows = $this->writer->queryRecord( $type, array( 'id' => array( $id ) ) );
-			if ( !count( $rows ) ) {
+			$rows = $this->writer->queryRecord($type, array('id' => array($id)));
+			if (!count($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);
 	}
 }
 }
@@ -9670,7 +9670,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function autoClearHistoryAfterStore( $autoClear = TRUE )
+	public static function autoClearHistoryAfterStore($autoClear = TRUE)
 	{
 		self::$autoClearHistoryAfterStore = (boolean) $autoClear;
 	}
@@ -9683,13 +9683,13 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	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;
@@ -9730,13 +9730,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);
 	}
 
 	/**
@@ -9752,32 +9752,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));
 		}
 
 	}
@@ -9807,9 +9807,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));
 	}
 
 	/**
@@ -9827,14 +9827,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);
 	}
 
 	/**
@@ -9845,7 +9845,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setBeanHelper( BeanHelper $beanhelper )
+	public function setBeanHelper(BeanHelper $beanhelper)
 	{
 		$this->beanhelper = $beanhelper;
 	}
@@ -9870,9 +9870,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function check( OODBBean $bean )
+	public function check(OODBBean $bean)
 	{
-		$this->repository->check( $bean );
+		$this->repository->check($bean);
 	}
 
 	/**
@@ -9901,9 +9901,9 @@ 
 	 *
 	 * @return array
 	 */
-	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);
 	}
 
 	/**
@@ -9915,9 +9915,9 @@ 
 	 *
 	 * @return BeanCollection
 	 */
-	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);
 	}
 
 	/**
@@ -9930,9 +9930,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function tableExists( $table )
+	public function tableExists($table)
 	{
-		return $this->repository->tableExists( $table );
+		return $this->repository->tableExists($table);
 	}
 
 	/**
@@ -9955,11 +9955,11 @@ 
 	 *
 	 * @return integer|string
 	 */
-	public function store( $bean )
+	public function store($bean)
 	{
-		$bean = $this->unboxIfNeeded( $bean );
-		$id = $this->repository->store( $bean );
-		if ( self::$autoClearHistoryAfterStore ) {
+		$bean = $this->unboxIfNeeded($bean);
+		$id = $this->repository->store($bean);
+		if (self::$autoClearHistoryAfterStore) {
 				$bean->clearHistory();
 		}
 		return $id;
@@ -9987,9 +9987,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);
 	}
 
 	/**
@@ -10001,10 +10001,10 @@ 
 	 *
 	 * @return void
 	 */
-	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);
 	}
 
 	/**
@@ -10021,9 +10021,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);
 	}
 
 	/**
@@ -10038,9 +10038,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function convertToBeans( $type, $rows, $mask = NULL )
+	public function convertToBeans($type, $rows, $mask = NULL)
 	{
-		return $this->repository->convertToBeans( $type, $rows, $mask );
+		return $this->repository->convertToBeans($type, $rows, $mask);
 	}
 
 	/**
@@ -10054,9 +10054,9 @@ 
 	 *
 	 * @return integer
 	 */
-	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);
 	}
 
 	/**
@@ -10066,9 +10066,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function wipe( $type )
+	public function wipe($type)
 	{
-		return $this->repository->wipe( $type );
+		return $this->repository->wipe($type);
 	}
 
 	/**
@@ -10080,8 +10080,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;
@@ -10096,7 +10096,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function setAssociationManager( AssociationManager $assocManager )
+	public function setAssociationManager(AssociationManager $assocManager)
 	{
 		$this->assocManager = $assocManager;
 	}
@@ -10125,16 +10125,16 @@ 
 	 *
 	 * @return void
 	 */
-	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.'(?)';
@@ -10143,7 +10143,7 @@ 
 			}
 		}
 
-		AQueryWriter::setSQLFilters( self::$sqlFilters, ( !$this->isFrozen ) );
+		AQueryWriter::setSQLFilters(self::$sqlFilters, (!$this->isFrozen));
 	}
 }
 }
@@ -10217,7 +10217,7 @@ 
 	 * @param DBAdapter   $adapter Database Adapter
 	 * @param QueryWriter $writer  Query Writer
 	 */
-	public function __construct( OODB $oodb, Adapter $adapter, QueryWriter $writer )
+	public function __construct(OODB $oodb, Adapter $adapter, QueryWriter $writer)
 	{
 		$this->oodb    = $oodb;
 		$this->adapter = $adapter;
@@ -10352,7 +10352,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 		$this->redbean = $toolbox->getRedBean();
@@ -10378,20 +10378,20 @@ 
 	 *
 	 * @return array
 	 */
-	public static function map($parentName,$childName) {
+	public static function map($parentName, $childName) {
 		return array(
 			'a' => $parentName,
 			'b' => $childName,
-			'matcher' => function( $parent, $child ) use ( $parentName, $childName ) {
-				$propertyName = 'own' . ucfirst( $childName );
+			'matcher' => function($parent, $child) use ($parentName, $childName) {
+				$propertyName = 'own'.ucfirst($childName);
 				if (!isset($parent[$propertyName])) {
 					$parent->noLoad()->{$propertyName} = array();
 				}
 				$property = "{$parentName}ID";
-				return ( $child->$property == $parent->id );
+				return ($child->$property == $parent->id);
 			},
-			'do' => function( $parent, $child ) use ( $childName ) {
-				$list = 'own'.ucfirst( $childName ).'List';
+			'do' => function($parent, $child) use ($childName) {
+				$list = 'own'.ucfirst($childName).'List';
 				$parent->noLoad()->{$list}[$child->id] = $child;
 			}
 		);
@@ -10416,27 +10416,27 @@ 
 	*
 	* @return array
 	*/
-	public static function nmMap( $parentName, $childName )
+	public static function nmMap($parentName, $childName)
 	{
 		$types = array($parentName, $childName);
-		sort( $types );
-		$link = implode( '_', $types );
+		sort($types);
+		$link = implode('_', $types);
 		return array(
 			'a' => $parentName,
 			'b' => $childName,
-			'matcher' => function( $parent, $child, $beans ) use ( $parentName, $childName, $link ) {
-				$propertyName = 'shared' . ucfirst( $childName );
+			'matcher' => function($parent, $child, $beans) use ($parentName, $childName, $link) {
+				$propertyName = 'shared'.ucfirst($childName);
 				if (!isset($parent[$propertyName])) {
 					$parent->noLoad()->{$propertyName} = array();
 				}
-				foreach( $beans[$link] as $linkBean ) {
-					if ( $linkBean["{$parentName}ID"] == $parent->id && $linkBean["{$childName}ID"] == $child->id ) {
+				foreach ($beans[$link] as $linkBean) {
+					if ($linkBean["{$parentName}ID"] == $parent->id && $linkBean["{$childName}ID"] == $child->id) {
 						return true;
 					}
 				}
 			},
-			'do' => function( $parent, $child ) use ( $childName ) {
-				$list = 'shared'.ucfirst( $childName ).'List';
+			'do' => function($parent, $child) use ($childName) {
+				$list = 'shared'.ucfirst($childName).'List';
 				$parent->noLoad()->{$list}[$child->id] = $child;
 			}
 		);
@@ -10455,15 +10455,15 @@ 
 	 *
 	 * @return array
 	 */
-	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);
 	}
 
 	/**
@@ -10481,10 +10481,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();
 		}
 
@@ -10504,17 +10504,17 @@ 
 	 *
 	 * @return OODBBean|NULL
 	 */
-	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);
 	}
 
 	/**
@@ -10530,15 +10530,15 @@ 
 	 *
 	 * @return OODBBean|NULL
 	 */
-	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);
 	}
 
 	/**
@@ -10554,12 +10554,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;
 		}
@@ -10577,9 +10577,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);
 	}
 
 	/**
@@ -10599,18 +10599,18 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public function findOrCreate( $type, $like = array(), $sql = '' )
+	public function findOrCreate($type, $like = array(), $sql = '')
 	{
-			$sql = $this->toolbox->getWriter()->glueLimitOne( $sql );
-			$beans = $this->findLike( $type, $like, $sql );
-			if ( count( $beans ) ) {
-				$bean = reset( $beans );
+			$sql = $this->toolbox->getWriter()->glueLimitOne($sql);
+			$beans = $this->findLike($type, $like, $sql);
+			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;
 	}
 
@@ -10636,9 +10636,9 @@ 
 	 *
 	 * @return array
 	 */
-	public function findLike( $type, $conditions = array(), $sql = '', $bindings = array() )
+	public function findLike($type, $conditions = array(), $sql = '', $bindings = array())
 	{
-		return $this->redbean->find( $type, $conditions, $sql, $bindings );
+		return $this->redbean->find($type, $conditions, $sql, $bindings);
 	}
 
 	/**
@@ -10713,74 +10713,74 @@ 
 	 *
 	 * @return array
 	 */
-	public function findMulti( $types, $sql = NULL, $bindings = array(), $remappings = array(), $queryTemplate = ' %s.%s AS %s__%s' )
+	public function findMulti($types, $sql = NULL, $bindings = array(), $remappings = array(), $queryTemplate = ' %s.%s AS %s__%s')
 	{
-		if ( !is_array( $types ) ) $types = array_map( 'trim', explode( ',', $types ) );
-		if ( is_null( $sql ) ) {
+		if (!is_array($types)) $types = array_map('trim', explode(',', $types));
+		if (is_null($sql)) {
 			$beans = array();
-			foreach( $types as $type ) $beans[$type] = $this->redbean->find( $type );
+			foreach ($types as $type) $beans[$type] = $this->redbean->find($type);
 		} else {
-			if ( !is_array( $sql ) ) {
+			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) {
 					$regex = "#( (`?{$type}`?)\.\*)#";
-					if ( preg_match( $regex, $sql, $matches ) ) {
+					if (preg_match($regex, $sql, $matches)) {
 						$pattern = $matches[1];
 						$table = $matches[2];
 						$newSelectorArray = array();
-						$columns = $writer->getColumns( $type );
-						foreach( $columns as $column => $definition ) {
-							$newSelectorArray[] = sprintf( $queryTemplate, $table, $column, $type, $column );
+						$columns = $writer->getColumns($type);
+						foreach ($columns as $column => $definition) {
+							$newSelectorArray[] = sprintf($queryTemplate, $table, $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);
 				}
 			}
 		}
@@ -10848,9 +10848,9 @@ 
 	 *
 	 * @return void
 	 */
-	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 ),
@@ -10873,14 +10873,14 @@ 
 	 *
 	 * @return array
 	 */
-	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();
 		}
 	}
@@ -10897,35 +10897,35 @@ 
 	 *
 	 * @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 ),
-				$exception->getDriverDetails() )
+		} catch (SQLException $exception) {
+			if (!$this->writer->sqlStateIn($exception->getSQLState(),
+				array(QueryWriter::C_SQLSTATE_INTEGRITY_CONSTRAINT_VIOLATION),
+				$exception->getDriverDetails())
 			) {
 				throw $exception;
 			}
@@ -10944,7 +10944,7 @@ 
 	 *
 	 * @param ToolBox $tools toolbox supplying core RedBeanPHP objects
 	 */
-	public function __construct( ToolBox $tools )
+	public function __construct(ToolBox $tools)
 	{
 		$this->oodb    = $tools->getRedBean();
 		$this->adapter = $tools->getDatabaseAdapter();
@@ -10961,9 +10961,9 @@ 
 	 *
 	 * @return string
 	 */
-	public function getTable( $types )
+	public function getTable($types)
 	{
-		return $this->writer->getAssocTable( $types );
+		return $this->writer->getAssocTable($types);
 	}
 
 	/**
@@ -10977,26 +10977,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);
 	}
 
 	/**
@@ -11012,24 +11012,24 @@ 
 	 *
 	 * @return integer
 	 */
-	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;
 		}
@@ -11050,37 +11050,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);
 				}
 			}
 		}
@@ -11098,13 +11098,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);
 		}
 	}
 
@@ -11130,20 +11130,20 @@ 
 	 *
 	 * @return array
 	 */
-	public function related( $bean, $type, $sql = '', $bindings = array() )
+	public function related($bean, $type, $sql = '', $bindings = array())
 	{
-		$sql   = $this->writer->glueSQLCondition( $sql );
-		$rows  = $this->relatedRows( $bean, $type, $sql, $bindings );
+		$sql   = $this->writer->glueSQLCondition($sql);
+		$rows  = $this->relatedRows($bean, $type, $sql, $bindings);
 		$links = array();
 
-		foreach ( $rows as $key => $row ) {
-			if ( !isset( $links[$row['id']] ) ) $links[$row['id']] = array();
+		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 );
-		foreach ( $beans as $bean ) $bean->setMeta( 'sys.belongs-to', $links[$bean->id] );
+		$beans = $this->oodb->convertToBeans($type, $rows);
+		foreach ($beans as $bean) $bean->setMeta('sys.belongs-to', $links[$bean->id]);
 
 		return $beans;
 	}
@@ -11206,7 +11206,7 @@ 
 	 *
 	 * @return SimpleModel|CustomModel|NULL
 	 */
-	public function getModelForBean( OODBBean $bean );
+	public function getModelForBean(OODBBean $bean);
 }
 }
 
@@ -11250,10 +11250,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();
 	}
 
 	/**
@@ -11264,7 +11264,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setFactoryFunction( $factory )
+	public static function setFactoryFunction($factory)
 	{
 		self::$factory = $factory;
 	}
@@ -11280,32 +11280,32 @@ 
 	/**
 	 * @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 ) ) {
-				$modelName = $prefix . ucfirst( $model );
-				if ( !class_exists( $modelName ) ) {
+			$modelName = $prefix.$modelName;
+			if (!class_exists($modelName)) {
+				$modelName = $prefix.ucfirst($model);
+				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;
 	}
 
@@ -11355,7 +11355,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function loadBean( OODBBean $bean )
+	public function loadBean(OODBBean $bean)
 	{
 		$this->bean = $bean;
 	}
@@ -11371,7 +11371,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function __get( $prop )
+	public function __get($prop)
 	{
 		return $this->bean->$prop;
 	}
@@ -11385,7 +11385,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function __set( $prop, $value )
+	public function __set($prop, $value)
 	{
 		$this->bean->$prop = $value;
 	}
@@ -11398,9 +11398,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function __isset( $key )
+	public function __isset($key)
 	{
-		return isset( $this->bean->$key );
+		return isset($this->bean->$key);
 	}
 
 	/**
@@ -11480,7 +11480,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function onEvent( $eventName, $bean )
+	public function onEvent($eventName, $bean)
 	{
 		$bean->$eventName();
 	}
@@ -11508,10 +11508,10 @@ 
 	 *
 	 * @return void
 	 */
-	public function attachEventListeners( Observable $observable )
+	public function attachEventListeners(Observable $observable)
 	{
-		foreach ( array( 'update', 'open', 'delete', 'after_delete', 'after_update', 'dispense' ) as $eventID ) {
-			$observable->addEventListener( $eventID, $this );
+		foreach (array('update', 'open', 'delete', 'after_delete', 'after_update', 'dispense') as $eventID) {
+			$observable->addEventListener($eventID, $this);
 		}
 	}
 }
@@ -11567,10 +11567,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;
 		}
@@ -11586,12 +11586,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;
 		}
@@ -11606,7 +11606,7 @@ 
 	 *
 	 * @param ToolBox $toolbox toolbox object
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 		$this->redbean = $toolbox->getRedBean();
@@ -11643,18 +11643,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);
 	}
 
 	/**
@@ -11678,13 +11678,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);
 			}
 		}
 	}
@@ -11714,22 +11714,22 @@ 
 	 *
 	 * @return string
 	 */
-	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;
 	}
@@ -11755,23 +11755,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);
 		}
 	}
 
@@ -11804,12 +11804,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);
 	}
 
 	/**
@@ -11841,12 +11841,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);
 	}
 
 	/**
@@ -11861,10 +11861,10 @@ 
 	 *
 	 * @return integer
 	 */
-	public function countTaggedAll( $beanType, $tagList, $sql = '', $bindings = array() )
+	public function countTaggedAll($beanType, $tagList, $sql = '', $bindings = array())
 	{
-		$tags  = $this->extractTagsIfNeeded( $tagList );
-		return $this->toolbox->getWriter()->queryCountTagged( $beanType, $tags, TRUE, $sql, $bindings );
+		$tags = $this->extractTagsIfNeeded($tagList);
+		return $this->toolbox->getWriter()->queryCountTagged($beanType, $tags, TRUE, $sql, $bindings);
 	}
 
 	/**
@@ -11879,10 +11879,10 @@ 
 	 *
 	 * @return integer
 	 */
-	public function countTagged( $beanType, $tagList, $sql = '', $bindings = array() )
+	public function countTagged($beanType, $tagList, $sql = '', $bindings = array())
 	{
-		$tags  = $this->extractTagsIfNeeded( $tagList );
-		return $this->toolbox->getWriter()->queryCountTagged( $beanType, $tags, FALSE, $sql, $bindings );
+		$tags = $this->extractTagsIfNeeded($tagList);
+		return $this->toolbox->getWriter()->queryCountTagged($beanType, $tags, FALSE, $sql, $bindings);
 	}
 }
 }
@@ -11921,7 +11921,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 	}
@@ -11941,11 +11941,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;
 		}
@@ -11973,15 +11973,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;
 	}
@@ -12022,16 +12022,16 @@ 
 	 *
 	 * @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)));
 		}
 
 		/**
@@ -12049,20 +12049,20 @@ 
 		 *
 		 *  Also see Github Issue #464
 		 */
-		$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;
 	}
@@ -12215,20 +12215,20 @@ 
 	 *
 	 * @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 )
 					,$exception->getDriverDetails()
 					)
 				) {
-					return ( $method === 'getCell' ) ? NULL : array();
+					return ($method === 'getCell') ? NULL : array();
 				} else {
 					throw $exception;
 				}
@@ -12236,7 +12236,7 @@ 
 
 			return $rs;
 		} else {
-			return Facade::$adapter->$method( $sql, $bindings );
+			return Facade::$adapter->$method($sql, $bindings);
 		}
 	}
 
@@ -12264,12 +12264,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();
 	}
 
@@ -12306,14 +12306,14 @@ 
 	 *
 	 * @return ToolBox
 	 */
-	public static function setup( $dsn = NULL, $username = NULL, $password = NULL, $frozen = FALSE, $partialBeans = FALSE )
+	public static function setup($dsn = NULL, $username = NULL, $password = NULL, $frozen = FALSE, $partialBeans = FALSE)
 	{
-		if ( is_null( $dsn ) ) {
-			$dsn = 'sqlite:/' . sys_get_temp_dir() . '/red.db';
+		if (is_null($dsn)) {
+			$dsn = 'sqlite:/'.sys_get_temp_dir().'/red.db';
 		}
 
-		self::addDatabase( 'default', $dsn, $username, $password, $frozen, $partialBeans );
-		self::selectDatabase( 'default' );
+		self::addDatabase('default', $dsn, $username, $password, $frozen, $partialBeans);
+		self::selectDatabase('default');
 
 		return self::$toolbox;
 	}
@@ -12343,9 +12343,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setNarrowFieldMode( $mode )
+	public static function setNarrowFieldMode($mode)
 	{
-		AQueryWriter::setNarrowFieldMode( $mode );
+		AQueryWriter::setNarrowFieldMode($mode);
 	}
 
 	/**
@@ -12360,7 +12360,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setAllowFluidTransactions( $mode )
+	public static function setAllowFluidTransactions($mode)
 	{
 		self::$allowFluidTransactions = $mode;
 	}
@@ -12395,9 +12395,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function transaction( $callback )
+	public static function transaction($callback)
 	{
-		return Transaction::transaction( self::$adapter, $callback );
+		return Transaction::transaction(self::$adapter, $callback);
 	}
 
 	/**
@@ -12422,21 +12422,21 @@ 
 	 *
 	 * @return void
 	 */
-	public static function addDatabase( $key, $dsn, $user = NULL, $pass = NULL, $frozen = FALSE, $partialBeans = FALSE )
+	public static function addDatabase($key, $dsn, $user = NULL, $pass = NULL, $frozen = FALSE, $partialBeans = FALSE)
 	{
-		if ( isset( self::$toolboxes[$key] ) ) {
-			throw new RedException( 'A database has already been specified for this key.' );
+		if (isset(self::$toolboxes[$key])) {
+			throw new RedException('A database has already been 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(
 			'pgsql'  => 'PostgreSQL',
@@ -12446,20 +12446,20 @@ 
 			'sqlsrv' => 'SQLServer',
 		);
 
-		$wkey = trim( strtolower( $dbType ) );
-		if ( !isset( $writers[$wkey] ) ) {
-			$wkey = preg_replace( '/\W/', '' , $wkey );
-			throw new RedException( 'Unsupported database ('.$wkey.').' );
+		$wkey = trim(strtolower($dbType));
+		if (!isset($writers[$wkey])) {
+			$wkey = preg_replace('/\W/', '', $wkey);
+			throw new RedException('Unsupported database ('.$wkey.').');
 		}
 		$writerClass = '\\RedBeanPHP\\QueryWriter\\'.$writers[$wkey];
-		$writer      = new $writerClass( $adapter );
-		$redbean     = new OODB( $writer, $frozen );
+		$writer      = new $writerClass($adapter);
+		$redbean     = new OODB($writer, $frozen);
 		
-		if ( $partialBeans ) {
-			$redbean->getCurrentRepository()->usePartialBeans( $partialBeans );
+		if ($partialBeans) {
+			$redbean->getCurrentRepository()->usePartialBeans($partialBeans);
 		}
 
-		self::$toolboxes[$key] = new ToolBox( $redbean, $adapter, $writer );
+		self::$toolboxes[$key] = new ToolBox($redbean, $adapter, $writer);
 	}
 
 	/**
@@ -12470,11 +12470,11 @@ 
 	 * @param string $ca   path certifying agent certificate '/etc/mysql/ssl/ca-cert.pem'
 	 * @param string $id   apply to toolbox (default = 'default')
 	 */
-	public static function useMysqlSSL( $key, $cert, $ca, $id = 'default' ) {
+	public static function useMysqlSSL($key, $cert, $ca, $id = 'default') {
 		$pdo = self::$toolboxes[$id]->getDatabaseAdapter()->getDatabase()->getPDO();
-		$pdo->setAttribute( \PDO::MYSQL_ATTR_SSL_KEY,  $key);
-		$pdo->setAttribute( \PDO::MYSQL_ATTR_SSL_CERT,  $cert);
-		$pdo->setAttribute( \PDO::MYSQL_ATTR_SSL_CA,  $ca);
+		$pdo->setAttribute(\PDO::MYSQL_ATTR_SSL_KEY, $key);
+		$pdo->setAttribute(\PDO::MYSQL_ATTR_SSL_CERT, $cert);
+		$pdo->setAttribute(\PDO::MYSQL_ATTR_SSL_CA, $ca);
 	}
 
 	/**
@@ -12486,9 +12486,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function hasDatabase( $key )
+	public static function hasDatabase($key)
 	{
-		return ( isset( self::$toolboxes[$key] ) );
+		return (isset(self::$toolboxes[$key]));
 	}
 
 	/**
@@ -12505,17 +12505,17 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function selectDatabase( $key, $force = FALSE )
+	public static function selectDatabase($key, $force = FALSE)
 	{
-		if ( self::$currentDB === $key && !$force ) {
+		if (self::$currentDB === $key && !$force) {
 			return FALSE;
 		}
 
-		if ( !isset( self::$toolboxes[$key] ) ) {
-			throw new RedException( 'Database not found in registry. Add database using R::addDatabase().' );
+		if (!isset(self::$toolboxes[$key])) {
+			throw new RedException('Database not found in registry. Add database using R::addDatabase().');
 		}
 
-		self::configureFacadeWithToolbox( self::$toolboxes[$key] );
+		self::configureFacadeWithToolbox(self::$toolboxes[$key]);
 		self::$currentDB = $key;
 
 		return TRUE;
@@ -12552,7 +12552,7 @@ 
 	 * @return RDefault
 	 * @throws RedException
 	 */
-	public static function debug( $tf = TRUE, $mode = 0 )
+	public static function debug($tf = TRUE, $mode = 0)
 	{
 		if ($mode > 1) {
 			$mode -= 2;
@@ -12561,11 +12561,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;
 	}
@@ -12581,9 +12581,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function fancyDebug( $toggle = TRUE )
+	public static function fancyDebug($toggle = TRUE)
 	{
-		self::debug( $toggle, 2 );
+		self::debug($toggle, 2);
 	}
 
 	/**
@@ -12597,9 +12597,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);
 	}
 
 	/**
@@ -12636,9 +12636,9 @@ 
 	 *
 	 * @return integer|string
 	 */
-	public static function store( $bean )
+	public static function store($bean)
 	{
-		return self::$redbean->store( $bean );
+		return self::$redbean->store($bean);
 	}
 
 	/**
@@ -12652,9 +12652,9 @@ 
 	 *
 	 * @param boolean|array $tf mode of operation (TRUE means frozen)
 	 */
-	public static function freeze( $tf = TRUE )
+	public static function freeze($tf = TRUE)
 	{
-		self::$redbean->freeze( $tf );
+		self::$redbean->freeze($tf);
 	}
 
 	/**
@@ -12676,9 +12676,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function loadMulti( $types, $id )
+	public static function loadMulti($types, $id)
 	{
-		return MultiLoader::load( self::$redbean, $types, $id );
+		return MultiLoader::load(self::$redbean, $types, $id);
 	}
 
 	/**
@@ -12720,10 +12720,10 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function load( $type, $id, $snippet = NULL )
+	public static function load($type, $id, $snippet = NULL)
 	{
-		if ( $snippet !== NULL ) self::$writer->setSQLSelectSnippet( $snippet );
-		$bean = self::$redbean->load( $type, $id );
+		if ($snippet !== NULL) self::$writer->setSQLSelectSnippet($snippet);
+		$bean = self::$redbean->load($type, $id);
 		return $bean;
 	}
 
@@ -12746,9 +12746,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function loadForUpdate( $type, $id )
+	public static function loadForUpdate($type, $id)
 	{
-		return self::load( $type, $id, AQueryWriter::C_SELECT_SNIPPET_FOR_UPDATE );
+		return self::load($type, $id, AQueryWriter::C_SELECT_SNIPPET_FOR_UPDATE);
 	}
 
 	/**
@@ -12781,10 +12781,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);
 	}
 
 	/**
@@ -12833,9 +12833,9 @@ 
 	 *
 	 * @return array|OODBBean
 	 */
-	public static function dispense( $typeOrBeanArray, $num = 1, $alwaysReturnArray = FALSE )
+	public static function dispense($typeOrBeanArray, $num = 1, $alwaysReturnArray = FALSE)
 	{
-		return DispenseHelper::dispense( self::$redbean, $typeOrBeanArray, $num, $alwaysReturnArray );
+		return DispenseHelper::dispense(self::$redbean, $typeOrBeanArray, $num, $alwaysReturnArray);
 	}
 
 	/**
@@ -12866,9 +12866,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function dispenseAll( $order, $onlyArrays = FALSE )
+	public static function dispenseAll($order, $onlyArrays = FALSE)
 	{
-		return DispenseHelper::dispenseAll( self::$redbean, $order, $onlyArrays );
+		return DispenseHelper::dispenseAll(self::$redbean, $order, $onlyArrays);
 	}
 
 	/**
@@ -12882,10 +12882,10 @@ 
 	 *
 	 * @return array
 	 */
-	public static function findOrDispense( $type, $sql = NULL, $bindings = array() )
+	public static function findOrDispense($type, $sql = NULL, $bindings = array())
 	{
-		DispenseHelper::checkType( $type );
-		return self::$finder->findOrDispense( $type, $sql, $bindings );
+		DispenseHelper::checkType($type);
+		return self::$finder->findOrDispense($type, $sql, $bindings);
 	}
 
 	/**
@@ -12897,10 +12897,10 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function findOneOrDispense( $type, $sql = NULL, $bindings = array() )
+	public static function findOneOrDispense($type, $sql = NULL, $bindings = array())
 	{
-		DispenseHelper::checkType( $type );
-		$arrayOfBeans = self::findOrDispense( $type, $sql, $bindings );
+		DispenseHelper::checkType($type);
+		$arrayOfBeans = self::findOrDispense($type, $sql, $bindings);
 		return reset($arrayOfBeans);
 	}
 
@@ -12919,9 +12919,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);
 	}
 
 	/**
@@ -12933,9 +12933,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);
 	}
 
 	/**
@@ -12953,9 +12953,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);
 	}
 
 	/**
@@ -12967,9 +12967,9 @@ 
 	 *
 	 * @return OODBBean|NULL
 	 */
-	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);
 	}
 
 	/**
@@ -12992,9 +12992,9 @@ 
 	 *
 	 * @return OODBBean|NULL
 	 */
-	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);
 	}
 
 	/**
@@ -13009,9 +13009,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);
 	}
 
 	/**
@@ -13082,9 +13082,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);
 	}
 
 	/**
@@ -13101,9 +13101,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);
 	}
 
 	/**
@@ -13117,9 +13117,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);
 	}
 
 	/**
@@ -13131,9 +13131,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);
 	}
 
 	/**
@@ -13149,9 +13149,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);
 	}
 
 	/**
@@ -13166,9 +13166,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);
 	}
 
 	/**
@@ -13183,9 +13183,9 @@ 
 	 *
 	 * @return RedBeanPHP\Cursor\PDOCursor
 	 */
-	public static function getCursor( $sql, $bindings = array() )
+	public static function getCursor($sql, $bindings = array())
 	{
-		return self::query( 'getCursor', $sql, $bindings );
+		return self::query('getCursor', $sql, $bindings);
 	}
 
 	/**
@@ -13200,9 +13200,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);
 	}
 
 	/**
@@ -13217,9 +13217,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);
 	}
 
 	/**
@@ -13236,9 +13236,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);
 	}
 
 	/**
@@ -13255,9 +13255,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);
 	}
 
 	/**
@@ -13297,10 +13297,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);
 	}
 
 	/**
@@ -13327,9 +13327,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);
 	}
 
 	/**
@@ -13347,9 +13347,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);
 	}
 
 	/**
@@ -13370,9 +13370,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;
 	}
 
@@ -13414,9 +13414,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function convertToBeans( $type, $rows, $metamask = NULL )
+	public static function convertToBeans($type, $rows, $metamask = NULL)
 	{
-		return self::$redbean->convertToBeans( $type, $rows, $metamask );
+		return self::$redbean->convertToBeans($type, $rows, $metamask);
 	}
 
 	/**
@@ -13428,10 +13428,10 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function convertToBean( $type, $row, $metamask = NULL )
+	public static function convertToBean($type, $row, $metamask = NULL)
 	{
-		$beans = self::$redbean->convertToBeans( $type, array( $row ), $metamask );
-		$bean  = reset( $beans );
+		$beans = self::$redbean->convertToBeans($type, array($row), $metamask);
+		$bean  = reset($beans);
 		return $bean;
 	}
 
@@ -13464,9 +13464,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);
 	}
 
 	/**
@@ -13490,9 +13490,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);
 	}
 
 	/**
@@ -13519,9 +13519,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);
 	}
 
 	/**
@@ -13544,9 +13544,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);
 	}
 
 	/**
@@ -13578,9 +13578,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);
 	}
 
 	/**
@@ -13612,9 +13612,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);
 	}
 
 	/**
@@ -13629,9 +13629,9 @@ 
 	 *
 	 * @return integer
 	 */
-	public static function countTaggedAll( $beanType, $tagList, $sql = '', $bindings = array() )
+	public static function countTaggedAll($beanType, $tagList, $sql = '', $bindings = array())
 	{
-		return self::$tagManager->countTaggedAll( $beanType, $tagList, $sql, $bindings );
+		return self::$tagManager->countTaggedAll($beanType, $tagList, $sql, $bindings);
 	}
 
 	/**
@@ -13646,9 +13646,9 @@ 
 	 *
 	 * @return integer
 	 */
-	public static function countTagged( $beanType, $tagList, $sql = '', $bindings = array() )
+	public static function countTagged($beanType, $tagList, $sql = '', $bindings = array())
 	{
-		return self::$tagManager->countTagged( $beanType, $tagList, $sql, $bindings );
+		return self::$tagManager->countTagged($beanType, $tagList, $sql, $bindings);
 	}
 
 	/**
@@ -13658,9 +13658,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function wipe( $beanType )
+	public static function wipe($beanType)
 	{
-		return Facade::$redbean->wipe( $beanType );
+		return Facade::$redbean->wipe($beanType);
 	}
 
 	/**
@@ -13674,9 +13674,9 @@ 
 	 *
 	 * @return integer
 	 */
-	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);
 	}
 
 	/**
@@ -13688,25 +13688,25 @@ 
 	 *
 	 * @return ToolBox
 	 */
-	public static function configureFacadeWithToolbox( ToolBox $tb )
+	public static function configureFacadeWithToolbox(ToolBox $tb)
 	{
 		$oldTools                 = self::$toolbox;
 		self::$toolbox            = $tb;
 		self::$writer             = self::$toolbox->getWriter();
 		self::$adapter            = self::$toolbox->getDatabaseAdapter();
 		self::$redbean            = self::$toolbox->getRedBean();
-		self::$finder             = new Finder( self::$toolbox );
-		self::$associationManager = new AssociationManager( self::$toolbox );
-		self::$tree               = new Tree( self::$toolbox );
-		self::$redbean->setAssociationManager( self::$associationManager );
-		self::$labelMaker         = new LabelMaker( self::$toolbox );
+		self::$finder             = new Finder(self::$toolbox);
+		self::$associationManager = new AssociationManager(self::$toolbox);
+		self::$tree               = new Tree(self::$toolbox);
+		self::$redbean->setAssociationManager(self::$associationManager);
+		self::$labelMaker         = new LabelMaker(self::$toolbox);
 		$helper                   = new SimpleModelHelper();
-		$helper->attachEventListeners( self::$redbean );
+		$helper->attachEventListeners(self::$redbean);
 		if (self::$redbean->getBeanHelper() == NULL) {
-			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;
 	}
 
@@ -13746,7 +13746,7 @@ 
 	 */
 	public static function begin()
 	{
-		if ( !self::$allowFluidTransactions && !self::$redbean->isFrozen() ) return FALSE;
+		if (!self::$allowFluidTransactions && !self::$redbean->isFrozen()) return FALSE;
 		self::$adapter->startTransaction();
 		return TRUE;
 	}
@@ -13787,7 +13787,7 @@ 
 	 */
 	public static function commit()
 	{
-		if ( !self::$allowFluidTransactions && !self::$redbean->isFrozen() ) return FALSE;
+		if (!self::$allowFluidTransactions && !self::$redbean->isFrozen()) return FALSE;
 		self::$adapter->commit();
 		return TRUE;
 	}
@@ -13828,7 +13828,7 @@ 
 	 */
 	public static function rollback()
 	{
-		if ( !self::$allowFluidTransactions && !self::$redbean->isFrozen() ) return FALSE;
+		if (!self::$allowFluidTransactions && !self::$redbean->isFrozen()) return FALSE;
 		self::$adapter->rollback();
 		return TRUE;
 	}
@@ -13843,9 +13843,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function getColumns( $table )
+	public static function getColumns($table)
 	{
-		return self::$writer->getColumns( $table );
+		return self::$writer->getColumns($table);
 	}
 
 	/**
@@ -13877,9 +13877,9 @@ 
 	 *
 	 * @return string
 	 */
-	public static function genSlots( $array, $template = NULL )
+	public static function genSlots($array, $template = NULL)
 	{
-		return ArrayTool::genSlots( $array, $template );
+		return ArrayTool::genSlots($array, $template);
 	}
 
 	/**
@@ -13898,9 +13898,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function flat( $array, $result = array() )
+	public static function flat($array, $result = array())
 	{
-		return ArrayTool::flat( $array, $result );
+		return ArrayTool::flat($array, $result);
 	}
 
 	/**
@@ -13914,7 +13914,7 @@ 
 	 */
 	public static function nuke()
 	{
-		if ( !self::$redbean->isFrozen() ) {
+		if (!self::$redbean->isFrozen()) {
 			self::$writer->wipeAll();
 		}
 	}
@@ -13929,11 +13929,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;
 	}
@@ -13947,10 +13947,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);
 		}
 	}
 
@@ -13969,9 +13969,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function trashBatch( $type, $ids )
+	public static function trashBatch($type, $ids)
 	{
-		self::trashAll( self::batch( $type, $ids ) );
+		self::trashAll(self::batch($type, $ids));
 	}
 
 	/**
@@ -13997,12 +13997,12 @@ 
 	 *
 	 * @return int
 	 */
-	public static function hunt( $type, $sqlSnippet = NULL, $bindings = array() )
+	public static function hunt($type, $sqlSnippet = NULL, $bindings = array())
 	{
 		$numberOfTrashedBeans = 0;
-		$beans = self::findCollection( $type, $sqlSnippet, $bindings );
-		while( $bean = $beans->next() ) {
-			self::trash( $bean );
+		$beans = self::findCollection($type, $sqlSnippet, $bindings);
+		while ($bean = $beans->next()) {
+			self::trash($bean);
 			$numberOfTrashedBeans++;
 		}
 		return $numberOfTrashedBeans;
@@ -14023,9 +14023,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function useWriterCache( $yesNo )
+	public static function useWriterCache($yesNo)
 	{
-		self::getWriter()->setUseCache( $yesNo );
+		self::getWriter()->setUseCache($yesNo);
 	}
 
 	/**
@@ -14039,9 +14039,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);
 	}
 
 	/**
@@ -14075,9 +14075,9 @@ 
 	 *
 	 * @return array|OODBBean
 	 */
-	public static function enum( $enum )
+	public static function enum($enum)
 	{
-		return self::$labelMaker->enum( $enum );
+		return self::$labelMaker->enum($enum);
 	}
 
 	/**
@@ -14090,9 +14090,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function gatherLabels( $beans )
+	public static function gatherLabels($beans)
 	{
-		return self::$labelMaker->gatherLabels( $beans );
+		return self::$labelMaker->gatherLabels($beans);
 	}
 
 	/**
@@ -14113,7 +14113,7 @@ 
 	 */
 	public static function close()
 	{
-		if ( isset( self::$adapter ) ) {
+		if (isset(self::$adapter)) {
 			self::$adapter->close();
 		}
 	}
@@ -14126,13 +14126,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);
 	}
 
 	/**
@@ -14144,10 +14144,10 @@ 
 	 *
 	 * @return string
 	 */
-	public static function isoDateTime( $time = NULL )
+	public static function isoDateTime($time = NULL)
 	{
-		if ( !$time ) $time = time();
-		return @date( 'Y-m-d H:i:s', $time );
+		if (!$time) $time = time();
+		return @date('Y-m-d H:i:s', $time);
 	}
 
 	/**
@@ -14159,7 +14159,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setDatabaseAdapter( Adapter $adapter )
+	public static function setDatabaseAdapter(Adapter $adapter)
 	{
 		self::$adapter = $adapter;
 	}
@@ -14174,7 +14174,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setWriter( QueryWriter $writer )
+	public static function setWriter(QueryWriter $writer)
 	{
 		self::$writer = $writer;
 	}
@@ -14187,7 +14187,7 @@ 
 	 *
 	 * @param OODB $redbean Object Database for facade to use
 	 */
-	public static function setRedBean( OODB $redbean )
+	public static function setRedBean(OODB $redbean)
 	{
 		self::$redbean = $redbean;
 	}
@@ -14220,10 +14220,10 @@ 
 	public static function getPDO()
 	{
 		$databaseAdapter = self::getDatabaseAdapter();
-		if ( is_null( $databaseAdapter ) ) return NULL;
+		if (is_null($databaseAdapter)) return NULL;
 		$database = $databaseAdapter->getDatabase();
-		if ( is_null( $database ) ) return NULL;
-		if ( !method_exists( $database, 'getPDO' ) ) return NULL;
+		if (is_null($database)) return NULL;
+		if (!method_exists($database, 'getPDO')) return NULL;
 		return $database->getPDO();
 	}
 
@@ -14289,7 +14289,7 @@ 
 	 */
 	public static function getExtractedToolbox()
 	{
-		return array( self::$redbean, self::$adapter, self::$writer, self::$toolbox );
+		return array(self::$redbean, self::$adapter, self::$writer, self::$toolbox);
 	}
 
 	/**
@@ -14300,9 +14300,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);
 	}
 
 	/**
@@ -14316,10 +14316,10 @@ 
 	 *
 	 * @return array
 	 */
-	public static function beansToArray( $beans )
+	public static function beansToArray($beans)
 	{
 		$list = array();
-		foreach( $beans as $bean ) $list[] = $bean->export();
+		foreach ($beans as $bean) $list[] = $bean->export();
 		return $list;
 	}
 
@@ -14351,9 +14351,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);
 	}
 
 	/**
@@ -14378,9 +14378,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function dump( $data )
+	public static function dump($data)
 	{
-		return Dump::dump( $data );
+		return Dump::dump($data);
 	}
 
 	/**
@@ -14406,9 +14406,9 @@ 
 	 *
 	 * @return void
 	 */
-	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);
 	}
 
 	/**
@@ -14447,9 +14447,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function aliases( $list )
+	public static function aliases($list)
 	{
-		OODBBean::aliases( $list );
+		OODBBean::aliases($list);
 	}
 
 	/**
@@ -14465,9 +14465,9 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function findOrCreate( $type, $like = array(), $sql = '' )
+	public static function findOrCreate($type, $like = array(), $sql = '')
 	{
-		return self::$finder->findOrCreate( $type, $like, $sql = '' );
+		return self::$finder->findOrCreate($type, $like, $sql = '');
 	}
 
 	/**
@@ -14484,9 +14484,9 @@ 
 	 *
 	 * @return array
 	 */
-	public static function findLike( $type, $like = array(), $sql = '', $bindings = array() )
+	public static function findLike($type, $like = array(), $sql = '', $bindings = array())
 	{
-		return self::$finder->findLike( $type, $like, $sql, $bindings );
+		return self::$finder->findLike($type, $like, $sql, $bindings);
 	}
 
 	/**
@@ -14520,7 +14520,7 @@ 
 	 */
 	public static function startLogging()
 	{
-		self::debug( TRUE, RDefault::C_LOGGER_ARRAY );
+		self::debug(TRUE, RDefault::C_LOGGER_ARRAY);
 	}
 
 	/**
@@ -14557,7 +14557,7 @@ 
 	 */
 	public static function stopLogging()
 	{
-		self::debug( FALSE );
+		self::debug(FALSE);
 	}
 
 	/**
@@ -14669,9 +14669,9 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setAutoResolve( $automatic = TRUE )
+	public static function setAutoResolve($automatic = TRUE)
 	{
-		OODBBean::setAutoResolve( (boolean) $automatic );
+		OODBBean::setAutoResolve((boolean) $automatic);
 	}
 
 	/**
@@ -14688,9 +14688,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function usePartialBeans( $yesNoBeans )
+	public static function usePartialBeans($yesNoBeans)
 	{
-		return self::$redbean->getCurrentRepository()->usePartialBeans( $yesNoBeans );
+		return self::$redbean->getCurrentRepository()->usePartialBeans($yesNoBeans);
 	}
 
 	/**
@@ -14721,10 +14721,10 @@ 
 	 *
 	 * @return void
 	 */
-	public static function csv( $sql = '', $bindings = array(), $columns = NULL, $path = '/tmp/redexport_%s.csv', $output = TRUE )
+	public static function csv($sql = '', $bindings = array(), $columns = NULL, $path = '/tmp/redexport_%s.csv', $output = TRUE)
 	{
-		$quickExport = new QuickExport( self::$toolbox );
-		$quickExport->csv( $sql, $bindings, $columns, $path, $output );
+		$quickExport = new QuickExport(self::$toolbox);
+		$quickExport->csv($sql, $bindings, $columns, $path, $output);
 	}
 
 	/**
@@ -14757,9 +14757,9 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function matchUp( $type, $sql, $bindings = array(), $onFoundDo = NULL, $onNotFoundDo = NULL, &$bean = NULL 	) {
-		$matchUp = new MatchUp( self::$toolbox );
-		return $matchUp->matchUp( $type, $sql, $bindings, $onFoundDo, $onNotFoundDo, $bean );
+	public static function matchUp($type, $sql, $bindings = array(), $onFoundDo = NULL, $onNotFoundDo = NULL, &$bean = NULL) {
+		$matchUp = new MatchUp(self::$toolbox);
+		return $matchUp->matchUp($type, $sql, $bindings, $onFoundDo, $onNotFoundDo, $bean);
 	}
 
 	/**
@@ -14780,7 +14780,7 @@ 
 	 */
 	public static function getLook()
 	{
-		return new Look( self::$toolbox );
+		return new Look(self::$toolbox);
 	}
 
 	/**
@@ -14830,9 +14830,9 @@ 
 	 *
 	 * @return string
 	 */
-	public static function look( $sql, $bindings = array(), $keys = array( 'selected', 'id', 'name' ), $template = '<option %s value="%s">%s</option>', $filter = 'trim', $glue = '' )
+	public static function look($sql, $bindings = array(), $keys = array('selected', 'id', 'name'), $template = '<option %s value="%s">%s</option>', $filter = 'trim', $glue = '')
 	{
-		return self::getLook()->look( $sql, $bindings, $keys, $template, $filter, $glue );
+		return self::getLook()->look($sql, $bindings, $keys, $template, $filter, $glue);
 	}
 
 	/**
@@ -14867,10 +14867,10 @@ 
 	 *
 	 * @return array
 	 */
-	public static function diff( $bean, $other, $filters = array( 'created', 'modified' ), $pattern = '%s.%s.%s' )
+	public static function diff($bean, $other, $filters = array('created', 'modified'), $pattern = '%s.%s.%s')
 	{
-		$diff = new Diff( self::$toolbox );
-		return $diff->diff( $bean, $other, $filters, $pattern );
+		$diff = new Diff(self::$toolbox);
+		return $diff->diff($bean, $other, $filters, $pattern);
 	}
 
 	/**
@@ -14884,7 +14884,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function addToolBoxWithKey( $key, ToolBox $toolbox )
+	public static function addToolBoxWithKey($key, ToolBox $toolbox)
 	{
 		self::$toolboxes[$key] = $toolbox;
 	}
@@ -14902,9 +14902,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function removeToolBoxByKey( $key )
+	public static function removeToolBoxByKey($key)
 	{
-		if ( !array_key_exists( $key, self::$toolboxes ) ) {
+		if (!array_key_exists($key, self::$toolboxes)) {
 			return FALSE;
 		}
 		return TRUE;
@@ -14918,9 +14918,9 @@ 
 	 *
 	 * @return ToolBox|NULL
 	 */
-	public static function getToolBoxByKey( $key )
+	public static function getToolBoxByKey($key)
 	{
-		if ( !array_key_exists( $key, self::$toolboxes ) ) {
+		if (!array_key_exists($key, self::$toolboxes)) {
 			return NULL;
 		}
 		return self::$toolboxes[$key];
@@ -14962,10 +14962,10 @@ 
 	 *
 	 * @return void
 	 */
-	public static function useJSONFeatures( $flag )
+	public static function useJSONFeatures($flag)
 	{
-		AQueryWriter::useJSONColumns( $flag );
-		OODBBean::convertArraysToJSON( $flag );
+		AQueryWriter::useJSONColumns($flag);
+		OODBBean::convertArraysToJSON($flag);
 	}
 
 	/**
@@ -14987,9 +14987,9 @@ 
 	 * @param string   $sql      optional SQL snippet
 	 * @param array    $bindings SQL snippet parameter bindings
 	 */
-	public static function children( OODBBean $bean, $sql = NULL, $bindings = array() )
+	public static function children(OODBBean $bean, $sql = NULL, $bindings = array())
 	{
-		return self::$tree->children( $bean, $sql, $bindings );
+		return self::$tree->children($bean, $sql, $bindings);
 	}
 
 	/**
@@ -15011,9 +15011,9 @@ 
 	 * @param string   $sql      optional SQL snippet
 	 * @param array    $bindings SQL snippet parameter bindings
 	 */
-	public static function parents( OODBBean $bean, $sql = NULL, $bindings = array() )
+	public static function parents(OODBBean $bean, $sql = NULL, $bindings = array())
 	{
-		return self::$tree->parents( $bean, $sql, $bindings );
+		return self::$tree->parents($bean, $sql, $bindings);
 	}
 
 	/**
@@ -15025,8 +15025,8 @@ 
 	 *
 	 * @return boolean
 	 */
-	public static function noNuke( $yesNo ) {
-		return AQueryWriter::forbidNuke( $yesNo );
+	public static function noNuke($yesNo) {
+		return AQueryWriter::forbidNuke($yesNo);
 	}
 
 	/**
@@ -15040,7 +15040,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function useFeatureSet( $label ) {
+	public static function useFeatureSet($label) {
 		return Feature::feature($label);
 	}
 
@@ -15067,10 +15067,10 @@ 
 	 *
 	 * @return void
 	 */
-	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;
 	}
@@ -15084,15 +15084,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);
 	}
 }
 
@@ -15175,12 +15175,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);
 		}
 	}
 
@@ -15197,11 +15197,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));
 		}
 	}
 
@@ -15214,14 +15214,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;
@@ -15237,12 +15237,12 @@ 
 	 *
 	 * @return boolean
 	 */
-	private function inTrailOrAdd( &$trail, OODBBean $bean )
+	private function inTrailOrAdd(&$trail, OODBBean $bean)
 	{
-		$type = $bean->getMeta( 'type' );
-		$key  = $type . $bean->getID();
+		$type = $bean->getMeta('type');
+		$key  = $type.$bean->getID();
 
-		if ( isset( $trail[$key] ) ) {
+		if (isset($trail[$key])) {
 			return TRUE;
 		}
 
@@ -15261,12 +15261,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);
 	}
 
 	/**
@@ -15278,9 +15278,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']);
 	}
 
 	/**
@@ -15292,9 +15292,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);
 	}
 
 	/**
@@ -15306,37 +15306,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;
 	}
@@ -15347,7 +15347,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox            = $toolbox;
 		$this->redbean            = $toolbox->getRedBean();
@@ -15363,18 +15363,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;
 	}
@@ -15400,10 +15400,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;
@@ -15434,7 +15434,7 @@ 
 	 *
 	 * @param boolean $yesNo TRUE to use caching, FALSE otherwise
 	 */
-	public function setCacheTables( $yesNo )
+	public function setCacheTables($yesNo)
 	{
 		$this->cacheTables = $yesNo;
 	}
@@ -15450,10 +15450,10 @@ 
 	 *
 	 * @return void
 	 */
-	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;
@@ -15484,21 +15484,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();
 		}
@@ -15539,19 +15539,19 @@ 
 	 *
 	 * @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 );
-			$duplicate = $this->dup( $bean, array(), TRUE );
-			$array[]   = $duplicate->export( FALSE, $parents, FALSE, $filters );
+		foreach ($beans as $bean) {
+			$this->setFilters($filters);
+			$duplicate = $this->dup($bean, array(), TRUE);
+			$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;
 	}
 }
@@ -15613,10 +15613,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);
 	}
 
 	/**
@@ -15635,10 +15635,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;
@@ -15682,7 +15682,7 @@ 
 	 *
 	 * @return void
 	 */
-	public static function setEnforceNamingPolicy( $yesNo )
+	public static function setEnforceNamingPolicy($yesNo)
 	{
 		self::$enforceNamingPolicy = (boolean) $yesNo;
 	}
@@ -15717,10 +15717,10 @@ 
 	 *
 	 * @return void
 	 */
-	public static function checkType( $type )
+	public static function checkType($type)
 	{
-		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);
 		}
 	}
 
@@ -15770,36 +15770,36 @@ 
 	 *
 	 * @return array|OODBBean
 	 */
-	public static function dispense( OODB $oodb, $typeOrBeanArray, $num = 1, $alwaysReturnArray = FALSE ) {
+	public static function dispense(OODB $oodb, $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 ) {
+				foreach ($typeOrBeanArray as $beanArray) {
 					if ( 
-						!( is_array( $beanArray ) 
-						&& isset( $beanArray['_type'] ) ) ) {
-						throw new RedException( 'Invalid Array Bean' );
+						!(is_array($beanArray) 
+						&& isset($beanArray['_type'])) ) {
+						throw new RedException('Invalid Array Bean');
 					}
 				}
-				foreach( $typeOrBeanArray as $beanArray ) $list[] = self::dispense( $oodb, $beanArray );
+				foreach ($typeOrBeanArray as $beanArray) $list[] = self::dispense($oodb, $beanArray);
 				return $list;
 			}
 
 			$import = $typeOrBeanArray;
 			$type = $import['_type'];
-			unset( $import['_type'] );
+			unset($import['_type']);
 		} else {
 			$type = $typeOrBeanArray;
 		}
 
-		if (self::$enforceNamingPolicy) self::checkType( $type );
+		if (self::$enforceNamingPolicy) self::checkType($type);
 
-		$beanOrBeans = $oodb->dispense( $type, $num, $alwaysReturnArray );
+		$beanOrBeans = $oodb->dispense($type, $num, $alwaysReturnArray);
 
-		if ( isset( $import ) ) {
-			$beanOrBeans->import( $import );
+		if (isset($import)) {
+			$beanOrBeans->import($import);
 		}
 
 		return $beanOrBeans;
@@ -15835,19 +15835,19 @@ 
 	 *
 	 * @return array
 	 */
-	public static function dispenseAll( OODB $oodb, $order, $onlyArrays = FALSE )
+	public static function dispenseAll(OODB $oodb, $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( $oodb, $type, $amount, $onlyArrays );
+			$list[] = self::dispense($oodb, $type, $amount, $onlyArrays);
 		}
 
 		return $list;
@@ -15903,21 +15903,21 @@ 
 	 *
 	 * @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);
 			}
 		}
 		return $array;
@@ -15971,18 +15971,18 @@ 
 	 *
 	 * @return OODBBean
 	 */
-	public static function load( OODB $oodb, $types, $id )
+	public static function load(OODB $oodb, $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] = $oodb->load( $typeItem, $id );
+		foreach ($types as $k => $typeItem) {
+			$types[$k] = $oodb->load($typeItem, $id);
 		}
 
 		return $types;
@@ -16050,27 +16050,27 @@ 
 	 *
 	 * @return mixed
 	 */
-	public static function transaction( Adapter $adapter, $callback )
+	public static function transaction(Adapter $adapter, $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) {
 				$adapter->startTransaction();
 			}
 			$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) {
 				$adapter->commit();
 			}
-		} catch ( \Exception $exception ) {
+		} catch (\Exception $exception) {
 			$depth--;
-			if ( $depth == 0 ) {
+			if ($depth == 0) {
 				$adapter->rollback();
 			}
 			throw $exception;
@@ -16119,7 +16119,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 	}
@@ -16127,20 +16127,20 @@ 
 	/**
 	 * Makes csv() testable.
 	 */
-	public static function operation( $name, $arg1, $arg2 = TRUE ) {
+	public static function operation($name, $arg1, $arg2 = TRUE) {
 		$out = '';
-		switch( $name ) {
+		switch ($name) {
 			case 'test':
 				self::$test = (boolean) $arg1;
 				break;
 			case 'header':
-				$out = ( self::$test ) ? $arg1 : header( $arg1, $arg2 );
+				$out = (self::$test) ? $arg1 : header($arg1, $arg2);
 				break;
 			case 'readfile':
-				$out = ( self::$test ) ? file_get_contents( $arg1 ) : readfile( $arg1 );
+				$out = (self::$test) ? file_get_contents($arg1) : readfile($arg1);
 				break;
 			case 'exit':
-				$out = ( self::$test ) ? 'exit' : exit();
+				$out = (self::$test) ? 'exit' : exit();
 				break;
 		}
 		return $out;
@@ -16174,28 +16174,28 @@ 
 	 *
 	 * @return void
 	 */
-	public function csv( $sql = '', $bindings = array(), $columns = NULL, $path = '/tmp/redexport_%s.csv', $output = TRUE, $options = array(',','"','\\') )
+	public function csv($sql = '', $bindings = array(), $columns = NULL, $path = '/tmp/redexport_%s.csv', $output = TRUE, $options = array(',', '"', '\\'))
 	{
-		list( $delimiter, $enclosure, $escapeChar ) = $options;
-		$path = sprintf( $path, date('Ymd_his') );
-		$handle = fopen( $path, 'w' );
-		if ($columns) if (PHP_VERSION_ID>=505040) fputcsv($handle, $columns, $delimiter, $enclosure, $escapeChar ); else fputcsv($handle, $columns, $delimiter, $enclosure );
-		$cursor = $this->toolbox->getDatabaseAdapter()->getCursor( $sql, $bindings );
-		while( $row = $cursor->getNextItem() ) {
-			if (PHP_VERSION_ID>=505040) fputcsv($handle, $row, $delimiter, $enclosure, $escapeChar ); else fputcsv($handle, $row, $delimiter, $enclosure );
+		list($delimiter, $enclosure, $escapeChar) = $options;
+		$path = sprintf($path, date('Ymd_his'));
+		$handle = fopen($path, 'w');
+		if ($columns) if (PHP_VERSION_ID >= 505040) fputcsv($handle, $columns, $delimiter, $enclosure, $escapeChar); else fputcsv($handle, $columns, $delimiter, $enclosure);
+		$cursor = $this->toolbox->getDatabaseAdapter()->getCursor($sql, $bindings);
+		while ($row = $cursor->getNextItem()) {
+			if (PHP_VERSION_ID >= 505040) fputcsv($handle, $row, $delimiter, $enclosure, $escapeChar); else fputcsv($handle, $row, $delimiter, $enclosure);
 		}
 		fclose($handle);
-		if ( $output ) {
+		if ($output) {
 			$file = basename($path);
-			$out = self::operation('header',"Pragma: public");
-			$out .= self::operation('header',"Expires: 0");
-			$out .= self::operation('header',"Cache-Control: must-revalidate, post-check=0, pre-check=0");
-			$out .= self::operation('header',"Cache-Control: private", FALSE );
-			$out .= self::operation('header',"Content-Type: text/csv");
-			$out .= self::operation('header',"Content-Disposition: attachment; filename={$file}" );
-			$out .= self::operation('header',"Content-Transfer-Encoding: binary");
-			$out .= self::operation('readfile',$path );
-			@unlink( $path );
+			$out = self::operation('header', "Pragma: public");
+			$out .= self::operation('header', "Expires: 0");
+			$out .= self::operation('header', "Cache-Control: must-revalidate, post-check=0, pre-check=0");
+			$out .= self::operation('header', "Cache-Control: private", FALSE);
+			$out .= self::operation('header', "Content-Type: text/csv");
+			$out .= self::operation('header', "Content-Disposition: attachment; filename={$file}");
+			$out .= self::operation('header', "Content-Transfer-Encoding: binary");
+			$out .= self::operation('readfile', $path);
+			@unlink($path);
 			self::operation('exit', FALSE);
 			return $out;
 		}
@@ -16241,7 +16241,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 	}
@@ -16276,32 +16276,32 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function matchUp( $type, $sql, $bindings = array(), $onFoundDo = NULL, $onNotFoundDo = NULL, &$bean = NULL )
+	public function matchUp($type, $sql, $bindings = array(), $onFoundDo = NULL, $onNotFoundDo = NULL, &$bean = NULL)
 	{
-		$finder = new Finder( $this->toolbox );
+		$finder = new Finder($this->toolbox);
 		$oodb   = $this->toolbox->getRedBean();
-		$bean = $finder->findOne( $type, $sql, $bindings );
-		if ( $bean && $onFoundDo ) {
-			foreach( $onFoundDo as $property => $value ) {
-				if ( function_exists('is_callable') && is_callable( $value ) ) {
-					$bean[$property] = call_user_func_array( $value, array( $bean ) );
+		$bean = $finder->findOne($type, $sql, $bindings);
+		if ($bean && $onFoundDo) {
+			foreach ($onFoundDo as $property => $value) {
+				if (function_exists('is_callable') && is_callable($value)) {
+					$bean[$property] = call_user_func_array($value, array($bean));
 				} else {
 					$bean[$property] = $value;
 				}
 			}
-			$oodb->store( $bean );
+			$oodb->store($bean);
 			return TRUE;
 		}
-		if ( $onNotFoundDo ) {
-			$bean = $oodb->dispense( $type );
-			foreach( $onNotFoundDo as $property => $value ) {
-				if ( function_exists('is_callable') && is_callable( $value ) ) {
-					$bean[$property] = call_user_func_array( $value, array( $bean ) );
+		if ($onNotFoundDo) {
+			$bean = $oodb->dispense($type);
+			foreach ($onNotFoundDo as $property => $value) {
+				if (function_exists('is_callable') && is_callable($value)) {
+					$bean[$property] = call_user_func_array($value, array($bean));
 				} else {
 					$bean[$property] = $value;
 				}
 			}
-			$oodb->store( $bean );
+			$oodb->store($bean);
 			return FALSE;
 		}
 		return NULL;
@@ -16344,7 +16344,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 	}
@@ -16396,23 +16396,23 @@ 
 	 *
 	 * @return string
 	 */
-	public function look( $sql, $bindings = array(), $keys = array( 'selected', 'id', 'name' ), $template = '<option %s value="%s">%s</option>', $filter = 'trim', $glue = '' )
+	public function look($sql, $bindings = array(), $keys = array('selected', 'id', 'name'), $template = '<option %s value="%s">%s</option>', $filter = 'trim', $glue = '')
 	{
 		$adapter = $this->toolbox->getDatabaseAdapter();
 		$lines = array();
-		$rows = $adapter->get( $sql, $bindings );
-		foreach( $rows as $row ) {
+		$rows = $adapter->get($sql, $bindings);
+		foreach ($rows as $row) {
 			$values = array();
-			foreach( $keys as $key ) {
+			foreach ($keys as $key) {
 				if (!empty($filter)) {
-					$values[] = call_user_func_array( $filter, array( $row[$key] ) );
+					$values[] = call_user_func_array($filter, array($row[$key]));
 				} else {
 					$values[] = $row[$key];
 				}
 			}
-			$lines[] = vsprintf( $template, $values );
+			$lines[] = vsprintf($template, $values);
 		}
-		$string = implode( $glue, $lines );
+		$string = implode($glue, $lines);
 		return $string;
 	}
 }
@@ -16453,7 +16453,7 @@ 
 	 *
 	 * @param ToolBox $toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 	}
@@ -16490,30 +16490,30 @@ 
 	 *
 	 * @return array
 	 */
-	public function diff( $beans, $others, $filters = array( 'created', 'modified' ), $format = '%s.%s.%s', $type = NULL )
+	public function diff($beans, $others, $filters = array('created', 'modified'), $format = '%s.%s.%s', $type = NULL)
 	{
 		$diff = array();
-		if ( !is_array( $beans ) ) $beans = array( $beans );
-		if ( !is_array( $others ) ) $others = array( $others );
-		foreach( $beans as $bean ) {
-			if ( !is_object( $bean ) ) continue;
-			if ( !( $bean instanceof OODBBean ) ) continue;
-			if ( $type == NULL ) $type = $bean->getMeta( 'type' );
-			foreach( $others as $other ) {
-				if ( !is_object( $other ) ) continue;
-				if ( !( $other instanceof OODBBean ) ) continue;
-				if ( $other->id == $bean->id ) {
-					foreach( $bean as $property => $value ) {
-						if ( in_array( $property, $filters ) ) continue;
-						$key = vsprintf( $format, array( $type, $bean->id, $property ) );
+		if (!is_array($beans)) $beans = array($beans);
+		if (!is_array($others)) $others = array($others);
+		foreach ($beans as $bean) {
+			if (!is_object($bean)) continue;
+			if (!($bean instanceof OODBBean)) continue;
+			if ($type == NULL) $type = $bean->getMeta('type');
+			foreach ($others as $other) {
+				if (!is_object($other)) continue;
+				if (!($other instanceof OODBBean)) continue;
+				if ($other->id == $bean->id) {
+					foreach ($bean as $property => $value) {
+						if (in_array($property, $filters)) continue;
+						$key = vsprintf($format, array($type, $bean->id, $property));
 						$compare = $other->{$property};
-						if ( !is_object( $value ) && !is_array( $value ) ) {
-							if ( $value != $compare ) {
-								$diff[$key] = array( $value, $compare );
+						if (!is_object($value) && !is_array($value)) {
+							if ($value != $compare) {
+								$diff[$key] = array($value, $compare);
 							}
 							continue;
 						} else {
-							$diff = array_merge( $diff, $this->diff( $value, $compare, $filters, $format, $key ) );
+							$diff = array_merge($diff, $this->diff($value, $compare, $filters, $format, $key));
 							continue;
 						}
 					}
@@ -16570,7 +16570,7 @@ 
 	 *
 	 * @param ToolBox $toolbox toolbox
 	 */
-	public function __construct( ToolBox $toolbox )
+	public function __construct(ToolBox $toolbox)
 	{
 		$this->toolbox = $toolbox;
 		$this->writer  = $toolbox->getWriter();
@@ -16590,14 +16590,14 @@ 
 	 *
 	 * @return array
 	 */
-	public function children( OODBBean $bean, $sql = NULL, $bindings = array() )
+	public function children(OODBBean $bean, $sql = NULL, $bindings = array())
 	{
 		$type = $bean->getMeta('type');
 		$id   = $bean->id;
 
-		$rows = $this->writer->queryRecursiveCommonTableExpression( $type, $id, FALSE, $sql, $bindings );
+		$rows = $this->writer->queryRecursiveCommonTableExpression($type, $id, FALSE, $sql, $bindings);
 
-		return $this->oodb->convertToBeans( $type, $rows );
+		return $this->oodb->convertToBeans($type, $rows);
 	}
 	
 	/**
@@ -16613,14 +16613,14 @@ 
 	 *
 	 * @return array
 	 */
-	public function parents( OODBBean $bean, $sql = NULL, $bindings = array() )
+	public function parents(OODBBean $bean, $sql = NULL, $bindings = array())
 	{
 		$type = $bean->getMeta('type');
 		$id   = $bean->id;
 
-		$rows = $this->writer->queryRecursiveCommonTableExpression( $type, $id, TRUE, $sql, $bindings );
+		$rows = $this->writer->queryRecursiveCommonTableExpression($type, $id, TRUE, $sql, $bindings);
 
-		return $this->oodb->convertToBeans( $type, $rows );		
+		return $this->oodb->convertToBeans($type, $rows);		
 	}	
 }
 }
@@ -16657,23 +16657,23 @@ 
 	 *
 	 * @return void
 	 */
-	public static function feature( $label ) {
-		switch( $label ) {
+	public static function feature($label) {
+		switch ($label) {
 			case "novice/latest":
-				R::noNuke( TRUE );
-				R::setAutoResolve( TRUE );
+				R::noNuke(TRUE);
+				R::setAutoResolve(TRUE);
 				break;
 			case "latest":
-				R::noNuke( FALSE );
-				R::setAutoResolve( TRUE );
+				R::noNuke(FALSE);
+				R::setAutoResolve(TRUE);
 				break;
 			case "novice/5.3":
-				R::noNuke( TRUE );
-				R::setAutoResolve( TRUE );
+				R::noNuke(TRUE);
+				R::setAutoResolve(TRUE);
 				break;
 			case "5.3":
-				R::noNuke( FALSE );
-				R::setAutoResolve( TRUE );
+				R::noNuke(FALSE);
+				R::setAutoResolve(TRUE);
 				break;
 			default:
 				throw new \Exception("Unknown feature set label.");
@@ -16714,7 +16714,7 @@ 
 class RedBean_SimpleModel extends \RedBeanPHP\SimpleModel {};
 
 if (!class_exists('R')) {
-	class R extends \RedBeanPHP\Facade{};
+	class R extends \RedBeanPHP\Facade {};
 }
 
 
@@ -16753,7 +16753,7 @@ 
 
 	function EID($enumName)
 	{
-		return \RedBeanPHP\Facade::enum( $enumName )->id;
+		return \RedBeanPHP\Facade::enum($enumName)->id;
 	}
 
 }
@@ -16766,33 +16766,33 @@ 
  *
  * @return void
  */
-if ( !function_exists( 'dmp' ) ) {
+if (!function_exists('dmp')) {
 
-	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);
 	}
 }
 

OctaORM.php

Spacing +176 added lines, -176 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-class OctaORM{
+class OctaORM {
 
     protected $redbean;
     protected $db_field;
@@ -29,19 +29,19 @@ 
     var $num_rows;
     var $result;
 
-    public function __construct($db){
+    public function __construct($db) {
         include_once('RedBean.php');
         $this->redbean = new R();
         $this->db_field = $db;
 
-        if(!$this->redbean->testConnection()){
+        if (!$this->redbean->testConnection()) {
             $conn = $this->initiate_database_connection($db);
             $this->redbean->setup(/** @scrutinizer ignore-type */ $conn);
-            $this->redbean->useFeatureSet( 'novice/latest' );
+            $this->redbean->useFeatureSet('novice/latest');
         }
     }
 
-    public function initiate_database_connection($db){
+    public function initiate_database_connection($db) {
         $DB_HOST = $db['hostname'];
         $DB_USERNAME = $db['username'];
         $DB_PASSWORD = $db['password'];
@@ -52,24 +52,24 @@ 
 
         $DB_con->exec("CREATE DATABASE IF NOT EXISTS $DB_NAME;");
 
-        $DB_con = new PDO("mysql:host={$DB_HOST};dbname={$DB_NAME}",$DB_USERNAME,$DB_PASSWORD);
+        $DB_con = new PDO("mysql:host={$DB_HOST};dbname={$DB_NAME}", $DB_USERNAME, $DB_PASSWORD);
         $DB_con->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
         return $DB_con;
     }
 
-    public function insert_id(){
+    public function insert_id() {
         return $this->last_id;
     }
 
-    public function last_query(){
+    public function last_query() {
         return $this->last_query;
     }
 
-    public function insert($array,$table){
+    public function insert($array, $table) {
         $data = $this->redbean->dispense($table);
 
-        if($array){
-            foreach($array as $key=>$row){
+        if ($array) {
+            foreach ($array as $key=>$row) {
                 $data->$key = $row;
             }
         }
@@ -78,28 +78,28 @@ 
         return ($this->last_id) ? true : false;
     }
 
-    public function insert_batch($array,$table){
+    public function insert_batch($array, $table) {
         $data = array();
 
-        if($array){
-            foreach($array as $key_ib=>$row_ib){
+        if ($array) {
+            foreach ($array as $key_ib=>$row_ib) {
 
-                $data[$key_ib]=$this->redbean->dispense($table);
+                $data[$key_ib] = $this->redbean->dispense($table);
                 $table_fields = [];
                 $table_fields_val = [];
 
-                if($row_ib){
-                    foreach($row_ib as $row=>$val){
+                if ($row_ib) {
+                    foreach ($row_ib as $row=>$val) {
                         $table_fields[] = $row;
                         $table_fields_val[] = $val;
                     }
 
-                    if($table_fields && $table_fields_val){
-                        foreach($table_fields as $key=>$row){
+                    if ($table_fields && $table_fields_val) {
+                        foreach ($table_fields as $key=>$row) {
                             $data[$key_ib]->$row = $table_fields_val[$key];
                         }
 
-                    }else{
+                    } else {
                         return false;
                     }
                 }
@@ -110,11 +110,11 @@ 
         return ($result) ? true : false;
     }
 
-    public function update($table,$array,$id){
+    public function update($table, $array, $id) {
         $data = $this->redbean->load($table, $id);
 
-        if($array){
-            foreach($array as $key=>$row){
+        if ($array) {
+            foreach ($array as $key=>$row) {
                 $data->$key = $row;
             }
         }
@@ -123,33 +123,33 @@ 
         return true;
     }
 
-    public function update_batch($table,$array,$where){
-        if($array){
-            foreach($array as $key_ub=>$row_ub){
+    public function update_batch($table, $array, $where) {
+        if ($array) {
+            foreach ($array as $key_ub=>$row_ub) {
                 $where_key = '';
                 $table_fields = [];
                 $table_fields_val = [];
 
-                if($row_ub){
-                    foreach($row_ub as $row=>$val){
+                if ($row_ub) {
+                    foreach ($row_ub as $row=>$val) {
 
-                        if($row === $where){
+                        if ($row === $where) {
                             $where_key = $val;
                         }
 
-                        if($row !== $where){
+                        if ($row !== $where) {
                             $table_fields[] = $row;
                             $table_fields_val[] = $val;
                         }
                     }
 
                     $data = $this->redbean->load($table, $where_key);
-                    if($table_fields && $table_fields_val){
-                        foreach($table_fields as $key=>$row){
+                    if ($table_fields && $table_fields_val) {
+                        foreach ($table_fields as $key=>$row) {
                             $data->$row = $table_fields_val[$key];
                         }
 
-                    }else{
+                    } else {
                         return false;
                     }
 
@@ -161,32 +161,32 @@ 
         return true;
     }
 
-    public function delete($table,$id){
-        if($id){
-            if(is_array($id)){
-                foreach($id as $key=>$row){
-                    $this->redbean->trash($table,$row);
+    public function delete($table, $id) {
+        if ($id) {
+            if (is_array($id)) {
+                foreach ($id as $key=>$row) {
+                    $this->redbean->trash($table, $row);
                 }
 
                 return true;
 
-            }else{
-                $this->redbean->trash($table,$id);
+            } else {
+                $this->redbean->trash($table, $id);
                 return true;
             }
         }
     }
 
-    public function delete_all($table){
+    public function delete_all($table) {
         $result = $this->redbean->wipe($table);
         return ($result) ? true : false;
     }
 
-    public function select($data){
+    public function select($data) {
         $reset = [];
-        if($data){
-            foreach($data as $key=>$row){
-                array_push($reset,$row);
+        if ($data) {
+            foreach ($data as $key=>$row) {
+                array_push($reset, $row);
             }
         }
 
@@ -194,25 +194,25 @@ 
         return $this->select;
     }
 
-    public function where($data=null,$match=null){
+    public function where($data = null, $match = null) {
         $tmp_where = '';
         $arr_check = false;
-        if($data){
-            if(is_array($data)){
+        if ($data) {
+            if (is_array($data)) {
                 end($data);
                 $last_element = key($data);
 
-                if($data){
+                if ($data) {
                     $arr_check = true;
-                    foreach($data as $key=>$row){
-                        if($key == $last_element){
+                    foreach ($data as $key=>$row) {
+                        if ($key == $last_element) {
                             $tmp_where .= $key."='".$row."'";
-                        }else{
+                        } else {
                             $tmp_where .= $key."='".$row."' AND ";
                         }
                     }
                 }
-            }else{
+            } else {
                 $arr_check = false;
                 $tmp_where = "WHERE ".$data."='".$match."'";
             }
@@ -221,25 +221,25 @@ 
         $this->where = ($arr_check) ? "WHERE ".$tmp_where : $tmp_where;
     }
 
-    public function or_where($data=null,$match=null){
+    public function or_where($data = null, $match = null) {
         $tmp_or_where = '';
         $arr_check = false;
-        if($data){
-            if(is_array($data)){
+        if ($data) {
+            if (is_array($data)) {
                 end($data);
                 $last_element = key($data);
                 $arr_check = true;
 
-                if($data){
-                    foreach($data as $key=>$row){
-                        if($key == $last_element){
+                if ($data) {
+                    foreach ($data as $key=>$row) {
+                        if ($key == $last_element) {
                             $tmp_or_where .= $key."='".$row."'";
-                        }else{
+                        } else {
                             $tmp_or_where .= $key."='".$row."' AND ";
                         }
                     }
                 }
-            }else{
+            } else {
                 $arr_check = false;
                 $tmp_or_where = "OR ".$data."='".$match."'";
             }
@@ -248,14 +248,14 @@ 
         $this->or_where = ($arr_check) ? "OR ".$tmp_or_where : $tmp_or_where;
     }
 
-    public function where_in($field,$data){
+    public function where_in($field, $data) {
         $where_in_fields = '';
         $last_key = end(array_keys($data));
-        if($data){
-            foreach($data as $key=>$row){
-                if($key == $last_key){
+        if ($data) {
+            foreach ($data as $key=>$row) {
+                if ($key == $last_key) {
                     $where_in_fields .= $row;
-                }else{
+                } else {
                     $where_in_fields .= $row.",";
                 }
             }
@@ -264,14 +264,14 @@ 
         $this->where_in = 'WHERE '.$field.' IN ('.$where_in_fields.')';
     }
 
-    public function or_where_in($field,$data){
+    public function or_where_in($field, $data) {
         $where_in_fields = '';
         $last_key = end(array_keys($data));
-        if($data){
-            foreach($data as $key=>$row){
-                if($key == $last_key){
+        if ($data) {
+            foreach ($data as $key=>$row) {
+                if ($key == $last_key) {
                     $where_in_fields .= $row;
-                }else{
+                } else {
                     $where_in_fields .= $row.",";
                 }
             }
@@ -280,14 +280,14 @@ 
         $this->or_where_in = 'OR '.$field.' IN ('.$where_in_fields.')';
     }
 
-    public function where_not_in($field,$data){
+    public function where_not_in($field, $data) {
         $where_in_fields = '';
         $last_key = end(array_keys($data));
-        if($data){
-            foreach($data as $key=>$row){
-                if($key == $last_key){
+        if ($data) {
+            foreach ($data as $key=>$row) {
+                if ($key == $last_key) {
                     $where_in_fields .= $row;
-                }else{
+                } else {
                     $where_in_fields .= $row.",";
                 }
             }
@@ -296,14 +296,14 @@ 
         $this->where_not_in = 'WHERE '.$field.' NOT IN ('.$where_in_fields.')';
     }
 
-    public function or_where_not_in($field,$data){
+    public function or_where_not_in($field, $data) {
         $where_in_fields = '';
         $last_key = end(array_keys($data));
-        if($data){
-            foreach($data as $key=>$row){
-                if($key == $last_key){
+        if ($data) {
+            foreach ($data as $key=>$row) {
+                if ($key == $last_key) {
                     $where_in_fields .= $row;
-                }else{
+                } else {
                     $where_in_fields .= $row.",";
                 }
             }
@@ -312,25 +312,25 @@ 
         $this->or_where_not_in = 'OR '.$field.' NOT IN ('.$where_in_fields.')';
     }
 
-    public function like($data=null,$match=null){
+    public function like($data = null, $match = null) {
         $tmp_like = '';
         $arr_check = false;
-        if($data){
-            if(is_array($data)){
+        if ($data) {
+            if (is_array($data)) {
                 end($data);
                 $last_element = key($data);
 
-                if($data){
+                if ($data) {
                     $arr_check = true;
-                    foreach($data as $key=>$row){
-                        if($key == $last_element){
+                    foreach ($data as $key=>$row) {
+                        if ($key == $last_element) {
                             $tmp_like .= $key." LIKE '%".$row."%'";
-                        }else{
+                        } else {
                             $tmp_like .= $key." LIKE '%".$row."%' AND ";
                         }
                     }
                 }
-            }else{
+            } else {
                 $arr_check = false;
                 $tmp_like = "WHERE ".$data." LIKE '%".$match."%'";
             }
@@ -340,23 +340,23 @@ 
         $this->like = ($arr_check) ? $tmp_like : "WHERE ".$tmp_like;
     }
 
-    public function or_like($data=null,$match=null){
+    public function or_like($data = null, $match = null) {
         $tmp_or_like = '';
-        if($data){
-            if(is_array($data)){
+        if ($data) {
+            if (is_array($data)) {
                 end($data);
                 $last_element = key($data);
 
-                if($data){
-                    foreach($data as $key=>$row){
-                        if($key == $last_element){
+                if ($data) {
+                    foreach ($data as $key=>$row) {
+                        if ($key == $last_element) {
                             $tmp_or_like .= "OR ".$key." LIKE '%".$row."%'";
-                        }else{
+                        } else {
                             $tmp_or_like .= "OR ".$key." LIKE '%".$row."%' AND ";
                         }
                     }
                 }
-            }else{
+            } else {
                 $tmp_or_like = "OR ".$data." LIKE '%".$match."%'";
             }
         }
@@ -364,25 +364,25 @@ 
         $this->or_like = $tmp_or_like;
     }
 
-    public function not_like($data=null,$match=null){
+    public function not_like($data = null, $match = null) {
         $tmp_like = '';
         $arr_check = false;
-        if($data){
-            if(is_array($data)){
+        if ($data) {
+            if (is_array($data)) {
                 end($data);
                 $last_element = key($data);
 
-                if($data){
+                if ($data) {
                     $arr_check = true;
-                    foreach($data as $key=>$row){
-                        if($key == $last_element){
+                    foreach ($data as $key=>$row) {
+                        if ($key == $last_element) {
                             $tmp_like .= $key." NOT LIKE '%".$row."%'";
-                        }else{
+                        } else {
                             $tmp_like .= $key." NOT LIKE '%".$row."%' AND ";
                         }
                     }
                 }
-            }else{
+            } else {
                 $arr_check = false;
                 $tmp_like = "WHERE ".$data." NOT LIKE '%".$match."%'";
             }
@@ -392,23 +392,23 @@ 
         $this->like = ($arr_check) ? "WHERE ".$tmp_like : $tmp_like;
     }
 
-    public function or_not_like($data=null,$match=null){
+    public function or_not_like($data = null, $match = null) {
         $tmp_or_like = '';
-        if($data){
-            if(is_array($data)){
+        if ($data) {
+            if (is_array($data)) {
                 end($data);
                 $last_element = key($data);
 
-                if($data){
-                    foreach($data as $key=>$row){
-                        if($key == $last_element){
+                if ($data) {
+                    foreach ($data as $key=>$row) {
+                        if ($key == $last_element) {
                             $tmp_or_like .= "OR ".$key." NOT LIKE '%".$row."%'";
-                        }else{
+                        } else {
                             $tmp_or_like .= "OR ".$key." NOT LIKE '%".$row."%' AND ";
                         }
                     }
                 }
-            }else{
+            } else {
                 $tmp_or_like = "OR ".$data." NOT LIKE '%".$match."%'";
             }
         }
@@ -416,25 +416,25 @@ 
         $this->or_like = $tmp_or_like;
     }
 
-    public function order_by($field,$sort){
+    public function order_by($field, $sort) {
         $this->order_by = $field.' '.$sort;
     }
 
-    public function join($table,$joint,$join_type="INNER"){
+    public function join($table, $joint, $join_type = "INNER") {
         $this->join = $join_type.' JOIN '.$table.' ON '.$joint;
     }
 
-    public function group_by($field){
+    public function group_by($field) {
         $this->group_by = 'GROUP BY '.$field;
     }
 
-    public function get($table=null,$limit=null,$offset=null){
+    public function get($table = null, $limit = null, $offset = null) {
         $this->table = $table;
         $this->limit = $limit;
         $this->offset = $offset;
     }
 
-    public function clear_global_var(){
+    public function clear_global_var() {
         $this->select = '';
         $this->where = '';
         $this->or_where = '';
@@ -457,10 +457,10 @@ 
         $this->result = '';
     }
 
-    public function row(){
+    public function row() {
         /*init var*/
         $result = [];
-        $select = ($this->select) ? implode(',',$this->select) : '*';
+        $select = ($this->select) ? implode(',', $this->select) : '*';
         $order_by = ($this->order_by) ? 'ORDER BY '.$this->order_by : '';
         $join = ($this->join) ? $this->join : '';
         $group_by = ($this->group_by) ? $this->group_by : '';
@@ -484,8 +484,8 @@ 
         $this->row = "SELECT {$select} FROM {$table} {$join} {$where} {$or_where} {$where_in} {$or_where_in} {$where_not_in} {$or_where_not_in} {$like} {$or_like} {$not_like} {$or_not_like} {$group_by} {$order_by} {$limit} {$offset}";
         $this->last_query = $this->row;
         $data = $this->redbean->getRow($this->row);
-        if($data){
-            foreach($data as $key=>$row){
+        if ($data) {
+            foreach ($data as $key=>$row) {
                 $result[$key] = $row;
             }
         }
@@ -497,10 +497,10 @@ 
         return $result;
     }
 
-    public function num_rows(){
+    public function num_rows() {
         /*init var*/
-        $result = 0;#array();
-        $select = ($this->select) ? implode(',',$this->select) : '*';
+        $result = 0; #array();
+        $select = ($this->select) ? implode(',', $this->select) : '*';
         $order_by = ($this->order_by) ? 'ORDER BY '.$this->order_by : '';
         $join = ($this->join) ? $this->join : '';
         $group_by = ($this->group_by) ? $this->group_by : '';
@@ -533,10 +533,10 @@ 
         return $result;
     }
 
-    public function result(){
+    public function result() {
         /*init var*/
         $result = array();
-        $select = ($this->select) ? implode(',',$this->select) : '*';
+        $select = ($this->select) ? implode(',', $this->select) : '*';
         $order_by = ($this->order_by) ? 'ORDER BY '.$this->order_by : '';
         $join = ($this->join) ? $this->join : '';
         $group_by = ($this->group_by) ? $this->group_by : '';
@@ -562,9 +562,9 @@ 
         $this->result = "SELECT {$select} FROM {$table} {$join} {$where} {$or_where} {$where_in} {$or_where_in} {$where_not_in} {$or_where_not_in} {$like} {$or_like} {$not_like} {$or_not_like} {$group_by} {$order_by} {$limit} {$offset}";
         $this->last_query = $this->result;
         $data = $this->redbean->getAll($this->result);
-        if($data){
-            foreach($data as $key=>$row){
-                $result[$key] = (object)$row;
+        if ($data) {
+            foreach ($data as $key=>$row) {
+                $result[$key] = (object) $row;
             }
         }
 
@@ -576,146 +576,146 @@ 
     }
 
     /*Database*/
-    public function wipe($beanType){
+    public function wipe($beanType) {
         $result = $this->redbean->wipe($beanType);
         return ($result) ? $result : false;
     }
 
-    public function dispense($data){
+    public function dispense($data) {
         $result = $this->redbean->dispense($data);
         return ($result) ? true : false;
     }
 
-    public function store($data){
+    public function store($data) {
         $result = $this->redbean->store($data);
         return ($result) ? true : false;
     }
 
-    public function inspect($data){
-        if($data){
-            if(is_array($data)){
+    public function inspect($data) {
+        if ($data) {
+            if (is_array($data)) {
 
                 $result = array();
-                foreach($data as $key=>$row){
-                    $result[$key]=$this->redbean->inspect($row);
+                foreach ($data as $key=>$row) {
+                    $result[$key] = $this->redbean->inspect($row);
                 }
 
                 return ($result) ? $result : false;
 
-            }else{
+            } else {
                 $this->redbean->inspect($data);
                 return true;
             }
         }
     }
 
-    public function get_all_tables(){
+    public function get_all_tables() {
         $result = $this->redbean->inspect();
         return ($result) ? $result : false;
     }
 
-    public function select_database($db_name){
+    public function select_database($db_name) {
         $result = $this->redbean->selectDatabase($db_name);
         return ($result) ? true : false;
     }
 
-    public function set_database(){
+    public function set_database() {
         $this->redbean->selectDatabase('default');
         return true;
     }
 
-    public function begin(){
+    public function begin() {
         $result = $this->redbean->begin();
         return ($result) ? true : false;
     }
 
-    public function commit(){
+    public function commit() {
         $result = $this->redbean->commit();
         return ($result) ? true : false;
     }
 
-    public function roll_back(){
+    public function roll_back() {
         $result = $this->redbean->rollback();
         return ($result) ? true : false;
     }
 
-    public function get_query_count(){
+    public function get_query_count() {
         $this->redbean->getQueryCount();
         return true;
     }
 
-    public function get_logs(){
+    public function get_logs() {
         $this->redbean->getLogs();
         return true;
     }
 
     /*querying*/
-    public function exec($data){
+    public function exec($data) {
         $this->redbean->exec($data);
         return true;
     }
 
-    public function get_all($table){
+    public function get_all($table) {
         $result = $this->redbean->getAll($table);
         return ($result) ? $result : false;
     }
 
-    public function get_row($data){
+    public function get_row($data) {
         $result = $this->redbean->getRow($data);
         return ($result) ? $result : false;
     }
 
-    public function get_column($data){
+    public function get_column($data) {
         $result = $this->redbean->getCol($data);
         return ($result) ? $result : false;
     }
 
-    public function get_cell($data){
+    public function get_cell($data) {
         $result = $this->redbean->getCell($data);
         return ($result) ? $result : false;
     }
 
-    public function get_assoc($data){
+    public function get_assoc($data) {
         $result = $this->redbean->getAssoc($data);
         return ($result) ? $result : false;
     }
 
-    public function get_inserted_id(){
+    public function get_inserted_id() {
         $result = $this->redbean->getInsertID();
         return ($result) ? $result : false;
     }
 
-    public function convert_to_beans($type,$rows,$metamask=null){
-        $result = $this->redbean->convertToBeans( $type, $rows, $metamask );
+    public function convert_to_beans($type, $rows, $metamask = null) {
+        $result = $this->redbean->convertToBeans($type, $rows, $metamask);
         return ($result) ? $result : false;
     }
 
     /*Data Tools*/
-    public function match_up($type, $sql, $bindings = array(), $onFoundDo = NULL, $onNotFoundDo = NULL, &$bean = NULL){
+    public function match_up($type, $sql, $bindings = array(), $onFoundDo = NULL, $onNotFoundDo = NULL, &$bean = NULL) {
         $result = $this->redbean->matchUp($type, $sql, $bindings, $onFoundDo, $onNotFoundDo, $bean);
         return ($result) ? $result : false;
     }
 
-    public function find_all($table){
+    public function find_all($table) {
         $this->redbean->findAll($table);
         return true;
     }
 
-    public function find($type,$sql,$bindings){
-        $result = $this->redbean->find($type,$sql,$bindings);
+    public function find($type, $sql, $bindings) {
+        $result = $this->redbean->find($type, $sql, $bindings);
         return ($result) ? $result : false;
     }
 
     /*Fluid and Frozen*/
-    public function freeze($data=null){
-        if($data){
+    public function freeze($data = null) {
+        if ($data) {
             $data = array();
-            foreach($data as $key=>$row){
+            foreach ($data as $key=>$row) {
                 $data[$key] = $row;
             }
 
             $this->redbean->freeze($data);
-        }else{
+        } else {
             $this->redbean->freeze(TRUE);
         }
         return true;
@@ -723,50 +723,50 @@ 
 
     /*Debugging*/
     /*value "true", "false"*/
-    public function debug($tf = TRUE, $mode = 0){
-        $this->redbean->debug($tf,$mode);
+    public function debug($tf = TRUE, $mode = 0) {
+        $this->redbean->debug($tf, $mode);
         return true;
     }
 
-    public function dump($data){
+    public function dump($data) {
         $this->redbean->dump($data);
         return true;
     }
 
-    public function test_connection(){
+    public function test_connection() {
         $this->redbean->testConnection();
         return true;
     }
 
     /*Aliases*/
-    public function load($oodb, $types, $id){
+    public function load($oodb, $types, $id) {
         $this->redbean->load($oodb, $types, $id);
         return true;
     }
 
     /*Count*/
-    public function count($type, $addSQL = '', $bindings = array()){
-        $result = $this->redbean->count($type,$addSQL,$bindings);
+    public function count($type, $addSQL = '', $bindings = array()) {
+        $result = $this->redbean->count($type, $addSQL, $bindings);
         return ($result) ? $result : false;
     }
 
     /*Labels, Enums, Tags*/
-    public function dispense_labels($type,$labels){
-        $result = $this->redbean->dispenseLabels($type,$labels);
+    public function dispense_labels($type, $labels) {
+        $result = $this->redbean->dispenseLabels($type, $labels);
         return ($result) ? $result : false;
     }
 
-    public function gather_labels($beans){
+    public function gather_labels($beans) {
         $result = $this->redbean->gatherLabels($beans);
         return ($result) ? $result : false;
     }
 
-    public function enum($enum){
+    public function enum($enum) {
         $result = $this->redbean->enum($enum);
         return ($result) ? $result : false;
     }
 
-    public function tag($bean, $tagList){
+    public function tag($bean, $tagList) {
         $result = $this->redbean->tag($bean, $tagList);
         return ($result) ? $result : false;
     }