synestergates788 / OctaORM

RedBean.php

Braces +367 added lines, -125 removed lines

@@ -82,7 +82,9 @@ 
 	 */
 	public function log()
 	{
-		if ( func_num_args() < 1 ) return;
+		if ( func_num_args() < 1 ) {
+		    return;
+		}
 
 		foreach ( func_get_args() as $argument ) {
 			if ( is_array( $argument ) ) {
@@ -100,7 +102,9 @@ 
 				}
 			}
 
-			if ( $this->mode === self::C_LOGGER_ECHO ) echo "<br>" . PHP_EOL;
+			if ( $this->mode === self::C_LOGGER_ECHO ) {
+			    echo "<br>" . PHP_EOL;
+			}
 		}
 	}
 
@@ -161,7 +165,9 @@ 
 	{
 		$found = array();
 		foreach( $this->logs as $logEntry ) {
-			if ( strpos( $logEntry, $needle ) !== FALSE ) $found[] = $logEntry;
+			if ( strpos( $logEntry, $needle ) !== FALSE ) {
+			    $found[] = $logEntry;
+			}
 		}
 		return $found;
 	}
@@ -252,7 +258,9 @@ 
 	 */
 	protected function fillInValue( $value )
 	{
-		if ( is_null( $value ) ) $value = 'NULL';
+		if ( is_null( $value ) ) {
+		    $value = 'NULL';
+		}
 
 		$value = strval( $value );
 		if ( strlen( $value ) > ( $this->strLen ) ) {
@@ -290,7 +298,9 @@ 
 				$highlight = TRUE;
 			}
 			if (PHP_SAPI === 'cli' && !self::$noCLI) {
-				if ($highlight) echo "\e[91m";
+				if ($highlight) {
+				    echo "\e[91m";
+				}
 				echo $str, PHP_EOL;
 				echo "\e[39m";
 			} else {
@@ -365,7 +375,9 @@ 
 	 */
 	public function log()
 	{
-		if ( func_num_args() < 1 ) return;
+		if ( func_num_args() < 1 ) {
+		    return;
+		}
 
 		$sql = func_get_arg( 0 );
 
@@ -770,7 +782,9 @@ 
 			//Unfortunately the code field is supposed to be int by default (php)
 			//So we need a property to convey the SQL State code.
 			$err = $e->getMessage();
-			if ( $this->loggingEnabled && $this->logger ) $this->logger->log( 'An error occurred: ' . $err );
+			if ( $this->loggingEnabled && $this->logger ) {
+			    $this->logger->log( 'An error occurred: ' . $err );
+			}
 			$exception = new SQL( $err, 0, $e );
 			$exception->setSQLState( $e->getCode() );
 			$exception->setDriverDetails( $e->errorInfo );
@@ -945,8 +959,9 @@ 
 	 */
 	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;
 	}
 
@@ -978,7 +993,9 @@ 
 	 */
 	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,7 +1012,9 @@ 
 	 */
 	public function connect()
 	{
-		if ( $this->isConnected ) return;
+		if ( $this->isConnected ) {
+		    return;
+		}
 		try {
 			$user = $this->connectInfo['user'];
 			$pass = $this->connectInfo['pass'];
@@ -1624,7 +1643,9 @@ 
 			&& $mode !== self::C_ERR_EXCEPTION
 			&& $mode !== self::C_ERR_FUNC
 			&& $mode !== self::C_ERR_FATAL
-		) throw new \Exception( 'Invalid error mode selected' );
+		) {
+		    throw new \Exception( 'Invalid error mode selected' );
+		}
 
 		if ( $mode === self::C_ERR_FUNC && !is_callable( $func ) ) {
 			throw new \Exception( 'Invalid error handler' );
@@ -1729,7 +1750,9 @@ 
 	public static function setMetaAll( $beans, $property, $value )
 	{
 		foreach( $beans as $bean ) {
-			if ( $bean instanceof OODBBean ) $bean->__info[ $property ] = $value;
+			if ( $bean instanceof OODBBean ) {
+			    $bean->__info[ $property ] = $value;
+			}
 			if ( $property == 'type' && !empty($bean->beanHelper)) {
 				$bean->__info['model'] = $bean->beanHelper->getModelForBean( $bean );
 			}
@@ -2103,7 +2126,9 @@ 
 		$arr = array();
 		if ( $parents ) {
 			foreach ( $this as $key => $value ) {
-				if ( substr( $key, -3 ) != '_id' ) continue;
+				if ( substr( $key, -3 ) != '_id' ) {
+				    continue;
+				}
 
 				$prop = substr( $key, 0, strlen( $key ) - 3 );
 				$this->$prop;
@@ -2115,12 +2140,16 @@ 
 				$vn = array();
 
 				foreach ( $value as $i => $b ) {
-					if ( !( $b instanceof OODBBean ) ) continue;
+					if ( !( $b instanceof OODBBean ) ) {
+					    continue;
+					}
 					$vn[] = $b->export( $meta, FALSE, FALSE, $filters );
 					$value = $vn;
 				}
 			} elseif ( $value instanceof OODBBean ) { if ( $hasFilters ) { //has to be on one line, otherwise code coverage miscounts as miss
-					if ( !in_array( strtolower( $value->getMeta( 'type' ) ), $filters ) ) continue;
+					if ( !in_array( strtolower( $value->getMeta( 'type' ) ), $filters ) ) {
+					    continue;
+					}
 				}
 				$value = $value->export( $meta, $parents, FALSE, $filters );
 			}
@@ -2216,7 +2245,9 @@ 
 		}
 		unset( $this->properties[$property] );
 		$shadowKey = 'sys.shadow.'.$property;
-		if ( isset( $this->__info[ $shadowKey ] ) ) unset( $this->__info[$shadowKey] );
+		if ( isset( $this->__info[ $shadowKey ] ) ) {
+		    unset( $this->__info[$shadowKey] );
+		}
 		//also clear modifiers
 		$this->clearModifiers();
 		return;
@@ -2398,7 +2429,9 @@ 
 	{
 		static $beautifulColumns = array();
 
-		if ( ctype_lower( $property ) ) return $property;
+		if ( ctype_lower( $property ) ) {
+		    return $property;
+		}
 		if (
 			( strpos( $property, 'own' ) === 0 && ctype_upper( substr( $property, 3, 1 ) ) )
 			|| ( strpos( $property, 'xown' ) === 0 && ctype_upper( substr( $property, 4, 1 ) ) )
@@ -3073,7 +3106,9 @@ 
 		}
 
 		if ( !is_null( $maxDepth ) ) {
-			if ( !$maxDepth-- ) return $this;
+			if ( !$maxDepth-- ) {
+			    return $this;
+			}
 		}
 
 		$oldFetchType = $this->fetchType;
@@ -3083,9 +3118,13 @@ 
 
 		$beans = $this->$property;
 
-		if ( $beans === NULL ) return $this;
+		if ( $beans === NULL ) {
+		    return $this;
+		}
 
-		if ( !is_array( $beans ) ) $beans = array( $beans );
+		if ( !is_array( $beans ) ) {
+		    $beans = array( $beans );
+		}
 
 		foreach( $beans as $bean ) {
 			$function( $bean );
@@ -3311,11 +3350,17 @@ 
 	 */
 	public function hasListChanged( $property )
 	{
-		if ( !array_key_exists( $property, $this->properties ) ) return FALSE;
+		if ( !array_key_exists( $property, $this->properties ) ) {
+		    return FALSE;
+		}
 		$diffAdded = array_diff_assoc( $this->properties[$property], $this->__info['sys.shadow.'.$property] );
-		if ( count( $diffAdded ) ) return TRUE;
+		if ( count( $diffAdded ) ) {
+		    return TRUE;
+		}
 		$diffMissing = array_diff_assoc( $this->__info['sys.shadow.'.$property], $this->properties[$property] );
-		if ( count( $diffMissing ) ) return TRUE;
+		if ( count( $diffMissing ) ) {
+		    return TRUE;
+		}
 		return FALSE;
 	}
 
@@ -3645,11 +3690,19 @@ 
 		$this->via = NULL;
 		$ids = $beanIndex = $references = array();
 
-		if ( strlen( $list ) < 4 ) throw new RedException('Invalid own-list.');
-		if ( strpos( $list, 'own') !== 0 ) throw new RedException('Only own-lists can be aggregated.');
-		if ( !ctype_upper( substr( $list, 3, 1 ) ) ) throw new RedException('Invalid own-list.');
+		if ( strlen( $list ) < 4 ) {
+		    throw new RedException('Invalid own-list.');
+		}
+		if ( strpos( $list, 'own') !== 0 ) {
+		    throw new RedException('Only own-lists can be aggregated.');
+		}
+		if ( !ctype_upper( substr( $list, 3, 1 ) ) ) {
+		    throw new RedException('Invalid own-list.');
+		}
 
-		if ( is_null( $type ) ) $type = $property;
+		if ( is_null( $type ) ) {
+		    $type = $property;
+		}
 
 		foreach( $this->$list as $bean ) {
 			$field = $property . '_id';
@@ -4207,7 +4260,9 @@ 
 		$assoc = array();
 		
 		foreach ( $rows as $row ) {
-			if ( empty( $row ) ) continue;
+			if ( empty( $row ) ) {
+			    continue;
+			}
 
 			$key   = array_shift( $row );
 			switch ( count( $row ) ) {
@@ -4245,7 +4300,9 @@ 
 	{
 		$this->sql = $sql;
 
-		if ( !$noSignal ) $this->signal( 'sql_exec', $this );
+		if ( !$noSignal ) {
+		    $this->signal( 'sql_exec', $this );
+		}
 
 		return $this->db->GetOne( $sql, $bindings );
 	}
@@ -5304,7 +5361,9 @@ 
 	public static function renameAssociation( $from, $to = NULL )
 	{
 		if ( is_array( $from ) ) {
-			foreach ( $from as $key => $value ) self::$renames[$key] = $value;
+			foreach ( $from as $key => $value ) {
+			    self::$renames[$key] = $value;
+			}
 
 			return;
 		}
@@ -5491,7 +5550,9 @@ 
 	private function putResultInCache( $cacheTag, $key, $values )
 	{
 		if ( isset( $this->cache[$cacheTag] ) ) {
-			if ( count( $this->cache[$cacheTag] ) > $this->maxCacheSizePerType ) array_shift( $this->cache[$cacheTag] );
+			if ( count( $this->cache[$cacheTag] ) > $this->maxCacheSizePerType ) {
+			    array_shift( $this->cache[$cacheTag] );
+			}
 		} else {
 			$this->cache[$cacheTag] = array();
 		}
@@ -5524,17 +5585,22 @@ 
 
 		$sqlConditions = array();
 		foreach ( $conditions as $column => $values ) {
-			if ( $values === NULL ) continue;
+			if ( $values === NULL ) {
+			    continue;
+			}
 
 			if ( is_array( $values ) ) {
-				if ( empty( $values ) ) continue;
+				if ( empty( $values ) ) {
+				    continue;
+				}
 			} else {
 				$values = array( $values );
 			}
 
 			$checkOODB = reset( $values );
-			if ( $checkOODB instanceof OODBBean && $checkOODB->getMeta( 'type' ) === $column && substr( $column, -3 ) != '_id' )
-				$column = $column . '_id';
+			if ( $checkOODB instanceof OODBBean && $checkOODB->getMeta( 'type' ) === $column && substr( $column, -3 ) != '_id' ) {
+							$column = $column . '_id';
+			}
 
 
 			$sql = $this->esc( $column );
@@ -5577,7 +5643,9 @@ 
 		}
 
 		$addSql = $this->glueSQLCondition( $addSql, !empty( $sqlConditions ) ? QueryWriter::C_GLUE_AND : NULL );
-		if ( $addSql ) $sql .= $addSql;
+		if ( $addSql ) {
+		    $sql .= $addSql;
+		}
 
 		return $sql;
 	}
@@ -5647,7 +5715,9 @@ 
 		}
 
 		foreach( $map as $key ) {
-			if ( $key['from'] === $property ) return $key;
+			if ( $key['from'] === $property ) {
+			    return $key;
+			}
 		}
 		return NULL;
 	}
@@ -5860,7 +5930,9 @@ 
 			$result = $this->adapter->getCell( "INSERT INTO $table (id) VALUES($default) $suffix" );
 		}
 
-		if ( $suffix ) return $result;
+		if ( $suffix ) {
+		    return $result;
+		}
 
 		$last_id = $this->adapter->getInsertID();
 
@@ -6016,8 +6088,9 @@ 
 	 */
 	public function writeJoin( $type, $targetType, $leftRight = 'LEFT' )
 	{
-		if ( $leftRight !== 'LEFT' && $leftRight !== 'RIGHT' && $leftRight !== 'INNER' )
-			throw new RedException( 'Invalid JOIN.' );
+		if ( $leftRight !== 'LEFT' && $leftRight !== 'RIGHT' && $leftRight !== 'INNER' ) {
+					throw new RedException( 'Invalid JOIN.' );
+		}
 
 		$table = $this->esc( $type );
 		$targetTable = $this->esc( $targetType );
@@ -6418,7 +6491,9 @@ 
 	 */
 	public function widenColumn( $type, $property, $dataType )
 	{
-		if ( !isset($this->typeno_sqltype[$dataType]) ) return FALSE;
+		if ( !isset($this->typeno_sqltype[$dataType]) ) {
+		    return FALSE;
+		}
 
 		$table   = $this->esc( $type );
 		$column  = $this->esc( $property );
@@ -6527,7 +6602,9 @@ 
 		foreach( $keys as $key ) {
 			if (
 				$key['from'] === $field
-			) return $key['table'];
+			) {
+			    return $key['table'];
+			}
 		}
 		return NULL;
 	}
@@ -6760,8 +6837,12 @@ 
 	{
 		$this->svalue = $value;
 
-		if ( is_null( $value ) ) return MySQL::C_DATATYPE_BOOL;
-		if ( $value === INF ) return MySQL::C_DATATYPE_TEXT7;
+		if ( is_null( $value ) ) {
+		    return MySQL::C_DATATYPE_BOOL;
+		}
+		if ( $value === INF ) {
+		    return MySQL::C_DATATYPE_TEXT7;
+		}
 
 		if ( $flagSpecial ) {
 			if ( preg_match( '/^-?\d+\.\d{2}$/', $value ) ) {
@@ -6792,7 +6873,9 @@ 
 			return MySQL::C_DATATYPE_BOOL;
 		}
 
-		if ( is_float( $value ) ) return self::C_DATATYPE_DOUBLE;
+		if ( is_float( $value ) ) {
+		    return self::C_DATATYPE_DOUBLE;
+		}
 
 		if ( !$this->startsWithZeros( $value ) ) {
 
@@ -6849,7 +6932,9 @@ 
 	{
 		$tableNoQ = $this->esc( $type, TRUE );
 		$columns = array();
-		foreach( $properties as $key => $column ) $columns[$key] = $this->esc( $column );
+		foreach( $properties as $key => $column ) {
+		    $columns[$key] = $this->esc( $column );
+		}
 		$table = $this->esc( $type );
 		sort( $columns ); // Else we get multiple indexes due to order-effects
 		$name = 'UQ_' . sha1( implode( ',', $columns ) );
@@ -6895,7 +6980,9 @@ 
 		$targetFieldNoQ = $this->esc( $targetProperty, TRUE );
 		$tableNoQ = $this->esc( $type, TRUE );
 		$fieldNoQ = $this->esc( $property, TRUE );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) {
+		    return FALSE;
+		}
 
 		//Widen the column if it's incapable of representing a foreign key (at least INT).
 		$columns = $this->getColumns( $tableNoQ );
@@ -6945,7 +7032,9 @@ 
 	 */
 	public function wipeAll()
 	{
-		if (AQueryWriter::$noNuke) throw new \Exception('The nuke() command has been disabled using noNuke() or R::feature(novice/...).');
+		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;' );
 
 		foreach ( $this->getTables() as $t ) {
@@ -7052,7 +7141,9 @@ 
 
 		$oldColumnNames = array_keys( $this->getColumns( $table ) );
 
-		foreach ( $oldColumnNames as $k => $v ) $oldColumnNames[$k] = "`$v`";
+		foreach ( $oldColumnNames as $k => $v ) {
+		    $oldColumnNames[$k] = "`$v`";
+		}
 
 		$q[] = "CREATE TEMPORARY TABLE tmp_backup(" . implode( ",", $oldColumnNames ) . ");";
 		$q[] = "INSERT INTO tmp_backup SELECT * FROM `$table`;";
@@ -7078,16 +7169,22 @@ 
 		foreach ( $tableMap['indexes'] as $name => $index ) {
 			if ( strpos( $name, 'UQ_' ) === 0 ) {
 				$cols = explode( '__', substr( $name, strlen( 'UQ_' . $table ) ) );
-				foreach ( $cols as $k => $v ) $cols[$k] = "`$v`";
+				foreach ( $cols as $k => $v ) {
+				    $cols[$k] = "`$v`";
+				}
 				$q[] = "CREATE UNIQUE INDEX $name ON `$table` (" . implode( ',', $cols ) . ")";
-			} else $q[] = "CREATE INDEX $name ON `$table` ({$index['name']}) ";
+			} else {
+			    $q[] = "CREATE INDEX $name ON `$table` ({$index['name']}) ";
+			}
 		}
 
 		$q[] = "INSERT INTO `$table` SELECT * FROM tmp_backup;";
 		$q[] = "DROP TABLE tmp_backup;";
 		$q[] = "PRAGMA foreign_keys = 1 ";
 
-		foreach ( $q as $sq ) $this->adapter->exec( $sq );
+		foreach ( $q as $sq ) {
+		    $this->adapter->exec( $sq );
+		}
 	}
 
 	/**
@@ -7133,9 +7230,13 @@ 
 		$targetColumn    = $this->esc( $targetProperty, TRUE );
 
 		$tables = $this->getTables();
-		if ( !in_array( $targetTable, $tables ) ) return FALSE;
+		if ( !in_array( $targetTable, $tables ) ) {
+		    return FALSE;
+		}
 
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $table, $column ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $table, $column ) ) ) {
+		    return FALSE;
+		}
 		$t = $this->getTable( $table );
 		$consSQL = ( $constraint ? 'CASCADE' : 'SET NULL' );
 		$label   = 'from_' . $column . '_to_table_' . $targetTable . '_col_' . $targetColumn;
@@ -7242,14 +7343,24 @@ 
 	{
 		$this->svalue = $value;
 
-		if ( $value === NULL ) return self::C_DATATYPE_INTEGER;
-		if ( $value === INF ) return self::C_DATATYPE_TEXT;
+		if ( $value === NULL ) {
+		    return self::C_DATATYPE_INTEGER;
+		}
+		if ( $value === INF ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
-		if ( $this->startsWithZeros( $value ) ) return self::C_DATATYPE_TEXT;
+		if ( $this->startsWithZeros( $value ) ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
-		if ( $value === TRUE || $value === FALSE )  return self::C_DATATYPE_INTEGER;
+		if ( $value === TRUE || $value === FALSE ) {
+		    return self::C_DATATYPE_INTEGER;
+		}
 
-		if ( is_numeric( $value ) && ( intval( $value ) == $value ) && $value < 2147483648 && $value > -2147483648 ) return self::C_DATATYPE_INTEGER;
+		if ( is_numeric( $value ) && ( intval( $value ) == $value ) && $value < 2147483648 && $value > -2147483648 ) {
+		    return self::C_DATATYPE_INTEGER;
+		}
 
 		if ( ( is_numeric( $value ) && $value < 2147483648 && $value > -2147483648)
 			|| preg_match( '/\d{4}\-\d\d\-\d\d/', $value )
@@ -7326,7 +7437,9 @@ 
 		$columnsRaw = $this->adapter->get( "PRAGMA table_info('$table')" );
 
 		$columns    = array();
-		foreach ( $columnsRaw as $r ) $columns[$r['name']] = $r['type'];
+		foreach ( $columnsRaw as $r ) {
+		    $columns[$r['name']] = $r['type'];
+		}
 
 		return $columns;
 	}
@@ -7373,7 +7486,9 @@ 
 	public function addIndex( $type, $name, $column )
 	{
 		$columns = $this->getColumns( $type );
-		if ( !isset( $columns[$column] ) ) return FALSE;
+		if ( !isset( $columns[$column] ) ) {
+		    return FALSE;
+		}
 
 		$table  = $this->esc( $type );
 		$name   = preg_replace( '/\W/', '', $name );
@@ -7412,7 +7527,9 @@ 
 	 */
 	public function wipeAll()
 	{
-		if (AQueryWriter::$noNuke) throw new \Exception('The nuke() command has been disabled using noNuke() or R::feature(novice/...).');
+		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 ' );
 
 		foreach ( $this->getTables() as $t ) {
@@ -7663,7 +7780,9 @@ 
 	{
 		$this->svalue = $value;
 
-		if ( $value === INF ) return self::C_DATATYPE_TEXT;
+		if ( $value === INF ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
 		if ( $flagSpecial && $value ) {
 			if ( preg_match( '/^\d{4}\-\d\d-\d\d$/', $value ) ) {
@@ -7702,9 +7821,13 @@ 
 			}
 		}
 
-		if ( is_float( $value ) ) return self::C_DATATYPE_DOUBLE;
+		if ( is_float( $value ) ) {
+		    return self::C_DATATYPE_DOUBLE;
+		}
 
-		if ( $this->startsWithZeros( $value ) ) return self::C_DATATYPE_TEXT;
+		if ( $this->startsWithZeros( $value ) ) {
+		    return self::C_DATATYPE_TEXT;
+		}
 
 		if ( $value === FALSE || $value === TRUE || $value === NULL || ( is_numeric( $value )
 				&& AQueryWriter::canBeTreatedAsInt( $value )
@@ -7726,7 +7849,9 @@ 
 	{
 		$r = ( isset( $this->sqltype_typeno[$typedescription] ) ) ? $this->sqltype_typeno[$typedescription] : 99;
 
-		if ( $includeSpecials ) return $r;
+		if ( $includeSpecials ) {
+		    return $r;
+		}
 
 		if ( $r >= QueryWriter::C_DATATYPE_RANGE_SPECIAL ) {
 			return self::C_DATATYPE_SPECIFIED;
@@ -7758,7 +7883,9 @@ 
 	{
 		$tableNoQ = $this->esc( $type, TRUE );
 		$columns = array();
-		foreach( $properties as $key => $column ) $columns[$key] = $this->esc( $column );
+		foreach( $properties as $key => $column ) {
+		    $columns[$key] = $this->esc( $column );
+		}
 		$table = $this->esc( $type );
 		sort( $columns ); //else we get multiple indexes due to order-effects
 		$name = "UQ_" . sha1( $table . implode( ',', $columns ) );
@@ -7814,7 +7941,9 @@ 
 		$targetField = $this->esc( $targetProperty );
 		$tableNoQ = $this->esc( $type, TRUE );
 		$fieldNoQ = $this->esc( $property, TRUE );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $fieldNoQ ) ) ) {
+		    return FALSE;
+		}
 		try{
 			$delRule = ( $isDep ? 'CASCADE' : 'SET NULL' );
 			$this->adapter->exec( "ALTER TABLE {$table}
@@ -7831,13 +7960,15 @@ 
 	 */
 	public function wipeAll()
 	{
-		if (AQueryWriter::$noNuke) throw new \Exception('The nuke() command has been disabled using noNuke() or R::feature(novice/...).');
+		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' );
 
 		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' );
@@ -7914,7 +8045,9 @@ 
 		$column          = $this->esc( $property );
 		$columnNoQ       = $this->esc( $property, TRUE );
 		$targetColumn    = $this->esc( $targetProperty );
-		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $columnNoQ ) ) ) return FALSE;
+		if ( !is_null( $this->getForeignKeyForTypeProperty( $tableNoQ, $columnNoQ ) ) ) {
+		    return FALSE;
+		}
 		$needsToDropFK   = FALSE;
 		$casc = ( $isDep ? 'CASCADE' : 'SET NULL' );
 		$sql  = "ALTER TABLE $table ADD CONSTRAINT FOREIGN KEY($column) REFERENCES $targetTable($targetColumn) ON DELETE $casc ";
@@ -7932,11 +8065,15 @@ 
 	protected function getKeyMapForType( $type  )
 	{
 		$sqlCode = $this->adapter->get("SHOW CREATE TABLE `{$type}`");
-		if (!isset($sqlCode[0])) return array();
+		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 );
 		$list = array();
-		if (!isset($matches[0])) return $list;
+		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' );
@@ -8134,7 +8271,9 @@ 
 	{
 		$tableNoQ = $this->esc( $type, TRUE );
 		$columns = array();
-		foreach( $properties as $key => $column ) $columns[$key] = $this->esc( $column );
+		foreach( $properties as $key => $column ) {
+		    $columns[$key] = $this->esc( $column );
+		}
 		$table = $this->esc( $type );
 		sort( $columns ); // else we get multiple indexes due to order-effects
 		$name = 'UQ_' . sha1( implode( ',', $columns ) );
@@ -8188,7 +8327,9 @@ 
 	 */
 	public function wipeAll()
 	{
-		if (AQueryWriter::$noNuke) throw new \Exception('The nuke() command has been disabled using noNuke() or R::feature(novice/...).');
+		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']}\"" );
@@ -8219,7 +8360,9 @@ 
 		foreach( $keys as $key ) {
 			if (
 				$key['from'] === $field
-			) return $key['table'];
+			) {
+			    return $key['table'];
+			}
 		}
 		return NULL;
 	}
@@ -8545,7 +8688,9 @@ 
 
 			$myFieldLink = $bean->getMeta( 'type' ) . '_id';
 			$alias = $bean->getMeta( 'sys.alias.' . $trash->getMeta( 'type' ) );
-			if ( $alias ) $myFieldLink = $alias . '_id';
+			if ( $alias ) {
+			    $myFieldLink = $alias . '_id';
+			}
 
 			if ( $trash->getMeta( 'sys.garbage' ) === TRUE ) {
 				$this->trash( $trash );
@@ -8635,7 +8780,9 @@ 
 			$this->store( $value );
 		}
 		$id = $value->id;
-		if ($bean->$linkField != $id) $bean->$linkField = $id;
+		if ($bean->$linkField != $id) {
+		    $bean->$linkField = $id;
+		}
 		$bean->setMeta( 'cast.' . $linkField, 'id' );
 		$embeddedBeans[$linkField] = $value;
 		unset( $bean->$property );
@@ -8878,7 +9025,9 @@ 
 	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();
@@ -9184,7 +9333,9 @@ 
 
 				$myFieldLink = $beanType . '_id';
 				$alias = $bean->getMeta( 'sys.alias.' . $addition->getMeta( 'type' ) );
-				if ( $alias ) $myFieldLink = $alias . '_id';
+				if ( $alias ) {
+				    $myFieldLink = $alias . '_id';
+				}
 
 				$addition->$myFieldLink = $bean->id;
 				$addition->setMeta( 'cast.' . $myFieldLink, 'id' );
@@ -9229,7 +9380,9 @@ 
 
 			$columnCache = NULL;
 			foreach ( $bean as $property => $value ) {
-				if ( $partial && !in_array( $property, $mask ) ) continue;
+				if ( $partial && !in_array( $property, $mask ) ) {
+				    continue;
+				}
 				if ( $property !== 'id' ) {
 					$this->modifySchema( $bean, $property, $value, $columnCache );
 				}
@@ -9448,7 +9601,9 @@ 
 			}
 
 			foreach( $properties as $key => $value ) {
-				if ( $partial && !in_array( $key, $mask ) ) continue;
+				if ( $partial && !in_array( $key, $mask ) ) {
+				    continue;
+				}
 				$updateValues[] = array( $k1 => $key, $k2 => $value );
 			}
 			$bean->id = $this->writer->updateRecord( $table, $updateValues, $id );
@@ -9485,7 +9640,9 @@ 
 
 				$myFieldLink = $beanType . '_id';
 				$alias = $bean->getMeta( 'sys.alias.' . $addition->getMeta( 'type' ) );
-				if ( $alias ) $myFieldLink = $alias . '_id';
+				if ( $alias ) {
+				    $myFieldLink = $alias . '_id';
+				}
 
 				$addition->$myFieldLink = $bean->id;
 				$addition->setMeta( 'cast.' . $myFieldLink, 'id' );
@@ -9830,7 +9987,9 @@ 
 	public function dispense( $type, $number = 1, $alwaysReturnArray = FALSE )
 	{
 		if ( $number < 1 ) {
-			if ( $alwaysReturnArray ) return array();
+			if ( $alwaysReturnArray ) {
+			    return array();
+			}
 			return NULL;
 		}
 
@@ -10130,8 +10289,12 @@ 
 		list( $type, $property ) = explode( '.', $field );
 		$mode = ($mode === 'write') ? QueryWriter::C_SQLFILTER_WRITE : QueryWriter::C_SQLFILTER_READ;
 
-		if ( !isset( self::$sqlFilters[$mode] ) ) self::$sqlFilters[$mode] = array();
-		if ( !isset( self::$sqlFilters[$mode][$type] ) ) self::$sqlFilters[$mode][$type] = array();
+		if ( !isset( self::$sqlFilters[$mode] ) ) {
+		    self::$sqlFilters[$mode] = array();
+		}
+		if ( !isset( self::$sqlFilters[$mode][$type] ) ) {
+		    self::$sqlFilters[$mode][$type] = array();
+		}
 
 		if ( is_null( $function ) ) {
 			unset( self::$sqlFilters[$mode][$type][$property] );
@@ -10715,10 +10878,14 @@ 
 	 */
 	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_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 ) ) {
 				$writer = $this->toolbox->getWriter();
@@ -10759,8 +10926,12 @@ 
 							$wannaBean[$property] = $value;
 						}
 					}
-					if ( !isset( $wannaBean['id'] ) ) continue;
-					if ( is_null( $wannaBean['id'] ) ) continue;
+					if ( !isset( $wannaBean['id'] ) ) {
+					    continue;
+					}
+					if ( is_null( $wannaBean['id'] ) ) {
+					    continue;
+					}
 					$wannaBeans[$type][$wannaBean['id']] = $wannaBean;
 				}
 			}
@@ -10780,7 +10951,9 @@ 
 			$do      = $remapping['do'];
 			foreach( $beans[$a] as $bean ) {
 				foreach( $beans[$b] as $putBean ) {
-					if ( $matcher( $bean, $putBean, $beans ) ) $do( $bean, $putBean, $beans, $remapping );
+					if ( $matcher( $bean, $putBean, $beans ) ) {
+					    $do( $bean, $putBean, $beans, $remapping );
+					}
 				}
 			}
 		}
@@ -11137,13 +11310,17 @@ 
 		$links = array();
 
 		foreach ( $rows as $key => $row ) {
-			if ( !isset( $links[$row['id']] ) ) $links[$row['id']] = array();
+			if ( !isset( $links[$row['id']] ) ) {
+			    $links[$row['id']] = array();
+			}
 			$links[$row['id']][] = $row['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] );
+		foreach ( $beans as $bean ) {
+		    $bean->setMeta( 'sys.belongs-to', $links[$bean->id] );
+		}
 
 		return $beans;
 	}
@@ -12056,7 +12233,9 @@ 
 		}
 
 		foreach( $values as $enumItem ) {
-				if ( $enumItem->name === $value ) return $enumItem;
+				if ( $enumItem->name === $value ) {
+				    return $enumItem;
+				}
 		}
 
 		$newEnumItems = $this->dispenseLabels( $type, array( $value ) );
@@ -12264,7 +12443,9 @@ 
 	 */
 	public static function testConnection()
 	{
-		if ( !isset( self::$adapter ) ) return FALSE;
+		if ( !isset( self::$adapter ) ) {
+		    return FALSE;
+		}
 
 		$database = self::$adapter->getDatabase();
 		try {
@@ -12722,7 +12903,9 @@ 
 	 */
 	public static function load( $type, $id, $snippet = NULL )
 	{
-		if ( $snippet !== NULL ) self::$writer->setSQLSelectSnippet( $snippet );
+		if ( $snippet !== NULL ) {
+		    self::$writer->setSQLSelectSnippet( $snippet );
+		}
 		$bean = self::$redbean->load( $type, $id );
 		return $bean;
 	}
@@ -12783,7 +12966,9 @@ 
 	 */
 	public static function trash( $beanOrType, $id = NULL )
 	{
-		if ( is_string( $beanOrType ) ) return self::trash( self::load( $beanOrType, $id ) );
+		if ( is_string( $beanOrType ) ) {
+		    return self::trash( self::load( $beanOrType, $id ) );
+		}
 		return self::$redbean->trash( $beanOrType );
 	}
 
@@ -13372,7 +13557,9 @@ 
 	 */
 	public static function useExportCase( $caseStyle = 'default' )
 	{
-		if ( !in_array( $caseStyle, array( 'default', 'camel', 'dolphin' ) ) ) throw new RedException( 'Invalid case selected.' );
+		if ( !in_array( $caseStyle, array( 'default', 'camel', 'dolphin' ) ) ) {
+		    throw new RedException( 'Invalid case selected.' );
+		}
 		self::$exportCaseStyle = $caseStyle;
 	}
 
@@ -13746,7 +13933,9 @@ 
 	 */
 	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 +13976,9 @@ 
 	 */
 	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 +14019,9 @@ 
 	 */
 	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;
 	}
@@ -14146,7 +14339,9 @@ 
 	 */
 	public static function isoDateTime( $time = NULL )
 	{
-		if ( !$time ) $time = time();
+		if ( !$time ) {
+		    $time = time();
+		}
 		return @date( 'Y-m-d H:i:s', $time );
 	}
 
@@ -14220,10 +14415,16 @@ 
 	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();
 	}
 
@@ -14319,7 +14520,9 @@ 
 	public static function beansToArray( $beans )
 	{
 		$list = array();
-		foreach( $beans as $bean ) $list[] = $bean->export();
+		foreach( $beans as $bean ) {
+		    $list[] = $bean->export();
+		}
 		return $list;
 	}
 
@@ -15308,7 +15511,9 @@ 
 	 */
 	protected function duplicate( OODBBean $bean, $trail = array(), $preserveIDs = FALSE )
 	{
-		if ( $this->inTrailOrAdd( $trail, $bean ) ) return $bean;
+		if ( $this->inTrailOrAdd( $trail, $bean ) ) {
+		    return $bean;
+		}
 
 		$type = $bean->getMeta( 'type' );
 
@@ -15316,7 +15521,9 @@ 
 		foreach ( $this->tables as $table ) {
 
 			if ( !empty( $this->filters ) ) {
-				if ( !in_array( $table, $this->filters ) ) continue;
+				if ( !in_array( $table, $this->filters ) ) {
+				    continue;
+				}
 			}
 
 			list( $owned, $shared ) = $this->getListNames( $table );
@@ -15550,8 +15757,12 @@ 
 			$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;
 	}
 }
@@ -15638,8 +15849,11 @@ 
 	public static function flat( $array, $result = array() )
 	{		
 		foreach( $array as $value ) {
-			if ( is_array( $value ) ) $result = self::flat( $value, $result );
-			else $result[] = $value;
+			if ( is_array( $value ) ) {
+			    $result = self::flat( $value, $result );
+			} else {
+			    $result[] = $value;
+			}
 		}
 		return $result;
 	}
@@ -15783,7 +15997,9 @@ 
 						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;
 			}
 
@@ -15794,7 +16010,9 @@ 
 			$type = $typeOrBeanArray;
 		}
 
-		if (self::$enforceNamingPolicy) self::checkType( $type );
+		if (self::$enforceNamingPolicy) {
+		    self::checkType( $type );
+		}
 
 		$beanOrBeans = $oodb->dispense( $type, $num, $alwaysReturnArray );
 
@@ -16179,10 +16397,18 @@ 
 		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 );
+		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 );
+			if (PHP_VERSION_ID>=505040) {
+			    fputcsv($handle, $row, $delimiter, $enclosure, $escapeChar );
+			} else {
+			    fputcsv($handle, $row, $delimiter, $enclosure );
+			}
 		}
 		fclose($handle);
 		if ( $output ) {
@@ -16493,18 +16719,34 @@ 
 	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 );
+		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' );
+			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 ( !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;
+						if ( in_array( $property, $filters ) ) {
+						    continue;
+						}
 						$key = vsprintf( $format, array( $type, $bean->id, $property ) );
 						$compare = $other->{$property};
 						if ( !is_object( $value ) && !is_array( $value ) ) {

OctaORM.php

Braces +21 added lines, -21 removed lines

@@ -99,7 +99,7 @@ 
                             $data[$key_ib]->$row = $table_fields_val[$key];
                         }
 
-                    }else{
+                    } else{
                         return false;
                     }
                 }
@@ -149,7 +149,7 @@ 
                             $data->$row = $table_fields_val[$key];
                         }
 
-                    }else{
+                    } else{
                         return false;
                     }
 
@@ -170,7 +170,7 @@ 
 
                 return true;
 
-            }else{
+            } else{
                 $this->redbean->trash($table,$id);
                 return true;
             }
@@ -207,12 +207,12 @@ 
                     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."'";
             }
@@ -234,12 +234,12 @@ 
                     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."'";
             }
@@ -255,7 +255,7 @@ 
             foreach($data as $key=>$row){
                 if($key == $last_key){
                     $where_in_fields .= $row;
-                }else{
+                } else{
                     $where_in_fields .= $row.",";
                 }
             }
@@ -271,7 +271,7 @@ 
             foreach($data as $key=>$row){
                 if($key == $last_key){
                     $where_in_fields .= $row;
-                }else{
+                } else{
                     $where_in_fields .= $row.",";
                 }
             }
@@ -287,7 +287,7 @@ 
             foreach($data as $key=>$row){
                 if($key == $last_key){
                     $where_in_fields .= $row;
-                }else{
+                } else{
                     $where_in_fields .= $row.",";
                 }
             }
@@ -303,7 +303,7 @@ 
             foreach($data as $key=>$row){
                 if($key == $last_key){
                     $where_in_fields .= $row;
-                }else{
+                } else{
                     $where_in_fields .= $row.",";
                 }
             }
@@ -325,12 +325,12 @@ 
                     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."%'";
             }
@@ -351,12 +351,12 @@ 
                     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."%'";
             }
         }
@@ -377,12 +377,12 @@ 
                     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."%'";
             }
@@ -403,12 +403,12 @@ 
                     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."%'";
             }
         }
@@ -602,7 +602,7 @@ 
 
                 return ($result) ? $result : false;
 
-            }else{
+            } else{
                 $this->redbean->inspect($data);
                 return true;
             }
@@ -715,7 +715,7 @@ 
             }
 
             $this->redbean->freeze($data);
-        }else{
+        } else{
             $this->redbean->freeze(TRUE);
         }
         return true;