reginaldojunior / winners

lib/Cake/Model/Datasource/Database/Postgres.php

Doc Comments +3 added lines, -3 removed lines

@@ -292,7 +292,7 @@ 
 /**
  * Gets the associated sequence for the given table/field
  *
- * @param string|Model $table Either a full table name (with prefix) as a string, or a model object
+ * @param string|null $table Either a full table name (with prefix) as a string, or a model object
  * @param string $field Name of the ID database field. Defaults to "id"
  * @return string The associated sequence name from the sequence map, defaults to "{$table}_{$field}_seq"
  */
@@ -497,7 +497,7 @@ 
  *
  * @param array $compare Results of CakeSchema::compare()
  * @param string $table name of the table
- * @return array
+ * @return false|string
  */
 	public function alterSchema($compare, $table = null) {
 		if (!is_array($compare)) {
@@ -783,7 +783,7 @@ 
  *
  * @param mixed $data Value to be translated
  * @param boolean $quote true to quote a boolean to be used in a query, false to return the boolean value
- * @return boolean Converted boolean value
+ * @return string|boolean Converted boolean value
  */
 	public function boolean($data, $quote = false) {
 		switch (true) {

Spacing +55 added lines, -55 removed lines

@@ -123,13 +123,13 @@ 
 			);
 
 			$this->connected = true;
-			if (!empty($config['encoding'])) {
+			if ( ! empty($config['encoding'])) {
 				$this->setEncoding($config['encoding']);
 			}
-			if (!empty($config['schema'])) {
-				$this->_execute('SET search_path TO "' . $config['schema'] . '"');
+			if ( ! empty($config['schema'])) {
+				$this->_execute('SET search_path TO "'.$config['schema'].'"');
 			}
-			if (!empty($config['settings'])) {
+			if ( ! empty($config['settings'])) {
 				foreach ($config['settings'] as $key => $value) {
 					$this->_execute("SET $key TO $value");
 				}
@@ -170,7 +170,7 @@ 
 		$sql = "SELECT table_name as name FROM INFORMATION_SCHEMA.tables WHERE table_schema = ?";
 		$result = $this->_execute($sql, array($schema));
 
-		if (!$result) {
+		if ( ! $result) {
 			return array();
 		}
 
@@ -210,7 +210,7 @@ 
 			// Postgres columns don't match the coding standards.
 			foreach ($cols as $c) {
 				$type = $c->type;
-				if (!empty($c->oct_length) && $c->char_length === null) {
+				if ( ! empty($c->oct_length) && $c->char_length === null) {
 					if ($c->type === 'character varying') {
 						$length = null;
 						$type = 'text';
@@ -219,7 +219,7 @@ 
 					} else {
 						$length = intval($c->oct_length);
 					}
-				} elseif (!empty($c->char_length)) {
+				} elseif ( ! empty($c->char_length)) {
 					$length = intval($c->char_length);
 				} else {
 					$length = $this->length($c->type);
@@ -250,16 +250,16 @@ 
 					preg_match('/nextval\([\'"]?([\w.]+)/', $c->default, $seq)
 				) {
 					$fields[$c->name]['default'] = null;
-					if (!empty($seq) && isset($seq[1])) {
+					if ( ! empty($seq) && isset($seq[1])) {
 						if (strpos($seq[1], '.') === false) {
-							$sequenceName = $c->schema . '.' . $seq[1];
+							$sequenceName = $c->schema.'.'.$seq[1];
 						} else {
 							$sequenceName = $seq[1];
 						}
 						$this->_sequenceMap[$table][$c->name] = $sequenceName;
 					}
 				}
-				if ($fields[$c->name]['type'] === 'boolean' && !empty($fields[$c->name]['default'])) {
+				if ($fields[$c->name]['type'] === 'boolean' && ! empty($fields[$c->name]['default'])) {
 					$fields[$c->name]['default'] = constant($fields[$c->name]['default']);
 				}
 			}
@@ -300,7 +300,7 @@ 
 		if (is_object($table)) {
 			$table = $this->fullTableName($table, false, false);
 		}
-		if (!isset($this->_sequenceMap[$table])) {
+		if ( ! isset($this->_sequenceMap[$table])) {
 			$this->describe($table);
 		}
 		if (isset($this->_sequenceMap[$table][$field])) {
@@ -338,13 +338,13 @@ 
  */
 	public function truncate($table, $reset = false) {
 		$table = $this->fullTableName($table, false, false);
-		if (!isset($this->_sequenceMap[$table])) {
+		if ( ! isset($this->_sequenceMap[$table])) {
 			$cache = $this->cacheSources;
 			$this->cacheSources = false;
 			$this->describe($table);
 			$this->cacheSources = $cache;
 		}
-		if ($this->execute('DELETE FROM ' . $this->fullTableName($table))) {
+		if ($this->execute('DELETE FROM '.$this->fullTableName($table))) {
 			if (isset($this->_sequenceMap[$table]) && $reset != true) {
 				foreach ($this->_sequenceMap[$table] as $sequence) {
 					list($schema, $sequence) = explode('.', $sequence);
@@ -384,17 +384,17 @@ 
 		}
 		$fields = parent::fields($model, $alias, $fields, false);
 
-		if (!$quote) {
+		if ( ! $quote) {
 			return $fields;
 		}
 		$count = count($fields);
 
-		if ($count >= 1 && !preg_match('/^\s*COUNT\(\*/', $fields[0])) {
+		if ($count >= 1 && ! preg_match('/^\s*COUNT\(\*/', $fields[0])) {
 			$result = array();
 			for ($i = 0; $i < $count; $i++) {
-				if (!preg_match('/^.+\\(.*\\)/', $fields[$i]) && !preg_match('/\s+AS\s+/', $fields[$i])) {
+				if ( ! preg_match('/^.+\\(.*\\)/', $fields[$i]) && ! preg_match('/\s+AS\s+/', $fields[$i])) {
 					if (substr($fields[$i], -1) === '*') {
-						if (strpos($fields[$i], '.') !== false && $fields[$i] != $alias . '.*') {
+						if (strpos($fields[$i], '.') !== false && $fields[$i] != $alias.'.*') {
 							$build = explode('.', $fields[$i]);
 							$AssociatedModel = $model->{$build[0]};
 						} else {
@@ -413,10 +413,10 @@ 
 					}
 
 					if (strrpos($fields[$i], '.') === false) {
-						$fields[$i] = $prepend . $this->name($alias) . '.' . $this->name($fields[$i]) . ' AS ' . $this->name($alias . '__' . $fields[$i]);
+						$fields[$i] = $prepend.$this->name($alias).'.'.$this->name($fields[$i]).' AS '.$this->name($alias.'__'.$fields[$i]);
 					} else {
 						$build = explode('.', $fields[$i]);
-						$fields[$i] = $prepend . $this->name($build[0]) . '.' . $this->name($build[1]) . ' AS ' . $this->name($build[0] . '__' . $build[1]);
+						$fields[$i] = $prepend.$this->name($build[0]).'.'.$this->name($build[1]).' AS '.$this->name($build[0].'__'.$build[1]);
 					}
 				} else {
 					$fields[$i] = preg_replace_callback('/\(([\s\.\w]+)\)/', array(&$this, '_quoteFunctionField'), $fields[$i]);
@@ -443,15 +443,15 @@ 
 		}
 		$constant = preg_match('/^\d+|NULL|FALSE|TRUE$/i', $match[1]);
 
-		if (!$constant && strpos($match[1], '.') === false) {
+		if ( ! $constant && strpos($match[1], '.') === false) {
 			$match[1] = $this->name($match[1]);
-		} elseif (!$constant) {
+		} elseif ( ! $constant) {
 			$parts = explode('.', $match[1]);
-			if (!Hash::numeric($parts)) {
+			if ( ! Hash::numeric($parts)) {
 				$match[1] = $this->name($match[1]);
 			}
 		}
-		return '(' . $prepend . $match[1] . ')';
+		return '('.$prepend.$match[1].')';
 	}
 
 /**
@@ -469,9 +469,9 @@ 
 			WHERE c.oid  = (
 				SELECT c.oid
 				FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
-				WHERE c.relname ~ '^(" . $table . ")$'
+				WHERE c.relname ~ '^(" . $table.")$'
 					AND pg_catalog.pg_table_is_visible(c.oid)
-					AND n.nspname ~ '^(" . $this->config['schema'] . ")$'
+					AND n.nspname ~ '^(" . $this->config['schema'].")$'
 			)
 			AND c.oid = i.indrelid AND i.indexrelid = c2.oid
 			ORDER BY i.indisprimary DESC, i.indisunique DESC, c2.relname", false);
@@ -500,15 +500,15 @@ 
  * @return array
  */
 	public function alterSchema($compare, $table = null) {
-		if (!is_array($compare)) {
+		if ( ! is_array($compare)) {
 			return false;
 		}
 		$out = '';
 		$colList = array();
 		foreach ($compare as $curTable => $types) {
 			$indexes = $colList = array();
-			if (!$table || $table === $curTable) {
-				$out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n";
+			if ( ! $table || $table === $curTable) {
+				$out .= 'ALTER TABLE '.$this->fullTableName($curTable)." \n";
 				foreach ($types as $type => $column) {
 					if (isset($column['indexes'])) {
 						$indexes[$type] = $column['indexes'];
@@ -518,19 +518,19 @@ 
 						case 'add':
 							foreach ($column as $field => $col) {
 								$col['name'] = $field;
-								$colList[] = 'ADD COLUMN ' . $this->buildColumn($col);
+								$colList[] = 'ADD COLUMN '.$this->buildColumn($col);
 							}
 							break;
 						case 'drop':
 							foreach ($column as $field => $col) {
 								$col['name'] = $field;
-								$colList[] = 'DROP COLUMN ' . $this->name($field);
+								$colList[] = 'DROP COLUMN '.$this->name($field);
 							}
 							break;
 						case 'change':
 							$schema = $this->describe($curTable);
 							foreach ($column as $field => $col) {
-								if (!isset($col['name'])) {
+								if ( ! isset($col['name'])) {
 									$col['name'] = $field;
 								}
 								$original = $schema[$field];
@@ -543,28 +543,28 @@ 
 								if ($field !== $col['name']) {
 									$newName = $this->name($col['name']);
 									$out .= "\tRENAME {$fieldName} TO {$newName};\n";
-									$out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n";
+									$out .= 'ALTER TABLE '.$this->fullTableName($curTable)." \n";
 									$fieldName = $newName;
 								}
 
 								if ($boolToInt) {
-									$colList[] = 'ALTER COLUMN ' . $fieldName . '  SET DEFAULT NULL';
-									$colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col)) . ' USING CASE WHEN TRUE THEN 1 ELSE 0 END';
+									$colList[] = 'ALTER COLUMN '.$fieldName.'  SET DEFAULT NULL';
+									$colList[] = 'ALTER COLUMN '.$fieldName.' TYPE '.str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col)).' USING CASE WHEN TRUE THEN 1 ELSE 0 END';
 								} else {
-									$colList[] = 'ALTER COLUMN ' . $fieldName . ' TYPE ' . str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col));
+									$colList[] = 'ALTER COLUMN '.$fieldName.' TYPE '.str_replace(array($fieldName, 'NOT NULL'), '', $this->buildColumn($col));
 								}
 
 								if (isset($nullable)) {
 									$nullable = ($nullable) ? 'DROP NOT NULL' : 'SET NOT NULL';
-									$colList[] = 'ALTER COLUMN ' . $fieldName . '  ' . $nullable;
+									$colList[] = 'ALTER COLUMN '.$fieldName.'  '.$nullable;
 								}
 
 								if (isset($default)) {
-									if (!$boolToInt) {
-										$colList[] = 'ALTER COLUMN ' . $fieldName . '  SET DEFAULT ' . $this->value($default, $col['type']);
+									if ( ! $boolToInt) {
+										$colList[] = 'ALTER COLUMN '.$fieldName.'  SET DEFAULT '.$this->value($default, $col['type']);
 									}
 								} else {
-									$colList[] = 'ALTER COLUMN ' . $fieldName . '  DROP DEFAULT';
+									$colList[] = 'ALTER COLUMN '.$fieldName.'  DROP DEFAULT';
 								}
 
 							}
@@ -572,18 +572,18 @@ 
 					}
 				}
 				if (isset($indexes['drop']['PRIMARY'])) {
-					$colList[] = 'DROP CONSTRAINT ' . $curTable . '_pkey';
+					$colList[] = 'DROP CONSTRAINT '.$curTable.'_pkey';
 				}
 				if (isset($indexes['add']['PRIMARY'])) {
 					$cols = $indexes['add']['PRIMARY']['column'];
 					if (is_array($cols)) {
 						$cols = implode(', ', $cols);
 					}
-					$colList[] = 'ADD PRIMARY KEY (' . $cols . ')';
+					$colList[] = 'ADD PRIMARY KEY ('.$cols.')';
 				}
 
-				if (!empty($colList)) {
-					$out .= "\t" . implode(",\n\t", $colList) . ";\n\n";
+				if ( ! empty($colList)) {
+					$out .= "\t".implode(",\n\t", $colList).";\n\n";
 				} else {
 					$out = '';
 				}
@@ -608,7 +608,7 @@ 
 				if ($name === 'PRIMARY') {
 					continue;
 				} else {
-					$out .= 'INDEX ' . $name;
+					$out .= 'INDEX '.$name;
 				}
 				$alter[] = $out;
 			}
@@ -619,15 +619,15 @@ 
 				if ($name === 'PRIMARY') {
 					continue;
 				} else {
-					if (!empty($value['unique'])) {
+					if ( ! empty($value['unique'])) {
 						$out .= 'UNIQUE ';
 					}
 					$out .= 'INDEX ';
 				}
 				if (is_array($value['column'])) {
-					$out .= $name . ' ON ' . $table . ' (' . implode(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
+					$out .= $name.' ON '.$table.' ('.implode(', ', array_map(array(&$this, 'name'), $value['column'])).')';
 				} else {
-					$out .= $name . ' ON ' . $table . ' (' . $this->name($value['column']) . ')';
+					$out .= $name.' ON '.$table.' ('.$this->name($value['column']).')';
 				}
 				$alter[] = $out;
 			}
@@ -663,7 +663,7 @@ 
 		if (is_array($real)) {
 			$col = $real['name'];
 			if (isset($real['limit'])) {
-				$col .= '(' . $real['limit'] . ')';
+				$col .= '('.$real['limit'].')';
 			}
 			return $col;
 		}
@@ -800,13 +800,13 @@ 
 				$result = ($data === 'TRUE');
 				break;
 			default:
-				$result = (bool)$data;
+				$result = (bool) $data;
 		}
 
 		if ($quote) {
 			return ($result) ? 'TRUE' : 'FALSE';
 		}
-		return (bool)$result;
+		return (bool) $result;
 	}
 
 /**
@@ -816,7 +816,7 @@ 
  * @return boolean True on success, false on failure
  */
 	public function setEncoding($enc) {
-		return $this->_execute('SET NAMES ' . $this->value($enc)) !== false;
+		return $this->_execute('SET NAMES '.$this->value($enc)) !== false;
 	}
 
 /**
@@ -842,7 +842,7 @@ 
  */
 	public function buildColumn($column) {
 		$col = $this->columns[$column['type']];
-		if (!isset($col['length']) && !isset($col['limit'])) {
+		if ( ! isset($col['length']) && ! isset($col['limit'])) {
 			unset($column['length']);
 		}
 		$out = parent::buildColumn($column);
@@ -888,15 +888,15 @@ 
  */
 	public function buildIndex($indexes, $table = null) {
 		$join = array();
-		if (!is_array($indexes)) {
+		if ( ! is_array($indexes)) {
 			return array();
 		}
 		foreach ($indexes as $name => $value) {
 			if ($name === 'PRIMARY') {
-				$out = 'PRIMARY KEY  (' . $this->name($value['column']) . ')';
+				$out = 'PRIMARY KEY  ('.$this->name($value['column']).')';
 			} else {
 				$out = 'CREATE ';
-				if (!empty($value['unique'])) {
+				if ( ! empty($value['unique'])) {
 					$out .= 'UNIQUE ';
 				}
 				if (is_array($value['column'])) {

lib/Cake/Model/Datasource/Database/Sqlite.php

Doc Comments +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
  * @param array $fields
  * @param array $values
  * @param mixed $conditions
- * @return array
+ * @return boolean
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
 		if (empty($values) && !empty($fields)) {

Spacing +29 added lines, -29 removed lines

@@ -110,9 +110,9 @@ 
 			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
 		);
 		try {
-			$this->_connection = new PDO('sqlite:' . $config['database'], null, null, $flags);
+			$this->_connection = new PDO('sqlite:'.$config['database'], null, null, $flags);
 			$this->connected = true;
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			throw new MissingConnectionException(array(
 				'class' => get_class($this),
 				'message' => $e->getMessage()
@@ -144,7 +144,7 @@ 
 
 		$result = $this->fetchAll("SELECT name FROM sqlite_master WHERE type='table' ORDER BY name;", false);
 
-		if (!$result || empty($result)) {
+		if ( ! $result || empty($result)) {
 			return array();
 		}
 
@@ -170,16 +170,16 @@ 
 		}
 		$fields = array();
 		$result = $this->_execute(
-			'PRAGMA table_info(' . $this->value($table, 'string') . ')'
+			'PRAGMA table_info('.$this->value($table, 'string').')'
 		);
 
 		foreach ($result as $column) {
-			$column = (array)$column;
+			$column = (array) $column;
 			$default = ($column['dflt_value'] === 'NULL') ? null : trim($column['dflt_value'], "'");
 
 			$fields[$column['name']] = array(
 				'type' => $this->column($column['type']),
-				'null' => !$column['notnull'],
+				'null' => ! $column['notnull'],
 				'default' => $default,
 				'length' => $this->length($column['type'])
 			);
@@ -207,12 +207,12 @@ 
  * @return array
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
-		if (empty($values) && !empty($fields)) {
+		if (empty($values) && ! empty($fields)) {
 			foreach ($fields as $field => $value) {
-				if (strpos($field, $model->alias . '.') !== false) {
+				if (strpos($field, $model->alias.'.') !== false) {
 					unset($fields[$field]);
-					$field = str_replace($model->alias . '.', "", $field);
-					$field = str_replace($model->alias . '.', "", $field);
+					$field = str_replace($model->alias.'.', "", $field);
+					$field = str_replace($model->alias.'.', "", $field);
 					$fields[$field] = $value;
 				}
 			}
@@ -229,9 +229,9 @@ 
  */
 	public function truncate($table) {
 		if (in_array('sqlite_sequence', $this->listSources())) {
-			$this->_execute('DELETE FROM sqlite_sequence where name=' . $this->startQuote . $this->fullTableName($table, false, false) . $this->endQuote);
+			$this->_execute('DELETE FROM sqlite_sequence where name='.$this->startQuote.$this->fullTableName($table, false, false).$this->endQuote);
 		}
-		return $this->execute('DELETE FROM ' . $this->fullTableName($table));
+		return $this->execute('DELETE FROM '.$this->fullTableName($table));
 	}
 
 /**
@@ -244,7 +244,7 @@ 
 		if (is_array($real)) {
 			$col = $real['name'];
 			if (isset($real['limit'])) {
-				$col .= '(' . $real['limit'] . ')';
+				$col .= '('.$real['limit'].')';
 			}
 			return $col;
 		}
@@ -312,7 +312,7 @@ 
 			$selects = array('seqno', 'cid', 'name');
 		}
 		while ($j < $numFields) {
-			if (!isset($selects[$j])) {
+			if ( ! isset($selects[$j])) {
 				$j++;
 				continue;
 			}
@@ -328,8 +328,8 @@ 
 
 			$metaType = false;
 			try {
-				$metaData = (array)$results->getColumnMeta($j);
-				if (!empty($metaData['sqlite:decl_type'])) {
+				$metaData = (array) $results->getColumnMeta($j);
+				if ( ! empty($metaData['sqlite:decl_type'])) {
 					$metaType = trim($metaData['sqlite:decl_type']);
 				}
 			} catch (Exception $e) {
@@ -401,20 +401,20 @@ 
 			return null;
 		}
 
-		if (!isset($this->columns[$type])) {
+		if ( ! isset($this->columns[$type])) {
 			trigger_error(__d('cake_dev', 'Column type %s does not exist', $type), E_USER_WARNING);
 			return null;
 		}
 
 		$isPrimary = (isset($column['key']) && $column['key'] === 'primary');
 		if ($isPrimary && $type === 'integer') {
-			return $this->name($name) . ' ' . $this->columns['primary_key']['name'];
+			return $this->name($name).' '.$this->columns['primary_key']['name'];
 		}
 		$out = parent::buildColumn($column);
 		if ($isPrimary && $type === 'biginteger') {
 			$replacement = 'PRIMARY KEY';
 			if ($column['null'] === false) {
-				$replacement = 'NOT NULL ' . $replacement;
+				$replacement = 'NOT NULL '.$replacement;
 			}
 			return str_replace($this->columns['primary_key']['name'], $replacement, $out);
 		}
@@ -428,7 +428,7 @@ 
  * @return boolean
  */
 	public function setEncoding($enc) {
-		if (!in_array($enc, array("UTF-8", "UTF-16", "UTF-16le", "UTF-16be"))) {
+		if ( ! in_array($enc, array("UTF-8", "UTF-16", "UTF-16le", "UTF-16be"))) {
 			return false;
 		}
 		return $this->_execute("PRAGMA encoding = \"{$enc}\"") !== false;
@@ -464,7 +464,7 @@ 
 			}
 			$out = 'CREATE ';
 
-			if (!empty($value['unique'])) {
+			if ( ! empty($value['unique'])) {
 				$out .= 'UNIQUE ';
 			}
 			if (is_array($value['column'])) {
@@ -473,7 +473,7 @@ 
 				$value['column'] = $this->name($value['column']);
 			}
 			$t = trim($table, '"');
-			$indexname = $this->name($t . '_' . $name);
+			$indexname = $this->name($t.'_'.$name);
 			$table = $this->name($table);
 			$out .= "INDEX {$dbname}.{$indexname} ON {$table}({$value['column']});";
 			$join[] = $out;
@@ -492,16 +492,16 @@ 
 		$index = array();
 		$table = $this->fullTableName($model, false, false);
 		if ($table) {
-			$indexes = $this->query('PRAGMA index_list(' . $table . ')');
+			$indexes = $this->query('PRAGMA index_list('.$table.')');
 
 			if (is_bool($indexes)) {
 				return array();
 			}
 			foreach ($indexes as $info) {
 				$key = array_pop($info);
-				$keyInfo = $this->query('PRAGMA index_info("' . $key['name'] . '")');
+				$keyInfo = $this->query('PRAGMA index_info("'.$key['name'].'")');
 				foreach ($keyInfo as $keyCol) {
-					if (!isset($index[$key['name']])) {
+					if ( ! isset($index[$key['name']])) {
 						$col = array();
 						if (preg_match('/autoindex/', $key['name'])) {
 							$key['name'] = 'PRIMARY';
@@ -509,7 +509,7 @@ 
 						$index[$key['name']]['column'] = $keyCol[0]['name'];
 						$index[$key['name']]['unique'] = intval($key['unique'] == 1);
 					} else {
-						if (!is_array($index[$key['name']]['column'])) {
+						if ( ! is_array($index[$key['name']]['column'])) {
 							$col[] = $index[$key['name']]['column'];
 						}
 						$col[] = $keyCol[0]['name'];
@@ -533,10 +533,10 @@ 
 			case 'schema':
 				extract($data);
 				if (is_array($columns)) {
-					$columns = "\t" . implode(",\n\t", array_filter($columns));
+					$columns = "\t".implode(",\n\t", array_filter($columns));
 				}
 				if (is_array($indexes)) {
-					$indexes = "\t" . implode("\n\t", array_filter($indexes));
+					$indexes = "\t".implode("\n\t", array_filter($indexes));
 				}
 				return "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
 			default:
@@ -560,7 +560,7 @@ 
  * @return string Drop table SQL statement
  */
 	protected function _dropTable($table) {
-		return 'DROP TABLE IF EXISTS ' . $this->fullTableName($table) . ";";
+		return 'DROP TABLE IF EXISTS '.$this->fullTableName($table).";";
 	}
 
 /**

lib/Cake/Model/Datasource/Database/Sqlserver.php

Doc Comments +2 added lines, -2 removed lines

@@ -337,7 +337,7 @@ 
  * @param Model $model
  * @param array $fields
  * @param array $values
- * @return array
+ * @return boolean
  */
 	public function create(Model $model, $fields = null, $values = null) {
 		if (!empty($values)) {
@@ -367,7 +367,7 @@ 
  * @param array $fields
  * @param array $values
  * @param mixed $conditions
- * @return array
+ * @return boolean
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
 		if (!empty($values)) {

Spacing +33 added lines, -33 removed lines

@@ -123,7 +123,7 @@ 
 			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
 		);
 
-		if (!empty($config['encoding'])) {
+		if ( ! empty($config['encoding'])) {
 			$flags[PDO::SQLSRV_ATTR_ENCODING] = $config['encoding'];
 		}
 
@@ -135,7 +135,7 @@ 
 				$flags
 			);
 			$this->connected = true;
-			if (!empty($config['settings'])) {
+			if ( ! empty($config['settings'])) {
 				foreach ($config['settings'] as $key => $value) {
 					$this->_execute("SET $key $value");
 				}
@@ -172,7 +172,7 @@ 
 		}
 		$result = $this->_execute("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES");
 
-		if (!$result) {
+		if ( ! $result) {
 			$result->closeCursor();
 			return array();
 		}
@@ -210,16 +210,16 @@ 
 			"SELECT
 				COLUMN_NAME as Field,
 				DATA_TYPE as Type,
-				COL_LENGTH('" . ($schema ? $fulltable : $table) . "', COLUMN_NAME) as Length,
+				COL_LENGTH('" . ($schema ? $fulltable : $table)."', COLUMN_NAME) as Length,
 				IS_NULLABLE As [Null],
 				COLUMN_DEFAULT as [Default],
-				COLUMNPROPERTY(OBJECT_ID('" . ($schema ? $fulltable : $table) . "'), COLUMN_NAME, 'IsIdentity') as [Key],
+				COLUMNPROPERTY(OBJECT_ID('" . ($schema ? $fulltable : $table)."'), COLUMN_NAME, 'IsIdentity') as [Key],
 				NUMERIC_SCALE as Size
 			FROM INFORMATION_SCHEMA.COLUMNS
-			WHERE TABLE_NAME = '" . $table . "'" . ($schema ? " AND TABLE_SCHEMA = '" . $schema . "'" : '')
+			WHERE TABLE_NAME = '" . $table."'".($schema ? " AND TABLE_SCHEMA = '".$schema."'" : '')
 		);
 
-		if (!$cols) {
+		if ( ! $cols) {
 			throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $table));
 		}
 
@@ -253,8 +253,8 @@ 
 			if (in_array($fields[$field]['type'], array('date', 'time', 'datetime', 'timestamp'))) {
 				$fields[$field]['length'] = null;
 			}
-			if ($fields[$field]['type'] === 'float' && !empty($column->Size)) {
-				$fields[$field]['length'] = $fields[$field]['length'] . ',' . $column->Size;
+			if ($fields[$field]['type'] === 'float' && ! empty($column->Size)) {
+				$fields[$field]['length'] = $fields[$field]['length'].','.$column->Size;
 			}
 		}
 		$this->_cacheDescription($table, $fields);
@@ -288,9 +288,9 @@ 
 					$fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i]));
 				}
 
-				if (!preg_match('/\s+AS\s+/i', $fields[$i])) {
+				if ( ! preg_match('/\s+AS\s+/i', $fields[$i])) {
 					if (substr($fields[$i], -1) === '*') {
-						if (strpos($fields[$i], '.') !== false && $fields[$i] != $alias . '.*') {
+						if (strpos($fields[$i], '.') !== false && $fields[$i] != $alias.'.*') {
 							$build = explode('.', $fields[$i]);
 							$AssociatedModel = $model->{$build[0]};
 						} else {
@@ -303,15 +303,15 @@ 
 					}
 
 					if (strpos($fields[$i], '.') === false) {
-						$this->_fieldMappings[$alias . '__' . $fields[$i]] = $alias . '.' . $fields[$i];
-						$fieldName = $this->name($alias . '.' . $fields[$i]);
-						$fieldAlias = $this->name($alias . '__' . $fields[$i]);
+						$this->_fieldMappings[$alias.'__'.$fields[$i]] = $alias.'.'.$fields[$i];
+						$fieldName = $this->name($alias.'.'.$fields[$i]);
+						$fieldAlias = $this->name($alias.'__'.$fields[$i]);
 					} else {
 						$build = explode('.', $fields[$i]);
 						$build[0] = trim($build[0], '[]');
 						$build[1] = trim($build[1], '[]');
-						$name = $build[0] . '.' . $build[1];
-						$alias = $build[0] . '__' . $build[1];
+						$name = $build[0].'.'.$build[1];
+						$alias = $build[0].'__'.$build[1];
 
 						$this->_fieldMappings[$alias] = $name;
 						$fieldName = $this->name($name);
@@ -322,7 +322,7 @@ 
 					}
 					$fields[$i] = "{$fieldName} AS {$fieldAlias}";
 				}
-				$result[] = $prepend . $fields[$i];
+				$result[] = $prepend.$fields[$i];
 			}
 			return $result;
 		}
@@ -340,7 +340,7 @@ 
  * @return array
  */
 	public function create(Model $model, $fields = null, $values = null) {
-		if (!empty($values)) {
+		if ( ! empty($values)) {
 			$fields = array_combine($fields, $values);
 		}
 		$primaryKey = $this->_getPrimaryKey($model);
@@ -349,12 +349,12 @@ 
 			if (empty($fields[$primaryKey])) {
 				unset($fields[$primaryKey]);
 			} else {
-				$this->_execute('SET IDENTITY_INSERT ' . $this->fullTableName($model) . ' ON');
+				$this->_execute('SET IDENTITY_INSERT '.$this->fullTableName($model).' ON');
 			}
 		}
 		$result = parent::create($model, array_keys($fields), array_values($fields));
-		if (array_key_exists($primaryKey, $fields) && !empty($fields[$primaryKey])) {
-			$this->_execute('SET IDENTITY_INSERT ' . $this->fullTableName($model) . ' OFF');
+		if (array_key_exists($primaryKey, $fields) && ! empty($fields[$primaryKey])) {
+			$this->_execute('SET IDENTITY_INSERT '.$this->fullTableName($model).' OFF');
 		}
 		return $result;
 	}
@@ -370,7 +370,7 @@ 
  * @return array
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
-		if (!empty($values)) {
+		if ( ! empty($values)) {
 			$fields = array_combine($fields, $values);
 		}
 		if (isset($fields[$model->primaryKey])) {
@@ -392,7 +392,7 @@ 
 	public function limit($limit, $offset = null) {
 		if ($limit) {
 			$rt = '';
-			if (!strpos(strtolower($limit), 'top') || strpos(strtolower($limit), 'top') === 0) {
+			if ( ! strpos(strtolower($limit), 'top') || strpos(strtolower($limit), 'top') === 0) {
 				$rt = ' TOP';
 			}
 			$rt .= sprintf(' %u', $limit);
@@ -517,12 +517,12 @@ 
 				$fields = trim($fields);
 
 				if (strpos($limit, 'TOP') !== false && strpos($fields, 'DISTINCT ') === 0) {
-					$limit = 'DISTINCT ' . trim($limit);
+					$limit = 'DISTINCT '.trim($limit);
 					$fields = substr($fields, 9);
 				}
 
 				// hack order as SQLServer requires an order if there is a limit.
-				if ($limit && !$order) {
+				if ($limit && ! $order) {
 					$order = 'ORDER BY (SELECT NULL)';
 				}
 
@@ -530,7 +530,7 @@ 
 				if (version_compare($this->getVersion(), '11', '<') && preg_match('/FETCH\sFIRST\s+([0-9]+)/i', $limit, $offset)) {
 					preg_match('/OFFSET\s*(\d+)\s*.*?(\d+)\s*ROWS/', $limit, $limitOffset);
 
-					$limit = 'TOP ' . intval($limitOffset[2]);
+					$limit = 'TOP '.intval($limitOffset[2]);
 					$page = intval($limitOffset[1] / $limitOffset[2]);
 					$offset = intval($limitOffset[2] * $page);
 
@@ -560,7 +560,7 @@ 
 
 				foreach (array('columns', 'indexes') as $var) {
 					if (is_array(${$var})) {
-						${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
+						${$var} = "\t".implode(",\n\t", array_filter(${$var}));
 					}
 				}
 				return trim("CREATE TABLE {$table} (\n{$columns});\n{$indexes}");
@@ -591,7 +591,7 @@ 
 		switch ($column) {
 			case 'string':
 			case 'text':
-				return 'N' . $this->_connection->quote($data, PDO::PARAM_STR);
+				return 'N'.$this->_connection->quote($data, PDO::PARAM_STR);
 			default:
 				return parent::value($data, $column);
 		}
@@ -649,17 +649,17 @@ 
 		$primaryKey = $this->_getPrimaryKey($table);
 		$hasPrimaryKey = $primaryKey && (
 			(is_array($fields) && in_array($primaryKey, $fields)
-			|| (is_string($fields) && strpos($fields, $this->startQuote . $primaryKey . $this->endQuote) !== false))
+			|| (is_string($fields) && strpos($fields, $this->startQuote.$primaryKey.$this->endQuote) !== false))
 		);
 
 		if ($hasPrimaryKey) {
-			$this->_execute('SET IDENTITY_INSERT ' . $this->fullTableName($table) . ' ON');
+			$this->_execute('SET IDENTITY_INSERT '.$this->fullTableName($table).' ON');
 		}
 
 		parent::insertMulti($table, $fields, $values);
 
 		if ($hasPrimaryKey) {
-			$this->_execute('SET IDENTITY_INSERT ' . $this->fullTableName($table) . ' OFF');
+			$this->_execute('SET IDENTITY_INSERT '.$this->fullTableName($table).' OFF');
 		}
 	}
 
@@ -701,7 +701,7 @@ 
 
 		foreach ($indexes as $name => $value) {
 			if ($name === 'PRIMARY') {
-				$join[] = 'PRIMARY KEY (' . $this->name($value['column']) . ')';
+				$join[] = 'PRIMARY KEY ('.$this->name($value['column']).')';
 			} elseif (isset($value['unique']) && $value['unique']) {
 				$out = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE";
 
@@ -791,7 +791,7 @@ 
  * @return string Drop table SQL statement
  */
 	protected function _dropTable($table) {
-		return "IF OBJECT_ID('" . $this->fullTableName($table, false) . "', 'U') IS NOT NULL DROP TABLE " . $this->fullTableName($table) . ";";
+		return "IF OBJECT_ID('".$this->fullTableName($table, false)."', 'U') IS NOT NULL DROP TABLE ".$this->fullTableName($table).";";
 	}
 
 /**

lib/Cake/Model/Datasource/DataSource.php

Doc Comments +4 added lines, -4 removed lines

@@ -172,7 +172,7 @@ 
  * Converts column types to basic types
  *
  * @param string $real Real column type (i.e. "varchar(255)")
- * @return string Abstract column type (i.e. "string")
+ * @return boolean Abstract column type (i.e. "string")
  */
 	public function column($real) {
 		return false;
@@ -238,7 +238,7 @@ 
  * Returns the ID generated from the previous INSERT operation.
  *
  * @param mixed $source
- * @return mixed Last ID key generated in previous INSERT
+ * @return boolean Last ID key generated in previous INSERT
  */
 	public function lastInsertId($source = null) {
 		return false;
@@ -248,7 +248,7 @@ 
  * Returns the number of rows returned by last operation.
  *
  * @param mixed $source
- * @return integer Number of rows returned by last operation
+ * @return boolean Number of rows returned by last operation
  */
 	public function lastNumRows($source = null) {
 		return false;
@@ -258,7 +258,7 @@ 
  * Returns the number of rows affected by last query.
  *
  * @param mixed $source
- * @return integer Number of rows affected by last query.
+ * @return boolean Number of rows affected by last query.
  */
 	public function lastAffected($source = null) {
 		return false;

Spacing +9 added lines, -9 removed lines

@@ -101,7 +101,7 @@ 
 			return $this->_sources;
 		}
 
-		$key = ConnectionManager::getSourceName($this) . '_' . $this->config['database'] . '_list';
+		$key = ConnectionManager::getSourceName($this).'_'.$this->config['database'].'_list';
 		$key = preg_replace('/[^A-Za-z0-9_\-.+]/', '_', $key);
 		$sources = Cache::read($key, '_cake_model_');
 
@@ -126,7 +126,7 @@ 
 		if (is_string($model)) {
 			$table = $model;
 		} else {
-			$table = $model->tablePrefix . $model->table;
+			$table = $model->tablePrefix.$model->table;
 		}
 
 		if (isset($this->_descriptions[$table])) {
@@ -135,7 +135,7 @@ 
 		$cache = $this->_cacheDescription($table);
 
 		if ($cache !== null) {
-			$this->_descriptions[$table] =& $cache;
+			$this->_descriptions[$table] = & $cache;
 			return $cache;
 		}
 		return null;
@@ -147,7 +147,7 @@ 
  * @return boolean Returns true if a transaction is not in progress
  */
 	public function begin() {
-		return !$this->_transactionStarted;
+		return ! $this->_transactionStarted;
 	}
 
 /**
@@ -299,10 +299,10 @@ 
 		}
 
 		if ($data !== null) {
-			$this->_descriptions[$object] =& $data;
+			$this->_descriptions[$object] = & $data;
 		}
 
-		$key = ConnectionManager::getSourceName($this) . '_' . $object;
+		$key = ConnectionManager::getSourceName($this).'_'.$object;
 		$cache = Cache::read($key, '_cake_model_');
 
 		if (empty($cache)) {
@@ -350,7 +350,7 @@ 
 									break;
 								}
 							}
-							if (!$found) {
+							if ( ! $found) {
 								$val = '';
 							}
 						}
@@ -378,7 +378,7 @@ 
 													break;
 												}
 											}
-											if (!$found) {
+											if ( ! $found) {
 												$val = '';
 											}
 										}
@@ -406,7 +406,7 @@ 
  * @return string Key name for model.
  */
 	public function resolveKey(Model $model, $key) {
-		return $model->alias . $key;
+		return $model->alias.$key;
 	}
 
 /**

lib/Cake/Model/Datasource/DboSource.php

Doc Comments +5 added lines, -5 removed lines

@@ -703,7 +703,7 @@ 
 /**
  * Modifies $result array to place virtual fields in model entry where they belongs to
  *
- * @param array $result Reference to the fetched row
+ * @param boolean $result Reference to the fetched row
  * @return void
  */
 	public function fetchVirtualField(&$result) {
@@ -1919,7 +1919,7 @@ 
  *
  * @param Model $model
  * @param mixed $conditions
- * @return array List of record IDs
+ * @return string|false List of record IDs
  */
 	protected function _matchRecords(Model $model, $conditions = null) {
 		if ($conditions === true) {
@@ -2032,7 +2032,7 @@ 
  * Deletes all the records in a table and resets the count of the auto-incrementing
  * primary key, where applicable.
  *
- * @param Model|string $table A string or model class representing the table to be truncated
+ * @param string $table A string or model class representing the table to be truncated
  * @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
  */
 	public function truncate($table) {
@@ -2172,7 +2172,7 @@ 
 /**
  * Returns the ID generated from the previous INSERT operation.
  *
- * @param mixed $source
+ * @param string $source
  * @return mixed
  */
 	public function lastInsertId($source = null) {
@@ -3221,7 +3221,7 @@ 
  * Guesses the data type of an array
  *
  * @param string $value
- * @return void
+ * @return string
  */
 	public function introspectType($value) {
 		if (!is_array($value)) {

Spacing +201 added lines, -201 removed lines

@@ -244,12 +244,12 @@ 
  * @throws MissingConnectionException when a connection cannot be made.
  */
 	public function __construct($config = null, $autoConnect = true) {
-		if (!isset($config['prefix'])) {
+		if ( ! isset($config['prefix'])) {
 			$config['prefix'] = '';
 		}
 		parent::__construct($config);
 		$this->fullDebug = Configure::read('debug') > 1;
-		if (!$this->enabled()) {
+		if ( ! $this->enabled()) {
 			throw new MissingConnectionException(array(
 				'class' => get_class($this),
 				'message' => __d('cake_dev', 'Selected driver is not enabled'),
@@ -315,7 +315,7 @@ 
  * @return string Quoted and escaped data
  */
 	public function value($data, $column = null) {
-		if (is_array($data) && !empty($data)) {
+		if (is_array($data) && ! empty($data)) {
 			return array_map(
 				array(&$this, 'value'),
 				$data, array_fill(0, count($data), $column)
@@ -455,14 +455,14 @@ 
 		try {
 			$query = $this->_connection->prepare($sql, $prepareOptions);
 			$query->setFetchMode(PDO::FETCH_LAZY);
-			if (!$query->execute($params)) {
+			if ( ! $query->execute($params)) {
 				$this->_results = $query;
 				$query->closeCursor();
 				return false;
 			}
-			if (!$query->columnCount()) {
+			if ( ! $query->columnCount()) {
 				$query->closeCursor();
-				if (!$query->rowCount()) {
+				if ( ! $query->rowCount()) {
 					return true;
 				}
 			}
@@ -492,7 +492,7 @@ 
 		if (empty($error[2])) {
 			return null;
 		}
-		return $error[1] . ': ' . $error[2];
+		return $error[1].': '.$error[2];
 	}
 
 /**
@@ -562,7 +562,7 @@ 
 				$order = $params[2 + $off];
 			}
 
-			if (!array_key_exists(0, $params)) {
+			if ( ! array_key_exists(0, $params)) {
 				return false;
 			}
 
@@ -570,7 +570,7 @@ 
 			$conditions = array();
 
 			foreach ($field as $f) {
-				$conditions[$args[2]->alias . '.' . $f] = $params[$c++];
+				$conditions[$args[2]->alias.'.'.$f] = $params[$c++];
 			}
 
 			if ($or) {
@@ -598,7 +598,7 @@ 
 		}
 		if (isset($args[1]) && $args[1] === true) {
 			return $this->fetchAll($args[0], true);
-		} elseif (isset($args[1]) && !is_array($args[1])) {
+		} elseif (isset($args[1]) && ! is_array($args[1])) {
 			return $this->fetchAll($args[0], false);
 		} elseif (isset($args[1]) && is_array($args[1])) {
 			if (isset($args[2])) {
@@ -617,7 +617,7 @@ 
  * @return array The fetched row as an array
  */
 	public function fetchRow($sql = null) {
-		if (is_string($sql) && strlen($sql) > 5 && !$this->execute($sql)) {
+		if (is_string($sql) && strlen($sql) > 5 && ! $this->execute($sql)) {
 			return null;
 		}
 
@@ -679,7 +679,7 @@ 
 				}
 			}
 
-			if (!is_bool($result) && $cache) {
+			if ( ! is_bool($result) && $cache) {
 				$this->_writeQueryCache($sql, $out, $params);
 			}
 
@@ -714,7 +714,7 @@ 
 				}
 				list($alias, $virtual) = explode($this->virtualFieldSeparator, $field);
 
-				if (!ClassRegistry::isKeySet($alias)) {
+				if ( ! ClassRegistry::isKeySet($alias)) {
 					return;
 				}
 				$model = ClassRegistry::getObject($alias);
@@ -771,7 +771,7 @@ 
 		if ($this->cacheMethods === false) {
 			return $value;
 		}
-		if (!$this->_methodCacheChange && empty(self::$methodCache)) {
+		if ( ! $this->_methodCacheChange && empty(self::$methodCache)) {
 			self::$methodCache = Cache::read('method_cache', '_cake_core_');
 		}
 		if ($value === null) {
@@ -806,42 +806,42 @@ 
 			}
 			return $data;
 		}
-		$cacheKey = md5($this->startQuote . $data . $this->endQuote);
+		$cacheKey = md5($this->startQuote.$data.$this->endQuote);
 		if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
 			return $return;
 		}
 		$data = trim($data);
 		if (preg_match('/^[\w-]+(?:\.[^ \*]*)*$/', $data)) { // string, string.string
 			if (strpos($data, '.') === false) { // string
-				return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote);
+				return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote.$data.$this->endQuote);
 			}
 			$items = explode('.', $data);
 			return $this->cacheMethod(__FUNCTION__, $cacheKey,
-				$this->startQuote . implode($this->endQuote . '.' . $this->startQuote, $items) . $this->endQuote
+				$this->startQuote.implode($this->endQuote.'.'.$this->startQuote, $items).$this->endQuote
 			);
 		}
 		if (preg_match('/^[\w-]+\.\*$/', $data)) { // string.*
 			return $this->cacheMethod(__FUNCTION__, $cacheKey,
-				$this->startQuote . str_replace('.*', $this->endQuote . '.*', $data)
+				$this->startQuote.str_replace('.*', $this->endQuote.'.*', $data)
 			);
 		}
 		if (preg_match('/^([\w-]+)\((.*)\)$/', $data, $matches)) { // Functions
 			return $this->cacheMethod(__FUNCTION__, $cacheKey,
-				$matches[1] . '(' . $this->name($matches[2]) . ')'
+				$matches[1].'('.$this->name($matches[2]).')'
 			);
 		}
 		if (
-			preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+' . preg_quote($this->alias) . '\s*([\w-]+)$/i', $data, $matches
+			preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+'.preg_quote($this->alias).'\s*([\w-]+)$/i', $data, $matches
 		)) {
 			return $this->cacheMethod(
 				__FUNCTION__, $cacheKey,
 				preg_replace(
-					'/\s{2,}/', ' ', $this->name($matches[1]) . ' ' . $this->alias . ' ' . $this->name($matches[3])
+					'/\s{2,}/', ' ', $this->name($matches[1]).' '.$this->alias.' '.$this->name($matches[3])
 				)
 			);
 		}
 		if (preg_match('/^[\w-_\s]*[\w-_]+/', $data)) {
-			return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote);
+			return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote.$data.$this->endQuote);
 		}
 		return $this->cacheMethod(__FUNCTION__, $cacheKey, $data);
 	}
@@ -902,7 +902,7 @@ 
 			echo $View->element('sql_dump', array('_forced_from_dbo_' => true));
 		} else {
 			foreach ($log['log'] as $k => $i) {
-				print (($k + 1) . ". {$i['query']}\n");
+				print (($k + 1).". {$i['query']}\n");
 			}
 		}
 	}
@@ -940,27 +940,27 @@ 
 	public function fullTableName($model, $quote = true, $schema = true) {
 		if (is_object($model)) {
 			$schemaName = $model->schemaName;
-			$table = $model->tablePrefix . $model->table;
-		} elseif (!empty($this->config['prefix']) && strpos($model, $this->config['prefix']) !== 0) {
-			$table = $this->config['prefix'] . strval($model);
+			$table = $model->tablePrefix.$model->table;
+		} elseif ( ! empty($this->config['prefix']) && strpos($model, $this->config['prefix']) !== 0) {
+			$table = $this->config['prefix'].strval($model);
 		} else {
 			$table = strval($model);
 		}
-		if ($schema && !isset($schemaName)) {
+		if ($schema && ! isset($schemaName)) {
 			$schemaName = $this->getSchemaName();
 		}
 
 		if ($quote) {
-			if ($schema && !empty($schemaName)) {
+			if ($schema && ! empty($schemaName)) {
 				if (strstr($table, '.') === false) {
-					return $this->name($schemaName) . '.' . $this->name($table);
+					return $this->name($schemaName).'.'.$this->name($table);
 				}
 			}
 			return $this->name($table);
 		}
-		if ($schema && !empty($schemaName)) {
+		if ($schema && ! empty($schemaName)) {
 			if (strstr($table, '.') === false) {
-				return $schemaName . '.' . $table;
+				return $schemaName.'.'.$table;
 			}
 		}
 		return $table;
@@ -981,7 +981,7 @@ 
 	public function create(Model $model, $fields = null, $values = null) {
 		$id = null;
 
-		if (!$fields) {
+		if ( ! $fields) {
 			unset($fields, $values);
 			$fields = array_keys($model->data);
 			$values = array_values($model->data);
@@ -1040,7 +1040,7 @@ 
 			$model->recursive = $recursive;
 		}
 
-		if (!empty($queryData['fields'])) {
+		if ( ! empty($queryData['fields'])) {
 			$bypass = true;
 			$queryData['fields'] = $this->fields($model, null, $queryData['fields']);
 		} else {
@@ -1066,7 +1066,7 @@ 
 						$assocData['fields'] = false;
 					}
 					if ($this->generateAssociationQuery($model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null) === true) {
-						$linkedModels[$type . '/' . $assoc] = true;
+						$linkedModels[$type.'/'.$assoc] = true;
 					}
 				}
 			}
@@ -1090,13 +1090,13 @@ 
 		if ($model->recursive > -1) {
 			$joined = array();
 			if (isset($queryData['joins'][0]['alias'])) {
-				$joined[$model->alias] = (array)Hash::extract($queryData['joins'], '{n}.alias');
+				$joined[$model->alias] = (array) Hash::extract($queryData['joins'], '{n}.alias');
 			}
 			foreach ($_associations as $type) {
 				foreach ($model->{$type} as $assoc => $assocData) {
 					$linkModel = $model->{$assoc};
 
-					if (!isset($linkedModels[$type . '/' . $assoc])) {
+					if ( ! isset($linkedModels[$type.'/'.$assoc])) {
 						if ($model->useDbConfig === $linkModel->useDbConfig) {
 							$db = $this;
 						} else {
@@ -1139,13 +1139,13 @@ 
  */
 	protected function _filterResults(&$results, Model $model, $filtered = array()) {
 		$current = reset($results);
-		if (!is_array($current)) {
+		if ( ! is_array($current)) {
 			return array();
 		}
 		$keys = array_diff(array_keys($current), $filtered, array($model->alias));
 		$filtering = array();
 		foreach ($keys as $className) {
-			if (!isset($model->{$className}) || !is_object($model->{$className})) {
+			if ( ! isset($model->{$className}) || ! is_object($model->{$className})) {
 				continue;
 			}
 			$linkedModel = $model->{$className};
@@ -1185,10 +1185,10 @@ 
 		}
 
 		if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
-			if (!is_array($resultSet)) {
+			if ( ! is_array($resultSet)) {
 				throw new CakeException(__d('cake_dev', 'Error in Model %s', get_class($model)));
 			}
-			if ($type === 'hasMany' && empty($assocData['limit']) && !empty($assocData['foreignKey'])) {
+			if ($type === 'hasMany' && empty($assocData['limit']) && ! empty($assocData['foreignKey'])) {
 				$ins = $fetch = array();
 				foreach ($resultSet as &$result) {
 					if ($in = $this->insertQueryData('{$__cakeID__$}', $result, $association, $assocData, $model, $linkModel, $stack)) {
@@ -1196,12 +1196,12 @@ 
 					}
 				}
 
-				if (!empty($ins)) {
+				if ( ! empty($ins)) {
 					$ins = array_unique($ins);
 					$fetch = $this->fetchAssociated($model, $query, $ins);
 				}
 
-				if (!empty($fetch) && is_array($fetch)) {
+				if ( ! empty($fetch) && is_array($fetch)) {
 					if ($recursive > 0) {
 						foreach ($linkModel->associations() as $type1) {
 							foreach ($linkModel->{$type1} as $assoc1 => $assocData1) {
@@ -1230,10 +1230,10 @@ 
 						$ins[] = $in;
 					}
 				}
-				if (!empty($ins)) {
+				if ( ! empty($ins)) {
 					$ins = array_unique($ins);
 					if (count($ins) > 1) {
-						$query = str_replace('{$__cakeID__$}', '(' . implode(', ', $ins) . ')', $query);
+						$query = str_replace('{$__cakeID__$}', '('.implode(', ', $ins).')', $query);
 						$query = str_replace('= (', 'IN (', $query);
 					} else {
 						$query = str_replace('{$__cakeID__$}', $ins[0], $query);
@@ -1264,7 +1264,7 @@ 
 						$joinedData = array();
 						if (($type === 'belongsTo' || $type === 'hasOne') && isset($row[$linkModel->alias], $joined[$model->alias]) && in_array($linkModel->alias, $joined[$model->alias])) {
 							$joinedData = Hash::filter($row[$linkModel->alias]);
-							if (!empty($joinedData)) {
+							if ( ! empty($joinedData)) {
 								$fetch[0] = array($linkModel->alias => $row[$linkModel->alias]);
 							}
 						} else {
@@ -1274,7 +1274,7 @@ 
 				}
 				$selfJoin = $linkModel->name === $model->name;
 
-				if (!empty($fetch) && is_array($fetch)) {
+				if ( ! empty($fetch) && is_array($fetch)) {
 					if ($recursive > 0) {
 						foreach ($linkModel->associations() as $type1) {
 							foreach ($linkModel->{$type1} as $assoc1 => $assocData1) {
@@ -1304,7 +1304,7 @@ 
 								$merge[] = $data;
 							}
 						}
-						if (empty($merge) && !isset($row[$association])) {
+						if (empty($merge) && ! isset($row[$association])) {
 							$row[$association] = $merge;
 						} else {
 							$this->_mergeAssociation($row, $merge, $association, $type);
@@ -1354,7 +1354,7 @@ 
 		$modelPK = $model->primaryKey;
 		$modelFK = $model->hasMany[$association]['foreignKey'];
 		foreach ($resultSet as &$result) {
-			if (!isset($result[$modelAlias])) {
+			if ( ! isset($result[$modelAlias])) {
 				continue;
 			}
 			$merged = array();
@@ -1390,7 +1390,7 @@ 
  * @return void
  */
 	protected function _mergeAssociation(&$data, &$merge, $association, $type, $selfJoin = false) {
-		if (isset($merge[0]) && !isset($merge[0][$association])) {
+		if (isset($merge[0]) && ! isset($merge[0][$association])) {
 			$association = Inflector::pluralize($association);
 		}
 
@@ -1398,14 +1398,14 @@ 
 			if (isset($merge[$association])) {
 				$data[$association] = $merge[$association][0];
 			} else {
-				if (!empty($merge[0][$association])) {
+				if ( ! empty($merge[0][$association])) {
 					foreach ($merge[0] as $assoc => $data2) {
 						if ($assoc !== $association) {
 							$merge[0][$association][$assoc] = $data2;
 						}
 					}
 				}
-				if (!isset($data[$association])) {
+				if ( ! isset($data[$association])) {
 					$data[$association] = array();
 					if ($merge[0][$association]) {
 						$data[$association] = $merge[0][$association];
@@ -1413,13 +1413,13 @@ 
 				} else {
 					if (is_array($merge[0][$association])) {
 						foreach ($data[$association] as $k => $v) {
-							if (!is_array($v)) {
+							if ( ! is_array($v)) {
 								$dataAssocTmp[$k] = $v;
 							}
 						}
 
 						foreach ($merge[0][$association] as $k => $v) {
-							if (!is_array($v)) {
+							if ( ! is_array($v)) {
 								$mergeAssocTmp[$k] = $v;
 							}
 						}
@@ -1439,7 +1439,7 @@ 
 			}
 		} else {
 			if (isset($merge[0][$association]) && $merge[0][$association] === false) {
-				if (!isset($data[$association])) {
+				if ( ! isset($data[$association])) {
 					$data[$association] = array();
 				}
 			} else {
@@ -1452,7 +1452,7 @@ 
 						unset($insert[$association]);
 					}
 
-					if (empty($data[$association]) || (isset($data[$association]) && !in_array($insert, $data[$association], true))) {
+					if (empty($data[$association]) || (isset($data[$association]) && ! in_array($insert, $data[$association], true))) {
 						$data[$association][] = $insert;
 					}
 				}
@@ -1480,11 +1480,11 @@ 
 
 		if (empty($queryData['fields'])) {
 			$queryData['fields'] = $this->fields($model, $modelAlias);
-		} elseif (!empty($model->hasMany) && $model->recursive > -1) {
+		} elseif ( ! empty($model->hasMany) && $model->recursive > -1) {
 			$assocFields = $this->fields($model, $modelAlias, array("{$modelAlias}.{$model->primaryKey}"));
 			$passedFields = $queryData['fields'];
 			if (count($passedFields) === 1) {
-				if (strpos($passedFields[0], $assocFields[0]) === false && !preg_match('/^[a-z]+\(/i', $passedFields[0])) {
+				if (strpos($passedFields[0], $assocFields[0]) === false && ! preg_match('/^[a-z]+\(/i', $passedFields[0])) {
 					$queryData['fields'] = array_merge($passedFields, $assocFields);
 				} else {
 					$queryData['fields'] = $passedFields;
@@ -1511,7 +1511,7 @@ 
 				$model
 			);
 		}
-		if ($external && !empty($assocData['finderQuery'])) {
+		if ($external && ! empty($assocData['finderQuery'])) {
 			return $assocData['finderQuery'];
 		}
 
@@ -1521,7 +1521,7 @@ 
 		if ($external || (in_array($type, array('hasOne', 'belongsTo')) && $assocData['fields'] !== false)) {
 			$fields = $this->fields($linkModel, $association, $assocData['fields']);
 		}
-		if (empty($assocData['offset']) && !empty($assocData['page'])) {
+		if (empty($assocData['offset']) && ! empty($assocData['page'])) {
 			$assocData['offset'] = ($assocData['page'] - 1) * $assocData['limit'];
 		}
 
@@ -1533,9 +1533,9 @@ 
 					$this->getConstraint($type, $model, $linkModel, $association, array_merge($assocData, compact('external', 'self')))
 				);
 
-				if (!$self && $external) {
+				if ( ! $self && $external) {
 					foreach ($conditions as $key => $condition) {
-						if (is_numeric($key) && strpos($condition, $modelAlias . '.') !== false) {
+						if (is_numeric($key) && strpos($condition, $modelAlias.'.') !== false) {
 							unset($conditions[$key]);
 						}
 					}
@@ -1558,10 +1558,10 @@ 
 					);
 					$queryData['fields'] = array_merge($queryData['fields'], $fields);
 
-					if (!empty($assocData['order'])) {
+					if ( ! empty($assocData['order'])) {
 						$queryData['order'][] = $assocData['order'];
 					}
-					if (!in_array($join, $queryData['joins'], true)) {
+					if ( ! in_array($join, $queryData['joins'], true)) {
 						$queryData['joins'][] = $join;
 					}
 					return true;
@@ -1569,7 +1569,7 @@ 
 				break;
 			case 'hasMany':
 				$assocData['fields'] = $this->fields($linkModel, $association, $assocData['fields']);
-				if (!empty($assocData['foreignKey'])) {
+				if ( ! empty($assocData['foreignKey'])) {
 					$assocData['fields'] = array_merge($assocData['fields'], $this->fields($linkModel, $association, array("{$association}.{$assocData['foreignKey']}")));
 				}
 				$query = array(
@@ -1587,14 +1587,14 @@ 
 				$joinFields = array();
 				$joinAssoc = null;
 
-				if (isset($assocData['with']) && !empty($assocData['with'])) {
+				if (isset($assocData['with']) && ! empty($assocData['with'])) {
 					$joinKeys = array($assocData['foreignKey'], $assocData['associationForeignKey']);
 					list($with, $joinFields) = $model->joinModel($assocData['with'], $joinKeys);
 
 					$joinTbl = $model->{$with};
 					$joinAlias = $joinTbl;
 
-					if (is_array($joinFields) && !empty($joinFields)) {
+					if (is_array($joinFields) && ! empty($joinFields)) {
 						$joinAssoc = $joinAlias = $model->{$with}->alias;
 						$joinFields = $this->fields($model->{$with}, $joinAlias, $joinFields);
 					} else {
@@ -1650,9 +1650,9 @@ 
 				return array("{$alias}.{$assoc['foreignKey']}" => '{$__cakeID__$}');
 			case ($assoc['external'] && $type === 'belongsTo'):
 				return array("{$alias}.{$linkModel->primaryKey}" => '{$__cakeForeignKey__$}');
-			case (!$assoc['external'] && $type === 'hasOne'):
+			case ( ! $assoc['external'] && $type === 'hasOne'):
 				return array("{$alias}.{$assoc['foreignKey']}" => $this->identifier("{$model->alias}.{$model->primaryKey}"));
-			case (!$assoc['external'] && $type === 'belongsTo'):
+			case ( ! $assoc['external'] && $type === 'belongsTo'):
 				return array("{$model->alias}.{$assoc['foreignKey']}" => $this->identifier("{$alias}.{$linkModel->primaryKey}"));
 			case ($type === 'hasMany'):
 				return array("{$alias}.{$assoc['foreignKey']}" => array('{$__cakeID__$}'));
@@ -1681,13 +1681,13 @@ 
 			'conditions' => array()
 		), $join);
 
-		if (!empty($data['alias'])) {
-			$data['alias'] = $this->alias . $this->name($data['alias']);
+		if ( ! empty($data['alias'])) {
+			$data['alias'] = $this->alias.$this->name($data['alias']);
 		}
-		if (!empty($data['conditions'])) {
+		if ( ! empty($data['conditions'])) {
 			$data['conditions'] = trim($this->conditions($data['conditions'], true, false));
 		}
-		if (!empty($data['table']) && (!is_string($data['table']) || strpos($data['table'], '(') !== 0)) {
+		if ( ! empty($data['table']) && ( ! is_string($data['table']) || strpos($data['table'], '(') !== 0)) {
 			$data['table'] = $this->fullTableName($data['table']);
 		}
 		return $this->renderJoinStatement($data);
@@ -1703,7 +1703,7 @@ 
  */
 	public function buildStatement($query, $model) {
 		$query = array_merge($this->_queryDefaults, $query);
-		if (!empty($query['joins'])) {
+		if ( ! empty($query['joins'])) {
 			$count = count($query['joins']);
 			for ($i = 0; $i < $count; $i++) {
 				if (is_array($query['joins'][$i])) {
@@ -1715,7 +1715,7 @@ 
 			'conditions' => $this->conditions($query['conditions'], true, true, $model),
 			'fields' => implode(', ', $query['fields']),
 			'table' => $query['table'],
-			'alias' => $this->alias . $this->name($query['alias']),
+			'alias' => $this->alias.$this->name($query['alias']),
 			'order' => $this->order($query['order'], 'ASC', $model),
 			'limit' => $this->limit($query['limit'], $query['offset']),
 			'joins' => implode(' ', $query['joins']),
@@ -1753,19 +1753,19 @@ 
 			case 'create':
 				return "INSERT INTO {$table} ({$fields}) VALUES ({$values})";
 			case 'update':
-				if (!empty($alias)) {
+				if ( ! empty($alias)) {
 					$aliases = "{$this->alias}{$alias} {$joins} ";
 				}
 				return trim("UPDATE {$table} {$aliases}SET {$fields} {$conditions}");
 			case 'delete':
-				if (!empty($alias)) {
+				if ( ! empty($alias)) {
 					$aliases = "{$this->alias}{$alias} {$joins} ";
 				}
 				return trim("DELETE {$alias} FROM {$table} {$aliases}{$conditions}");
 			case 'schema':
 				foreach (array('columns', 'indexes', 'tableParameters') as $var) {
 					if (is_array(${$var})) {
-						${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
+						${$var} = "\t".implode(",\n\t", array_filter(${$var}));
 					} else {
 						${$var} = '';
 					}
@@ -1792,10 +1792,10 @@ 
 		}
 
 		if (is_array($query)) {
-			return array_merge((array)$assoc, $query);
+			return array_merge((array) $assoc, $query);
 		}
 
-		if (!empty($query)) {
+		if ( ! empty($query)) {
 			$query = array($query);
 			if (is_array($assoc)) {
 				$query = array_merge($query, $assoc);
@@ -1819,7 +1819,7 @@ 
  * @return boolean Success
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
-		if (!$values) {
+		if ( ! $values) {
 			$combined = $fields;
 		} else {
 			$combined = array_combine($fields, $values);
@@ -1836,7 +1836,7 @@ 
 		}
 		$query = compact('table', 'alias', 'joins', 'fields', 'conditions');
 
-		if (!$this->execute($this->renderStatement('update', $query))) {
+		if ( ! $this->execute($this->renderStatement('update', $query))) {
 			$model->onError();
 			return false;
 		}
@@ -1853,33 +1853,33 @@ 
  * @return array Fields and values, quoted and prepared
  */
 	protected function _prepareUpdateFields(Model $model, $fields, $quoteValues = true, $alias = false) {
-		$quotedAlias = $this->startQuote . $model->alias . $this->endQuote;
+		$quotedAlias = $this->startQuote.$model->alias.$this->endQuote;
 
 		$updates = array();
 		foreach ($fields as $field => $value) {
 			if ($alias && strpos($field, '.') === false) {
 				$quoted = $model->escapeField($field);
-			} elseif (!$alias && strpos($field, '.') !== false) {
-				$quoted = $this->name(str_replace($quotedAlias . '.', '', str_replace(
-					$model->alias . '.', '', $field
+			} elseif ( ! $alias && strpos($field, '.') !== false) {
+				$quoted = $this->name(str_replace($quotedAlias.'.', '', str_replace(
+					$model->alias.'.', '', $field
 				)));
 			} else {
 				$quoted = $this->name($field);
 			}
 
 			if ($value === null) {
-				$updates[] = $quoted . ' = NULL';
+				$updates[] = $quoted.' = NULL';
 				continue;
 			}
-			$update = $quoted . ' = ';
+			$update = $quoted.' = ';
 
 			if ($quoteValues) {
 				$update .= $this->value($value, $model->getColumnType($field));
 			} elseif ($model->getColumnType($field) === 'boolean' && (is_int($value) || is_bool($value))) {
 				$update .= $this->boolean($value, true);
-			} elseif (!$alias) {
-				$update .= str_replace($quotedAlias . '.', '', str_replace(
-					$model->alias . '.', '', $value
+			} elseif ( ! $alias) {
+				$update .= str_replace($quotedAlias.'.', '', str_replace(
+					$model->alias.'.', '', $value
 				));
 			} else {
 				$update .= $value;
@@ -1935,7 +1935,7 @@ 
 					$field = ltrim($field, $this->startQuote);
 					$field = rtrim($field, $this->endQuote);
 				}
-				if (!$model->hasField($field)) {
+				if ( ! $model->hasField($field)) {
 					$noJoin = false;
 					break;
 				}
@@ -1998,14 +1998,14 @@ 
  * @return string An SQL calculation function
  */
 	public function calculate(Model $model, $func, $params = array()) {
-		$params = (array)$params;
+		$params = (array) $params;
 
 		switch (strtolower($func)) {
 			case 'count':
-				if (!isset($params[0])) {
+				if ( ! isset($params[0])) {
 					$params[0] = '*';
 				}
-				if (!isset($params[1])) {
+				if ( ! isset($params[1])) {
 					$params[1] = 'count';
 				}
 				if (is_object($model) && $model->isVirtualField($params[0])) {
@@ -2013,10 +2013,10 @@ 
 				} else {
 					$arg = $this->name($params[0]);
 				}
-				return 'COUNT(' . $arg . ') AS ' . $this->name($params[1]);
+				return 'COUNT('.$arg.') AS '.$this->name($params[1]);
 			case 'max':
 			case 'min':
-				if (!isset($params[1])) {
+				if ( ! isset($params[1])) {
 					$params[1] = $params[0];
 				}
 				if (is_object($model) && $model->isVirtualField($params[0])) {
@@ -2024,7 +2024,7 @@ 
 				} else {
 					$arg = $this->name($params[0]);
 				}
-				return strtoupper($func) . '(' . $arg . ') AS ' . $this->name($params[1]);
+				return strtoupper($func).'('.$arg.') AS '.$this->name($params[1]);
 		}
 	}
 
@@ -2036,7 +2036,7 @@ 
  * @return boolean SQL TRUNCATE TABLE statement, false if not applicable.
  */
 	public function truncate($table) {
-		return $this->execute('TRUNCATE TABLE ' . $this->fullTableName($table));
+		return $this->execute('TRUNCATE TABLE '.$this->fullTableName($table));
 	}
 
 /**
@@ -2077,7 +2077,7 @@ 
  * @return boolean
  */
 	protected function _beginNested() {
-		$query = 'SAVEPOINT LEVEL' . ++$this->_transactionNesting;
+		$query = 'SAVEPOINT LEVEL'.++$this->_transactionNesting;
 		if ($this->fullDebug) {
 			$this->logQuery($query);
 		}
@@ -2093,7 +2093,7 @@ 
  * or a transaction has not started).
  */
 	public function commit() {
-		if (!$this->_transactionStarted) {
+		if ( ! $this->_transactionStarted) {
 			return false;
 		}
 
@@ -2119,7 +2119,7 @@ 
  * @return boolean
  */
 	protected function _commitNested() {
-		$query = 'RELEASE SAVEPOINT LEVEL' . $this->_transactionNesting--;
+		$query = 'RELEASE SAVEPOINT LEVEL'.$this->_transactionNesting--;
 		if ($this->fullDebug) {
 			$this->logQuery($query);
 		}
@@ -2135,7 +2135,7 @@ 
  * or a transaction has not started).
  */
 	public function rollback() {
-		if (!$this->_transactionStarted) {
+		if ( ! $this->_transactionStarted) {
 			return false;
 		}
 
@@ -2161,7 +2161,7 @@ 
  * @return boolean
  */
 	protected function _rollbackNested() {
-		$query = 'ROLLBACK TO SAVEPOINT LEVEL' . $this->_transactionNesting--;
+		$query = 'ROLLBACK TO SAVEPOINT LEVEL'.$this->_transactionNesting--;
 		if ($this->fullDebug) {
 			$this->logQuery($query);
 		}
@@ -2194,18 +2194,18 @@ 
  * @see DboSource::conditions()
  */
 	public function defaultConditions(Model $model, $conditions, $useAlias = true) {
-		if (!empty($conditions)) {
+		if ( ! empty($conditions)) {
 			return $conditions;
 		}
 		$exists = $model->exists();
-		if (!$exists && $conditions !== null) {
+		if ( ! $exists && $conditions !== null) {
 			return false;
-		} elseif (!$exists) {
+		} elseif ( ! $exists) {
 			return null;
 		}
 		$alias = $model->alias;
 
-		if (!$useAlias) {
+		if ( ! $useAlias) {
 			$alias = $this->fullTableName($model, false);
 		}
 		return array("{$alias}.{$model->primaryKey}" => $model->getID());
@@ -2221,7 +2221,7 @@ 
  */
 	public function resolveKey(Model $model, $key, $assoc = null) {
 		if (strpos('.', $key) !== false) {
-			return $this->name($model->alias) . '.' . $this->name($key);
+			return $this->name($model->alias).'.'.$this->name($key);
 		}
 		return $key;
 	}
@@ -2238,7 +2238,7 @@ 
 			$base = array_fill_keys(array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group'), array());
 			$base['callbacks'] = null;
 		}
-		return (array)$data + $base;
+		return (array) $data + $base;
 	}
 
 /**
@@ -2252,9 +2252,9 @@ 
 	protected function _constructVirtualFields(Model $model, $alias, $fields) {
 		$virtual = array();
 		foreach ($fields as $field) {
-			$virtualField = $this->name($alias . $this->virtualFieldSeparator . $field);
+			$virtualField = $this->name($alias.$this->virtualFieldSeparator.$field);
 			$expression = $this->_quoteFields($model->getVirtualField($field));
-			$virtual[] = '(' . $expression . ") {$this->alias} {$virtualField}";
+			$virtual[] = '('.$expression.") {$this->alias} {$virtualField}";
 		}
 		return $virtual;
 	}
@@ -2291,36 +2291,36 @@ 
 		$allFields = empty($fields);
 		if ($allFields) {
 			$fields = array_keys($model->schema());
-		} elseif (!is_array($fields)) {
+		} elseif ( ! is_array($fields)) {
 			$fields = String::tokenize($fields);
 		}
 		$fields = array_values(array_filter($fields));
-		$allFields = $allFields || in_array('*', $fields) || in_array($model->alias . '.*', $fields);
+		$allFields = $allFields || in_array('*', $fields) || in_array($model->alias.'.*', $fields);
 
 		$virtual = array();
-		if (!empty($virtualFields)) {
+		if ( ! empty($virtualFields)) {
 			$virtualKeys = array_keys($virtualFields);
 			foreach ($virtualKeys as $field) {
-				$virtualKeys[] = $model->alias . '.' . $field;
+				$virtualKeys[] = $model->alias.'.'.$field;
 			}
 			$virtual = ($allFields) ? $virtualKeys : array_intersect($virtualKeys, $fields);
 			foreach ($virtual as $i => $field) {
 				if (strpos($field, '.') !== false) {
-					$virtual[$i] = str_replace($model->alias . '.', '', $field);
+					$virtual[$i] = str_replace($model->alias.'.', '', $field);
 				}
 				$fields = array_diff($fields, array($field));
 			}
 			$fields = array_values($fields);
 		}
-		if (!$quote) {
-			if (!empty($virtual)) {
+		if ( ! $quote) {
+			if ( ! empty($virtual)) {
 				$fields = array_merge($fields, $this->_constructVirtualFields($model, $alias, $virtual));
 			}
 			return $fields;
 		}
 		$count = count($fields);
 
-		if ($count >= 1 && !in_array($fields[0], array('*', 'COUNT(*)'))) {
+		if ($count >= 1 && ! in_array($fields[0], array('*', 'COUNT(*)'))) {
 			for ($i = 0; $i < $count; $i++) {
 				if (is_string($fields[$i]) && in_array($fields[$i], $virtual)) {
 					unset($fields[$i]);
@@ -2328,9 +2328,9 @@ 
 				}
 				if (is_object($fields[$i]) && isset($fields[$i]->type) && $fields[$i]->type === 'expression') {
 					$fields[$i] = $fields[$i]->value;
-				} elseif (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])) {
+				} elseif (preg_match('/^\(.*\)\s'.$this->alias.'.*/i', $fields[$i])) {
 					continue;
-				} elseif (!preg_match('/^.+\\(.*\\)/', $fields[$i])) {
+				} elseif ( ! preg_match('/^.+\\(.*\\)/', $fields[$i])) {
 					$prepend = '';
 
 					if (strpos($fields[$i], 'DISTINCT') !== false) {
@@ -2340,36 +2340,36 @@ 
 					$dot = strpos($fields[$i], '.');
 
 					if ($dot === false) {
-						$prefix = !(
+						$prefix = ! (
 							strpos($fields[$i], ' ') !== false ||
 							strpos($fields[$i], '(') !== false
 						);
-						$fields[$i] = $this->name(($prefix ? $alias . '.' : '') . $fields[$i]);
+						$fields[$i] = $this->name(($prefix ? $alias.'.' : '').$fields[$i]);
 					} else {
 						if (strpos($fields[$i], ',') === false) {
 							$build = explode('.', $fields[$i]);
-							if (!Hash::numeric($build)) {
+							if ( ! Hash::numeric($build)) {
 								$fields[$i] = $this->name(implode('.', $build));
 							}
 						}
 					}
-					$fields[$i] = $prepend . $fields[$i];
+					$fields[$i] = $prepend.$fields[$i];
 				} elseif (preg_match('/\(([\.\w]+)\)/', $fields[$i], $field)) {
 					if (isset($field[1])) {
 						if (strpos($field[1], '.') === false) {
-							$field[1] = $this->name($alias . '.' . $field[1]);
+							$field[1] = $this->name($alias.'.'.$field[1]);
 						} else {
 							$field[0] = explode('.', $field[1]);
-							if (!Hash::numeric($field[0])) {
+							if ( ! Hash::numeric($field[0])) {
 								$field[0] = implode('.', array_map(array(&$this, 'name'), $field[0]));
-								$fields[$i] = preg_replace('/\(' . $field[1] . '\)/', '(' . $field[0] . ')', $fields[$i], 1);
+								$fields[$i] = preg_replace('/\('.$field[1].'\)/', '('.$field[0].')', $fields[$i], 1);
 							}
 						}
 					}
 				}
 			}
 		}
-		if (!empty($virtual)) {
+		if ( ! empty($virtual)) {
 			$fields = array_merge($fields, $this->_constructVirtualFields($model, $alias, $virtual));
 		}
 		return $this->cacheMethod(__FUNCTION__, $cacheKey, array_unique($fields));
@@ -2397,20 +2397,20 @@ 
 			$clause = ' WHERE ';
 		}
 
-		if (is_array($conditions) && !empty($conditions)) {
+		if (is_array($conditions) && ! empty($conditions)) {
 			$out = $this->conditionKeysToString($conditions, $quoteValues, $model);
 
 			if (empty($out)) {
-				return $clause . ' 1 = 1';
+				return $clause.' 1 = 1';
 			}
-			return $clause . implode(' AND ', $out);
+			return $clause.implode(' AND ', $out);
 		}
 		if (is_bool($conditions)) {
-			return $clause . (int)$conditions . ' = 1';
+			return $clause.(int) $conditions.' = 1';
 		}
 
 		if (empty($conditions) || trim($conditions) === '') {
-			return $clause . '1 = 1';
+			return $clause.'1 = 1';
 		}
 		$clauses = '/^WHERE\\x20|^GROUP\\x20BY\\x20|^HAVING\\x20|^ORDER\\x20BY\\x20/i';
 
@@ -2418,7 +2418,7 @@ 
 			$clause = '';
 		}
 		$conditions = $this->_quoteFields($conditions);
-		return $clause . $conditions;
+		return $clause.$conditions;
 	}
 
 /**
@@ -2440,7 +2440,7 @@ 
 
 			if (is_array($value)) {
 				$valueInsert = (
-					!empty($value) &&
+					! empty($value) &&
 					(substr_count($key, '?') === count($value) || substr_count($key, ':') === count($value))
 				);
 			}
@@ -2451,7 +2451,7 @@ 
 				$out[] = $this->_quoteFields($value);
 			} elseif ((is_numeric($key) && is_array($value)) || in_array(strtolower(trim($key)), $bool)) {
 				if (in_array(strtolower(trim($key)), $bool)) {
-					$join = ' ' . strtoupper($key) . ' ';
+					$join = ' '.strtoupper($key).' ';
 				} else {
 					$key = $join;
 				}
@@ -2459,7 +2459,7 @@ 
 
 				if (strpos($join, 'NOT') !== false) {
 					if (strtoupper(trim($key)) === 'NOT') {
-						$key = 'AND ' . trim($key);
+						$key = 'AND '.trim($key);
 					}
 					$not = 'NOT ';
 				}
@@ -2470,30 +2470,30 @@ 
 
 				if (empty($value[1])) {
 					if ($not) {
-						$out[] = $not . '(' . $value[0] . ')';
+						$out[] = $not.'('.$value[0].')';
 					} else {
 						$out[] = $value[0];
 					}
 				} else {
-					$out[] = '(' . $not . '(' . implode(') ' . strtoupper($key) . ' (', $value) . '))';
+					$out[] = '('.$not.'('.implode(') '.strtoupper($key).' (', $value).'))';
 				}
 			} else {
 				if (is_object($value) && isset($value->type)) {
 					if ($value->type === 'identifier') {
-						$data .= $this->name($key) . ' = ' . $this->name($value->value);
+						$data .= $this->name($key).' = '.$this->name($value->value);
 					} elseif ($value->type === 'expression') {
 						if (is_numeric($key)) {
 							$data .= $value->value;
 						} else {
-							$data .= $this->name($key) . ' = ' . $value->value;
+							$data .= $this->name($key).' = '.$value->value;
 						}
 					}
-				} elseif (is_array($value) && !empty($value) && !$valueInsert) {
+				} elseif (is_array($value) && ! empty($value) && ! $valueInsert) {
 					$keys = array_keys($value);
 					if ($keys === array_values($keys)) {
 						$count = count($value);
-						if ($count === 1 && !preg_match('/\s+(?:NOT|\!=)$/', $key)) {
-							$data = $this->_quoteFields($key) . ' = (';
+						if ($count === 1 && ! preg_match('/\s+(?:NOT|\!=)$/', $key)) {
+							$data = $this->_quoteFields($key).' = (';
 							if ($quoteValues) {
 								if (is_object($model)) {
 									$columnType = $model->getColumnType($key);
@@ -2507,12 +2507,12 @@ 
 					} else {
 						$ret = $this->conditionKeysToString($value, $quoteValues, $model);
 						if (count($ret) > 1) {
-							$data = '(' . implode(') AND (', $ret) . ')';
+							$data = '('.implode(') AND (', $ret).')';
 						} elseif (isset($ret[0])) {
 							$data = $ret[0];
 						}
 					}
-				} elseif (is_numeric($key) && !empty($value)) {
+				} elseif (is_numeric($key) && ! empty($value)) {
 					$data = $this->_quoteFields($value);
 				} else {
 					$data = $this->_parseKey($model, trim($key), $value);
@@ -2537,7 +2537,7 @@ 
  * @return string
  */
 	protected function _parseKey($model, $key, $value) {
-		$operatorMatch = '/^(((' . implode(')|(', $this->_sqlOps);
+		$operatorMatch = '/^((('.implode(')|(', $this->_sqlOps);
 		$operatorMatch .= ')\\x20?)|<[>=]?(?![^>]+>)\\x20?|[>=!]{1,3}(?!<)\\x20?)/is';
 		$bound = (strpos($key, '?') !== false || (is_array($value) && strpos($key, ':') !== false));
 
@@ -2546,8 +2546,8 @@ 
 		} else {
 			list($key, $operator) = explode(' ', trim($key), 2);
 
-			if (!preg_match($operatorMatch, trim($operator)) && strpos($operator, ' ') !== false) {
-				$key = $key . ' ' . $operator;
+			if ( ! preg_match($operatorMatch, trim($operator)) && strpos($operator, ' ') !== false) {
+				$key = $key.' '.$operator;
 				$split = strrpos($key, ' ');
 				$operator = substr($key, $split);
 				$key = substr($key, 0, $split);
@@ -2572,7 +2572,7 @@ 
 
 		$value = $this->value($value, $type);
 
-		if (!$virtual && $key !== '?') {
+		if ( ! $virtual && $key !== '?') {
 			$isKey = (
 				strpos($key, '(') !== false ||
 				strpos($key, ')') !== false ||
@@ -2582,10 +2582,10 @@ 
 		}
 
 		if ($bound) {
-			return String::insert($key . ' ' . trim($operator), $value);
+			return String::insert($key.' '.trim($operator), $value);
 		}
 
-		if (!preg_match($operatorMatch, trim($operator))) {
+		if ( ! preg_match($operatorMatch, trim($operator))) {
 			$operator .= is_array($value) ? ' IN' : ' =';
 		}
 		$operator = trim($operator);
@@ -2630,10 +2630,10 @@ 
 		$start = $end = null;
 		$original = $conditions;
 
-		if (!empty($this->startQuote)) {
+		if ( ! empty($this->startQuote)) {
 			$start = preg_quote($this->startQuote);
 		}
-		if (!empty($this->endQuote)) {
+		if ( ! empty($this->endQuote)) {
 			$end = preg_quote($this->endQuote);
 		}
 		$conditions = str_replace(array($start, $end), '', $conditions);
@@ -2691,12 +2691,12 @@ 
  * @return string ORDER BY clause
  */
 	public function order($keys, $direction = 'ASC', $model = null) {
-		if (!is_array($keys)) {
+		if ( ! is_array($keys)) {
 			$keys = array($keys);
 		}
 		$keys = array_filter($keys);
 		$result = array();
-		while (!empty($keys)) {
+		while ( ! empty($keys)) {
 			list($key, $dir) = each($keys);
 			array_shift($keys);
 
@@ -2705,7 +2705,7 @@ 
 				$dir = $direction;
 			}
 
-			if (is_string($key) && strpos($key, ',') !== false && !preg_match('/\(.+\,.+\)/', $key)) {
+			if (is_string($key) && strpos($key, ',') !== false && ! preg_match('/\(.+\,.+\)/', $key)) {
 				$key = array_map('trim', explode(',', $key));
 			}
 			if (is_array($key)) {
@@ -2732,24 +2732,24 @@ 
 			$key = trim($key);
 
 			if (is_object($model) && $model->isVirtualField($key)) {
-				$key = '(' . $this->_quoteFields($model->getVirtualField($key)) . ')';
+				$key = '('.$this->_quoteFields($model->getVirtualField($key)).')';
 			}
 			list($alias) = pluginSplit($key);
 			if (is_object($model) && $alias !== $model->alias && is_object($model->{$alias}) && $model->{$alias}->isVirtualField($key)) {
-				$key = '(' . $this->_quoteFields($model->{$alias}->getVirtualField($key)) . ')';
+				$key = '('.$this->_quoteFields($model->{$alias}->getVirtualField($key)).')';
 			}
 
 			if (strpos($key, '.')) {
 				$key = preg_replace_callback('/([a-zA-Z0-9_-]{1,})\\.([a-zA-Z0-9_-]{1,})/', array(&$this, '_quoteMatchedField'), $key);
 			}
-			if (!preg_match('/\s/', $key) && strpos($key, '.') === false) {
+			if ( ! preg_match('/\s/', $key) && strpos($key, '.') === false) {
 				$key = $this->name($key);
 			}
-			$key .= ' ' . trim($dir);
+			$key .= ' '.trim($dir);
 			$result[] = $key;
 		}
-		if (!empty($result)) {
-			return ' ORDER BY ' . implode(', ', $result);
+		if ( ! empty($result)) {
+			return ' ORDER BY '.implode(', ', $result);
 		}
 		return '';
 	}
@@ -2763,16 +2763,16 @@ 
  */
 	public function group($group, $model = null) {
 		if ($group) {
-			if (!is_array($group)) {
+			if ( ! is_array($group)) {
 				$group = array($group);
 			}
 			foreach ($group as $index => $key) {
 				if (is_object($model) && $model->isVirtualField($key)) {
-					$group[$index] = '(' . $model->getVirtualField($key) . ')';
+					$group[$index] = '('.$model->getVirtualField($key).')';
 				}
 			}
 			$group = implode(', ', $group);
-			return ' GROUP BY ' . $this->_quoteFields($group);
+			return ' GROUP BY '.$this->_quoteFields($group);
 		}
 		return null;
 	}
@@ -2796,7 +2796,7 @@ 
 	public function hasAny(Model $Model, $sql) {
 		$sql = $this->conditions($sql);
 		$table = $this->fullTableName($Model);
-		$alias = $this->alias . $this->name($Model->alias);
+		$alias = $this->alias.$this->name($Model->alias);
 		$where = $sql ? "{$sql}" : ' WHERE 1 = 1';
 		$id = $Model->escapeField();
 
@@ -2815,7 +2815,7 @@ 
  * @return mixed An integer or string representing the length of the column, or null for unknown length.
  */
 	public function length($real) {
-		if (!preg_match_all('/([\w\s]+)(?:\((\d+)(?:,(\d+))?\))?(\sunsigned)?(\szerofill)?/', $real, $result)) {
+		if ( ! preg_match_all('/([\w\s]+)(?:\((\d+)(?:,(\d+))?\))?(\sunsigned)?(\szerofill)?/', $real, $result)) {
 			$col = str_replace(array(')', 'unsigned'), '', $real);
 			$limit = null;
 
@@ -2840,7 +2840,7 @@ 
 
 		$isFloat = in_array($type, array('dec', 'decimal', 'float', 'numeric', 'double'));
 		if ($isFloat && $offset) {
-			return $length . ',' . $offset;
+			return $length.','.$offset;
 		}
 
 		if (($real[0] == $type) && (count($real) === 1)) {
@@ -2849,7 +2849,7 @@ 
 
 		if (isset($types[$type])) {
 			$length += $types[$type];
-			if (!empty($sign)) {
+			if ( ! empty($sign)) {
 				$length--;
 			}
 		} elseif (in_array($type, array('enum', 'set'))) {
@@ -2876,9 +2876,9 @@ 
  */
 	public function boolean($data, $quote = false) {
 		if ($quote) {
-			return !empty($data) ? '1' : '0';
+			return ! empty($data) ? '1' : '0';
 		}
-		return !empty($data);
+		return ! empty($data);
 	}
 
 /**
@@ -2962,14 +2962,14 @@ 
  * @return string
  */
 	public function createSchema($schema, $tableName = null) {
-		if (!$schema instanceof CakeSchema) {
+		if ( ! $schema instanceof CakeSchema) {
 			trigger_error(__d('cake_dev', 'Invalid schema object'), E_USER_WARNING);
 			return null;
 		}
 		$out = '';
 
 		foreach ($schema->tables as $curTable => $columns) {
-			if (!$tableName || $tableName === $curTable) {
+			if ( ! $tableName || $tableName === $curTable) {
 				$cols = $indexes = $tableParameters = array();
 				$primary = null;
 				$table = $this->fullTableName($curTable);
@@ -2996,7 +2996,7 @@ 
 					}
 					if ($name !== 'indexes' && $name !== 'tableParameters') {
 						$col['name'] = $name;
-						if (!isset($col['type'])) {
+						if ( ! isset($col['type'])) {
 							$col['type'] = 'string';
 						}
 						$cols[] = $this->buildColumn($col);
@@ -3006,12 +3006,12 @@ 
 						$tableParameters = array_merge($tableParameters, $this->buildTableParameters($col, $table));
 					}
 				}
-				if (!isset($columns['indexes']['PRIMARY']) && !empty($primary)) {
+				if ( ! isset($columns['indexes']['PRIMARY']) && ! empty($primary)) {
 					$col = array('PRIMARY' => array('column' => $primary, 'unique' => 1));
 					$indexes = array_merge($indexes, $this->buildIndex($col, $table));
 				}
 				$columns = $cols;
-				$out .= $this->renderStatement('schema', compact('table', 'columns', 'indexes', 'tableParameters')) . "\n\n";
+				$out .= $this->renderStatement('schema', compact('table', 'columns', 'indexes', 'tableParameters'))."\n\n";
 			}
 		}
 		return $out;
@@ -3040,13 +3040,13 @@ 
 		$out = '';
 
 		if ($table && array_key_exists($table, $schema->tables)) {
-			return $this->_dropTable($table) . "\n";
+			return $this->_dropTable($table)."\n";
 		} elseif ($table) {
 			return $out;
 		}
 
 		foreach (array_keys($schema->tables) as $curTable) {
-			$out .= $this->_dropTable($curTable) . "\n";
+			$out .= $this->_dropTable($curTable)."\n";
 		}
 		return $out;
 	}
@@ -3058,7 +3058,7 @@ 
  * @return string Drop table SQL statement
  */
 	protected function _dropTable($table) {
-		return 'DROP TABLE ' . $this->fullTableName($table) . ";";
+		return 'DROP TABLE '.$this->fullTableName($table).";";
 	}
 
 /**
@@ -3077,13 +3077,13 @@ 
 			return null;
 		}
 
-		if (!isset($this->columns[$type])) {
+		if ( ! isset($this->columns[$type])) {
 			trigger_error(__d('cake_dev', 'Column type %s does not exist', $type), E_USER_WARNING);
 			return null;
 		}
 
 		$real = $this->columns[$type];
-		$out = $this->name($name) . ' ' . $real['name'];
+		$out = $this->name($name).' '.$real['name'];
 
 		if (isset($column['length'])) {
 			$length = $column['length'];
@@ -3095,7 +3095,7 @@ 
 			$length = $real['limit'];
 		}
 		if (isset($length)) {
-			$out .= '(' . $length . ')';
+			$out .= '('.$length.')';
 		}
 
 		if (($column['type'] === 'integer' || $column['type'] === 'float') && isset($column['default']) && $column['default'] === '') {
@@ -3104,16 +3104,16 @@ 
 		$out = $this->_buildFieldParameters($out, $column, 'beforeDefault');
 
 		if (isset($column['key']) && $column['key'] === 'primary' && ($type === 'integer' || $type === 'biginteger')) {
-			$out .= ' ' . $this->columns['primary_key']['name'];
+			$out .= ' '.$this->columns['primary_key']['name'];
 		} elseif (isset($column['key']) && $column['key'] === 'primary') {
 			$out .= ' NOT NULL';
 		} elseif (isset($column['default']) && isset($column['null']) && $column['null'] === false) {
-			$out .= ' DEFAULT ' . $this->value($column['default'], $type) . ' NOT NULL';
+			$out .= ' DEFAULT '.$this->value($column['default'], $type).' NOT NULL';
 		} elseif (isset($column['default'])) {
-			$out .= ' DEFAULT ' . $this->value($column['default'], $type);
-		} elseif ($type !== 'timestamp' && !empty($column['null'])) {
+			$out .= ' DEFAULT '.$this->value($column['default'], $type);
+		} elseif ($type !== 'timestamp' && ! empty($column['null'])) {
 			$out .= ' DEFAULT NULL';
-		} elseif ($type === 'timestamp' && !empty($column['null'])) {
+		} elseif ($type === 'timestamp' && ! empty($column['null'])) {
 			$out .= ' NULL';
 		} elseif (isset($column['null']) && $column['null'] === false) {
 			$out .= ' NOT NULL';
@@ -3135,14 +3135,14 @@ 
 	protected function _buildFieldParameters($columnString, $columnData, $position) {
 		foreach ($this->fieldParameters as $paramName => $value) {
 			if (isset($columnData[$paramName]) && $value['position'] == $position) {
-				if (isset($value['options']) && !in_array($columnData[$paramName], $value['options'])) {
+				if (isset($value['options']) && ! in_array($columnData[$paramName], $value['options'])) {
 					continue;
 				}
 				$val = $columnData[$paramName];
 				if ($value['quote']) {
 					$val = $this->value($val);
 				}
-				$columnString .= ' ' . $value['value'] . $value['join'] . $val;
+				$columnString .= ' '.$value['value'].$value['join'].$val;
 			}
 		}
 		return $columnString;
@@ -3163,15 +3163,15 @@ 
 				$out .= 'PRIMARY ';
 				$name = null;
 			} else {
-				if (!empty($value['unique'])) {
+				if ( ! empty($value['unique'])) {
 					$out .= 'UNIQUE ';
 				}
-				$name = $this->startQuote . $name . $this->endQuote;
+				$name = $this->startQuote.$name.$this->endQuote;
 			}
 			if (is_array($value['column'])) {
-				$out .= 'KEY ' . $name . ' (' . implode(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
+				$out .= 'KEY '.$name.' ('.implode(', ', array_map(array(&$this, 'name'), $value['column'])).')';
 			} else {
-				$out .= 'KEY ' . $name . ' (' . $this->name($value['column']) . ')';
+				$out .= 'KEY '.$name.' ('.$this->name($value['column']).')';
 			}
 			$join[] = $out;
 		}
@@ -3189,7 +3189,7 @@ 
 		if (method_exists($this, 'listDetailedSources')) {
 			$currentTableDetails = $this->listDetailedSources($name);
 			foreach ($this->tableParameters as $paramName => $parameter) {
-				if (!empty($parameter['column']) && !empty($currentTableDetails[$parameter['column']])) {
+				if ( ! empty($parameter['column']) && ! empty($currentTableDetails[$parameter['column']])) {
 					$parameters[$paramName] = $currentTableDetails[$parameter['column']];
 				}
 			}
@@ -3211,7 +3211,7 @@ 
 				if ($this->tableParameters[$name]['quote']) {
 					$value = $this->value($value);
 				}
-				$result[] = $this->tableParameters[$name]['value'] . $this->tableParameters[$name]['join'] . $value;
+				$result[] = $this->tableParameters[$name]['value'].$this->tableParameters[$name]['join'].$value;
 			}
 		}
 		return $result;
@@ -3224,7 +3224,7 @@ 
  * @return void
  */
 	public function introspectType($value) {
-		if (!is_array($value)) {
+		if ( ! is_array($value)) {
 			if (is_bool($value)) {
 				return 'boolean';
 			}
@@ -3244,12 +3244,12 @@ 
 		$containsInt = $containsString = false;
 		foreach ($value as $valElement) {
 			$valElement = trim($valElement);
-			if (!is_float($valElement) && !preg_match('/^[\d]+\.[\d]+$/', $valElement)) {
+			if ( ! is_float($valElement) && ! preg_match('/^[\d]+\.[\d]+$/', $valElement)) {
 				$isAllFloat = false;
 			} else {
 				continue;
 			}
-			if (!is_int($valElement) && !preg_match('/^[\d]+$/', $valElement)) {
+			if ( ! is_int($valElement) && ! preg_match('/^[\d]+$/', $valElement)) {
 				$isAllInt = false;
 			} else {
 				$containsInt = true;
@@ -3265,7 +3265,7 @@ 
 			return 'integer';
 		}
 
-		if ($containsInt && !$containsString) {
+		if ($containsInt && ! $containsString) {
 			return 'integer';
 		}
 		return 'string';

lib/Cake/Model/Datasource/Session/DatabaseSession.php

Doc Comments +3 added lines, -3 removed lines

@@ -85,8 +85,8 @@ 
 /**
  * Method used to read from a database session.
  *
- * @param integer|string $id The key of the value to read
- * @return mixed The value of the key or false if it does not exist
+ * @param string $id The key of the value to read
+ * @return boolean The value of the key or false if it does not exist
  */
 	public function read($id) {
 		$row = $this->_model->find('first', array(
@@ -104,7 +104,7 @@ 
  * Helper function called on write for database sessions.
  *
  * @param integer $id ID that uniquely identifies session in database
- * @param mixed $data The value of the data to be saved.
+ * @param string $data The value of the data to be saved.
  * @return boolean True for successful write, false otherwise.
  */
 	public function write($id, $data) {

Spacing +3 added lines, -3 removed lines

@@ -108,7 +108,7 @@ 
  * @return boolean True for successful write, false otherwise.
  */
 	public function write($id, $data) {
-		if (!$id) {
+		if ( ! $id) {
 			return false;
 		}
 		$expires = time() + $this->_timeout;
@@ -134,12 +134,12 @@ 
  * @return boolean Success
  */
 	public function gc($expires = null) {
-		if (!$expires) {
+		if ( ! $expires) {
 			$expires = time();
 		} else {
 			$expires = time() - $expires;
 		}
-		return $this->_model->deleteAll(array($this->_model->alias . ".expires <" => $expires), false, false);
+		return $this->_model->deleteAll(array($this->_model->alias.".expires <" => $expires), false, false);
 	}
 
 }

lib/Cake/Model/Model.php

Doc Comments +9 added lines, -13 removed lines

@@ -1647,7 +1647,7 @@ 
  *
  * @param string $name Name of the table field
  * @param mixed $value Value of the field
- * @param boolean|array $validate Either a boolean, or an array.
+ * @param boolean $validate Either a boolean, or an array.
  *   If a boolean, indicates whether or not to validate before saving.
  *   If an array, allows control of 'validate', 'callbacks' and 'counterCache' options.
  *   See Model::save() for details of each options.
@@ -2285,7 +2285,7 @@ 
  *
  * @param array $data Record data to validate. This should be a numerically-indexed array
  * @param array $options Options to use when validating record data (see above), See also $options of validates().
- * @return boolean|array If atomic: True on success, or false on failure.
+ * @return boolean If atomic: True on success, or false on failure.
  *    Otherwise: array similar to the $data array passed, but values are set to true/false
  *    depending on whether each record validated successfully.
  */
@@ -3207,7 +3207,7 @@ 
  *
  * @param array $results Results to filter
  * @param boolean $primary If this is the primary model results (results from model where the find operation was performed)
- * @return array Set of filtered results
+ * @return string Set of filtered results
  */
 	protected function _filterResults($results, $primary = true) {
 		$event = new CakeEvent('Model.afterFind', $this, array($results, $primary));
@@ -3294,10 +3294,6 @@ 
  * Returns a resultset for a given SQL statement. Custom SQL queries should be performed with this method.
  *
  * @param string $sql SQL statement
- * @param boolean|array $params Either a boolean to control query caching or an array of parameters
- *    for use with prepared statement placeholders.
- * @param boolean $cache If $params is provided, a boolean flag for enabling/disabled
- *    query caching.
  * @return mixed Resultset array or boolean indicating success / failure depending on the query executed
  * @link http://book.cakephp.org/2.0/en/models/retrieving-your-data.html#model-query
  */
@@ -3417,7 +3413,7 @@ 
 /**
  * Returns the ID of the last record this model inserted.
  *
- * @return mixed Last inserted ID
+ * @return integer Last inserted ID
  */
 	public function getLastInsertID() {
 		return $this->getInsertID();
@@ -3426,7 +3422,7 @@ 
 /**
  * Returns the ID of the last record this model inserted.
  *
- * @return mixed Last inserted ID
+ * @return integer Last inserted ID
  */
 	public function getInsertID() {
 		return $this->_insertID;
@@ -3445,7 +3441,7 @@ 
 /**
  * Returns the number of rows returned from the last query.
  *
- * @return integer Number of rows
+ * @return boolean Number of rows
  */
 	public function getNumRows() {
 		return $this->getDataSource()->lastNumRows();
@@ -3454,7 +3450,7 @@ 
 /**
  * Returns the number of rows affected by the last query.
  *
- * @return integer Number of rows
+ * @return boolean Number of rows
  */
 	public function getAffectedRows() {
 		return $this->getDataSource()->lastAffected();
@@ -3591,7 +3587,7 @@ 
  * call, otherwise return the (modified) query data.
  *
  * @param array $query Data used to execute this query, i.e. conditions, order, etc.
- * @return mixed true if the operation should continue, false if it should abort; or, modified
+ * @return boolean true if the operation should continue, false if it should abort; or, modified
  *  $query to continue with new $query
  * @link http://book.cakephp.org/2.0/en/models/callback-methods.html#beforefind
  */
@@ -3692,7 +3688,7 @@ 
  *
  * @param string $type If null this deletes cached views if Cache.check is true
  *     Will be used to allow deleting query cache also
- * @return mixed True on delete, null otherwise
+ * @return null|boolean True on delete, null otherwise
  */
 	protected function _clearCache($type = null) {
 		if ($type !== null || Configure::read('Cache.check') !== true) {

Spacing +178 added lines, -178 removed lines

@@ -730,7 +730,7 @@ 
 				$this->useTable = Inflector::tableize($this->name);
 			}
 
-			if (!$this->displayField) {
+			if ( ! $this->displayField) {
 				unset($this->displayField);
 			}
 			$this->table = $this->useTable;
@@ -836,20 +836,20 @@ 
 
 					if ($className) {
 						$assocKey = $k;
-						$dynamic = !empty($relation['dynamicWith']);
+						$dynamic = ! empty($relation['dynamicWith']);
 						break(2);
 					}
 				}
 			}
 		}
 
-		if (!$className) {
+		if ( ! $className) {
 			return false;
 		}
 
 		list($plugin, $className) = pluginSplit($className);
 
-		if (!ClassRegistry::isKeySet($className) && !empty($dynamic)) {
+		if ( ! ClassRegistry::isKeySet($className) && ! empty($dynamic)) {
 			$this->{$className} = new AppModel(array(
 				'name' => $className,
 				'table' => $this->hasAndBelongsToMany[$assocKey]['joinTable'],
@@ -859,7 +859,7 @@ 
 			$this->_constructLinkedModel($name, $className, $plugin);
 		}
 
-		if (!empty($assocKey)) {
+		if ( ! empty($assocKey)) {
 			$this->hasAndBelongsToMany[$assocKey]['joinTable'] = $this->{$name}->table;
 			if (count($this->{$name}->schema()) <= 2 && $this->{$name}->primaryKey !== false) {
 				$this->{$name}->primaryKey = $this->hasAndBelongsToMany[$assocKey]['foreignKey'];
@@ -882,7 +882,7 @@ 
 
 		if ($name === 'tablePrefix') {
 			$this->setDataSource();
-			if (property_exists($this, 'tablePrefix') && !empty($this->tablePrefix)) {
+			if (property_exists($this, 'tablePrefix') && ! empty($this->tablePrefix)) {
 				return $this->tablePrefix;
 			}
 
@@ -915,7 +915,7 @@ 
  */
 	public function bindModel($params, $reset = true) {
 		foreach ($params as $assoc => $model) {
-			if ($reset === true && !isset($this->__backAssociation[$assoc])) {
+			if ($reset === true && ! isset($this->__backAssociation[$assoc])) {
 				$this->__backAssociation[$assoc] = $this->{$assoc};
 			}
 
@@ -963,7 +963,7 @@ 
  */
 	public function unbindModel($params, $reset = true) {
 		foreach ($params as $assoc => $models) {
-			if ($reset === true && !isset($this->__backAssociation[$assoc])) {
+			if ($reset === true && ! isset($this->__backAssociation[$assoc])) {
 				$this->__backAssociation[$assoc] = $this->{$assoc};
 			}
 
@@ -986,9 +986,9 @@ 
  */
 	protected function _createLinks() {
 		foreach ($this->_associations as $type) {
-			$association =& $this->{$type};
+			$association = & $this->{$type};
 
-			if (!is_array($association)) {
+			if ( ! is_array($association)) {
 				$association = explode(',', $association);
 
 				foreach ($association as $i => $className) {
@@ -998,7 +998,7 @@ 
 				}
 			}
 
-			if (!empty($association)) {
+			if ( ! empty($association)) {
 				foreach ($association as $assoc => $value) {
 					$plugin = null;
 
@@ -1009,7 +1009,7 @@ 
 
 						if (strpos($assoc, '.') !== false) {
 							list($plugin, $assoc) = pluginSplit($assoc, true);
-							$association[$assoc] = array('className' => $plugin . $assoc);
+							$association[$assoc] = array('className' => $plugin.$assoc);
 						} else {
 							$association[$assoc] = $value;
 						}
@@ -1039,16 +1039,16 @@ 
 			$className = $assoc;
 		}
 
-		if (!isset($this->{$assoc}) || $this->{$assoc}->name !== $className) {
+		if ( ! isset($this->{$assoc}) || $this->{$assoc}->name !== $className) {
 			if ($plugin) {
 				$plugin .= '.';
 			}
 
-			$model = array('class' => $plugin . $className, 'alias' => $assoc);
+			$model = array('class' => $plugin.$className, 'alias' => $assoc);
 			$this->{$assoc} = ClassRegistry::init($model);
 
 			if ($plugin) {
-				ClassRegistry::addObject($plugin . $className, $this->{$assoc});
+				ClassRegistry::addObject($plugin.$className, $this->{$assoc});
 			}
 
 			if ($assoc) {
@@ -1067,10 +1067,10 @@ 
 	protected function _generateAssociation($type, $assocKey) {
 		$class = $assocKey;
 		$dynamicWith = false;
-		$assoc =& $this->{$type}[$assocKey];
+		$assoc = & $this->{$type}[$assocKey];
 
 		foreach ($this->_associationKeys[$type] as $key) {
-			if (!isset($assoc[$key]) || $assoc[$key] === null) {
+			if ( ! isset($assoc[$key]) || $assoc[$key] === null) {
 				$data = '';
 
 				switch ($key) {
@@ -1079,11 +1079,11 @@ 
 						break;
 
 					case 'foreignKey':
-						$data = (($type === 'belongsTo') ? Inflector::underscore($assocKey) : Inflector::singularize($this->table)) . '_id';
+						$data = (($type === 'belongsTo') ? Inflector::underscore($assocKey) : Inflector::singularize($this->table)).'_id';
 						break;
 
 					case 'associationForeignKey':
-						$data = Inflector::singularize($this->{$class}->table) . '_id';
+						$data = Inflector::singularize($this->{$class}->table).'_id';
 						break;
 
 					case 'with':
@@ -1094,7 +1094,7 @@ 
 					case 'joinTable':
 						$tables = array($this->table, $this->{$class}->table);
 						sort($tables);
-						$data = $tables[0] . '_' . $tables[1];
+						$data = $tables[0].'_'.$tables[1];
 						break;
 
 					case 'className':
@@ -1132,9 +1132,9 @@ 
 			$sources = $db->listSources();
 			$db->cacheSources = $restore;
 
-			if (is_array($sources) && !in_array(strtolower($this->tablePrefix . $tableName), array_map('strtolower', $sources))) {
+			if (is_array($sources) && ! in_array(strtolower($this->tablePrefix.$tableName), array_map('strtolower', $sources))) {
 				throw new MissingTableException(array(
-					'table' => $this->tablePrefix . $tableName,
+					'table' => $this->tablePrefix.$tableName,
 					'class' => $this->alias,
 					'ds' => $this->useDbConfig,
 				));
@@ -1165,7 +1165,7 @@ 
  * @link http://book.cakephp.org/2.0/en/models/saving-your-data.html
  */
 	public function set($one, $two = null) {
-		if (!$one) {
+		if ( ! $one) {
 			return;
 		}
 
@@ -1187,7 +1187,7 @@ 
 		}
 
 		foreach ($data as $modelName => $fieldSet) {
-			if (!is_array($fieldSet)) {
+			if ( ! is_array($fieldSet)) {
 				continue;
 			}
 
@@ -1217,10 +1217,10 @@ 
  */
 	protected function _setAliasData($data) {
 		$models = array_keys($this->getAssociated());
-		$schema = array_keys((array)$this->schema());
+		$schema = array_keys((array) $this->schema());
 
 		foreach ($data as $field => $value) {
-			if (in_array($field, $schema) || !in_array($field, $models)) {
+			if (in_array($field, $schema) || ! in_array($field, $models)) {
 				$data[$this->alias][$field] = $value;
 				unset($data[$field]);
 			}
@@ -1258,13 +1258,13 @@ 
  * @return mixed The resulting data that should be assigned to a field
  */
 	public function deconstruct($field, $data) {
-		if (!is_array($data)) {
+		if ( ! is_array($data)) {
 			return $data;
 		}
 
 		$type = $this->getColumnType($field);
 
-		if (!in_array($type, array('datetime', 'timestamp', 'date', 'time'))) {
+		if ( ! in_array($type, array('datetime', 'timestamp', 'date', 'time'))) {
 			return $data;
 		}
 
@@ -1282,7 +1282,7 @@ 
 		if (
 			isset($data['hour']) &&
 			isset($data['meridian']) &&
-			!empty($data['hour']) &&
+			! empty($data['hour']) &&
 			$data['hour'] != 12 &&
 			$data['meridian'] === 'pm'
 		) {
@@ -1295,13 +1295,13 @@ 
 
 		if ($type === 'time') {
 			foreach ($timeFields as $key => $val) {
-				if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
+				if ( ! isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
 					$data[$val] = '00';
 				} elseif ($data[$val] !== '') {
 					$data[$val] = sprintf('%02d', $data[$val]);
 				}
 
-				if (!empty($data[$val])) {
+				if ( ! empty($data[$val])) {
 					$date[$key] = $data[$val];
 				} else {
 					return null;
@@ -1312,24 +1312,24 @@ 
 		if ($type === 'datetime' || $type === 'timestamp' || $type === 'date') {
 			foreach ($dateFields as $key => $val) {
 				if ($val === 'hour' || $val === 'min' || $val === 'sec') {
-					if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
+					if ( ! isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
 						$data[$val] = '00';
 					} else {
 						$data[$val] = sprintf('%02d', $data[$val]);
 					}
 				}
 
-				if (!isset($data[$val]) || isset($data[$val]) && (empty($data[$val]) || $data[$val][0] === '-')) {
+				if ( ! isset($data[$val]) || isset($data[$val]) && (empty($data[$val]) || $data[$val][0] === '-')) {
 					return null;
 				}
 
-				if (isset($data[$val]) && !empty($data[$val])) {
+				if (isset($data[$val]) && ! empty($data[$val])) {
 					$date[$key] = $data[$val];
 				}
 			}
 		}
 
-		if ($useNewDate && !empty($date)) {
+		if ($useNewDate && ! empty($date)) {
 			$format = $this->getDataSource()->columns[$type]['format'];
 			foreach (array('m', 'd', 'H', 'i', 's') as $index) {
 				if (isset($date[$index])) {
@@ -1351,7 +1351,7 @@ 
  * @return array Array of table metadata
  */
 	public function schema($field = false) {
-		if ($this->useTable !== false && (!is_array($this->_schema) || $field === true)) {
+		if ($this->useTable !== false && ( ! is_array($this->_schema) || $field === true)) {
 			$db = $this->getDataSource();
 			$db->cacheSources = ($this->cacheSources && $db->cacheSources);
 			if (method_exists($db, 'describe')) {
@@ -1359,7 +1359,7 @@ 
 			}
 		}
 
-		if (!is_string($field)) {
+		if ( ! is_string($field)) {
 			return $this->_schema;
 		}
 
@@ -1439,7 +1439,7 @@ 
 			return false;
 		}
 
-		if ($checkVirtual && !empty($this->virtualFields) && $this->isVirtualField($name)) {
+		if ($checkVirtual && ! empty($this->virtualFields) && $this->isVirtualField($name)) {
 			return true;
 		}
 
@@ -1476,7 +1476,7 @@ 
  * @return boolean indicating whether the field exists as a model virtual field.
  */
 	public function isVirtualField($field) {
-		if (empty($this->virtualFields) || !is_string($field)) {
+		if (empty($this->virtualFields) || ! is_string($field)) {
 			return false;
 		}
 
@@ -1503,7 +1503,7 @@ 
  *    or false if none $field exist.
  */
 	public function getVirtualField($field = null) {
-		if (!$field) {
+		if ( ! $field) {
 			return empty($this->virtualFields) ? false : $this->virtualFields;
 		}
 
@@ -1536,7 +1536,7 @@ 
 		$this->validationErrors = array();
 
 		if ($data !== null && $data !== false) {
-			$schema = (array)$this->schema();
+			$schema = (array) $this->schema();
 			foreach ($schema as $field => $properties) {
 				if ($this->primaryKey !== $field && isset($properties['default']) && $properties['default'] !== '') {
 					$defaults[$field] = $properties['default'];
@@ -1589,7 +1589,7 @@ 
 
 		if ($id !== null && $id !== false) {
 			$this->data = $this->find('first', array(
-				'conditions' => array($this->alias . '.' . $this->primaryKey => $id),
+				'conditions' => array($this->alias.'.'.$this->primaryKey => $id),
 				'fields' => $fields
 			));
 
@@ -1611,7 +1611,7 @@ 
  */
 	public function field($name, $conditions = null, $order = null) {
 		if ($conditions === null && $this->id !== false) {
-			$conditions = array($this->alias . '.' . $this->primaryKey => $this->id);
+			$conditions = array($this->alias.'.'.$this->primaryKey => $this->id);
 		}
 
 		$recursive = $this->recursive;
@@ -1621,7 +1621,7 @@ 
 
 		$fields = $name;
 		$data = $this->find('first', compact('conditions', 'fields', 'order', 'recursive'));
-		if (!$data) {
+		if ( ! $data) {
 			return false;
 		}
 
@@ -1694,14 +1694,14 @@ 
 		$_whitelist = $this->whitelist;
 		$fields = array();
 
-		if (!is_array($validate)) {
+		if ( ! is_array($validate)) {
 			$options = array_merge($defaults, compact('validate', 'fieldList'));
 		} else {
 			$options = array_merge($defaults, $validate);
 		}
 
-		if (!empty($options['fieldList'])) {
-			if (!empty($options['fieldList'][$this->alias]) && is_array($options['fieldList'][$this->alias])) {
+		if ( ! empty($options['fieldList'])) {
+			if ( ! empty($options['fieldList'][$this->alias]) && is_array($options['fieldList'][$this->alias])) {
 				$this->whitelist = $options['fieldList'][$this->alias];
 			} elseif (Hash::dimensions($options['fieldList']) < 2) {
 				$this->whitelist = $options['fieldList'];
@@ -1712,7 +1712,7 @@ 
 
 		$this->set($data);
 
-		if (empty($this->data) && !$this->hasField(array('created', 'updated', 'modified'))) {
+		if (empty($this->data) && ! $this->hasField(array('created', 'updated', 'modified'))) {
 			$this->whitelist = $_whitelist;
 			return false;
 		}
@@ -1732,7 +1732,7 @@ 
 		$exists = $this->exists();
 		$dateFields = array('modified', 'updated');
 
-		if (!$exists) {
+		if ( ! $exists) {
 			$dateFields[] = 'created';
 		}
 
@@ -1740,7 +1740,7 @@ 
 			$fields = array_keys($this->data[$this->alias]);
 		}
 
-		if ($options['validate'] && !$this->validates($options)) {
+		if ($options['validate'] && ! $this->validates($options)) {
 			$this->whitelist = $_whitelist;
 			return false;
 		}
@@ -1749,7 +1749,7 @@ 
 		$now = time();
 
 		foreach ($dateFields as $updateCol) {
-			if (in_array($updateCol, $fields) || !$this->hasField($updateCol)) {
+			if (in_array($updateCol, $fields) || ! $this->hasField($updateCol)) {
 				continue;
 			}
 
@@ -1761,7 +1761,7 @@ 
 				$time = call_user_func($colType['formatter'], $colType['format']);
 			}
 
-			if (!empty($this->whitelist)) {
+			if ( ! empty($this->whitelist)) {
 				$this->whitelist[] = $updateCol;
 			}
 			$this->set($updateCol, $time);
@@ -1771,7 +1771,7 @@ 
 			$event = new CakeEvent('Model.beforeSave', $this, array($options));
 			list($event->break, $event->breakOn) = array(true, array(false, null));
 			$this->getEventManager()->dispatch($event);
-			if (!$event->result) {
+			if ( ! $event->result) {
 				$this->whitelist = $_whitelist;
 				return false;
 			}
@@ -1807,7 +1807,7 @@ 
 
 		$count = count($fields);
 
-		if (!$exists && $count > 0) {
+		if ( ! $exists && $count > 0) {
 			$this->id = false;
 		}
 
@@ -1817,8 +1817,8 @@ 
 		if ($count > 0) {
 			$cache = $this->_prepareUpdateFields(array_combine($fields, $values));
 
-			if (!empty($this->id)) {
-				$success = (bool)$db->update($this, $fields, $values);
+			if ( ! empty($this->id)) {
+				$success = (bool) $db->update($this, $fields, $values);
 			} else {
 				if (empty($this->data[$this->alias][$this->primaryKey]) && $this->_isUUIDField($this->primaryKey)) {
 					if (array_key_exists($this->primaryKey, $this->data[$this->alias])) {
@@ -1829,19 +1829,19 @@ 
 					}
 				}
 
-				if (!$db->create($this, $fields, $values)) {
+				if ( ! $db->create($this, $fields, $values)) {
 					$success = false;
 				} else {
 					$created = true;
 				}
 			}
 
-			if ($success && $options['counterCache'] && !empty($this->belongsTo)) {
+			if ($success && $options['counterCache'] && ! empty($this->belongsTo)) {
 				$this->updateCounterCache($cache, $created);
 			}
 		}
 
-		if (!empty($joined) && $success === true) {
+		if ( ! empty($joined) && $success === true) {
 			$this->_saveMulti($joined, $this->id, $db);
 		}
 
@@ -1850,7 +1850,7 @@ 
 		}
 
 		if ($success && $count > 0) {
-			if (!empty($this->data)) {
+			if ( ! empty($this->data)) {
 				if ($created) {
 					$this->data[$this->alias][$this->primaryKey] = $this->id;
 				}
@@ -1861,7 +1861,7 @@ 
 				$this->getEventManager()->dispatch($event);
 			}
 
-			if (!empty($this->data)) {
+			if ( ! empty($this->data)) {
 				$success = $this->data;
 			}
 
@@ -1895,7 +1895,7 @@ 
  */
 	protected function _saveMulti($joined, $id, $db) {
 		foreach ($joined as $assoc => $data) {
-			if (!isset($this->hasAndBelongsToMany[$assoc])) {
+			if ( ! isset($this->hasAndBelongsToMany[$assoc])) {
 				continue;
 			}
 
@@ -1905,7 +1905,7 @@ 
 
 			$Model = $this->{$join};
 
-			if (!empty($habtm['with'])) {
+			if ( ! empty($habtm['with'])) {
 				$withModel = is_array($habtm['with']) ? key($habtm['with']) : $habtm['with'];
 				list(, $withModel) = pluginSplit($withModel);
 				$dbMulti = $this->{$withModel}->getDataSource();
@@ -1913,7 +1913,7 @@ 
 				$dbMulti = $db;
 			}
 
-			$isUUID = !empty($Model->primaryKey) && $Model->_isUUIDField($Model->primaryKey);
+			$isUUID = ! empty($Model->primaryKey) && $Model->_isUUIDField($Model->primaryKey);
 
 			$newData = $newValues = $newJoins = array();
 			$primaryAdded = false;
@@ -1924,12 +1924,12 @@ 
 			);
 
 			$idField = $db->name($Model->primaryKey);
-			if ($isUUID && !in_array($idField, $fields)) {
+			if ($isUUID && ! in_array($idField, $fields)) {
 				$fields[] = $idField;
 				$primaryAdded = true;
 			}
 
-			foreach ((array)$data as $row) {
+			foreach ((array) $data as $row) {
 				if ((is_string($row) && (strlen($row) === 36 || strlen($row) === 16)) || is_numeric($row)) {
 					$newJoins[] = $row;
 					$values = array($id, $row);
@@ -1941,13 +1941,13 @@ 
 					$newValues[$row] = $values;
 					unset($values);
 				} elseif (isset($row[$habtm['associationForeignKey']])) {
-					if (!empty($row[$Model->primaryKey])) {
+					if ( ! empty($row[$Model->primaryKey])) {
 						$newJoins[] = $row[$habtm['associationForeignKey']];
 					}
 
 					$newData[] = $row;
 				} elseif (isset($row[$join]) && isset($row[$join][$habtm['associationForeignKey']])) {
-					if (!empty($row[$join][$Model->primaryKey])) {
+					if ( ! empty($row[$join][$Model->primaryKey])) {
 						$newJoins[] = $row[$join][$habtm['associationForeignKey']];
 					}
 
@@ -1958,14 +1958,14 @@ 
 			$keepExisting = $habtm['unique'] === 'keepExisting';
 			if ($habtm['unique']) {
 				$conditions = array(
-					$join . '.' . $habtm['foreignKey'] => $id
+					$join.'.'.$habtm['foreignKey'] => $id
 				);
 
-				if (!empty($habtm['conditions'])) {
-					$conditions = array_merge($conditions, (array)$habtm['conditions']);
+				if ( ! empty($habtm['conditions'])) {
+					$conditions = array_merge($conditions, (array) $habtm['conditions']);
 				}
 
-				$associationForeignKey = $Model->alias . '.' . $habtm['associationForeignKey'];
+				$associationForeignKey = $Model->alias.'.'.$habtm['associationForeignKey'];
 				$links = $Model->find('all', array(
 					'conditions' => $conditions,
 					'recursive' => empty($habtm['conditions']) ? -1 : 0,
@@ -1973,8 +1973,8 @@ 
 				));
 
 				$oldLinks = Hash::extract($links, "{n}.{$associationForeignKey}");
-				if (!empty($oldLinks)) {
-					if ($keepExisting && !empty($newJoins)) {
+				if ( ! empty($oldLinks)) {
+					if ($keepExisting && ! empty($newJoins)) {
 						$conditions[$associationForeignKey] = array_diff($oldLinks, $newJoins);
 					} else {
 						$conditions[$associationForeignKey] = $oldLinks;
@@ -1984,7 +1984,7 @@ 
 				}
 			}
 
-			if (!empty($newData)) {
+			if ( ! empty($newData)) {
 				foreach ($newData as $data) {
 					$data[$habtm['foreignKey']] = $id;
 					if (empty($data[$Model->primaryKey])) {
@@ -1995,11 +1995,11 @@ 
 				}
 			}
 
-			if (!empty($newValues)) {
-				if ($keepExisting && !empty($links)) {
+			if ( ! empty($newValues)) {
+				if ($keepExisting && ! empty($links)) {
 					foreach ($links as $link) {
 						$oldJoin = $link[$join][$habtm['associationForeignKey']];
-						if (!in_array($oldJoin, $newJoins)) {
+						if ( ! in_array($oldJoin, $newJoins)) {
 							$conditions[$associationForeignKey] = $oldJoin;
 							$db->delete($Model, $conditions);
 						} else {
@@ -2010,7 +2010,7 @@ 
 					$newValues = array_values($newValues);
 				}
 
-				if (!empty($newValues)) {
+				if ( ! empty($newValues)) {
 					$dbMulti->insertMulti($Model, $fields, $newValues);
 				}
 			}
@@ -2038,7 +2038,7 @@ 
 
 			$Model = $this->{$parent};
 
-			if (!is_array($assoc['counterCache'])) {
+			if ( ! is_array($assoc['counterCache'])) {
 				if (isset($assoc['counterScope'])) {
 					$assoc['counterCache'] = array($assoc['counterCache'] => $assoc['counterScope']);
 				} else {
@@ -2050,21 +2050,21 @@ 
 			$fkQuoted = $this->escapeField($assoc['foreignKey']);
 
 			foreach ($assoc['counterCache'] as $field => $conditions) {
-				if (!is_string($field)) {
-					$field = Inflector::underscore($this->alias) . '_count';
+				if ( ! is_string($field)) {
+					$field = Inflector::underscore($this->alias).'_count';
 				}
 
-				if (!$Model->hasField($field)) {
+				if ( ! $Model->hasField($field)) {
 					continue;
 				}
 
 				if ($conditions === true) {
 					$conditions = array();
 				} else {
-					$conditions = (array)$conditions;
+					$conditions = (array) $conditions;
 				}
 
-				if (!array_key_exists($foreignKey, $keys)) {
+				if ( ! array_key_exists($foreignKey, $keys)) {
 					$keys[$foreignKey] = $this->field($foreignKey);
 				}
 
@@ -2083,7 +2083,7 @@ 
 				$conditions[$fkQuoted] = $keys[$foreignKey];
 
 				if ($recursive === 0) {
-					$conditions = array_merge($conditions, (array)$conditions);
+					$conditions = array_merge($conditions, (array) $conditions);
 				}
 
 				$count = intval($this->find('count', compact('conditions', 'recursive')));
@@ -2118,7 +2118,7 @@ 
 		}
 
 		$old = $this->find('first', array(
-			'conditions' => array($this->alias . '.' . $this->primaryKey => $this->id),
+			'conditions' => array($this->alias.'.'.$this->primaryKey => $this->id),
 			'fields' => array_values($included),
 			'recursive' => -1
 		));
@@ -2209,16 +2209,16 @@ 
 
 		if (empty($data) && $options['validate'] !== false) {
 			$result = $this->save($data, $options);
-			if (!$options['atomic']) {
-				return array(!empty($result));
+			if ( ! $options['atomic']) {
+				return array( ! empty($result));
 			}
 
-			return !empty($result);
+			return ! empty($result);
 		}
 
 		if ($options['validate'] === 'first') {
 			$validates = $this->validateMany($data, $options);
-			if ((!$validates && $options['atomic']) || (!$options['atomic'] && in_array(false, $validates, true))) {
+			if (( ! $validates && $options['atomic']) || ( ! $options['atomic'] && in_array(false, $validates, true))) {
 				return $validates;
 			}
 			$options['validate'] = false;
@@ -2241,21 +2241,21 @@ 
 				}
 			}
 
-			$validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, $saved, true))));
-			if (!$validates) {
+			$validates = ($validates && ($saved === true || (is_array($saved) && ! in_array(false, $saved, true))));
+			if ( ! $validates) {
 				$validationErrors[$key] = $this->validationErrors;
 			}
 
-			if (!$options['atomic']) {
+			if ( ! $options['atomic']) {
 				$return[$key] = $validates;
-			} elseif (!$validates) {
+			} elseif ( ! $validates) {
 				break;
 			}
 		}
 
 		$this->validationErrors = $validationErrors;
 
-		if (!$options['atomic']) {
+		if ( ! $options['atomic']) {
 			return $return;
 		}
 
@@ -2331,16 +2331,16 @@ 
 
 		if (empty($data) && $options['validate'] !== false) {
 			$result = $this->save($data, $options);
-			if (!$options['atomic']) {
-				return array(!empty($result));
+			if ( ! $options['atomic']) {
+				return array( ! empty($result));
 			}
 
-			return !empty($result);
+			return ! empty($result);
 		}
 
 		if ($options['validate'] === 'first') {
 			$validates = $this->validateAssociated($data, $options);
-			if ((!$validates && $options['atomic']) || (!$options['atomic'] && in_array(false, Hash::flatten($validates), true))) {
+			if (( ! $validates && $options['atomic']) || ( ! $options['atomic'] && in_array(false, Hash::flatten($validates), true))) {
 				return $validates;
 			}
 
@@ -2357,7 +2357,7 @@ 
 		$validates = true;
 		foreach ($data as $association => $values) {
 			$isEmpty = empty($values) || (isset($values[$association]) && empty($values[$association]));
-			if ($isEmpty || !isset($associations[$association]) || $associations[$association] !== 'belongsTo') {
+			if ($isEmpty || ! isset($associations[$association]) || $associations[$association] !== 'belongsTo') {
 				continue;
 			}
 
@@ -2371,7 +2371,7 @@ 
 				} else {
 					$saved = $Model->save($values, array_merge($options, array('atomic' => false)));
 				}
-				$validates = ($saved === true || (is_array($saved) && !in_array(false, $saved, true)));
+				$validates = ($saved === true || (is_array($saved) && ! in_array(false, $saved, true)));
 			}
 
 			if ($validates) {
@@ -2389,19 +2389,19 @@ 
 			$return[$association] = $validates;
 		}
 
-		if ($validates && !($this->create(null) !== null && $this->save($data, $options))) {
+		if ($validates && ! ($this->create(null) !== null && $this->save($data, $options))) {
 			$validationErrors[$this->alias] = $this->validationErrors;
 			$validates = false;
 		}
 		$return[$this->alias] = $validates;
 
 		foreach ($data as $association => $values) {
-			if (!$validates) {
+			if ( ! $validates) {
 				break;
 			}
 
 			$isEmpty = empty($values) || (isset($values[$association]) && empty($values[$association]));
-			if ($isEmpty || !isset($associations[$association])) {
+			if ($isEmpty || ! isset($associations[$association])) {
 				continue;
 			}
 
@@ -2429,8 +2429,8 @@ 
 						}
 					}
 
-					$validates = ($validates && ($saved === true || (is_array($saved) && !in_array(false, $saved, true))));
-					if (!$validates) {
+					$validates = ($validates && ($saved === true || (is_array($saved) && ! in_array(false, $saved, true))));
+					if ( ! $validates) {
 						$validationErrors[$association] = $Model->validationErrors;
 					}
 
@@ -2464,7 +2464,7 @@ 
 			$this->validationErrors = array_merge($this->validationErrors, $validationErrors);
 		}
 
-		if (!$options['atomic']) {
+		if ( ! $options['atomic']) {
 			return $return;
 		}
 		if ($validates) {
@@ -2487,18 +2487,18 @@ 
  * @return array $options
  */
 	protected function _addToWhiteList($key, $options) {
-		if (empty($options['fieldList']) && $this->whitelist && !in_array($key, $this->whitelist)) {
+		if (empty($options['fieldList']) && $this->whitelist && ! in_array($key, $this->whitelist)) {
 			$options['fieldList'][$this->alias] = $this->whitelist;
 			$options['fieldList'][$this->alias][] = $key;
 			return $options;
 		}
 
-		if (!empty($options['fieldList'][$this->alias]) && is_array($options['fieldList'][$this->alias])) {
+		if ( ! empty($options['fieldList'][$this->alias]) && is_array($options['fieldList'][$this->alias])) {
 			$options['fieldList'][$this->alias][] = $key;
 			return $options;
 		}
 
-		if (!empty($options['fieldList']) && is_array($options['fieldList']) && Hash::dimensions($options['fieldList']) < 2) {
+		if ( ! empty($options['fieldList']) && is_array($options['fieldList']) && Hash::dimensions($options['fieldList']) < 2) {
 			$options['fieldList'][] = $key;
 		}
 
@@ -2550,7 +2550,7 @@ 
  * @link http://book.cakephp.org/2.0/en/models/deleting-data.html
  */
 	public function delete($id = null, $cascade = true) {
-		if (!empty($id)) {
+		if ( ! empty($id)) {
 			$this->id = $id;
 		}
 
@@ -2563,7 +2563,7 @@ 
 			return false;
 		}
 
-		if (!$this->exists()) {
+		if ( ! $this->exists()) {
 			return false;
 		}
 
@@ -2571,7 +2571,7 @@ 
 		$this->_deleteLinks($id);
 		$this->id = $id;
 
-		if (!empty($this->belongsTo)) {
+		if ( ! empty($this->belongsTo)) {
 			foreach ($this->belongsTo as $assoc) {
 				if (empty($assoc['counterCache'])) {
 					continue;
@@ -2579,7 +2579,7 @@ 
 
 				$keys = $this->find('first', array(
 					'fields' => $this->_collectForeignKeys(),
-					'conditions' => array($this->alias . '.' . $this->primaryKey => $id),
+					'conditions' => array($this->alias.'.'.$this->primaryKey => $id),
 					'recursive' => -1,
 					'callbacks' => false
 				));
@@ -2587,11 +2587,11 @@ 
 			}
 		}
 
-		if (!$this->getDataSource()->delete($this, array($this->alias . '.' . $this->primaryKey => $id))) {
+		if ( ! $this->getDataSource()->delete($this, array($this->alias.'.'.$this->primaryKey => $id))) {
 			return false;
 		}
 
-		if (!empty($keys[$this->alias])) {
+		if ( ! empty($keys[$this->alias])) {
 			$this->updateCounterCache($keys[$this->alias]);
 		}
 
@@ -2614,7 +2614,7 @@ 
 			return;
 		}
 
-		if (!empty($this->__backAssociation)) {
+		if ( ! empty($this->__backAssociation)) {
 			$savedAssociations = $this->__backAssociation;
 			$this->__backAssociation = array();
 		}
@@ -2633,7 +2633,7 @@ 
 				$Model->recursive = -1;
 				$conditions = array($Model->escapeField($data['foreignKey']) => $id);
 				if ($data['conditions']) {
-					$conditions = array_merge((array)$data['conditions'], $conditions);
+					$conditions = array_merge((array) $data['conditions'], $conditions);
 				}
 			}
 
@@ -2644,7 +2644,7 @@ 
 					'conditions' => $conditions, 'fields' => $Model->primaryKey
 				));
 
-				if (!empty($records)) {
+				if ( ! empty($records)) {
 					foreach ($records as $record) {
 						$Model->delete($record[$Model->alias][$Model->primaryKey]);
 					}
@@ -2674,7 +2674,7 @@ 
 				'callbacks' => false
 			));
 
-			if (!empty($records)) {
+			if ( ! empty($records)) {
 				foreach ($records as $record) {
 					$Model->delete($record[$Model->alias][$Model->primaryKey]);
 				}
@@ -2698,7 +2698,7 @@ 
 
 		$db = $this->getDataSource();
 
-		if (!$cascade && !$callbacks) {
+		if ( ! $cascade && ! $callbacks) {
 			return $db->delete($this, $conditions);
 		}
 
@@ -2736,7 +2736,7 @@ 
 			}
 		}
 
-		return $db->delete($this, array($this->alias . '.' . $this->primaryKey => $ids));
+		return $db->delete($this, array($this->alias.'.'.$this->primaryKey => $ids));
 	}
 
 /**
@@ -2776,9 +2776,9 @@ 
 			return false;
 		}
 
-		return (bool)$this->find('count', array(
+		return (bool) $this->find('count', array(
 			'conditions' => array(
-				$this->alias . '.' . $this->primaryKey => $id
+				$this->alias.'.'.$this->primaryKey => $id
 			),
 			'recursive' => -1,
 			'callbacks' => false
@@ -2792,7 +2792,7 @@ 
  * @return boolean True if such a record exists
  */
 	public function hasAny($conditions = null) {
-		return (bool)$this->find('count', array('conditions' => $conditions, 'recursive' => -1));
+		return (bool) $this->find('count', array('conditions' => $conditions, 'recursive' => -1));
 	}
 
 /**
@@ -2910,7 +2910,7 @@ 
 		$this->findQueryType = null;
 
 		if ($this->findMethods[$type] === true) {
-			return $this->{'_find' . ucfirst($type)}('after', $query, $results);
+			return $this->{'_find'.ucfirst($type)}('after', $query, $results);
 		}
 	}
 
@@ -2928,18 +2928,18 @@ 
 				'conditions' => null, 'fields' => null, 'joins' => array(), 'limit' => null,
 				'offset' => null, 'order' => null, 'page' => 1, 'group' => null, 'callbacks' => true,
 			),
-			(array)$query
+			(array) $query
 		);
 
 		if ($this->findMethods[$type] === true) {
-			$query = $this->{'_find' . ucfirst($type)}('before', $query);
+			$query = $this->{'_find'.ucfirst($type)}('before', $query);
 		}
 
-		if (!is_numeric($query['page']) || intval($query['page']) < 1) {
+		if ( ! is_numeric($query['page']) || intval($query['page']) < 1) {
 			$query['page'] = 1;
 		}
 
-		if ($query['page'] > 1 && !empty($query['limit'])) {
+		if ($query['page'] > 1 && ! empty($query['limit'])) {
 			$query['offset'] = ($query['page'] - 1) * $query['limit'];
 		}
 
@@ -3014,26 +3014,26 @@ 
  */
 	protected function _findCount($state, $query, $results = array()) {
 		if ($state === 'before') {
-			if (!empty($query['type']) && isset($this->findMethods[$query['type']]) && $query['type'] !== 'count') {
+			if ( ! empty($query['type']) && isset($this->findMethods[$query['type']]) && $query['type'] !== 'count') {
 				$query['operation'] = 'count';
-				$query = $this->{'_find' . ucfirst($query['type'])}('before', $query);
+				$query = $this->{'_find'.ucfirst($query['type'])}('before', $query);
 			}
 
 			$db = $this->getDataSource();
 			$query['order'] = false;
-			if (!method_exists($db, 'calculate')) {
+			if ( ! method_exists($db, 'calculate')) {
 				return $query;
 			}
 
-			if (!empty($query['fields']) && is_array($query['fields'])) {
-				if (!preg_match('/^count/i', current($query['fields']))) {
+			if ( ! empty($query['fields']) && is_array($query['fields'])) {
+				if ( ! preg_match('/^count/i', current($query['fields']))) {
 					unset($query['fields']);
 				}
 			}
 
 			if (empty($query['fields'])) {
 				$query['fields'] = $db->calculate($this, 'count');
-			} elseif (method_exists($db, 'expression') && is_string($query['fields']) && !preg_match('/count/i', $query['fields'])) {
+			} elseif (method_exists($db, 'expression') && is_string($query['fields']) && ! preg_match('/count/i', $query['fields'])) {
 				$query['fields'] = $db->calculate($this, 'count', array(
 					$db->expression($query['fields']), 'count'
 				));
@@ -3070,37 +3070,37 @@ 
 				$query['fields'] = array("{$this->alias}.{$this->primaryKey}", "{$this->alias}.{$this->displayField}");
 				$list = array("{n}.{$this->alias}.{$this->primaryKey}", "{n}.{$this->alias}.{$this->displayField}", null);
 			} else {
-				if (!is_array($query['fields'])) {
+				if ( ! is_array($query['fields'])) {
 					$query['fields'] = String::tokenize($query['fields']);
 				}
 
 				if (count($query['fields']) === 1) {
 					if (strpos($query['fields'][0], '.') === false) {
-						$query['fields'][0] = $this->alias . '.' . $query['fields'][0];
+						$query['fields'][0] = $this->alias.'.'.$query['fields'][0];
 					}
 
-					$list = array("{n}.{$this->alias}.{$this->primaryKey}", '{n}.' . $query['fields'][0], null);
+					$list = array("{n}.{$this->alias}.{$this->primaryKey}", '{n}.'.$query['fields'][0], null);
 					$query['fields'] = array("{$this->alias}.{$this->primaryKey}", $query['fields'][0]);
 				} elseif (count($query['fields']) === 3) {
 					for ($i = 0; $i < 3; $i++) {
 						if (strpos($query['fields'][$i], '.') === false) {
-							$query['fields'][$i] = $this->alias . '.' . $query['fields'][$i];
+							$query['fields'][$i] = $this->alias.'.'.$query['fields'][$i];
 						}
 					}
 
-					$list = array('{n}.' . $query['fields'][0], '{n}.' . $query['fields'][1], '{n}.' . $query['fields'][2]);
+					$list = array('{n}.'.$query['fields'][0], '{n}.'.$query['fields'][1], '{n}.'.$query['fields'][2]);
 				} else {
 					for ($i = 0; $i < 2; $i++) {
 						if (strpos($query['fields'][$i], '.') === false) {
-							$query['fields'][$i] = $this->alias . '.' . $query['fields'][$i];
+							$query['fields'][$i] = $this->alias.'.'.$query['fields'][$i];
 						}
 					}
 
-					$list = array('{n}.' . $query['fields'][0], '{n}.' . $query['fields'][1], null);
+					$list = array('{n}.'.$query['fields'][0], '{n}.'.$query['fields'][1], null);
 				}
 			}
 
-			if (!isset($query['recursive']) || $query['recursive'] === null) {
+			if ( ! isset($query['recursive']) || $query['recursive'] === null) {
 				$query['recursive'] = -1;
 			}
 			list($query['list']['keyPath'], $query['list']['valuePath'], $query['list']['groupPath']) = $list;
@@ -3128,18 +3128,18 @@ 
 		extract($query);
 
 		if ($state === 'before') {
-			$conditions = (array)$conditions;
+			$conditions = (array) $conditions;
 			if (isset($field) && isset($value)) {
 				if (strpos($field, '.') === false) {
-					$field = $this->alias . '.' . $field;
+					$field = $this->alias.'.'.$field;
 				}
 			} else {
-				$field = $this->alias . '.' . $this->primaryKey;
+				$field = $this->alias.'.'.$this->primaryKey;
 				$value = $this->id;
 			}
 
-			$query['conditions'] = array_merge($conditions, array($field . ' <' => $value));
-			$query['order'] = $field . ' DESC';
+			$query['conditions'] = array_merge($conditions, array($field.' <' => $value));
+			$query['order'] = $field.' DESC';
 			$query['limit'] = 1;
 			$query['field'] = $field;
 			$query['value'] = $value;
@@ -3147,28 +3147,28 @@ 
 			return $query;
 		}
 
-		unset($query['conditions'][$field . ' <']);
+		unset($query['conditions'][$field.' <']);
 		$return = array();
 		if (isset($results[0])) {
 			$prevVal = Hash::get($results[0], $field);
-			$query['conditions'][$field . ' >='] = $prevVal;
-			$query['conditions'][$field . ' !='] = $value;
+			$query['conditions'][$field.' >='] = $prevVal;
+			$query['conditions'][$field.' !='] = $value;
 			$query['limit'] = 2;
 		} else {
 			$return['prev'] = null;
-			$query['conditions'][$field . ' >'] = $value;
+			$query['conditions'][$field.' >'] = $value;
 			$query['limit'] = 1;
 		}
 
-		$query['order'] = $field . ' ASC';
+		$query['order'] = $field.' ASC';
 		$neighbors = $this->find('all', $query);
-		if (!array_key_exists('prev', $return)) {
+		if ( ! array_key_exists('prev', $return)) {
 			$return['prev'] = isset($neighbors[0]) ? $neighbors[0] : null;
 		}
 
 		if (count($neighbors) === 2) {
 			$return['next'] = $neighbors[1];
-		} elseif (count($neighbors) === 1 && !$return['prev']) {
+		} elseif (count($neighbors) === 1 && ! $return['prev']) {
 			$return['next'] = $neighbors[0];
 		} else {
 			$return['next'] = null;
@@ -3197,8 +3197,8 @@ 
 		}
 
 		return Hash::nest($results, array(
-			'idPath' => '{n}.' . $this->alias . '.' . $this->primaryKey,
-			'parentPath' => '{n}.' . $this->alias . '.' . $parent
+			'idPath' => '{n}.'.$this->alias.'.'.$this->primaryKey,
+			'parentPath' => '{n}.'.$this->alias.'.'.$parent
 		));
 	}
 
@@ -3224,7 +3224,7 @@ 
  * @return boolean Success
  */
 	public function resetAssociations() {
-		if (!empty($this->__backAssociation)) {
+		if ( ! empty($this->__backAssociation)) {
 			foreach ($this->_associations as $type) {
 				if (isset($this->__backAssociation[$type])) {
 					$this->{$type} = $this->__backAssociation[$type];
@@ -3236,7 +3236,7 @@ 
 
 		foreach ($this->_associations as $type) {
 			foreach ($this->{$type} as $key => $name) {
-				if (property_exists($this, $key) && !empty($this->{$key}->__backAssociation)) {
+				if (property_exists($this, $key) && ! empty($this->{$key}->__backAssociation)) {
 					$this->{$key}->resetAssociations();
 				}
 			}
@@ -3254,7 +3254,7 @@ 
  * @return boolean False if any records matching any fields are found
  */
 	public function isUnique($fields, $or = true) {
-		if (!is_array($fields)) {
+		if ( ! is_array($fields)) {
 			$fields = func_get_args();
 			if (is_bool($fields[count($fields) - 1])) {
 				$or = $fields[count($fields) - 1];
@@ -3275,7 +3275,7 @@ 
 
 			if (strpos($field, '.') === false) {
 				unset($fields[$field]);
-				$fields[$this->alias . '.' . $field] = $value;
+				$fields[$this->alias.'.'.$field] = $value;
 			}
 		}
 
@@ -3283,11 +3283,11 @@ 
 			$fields = array('or' => $fields);
 		}
 
-		if (!empty($this->id)) {
-			$fields[$this->alias . '.' . $this->primaryKey . ' !='] = $this->id;
+		if ( ! empty($this->id)) {
+			$fields[$this->alias.'.'.$this->primaryKey.' !='] = $this->id;
 		}
 
-		return !$this->find('count', array('conditions' => $fields, 'recursive' => -1));
+		return ! $this->find('count', array('conditions' => $fields, 'recursive' => -1));
 	}
 
 /**
@@ -3354,7 +3354,7 @@ 
  */
 	public function isForeignKey($field) {
 		$foreignKeys = array();
-		if (!empty($this->belongsTo)) {
+		if ( ! empty($this->belongsTo)) {
 			foreach ($this->belongsTo as $data) {
 				$foreignKeys[] = $data['foreignKey'];
 			}
@@ -3381,11 +3381,11 @@ 
 		}
 
 		$db = $this->getDataSource();
-		if (strpos($field, $db->name($alias) . '.') === 0) {
+		if (strpos($field, $db->name($alias).'.') === 0) {
 			return $field;
 		}
 
-		return $db->name($alias . '.' . $field);
+		return $db->name($alias.'.'.$field);
 	}
 
 /**
@@ -3399,11 +3399,11 @@ 
 			return false;
 		}
 
-		if (!is_array($this->id)) {
+		if ( ! is_array($this->id)) {
 			return $this->id;
 		}
 
-		if (isset($this->id[$list]) && !empty($this->id[$list])) {
+		if (isset($this->id[$list]) && ! empty($this->id[$list])) {
 			return $this->id[$list];
 		}
 
@@ -3475,10 +3475,10 @@ 
 		}
 
 		$db = ConnectionManager::getDataSource($this->useDbConfig);
-		if (!empty($oldConfig) && isset($db->config['prefix'])) {
+		if ( ! empty($oldConfig) && isset($db->config['prefix'])) {
 			$oldDb = ConnectionManager::getDataSource($oldConfig);
 
-			if (!isset($this->tablePrefix) || (!isset($oldDb->config['prefix']) || $this->tablePrefix === $oldDb->config['prefix'])) {
+			if ( ! isset($this->tablePrefix) || ( ! isset($oldDb->config['prefix']) || $this->tablePrefix === $oldDb->config['prefix'])) {
 				$this->tablePrefix = $db->config['prefix'];
 			}
 		} elseif (isset($db->config['prefix'])) {
@@ -3494,7 +3494,7 @@ 
  * @return DataSource A DataSource object
  */
 	public function getDataSource() {
-		if (!$this->_sourceConfigured && $this->useTable !== false) {
+		if ( ! $this->_sourceConfigured && $this->useTable !== false) {
 			$this->_sourceConfigured = true;
 			$this->setSource($this->useTable);
 		}
@@ -3518,10 +3518,10 @@ 
  * @return array Associations
  */
 	public function getAssociated($type = null) {
-		if (!$type) {
+		if ( ! $type) {
 			$associated = array();
 			foreach ($this->_associations as $assoc) {
-				if (!empty($this->{$assoc})) {
+				if ( ! empty($this->{$assoc})) {
 					$models = array_keys($this->{$assoc});
 					foreach ($models as $m) {
 						$associated[$m] = $assoc;
@@ -3706,7 +3706,7 @@ 
 		foreach ($this->_associations as $association) {
 			foreach ($this->{$association} as $className) {
 				$pluralizedAssociation = Inflector::pluralize($className['className']);
-				if (!in_array(strtolower($pluralizedAssociation), $assoc)) {
+				if ( ! in_array(strtolower($pluralizedAssociation), $assoc)) {
 					$assoc = array_merge($assoc, array(
 						strtolower($pluralizedAssociation),
 						Inflector::underscore($pluralizedAssociation)
@@ -3728,7 +3728,7 @@ 
 	public function validator(ModelValidator $instance = null) {
 		if ($instance) {
 			$this->_validator = $instance;
-		} elseif (!$this->_validator) {
+		} elseif ( ! $this->_validator) {
 			$this->_validator = new ModelValidator($this);
 		}
 

lib/Cake/Model/ModelValidator.php

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
  *
  * @param array $data Record data to validate. This should be an array indexed by association name.
  * @param array $options Options to use when validating record data (see above), See also $options of validates().
- * @return array|boolean If atomic: True on success, or false on failure.
+ * @return boolean If atomic: True on success, or false on failure.
  *    Otherwise: array similar to the $data array passed, but values are set to true/false
  *    depending on whether each record validated successfully.
  */

Spacing +19 added lines, -19 removed lines

@@ -131,12 +131,12 @@ 
 		$model->validationErrors = $validationErrors = $return = array();
 		$model->create(null);
 		$return[$model->alias] = true;
-		if (!($model->set($data) && $model->validates($options))) {
+		if ( ! ($model->set($data) && $model->validates($options))) {
 			$validationErrors[$model->alias] = $model->validationErrors;
 			$return[$model->alias] = false;
 		}
 		$data = $model->data;
-		if (!empty($options['deep']) && isset($data[$model->alias])) {
+		if ( ! empty($options['deep']) && isset($data[$model->alias])) {
 			$recordData = $data[$model->alias];
 			unset($data[$model->alias]);
 			$data += $recordData;
@@ -155,14 +155,14 @@ 
 						$data[$association] = $model->{$association}->data[$model->{$association}->alias];
 					}
 					if (is_array($validates)) {
-						$validates = !in_array(false, Hash::flatten($validates), true);
+						$validates = ! in_array(false, Hash::flatten($validates), true);
 					}
 					$return[$association] = $validates;
 				} elseif ($associations[$association] === 'hasMany') {
 					$validates = $model->{$association}->validateMany($values, $options);
 					$return[$association] = $validates;
 				}
-				if (!$validates || (is_array($validates) && in_array(false, $validates, true))) {
+				if ( ! $validates || (is_array($validates) && in_array(false, $validates, true))) {
 					$validationErrors[$association] = $model->{$association}->validationErrors;
 				}
 			}
@@ -174,10 +174,10 @@ 
 			unset($validationErrors[$model->alias]);
 			$model->validationErrors = array_merge($model->validationErrors, $validationErrors);
 		}
-		if (!$options['atomic']) {
+		if ( ! $options['atomic']) {
 			return $return;
 		}
-		if ($return[$model->alias] === false || !empty($model->validationErrors)) {
+		if ($return[$model->alias] === false || ! empty($model->validationErrors)) {
 			return false;
 		}
 		return true;
@@ -223,7 +223,7 @@ 
 			$return[$key] = $validates;
 		}
 		$model->validationErrors = $validationErrors;
-		if (!$options['atomic']) {
+		if ( ! $options['atomic']) {
 			return $return;
 		}
 		return empty($model->validationErrors);
@@ -238,12 +238,12 @@ 
  * @see ModelValidator::validates()
  */
 	public function errors($options = array()) {
-		if (!$this->_triggerBeforeValidate($options)) {
+		if ( ! $this->_triggerBeforeValidate($options)) {
 			return false;
 		}
 		$model = $this->getModel();
 
-		if (!$this->_parseRules()) {
+		if ( ! $this->_parseRules()) {
 			return $model->validationErrors;
 		}
 
@@ -286,7 +286,7 @@ 
  */
 	public function getMethods() {
 		$behaviors = $this->_model->Behaviors->enabled();
-		if (!empty($this->_methods) && $behaviors === $this->_behaviors) {
+		if ( ! empty($this->_methods) && $behaviors === $this->_behaviors) {
 			return $this->_methods;
 		}
 		$this->_behaviors = $behaviors;
@@ -315,7 +315,7 @@ 
 	public function getField($name = null) {
 		$this->_parseRules();
 		if ($name !== null) {
-			if (!empty($this->_fields[$name])) {
+			if ( ! empty($this->_fields[$name])) {
 				return $this->_fields[$name];
 			}
 			return null;
@@ -384,8 +384,8 @@ 
 		$model = $this->getModel();
 		$whitelist = $model->whitelist;
 
-		if (!empty($fieldList)) {
-			if (!empty($fieldList[$model->alias]) && is_array($fieldList[$model->alias])) {
+		if ( ! empty($fieldList)) {
+			if ( ! empty($fieldList[$model->alias]) && is_array($fieldList[$model->alias])) {
 				$whitelist = $fieldList[$model->alias];
 			} else {
 				$whitelist = $fieldList;
@@ -399,8 +399,8 @@ 
 
 		$validateList = array();
 		$this->validationErrors = array();
-		foreach ((array)$whitelist as $f) {
-			if (!empty($this->_fields[$f])) {
+		foreach ((array) $whitelist as $f) {
+			if ( ! empty($this->_fields[$f])) {
 				$validateList[$f] = $this->_fields[$f];
 			}
 		}
@@ -421,14 +421,14 @@ 
 		$model = $this->getModel();
 
 		foreach ($model->hasAndBelongsToMany as $assoc => $association) {
-			if (empty($association['with']) || !isset($model->data[$assoc])) {
+			if (empty($association['with']) || ! isset($model->data[$assoc])) {
 				continue;
 			}
 			list($join) = $model->joinModel($model->hasAndBelongsToMany[$assoc]['with']);
 			$data = $model->data[$assoc];
 
 			$newData = array();
-			foreach ((array)$data as $row) {
+			foreach ((array) $data as $row) {
 				if (isset($row[$model->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
 					$newData[] = $row;
 				} elseif (isset($row[$join]) && isset($row[$join][$model->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
@@ -492,7 +492,7 @@ 
  */
 	public function offsetSet($field, $rules) {
 		$this->_parseRules();
-		if (!$rules instanceof CakeValidationSet) {
+		if ( ! $rules instanceof CakeValidationSet) {
 			$rules = new CakeValidationSet($field, $rules);
 			$methods = $this->getMethods();
 			$rules->setMethods($methods);
@@ -561,7 +561,7 @@ 
 			return $this;
 		}
 
-		if (!isset($this->_fields[$field])) {
+		if ( ! isset($this->_fields[$field])) {
 			$rule = (is_string($name)) ? array($name => $rule) : $name;
 			$this->_fields[$field] = new CakeValidationSet($field, $rule);
 		} else {

lib/Cake/Model/Validator/CakeValidationSet.php

Doc Comments +2 added lines, -2 removed lines

@@ -75,7 +75,7 @@ 
  * Constructor
  *
  * @param string $fieldName The fieldname
- * @param array $ruleset
+ * @param array $ruleSet
  */
 	public function __construct($fieldName, $ruleSet) {
 		$this->field = $fieldName;
@@ -234,7 +234,7 @@ 
  *
  * @param array $rules The rules to be set
  * @param boolean $mergeVars [optional] If true, merges vars instead of replace. Defaults to true.
- * @return ModelField
+ * @return CakeValidationSet
  */
 	public function setRules($rules = array(), $mergeVars = true) {
 		if ($mergeVars === false) {

Spacing +7 added lines, -7 removed lines

@@ -80,7 +80,7 @@ 
 	public function __construct($fieldName, $ruleSet) {
 		$this->field = $fieldName;
 
-		if (!is_array($ruleSet) || (is_array($ruleSet) && isset($ruleSet['rule']))) {
+		if ( ! is_array($ruleSet) || (is_array($ruleSet) && isset($ruleSet['rule']))) {
 			$ruleSet = array($ruleSet);
 		}
 
@@ -97,7 +97,7 @@ 
  * @return void
  */
 	public function setMethods(&$methods) {
-		$this->_methods =& $methods;
+		$this->_methods = & $methods;
 	}
 
 /**
@@ -128,14 +128,14 @@ 
 			}
 
 			$checkRequired = $rule->checkRequired($this->field, $data);
-			if (!$checkRequired && array_key_exists($this->field, $data)) {
+			if ( ! $checkRequired && array_key_exists($this->field, $data)) {
 				if ($rule->checkEmpty($this->field, $data)) {
 					break;
 				}
 				$rule->process($this->field, $data, $this->_methods);
 			}
 
-			if ($checkRequired || !$rule->isValid()) {
+			if ($checkRequired || ! $rule->isValid()) {
 				$errors[] = $this->_processValidationResponse($name, $rule);
 				if ($rule->isLast()) {
 					break;
@@ -164,7 +164,7 @@ 
  * @return CakeValidationRule
  */
 	public function getRule($name) {
-		if (!empty($this->_rules[$name])) {
+		if ( ! empty($this->_rules[$name])) {
 			return $this->_rules[$name];
 		}
 	}
@@ -194,7 +194,7 @@ 
  * @return CakeValidationSet this instance
  */
 	public function setRule($name, $rule) {
-		if (!($rule instanceof CakeValidationRule)) {
+		if ( ! ($rule instanceof CakeValidationRule)) {
 			$rule = new CakeValidationRule($rule);
 		}
 		$this->_rules[$name] = $rule;
@@ -296,7 +296,7 @@ 
  * @return array Translated args.
  */
 	protected function _translateArgs($args) {
-		foreach ((array)$args as $k => $arg) {
+		foreach ((array) $args as $k => $arg) {
 			if (is_string($arg)) {
 				$args[$k] = __d($this->_validationDomain, $arg);
 			}