reginaldojunior / winners

lib/Cake/Log/Engine/ConsoleLog.php

Doc Comments +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
  *
  * @param string $type The type of log you are making.
  * @param string $message The message you want to log.
- * @return boolean success of write.
+ * @return integer success of write.
  */
 	public function write($type, $message) {
 		$output = date('Y-m-d H:i:s') . ' ' . ucfirst($type) . ': ' . $message . "\n";

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
  */
 	public function __construct($config = array()) {
 		parent::__construct($config);
-		if (DS === '\\' && !(bool)env('ANSICON')) {
+		if (DS === '\\' && ! (bool) env('ANSICON')) {
 			$outputAs = ConsoleOutput::PLAIN;
 		} else {
 			$outputAs = ConsoleOutput::COLOR;
@@ -78,7 +78,7 @@ 
  * @return boolean success of write.
  */
 	public function write($type, $message) {
-		$output = date('Y-m-d H:i:s') . ' ' . ucfirst($type) . ': ' . $message . "\n";
+		$output = date('Y-m-d H:i:s').' '.ucfirst($type).': '.$message."\n";
 		return $this->_output->write(sprintf('<%s>%s</%s>', $type, $output, $type), false);
 	}
 

lib/Cake/Log/Engine/FileLog.php

Doc Comments +3 added lines, -4 removed lines

@@ -83,7 +83,6 @@ 
  * - `mask` A mask is applied when log files are created. Left empty no chmod
  *   is made.
  *
- * @param array $options Options for the FileLog, see above.
  */
 	public function __construct($config = array()) {
 		$config = Hash::merge($this->_defaults, $config);
@@ -94,7 +93,7 @@ 
  * Sets protected properties based on config provided
  *
  * @param array $config Engine configuration
- * @return array
+ * @return string
  */
 	public function config($config = array()) {
 		parent::config($config);
@@ -128,7 +127,7 @@ 
  *
  * @param string $type The type of log you are making.
  * @param string $message The message you want to log.
- * @return boolean success of write.
+ * @return integer success of write.
  */
 	public function write($type, $message) {
 		$output = date('Y-m-d H:i:s') . ' ' . ucfirst($type) . ': ' . $message . "\n";
@@ -181,7 +180,7 @@ 
  * Also if `rotate` count is reached oldest file is removed.
  *
  * @param string $filename Log file name
- * @return mixed True if rotated successfully or false in case of error.
+ * @return null|boolean True if rotated successfully or false in case of error.
  *   Void if file doesn't need to be rotated.
  */
 	protected function _rotateFile($filename) {

Spacing +15 added lines, -15 removed lines

@@ -99,22 +99,22 @@ 
 	public function config($config = array()) {
 		parent::config($config);
 
-		if (!empty($config['path'])) {
+		if ( ! empty($config['path'])) {
 			$this->_path = $config['path'];
 		}
-		if (Configure::read('debug') && !is_dir($this->_path)) {
+		if (Configure::read('debug') && ! is_dir($this->_path)) {
 			mkdir($this->_path, 0775, true);
 		}
 
-		if (!empty($config['file'])) {
+		if ( ! empty($config['file'])) {
 			$this->_file = $config['file'];
 			if (substr($this->_file, -4) !== '.log') {
 				$this->_file .= '.log';
 			}
 		}
-		if (!empty($config['size'])) {
+		if ( ! empty($config['size'])) {
 			if (is_numeric($config['size'])) {
-				$this->_size = (int)$config['size'];
+				$this->_size = (int) $config['size'];
 			} else {
 				$this->_size = CakeNumber::fromReadableSize($config['size']);
 			}
@@ -131,13 +131,13 @@ 
  * @return boolean success of write.
  */
 	public function write($type, $message) {
-		$output = date('Y-m-d H:i:s') . ' ' . ucfirst($type) . ': ' . $message . "\n";
+		$output = date('Y-m-d H:i:s').' '.ucfirst($type).': '.$message."\n";
 		$filename = $this->_getFilename($type);
-		if (!empty($this->_size)) {
+		if ( ! empty($this->_size)) {
 			$this->_rotateFile($filename);
 		}
 
-		$pathname = $this->_path . $filename;
+		$pathname = $this->_path.$filename;
 		if (empty($this->_config['mask'])) {
 			return file_put_contents($pathname, $output, FILE_APPEND);
 		}
@@ -145,7 +145,7 @@ 
 		$exists = file_exists($pathname);
 		$result = file_put_contents($pathname, $output, FILE_APPEND);
 		static $selfError = false;
-		if (!$selfError && !$exists && !chmod($pathname, (int)$this->_config['mask'])) {
+		if ( ! $selfError && ! $exists && ! chmod($pathname, (int) $this->_config['mask'])) {
 			$selfError = true;
 			trigger_error(__d(
 				'cake_dev', 'Could not apply permission mask "%s" on log file "%s"',
@@ -163,14 +163,14 @@ 
 	protected function _getFilename($type) {
 		$debugTypes = array('notice', 'info', 'debug');
 
-		if (!empty($this->_file)) {
+		if ( ! empty($this->_file)) {
 			$filename = $this->_file;
 		} elseif ($type === 'error' || $type === 'warning') {
 			$filename = 'error.log';
 		} elseif (in_array($type, $debugTypes)) {
 			$filename = 'debug.log';
 		} else {
-			$filename = $type . '.log';
+			$filename = $type.'.log';
 		}
 
 		return $filename;
@@ -185,14 +185,14 @@ 
  *   Void if file doesn't need to be rotated.
  */
 	protected function _rotateFile($filename) {
-		$filepath = $this->_path . $filename;
+		$filepath = $this->_path.$filename;
 		if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
 			clearstatcache(true, $filepath);
 		} else {
 			clearstatcache();
 		}
 
-		if (!file_exists($filepath) ||
+		if ( ! file_exists($filepath) ||
 			filesize($filepath) < $this->_size
 		) {
 			return;
@@ -201,10 +201,10 @@ 
 		if ($this->_config['rotate'] === 0) {
 			$result = unlink($filepath);
 		} else {
-			$result = rename($filepath, $filepath . '.' . time());
+			$result = rename($filepath, $filepath.'.'.time());
 		}
 
-		$files = glob($filepath . '.*');
+		$files = glob($filepath.'.*');
 		if ($files) {
 			$filesToDelete = count($files) - $this->_config['rotate'];
 			while ($filesToDelete > 0) {

lib/Cake/Model/Behavior/TranslateBehavior.php

Doc Comments +5 added lines, -5 removed lines

@@ -62,7 +62,7 @@ 
  *
  * @param Model $Model Model the behavior is being attached to.
  * @param array $config Array of configuration information.
- * @return mixed
+ * @return boolean
  */
 	public function setup(Model $Model, $config = array()) {
 		$db = ConnectionManager::getDataSource($Model->useDbConfig);
@@ -368,7 +368,7 @@ 
  * is disabled.
  *
  * @param Model $Model
- * @return void
+ * @return boolean|null
  */
 	protected function _setRuntimeData(Model $Model) {
 		$locale = $this->_getLocale($Model);
@@ -400,8 +400,8 @@ 
  * Restores model data to the original data.
  * This solves issues with saveAssociated and validate = first.
  *
- * @param Model $model
- * @return void
+ * @param Model $Model
+ * @return boolean
  */
 	public function afterValidate(Model $Model) {
 		$Model->data[$Model->alias] = array_merge(
@@ -417,7 +417,7 @@ 
  * @param Model $Model Model the callback is called on
  * @param boolean $created Whether or not the save created a record.
  * @param array $options Options passed from Model::save().
- * @return void
+ * @return boolean|null
  */
 	public function afterSave(Model $Model, $created, $options = array()) {
 		if (!isset($this->runtime[$Model->alias]['beforeValidate']) && !isset($this->runtime[$Model->alias]['beforeSave'])) {

Spacing +26 added lines, -26 removed lines

@@ -66,7 +66,7 @@ 
  */
 	public function setup(Model $Model, $config = array()) {
 		$db = ConnectionManager::getDataSource($Model->useDbConfig);
-		if (!$db->connected) {
+		if ( ! $db->connected) {
 			trigger_error(
 				__d('cake_dev', 'Datasource %s for TranslateBehavior of model %s is not connected', $Model->useDbConfig, $Model->alias),
 				E_USER_ERROR
@@ -108,7 +108,7 @@ 
 		$db = $Model->getDataSource();
 		$RuntimeModel = $this->translateModel($Model);
 
-		if (!empty($RuntimeModel->tablePrefix)) {
+		if ( ! empty($RuntimeModel->tablePrefix)) {
 			$tablePrefix = $RuntimeModel->tablePrefix;
 		} else {
 			$tablePrefix = $db->config['prefix'];
@@ -152,14 +152,14 @@ 
 			$addFields = $fields;
 		} elseif (is_array($query['fields'])) {
 			$isAllFields = (
-				in_array($Model->alias . '.' . '*', $query['fields']) ||
+				in_array($Model->alias.'.'.'*', $query['fields']) ||
 				in_array($Model->escapeField('*'), $query['fields'])
 			);
 			foreach ($fields as $key => $value) {
 				$field = (is_numeric($key)) ? $value : $key;
 				if (
 					$isAllFields ||
-					in_array($Model->alias . '.' . $field, $query['fields']) ||
+					in_array($Model->alias.'.'.$field, $query['fields']) ||
 					in_array($field, $query['fields'])
 				) {
 					$addFields[] = $field;
@@ -172,8 +172,8 @@ 
 			foreach ($addFields as $_f => $field) {
 				$aliasField = is_numeric($_f) ? $field : $_f;
 
-				foreach (array($aliasField, $Model->alias . '.' . $aliasField) as $_field) {
-					$key = array_search($_field, (array)$query['fields']);
+				foreach (array($aliasField, $Model->alias.'.'.$aliasField) as $_field) {
+					$key = array_search($_field, (array) $query['fields']);
 
 					if ($key !== false) {
 						unset($query['fields'][$key]);
@@ -197,7 +197,7 @@ 
  */
 	protected function _checkConditions(Model $Model, $query) {
 		$conditionFields = array();
-		if (empty($query['conditions']) || (!empty($query['conditions']) && !is_array($query['conditions']))) {
+		if (empty($query['conditions']) || ( ! empty($query['conditions']) && ! is_array($query['conditions']))) {
 			return $conditionFields;
 		}
 		foreach ($query['conditions'] as $col => $val) {
@@ -234,7 +234,7 @@ 
 				$aliasVirtualLocale = "{$aliasVirtual}_{$_locale}";
 				$aliasLocale = "{$alias}__{$_locale}";
 				$Model->virtualFields[$aliasVirtualLocale] = "{$aliasLocale}.content";
-				if (!empty($query['fields']) && is_array($query['fields'])) {
+				if ( ! empty($query['fields']) && is_array($query['fields'])) {
 					$query['fields'][] = $aliasVirtualLocale;
 				}
 				$query['joins'][] = array(
@@ -251,7 +251,7 @@ 
 			}
 		} else {
 			$Model->virtualFields[$aliasVirtual] = "{$alias}.content";
-			if (!empty($query['fields']) && is_array($query['fields'])) {
+			if ( ! empty($query['fields']) && is_array($query['fields'])) {
 				$query['fields'][] = $aliasVirtual;
 			}
 			$query['joins'][] = array(
@@ -281,7 +281,7 @@ 
 		$Model->virtualFields = $this->runtime[$Model->alias]['virtualFields'];
 
 		$this->runtime[$Model->alias]['virtualFields'] = $this->runtime[$Model->alias]['fields'] = array();
-		if (!empty($this->runtime[$Model->alias]['restoreFields'])) {
+		if ( ! empty($this->runtime[$Model->alias]['restoreFields'])) {
 			$this->runtime[$Model->alias]['fields'] = $this->runtime[$Model->alias]['restoreFields'];
 			unset($this->runtime[$Model->alias]['restoreFields']);
 		}
@@ -301,14 +301,14 @@ 
 				if (is_array($locale)) {
 					foreach ($locale as $_locale) {
 						$aliasVirtualLocale = "{$aliasVirtual}_{$_locale}";
-						if (!isset($row[$Model->alias][$aliasField]) && !empty($row[$Model->alias][$aliasVirtualLocale])) {
+						if ( ! isset($row[$Model->alias][$aliasField]) && ! empty($row[$Model->alias][$aliasVirtualLocale])) {
 							$row[$Model->alias][$aliasField] = $row[$Model->alias][$aliasVirtualLocale];
 							$row[$Model->alias]['locale'] = $_locale;
 						}
 						unset($row[$Model->alias][$aliasVirtualLocale]);
 					}
 
-					if (!isset($row[$Model->alias][$aliasField])) {
+					if ( ! isset($row[$Model->alias][$aliasField])) {
 						$row[$Model->alias][$aliasField] = '';
 					}
 				} else {
@@ -350,7 +350,7 @@ 
  * @see Model::save()
  */
 	public function beforeSave(Model $Model, $options = array()) {
-		if (isset($options['validate']) && !$options['validate']) {
+		if (isset($options['validate']) && ! $options['validate']) {
 			unset($this->runtime[$Model->alias]['beforeSave']);
 		}
 		if (isset($this->runtime[$Model->alias]['beforeSave'])) {
@@ -384,7 +384,7 @@ 
 			if (isset($Model->data[$Model->alias][$field])) {
 				$tempData[$field] = $Model->data[$Model->alias][$field];
 				if (is_array($Model->data[$Model->alias][$field])) {
-					if (is_string($locale) && !empty($Model->data[$Model->alias][$field][$locale])) {
+					if (is_string($locale) && ! empty($Model->data[$Model->alias][$field][$locale])) {
 						$Model->data[$Model->alias][$field] = $Model->data[$Model->alias][$field][$locale];
 					} else {
 						$values = array_values($Model->data[$Model->alias][$field]);
@@ -420,7 +420,7 @@ 
  * @return void
  */
 	public function afterSave(Model $Model, $created, $options = array()) {
-		if (!isset($this->runtime[$Model->alias]['beforeValidate']) && !isset($this->runtime[$Model->alias]['beforeSave'])) {
+		if ( ! isset($this->runtime[$Model->alias]['beforeValidate']) && ! isset($this->runtime[$Model->alias]['beforeSave'])) {
 			return true;
 		}
 		if (isset($this->runtime[$Model->alias]['beforeValidate'])) {
@@ -454,8 +454,8 @@ 
 			$translations = $RuntimeModel->find('list', array(
 				'conditions' => $conditions,
 				'fields' => array(
-					$RuntimeModel->alias . '.locale',
-					$RuntimeModel->alias . '.id'
+					$RuntimeModel->alias.'.locale',
+					$RuntimeModel->alias.'.id'
 				)
 			));
 			foreach ($value as $_locale => $_value) {
@@ -495,12 +495,12 @@ 
 		$hasLocales = count($locales) > 0;
 
 		foreach ($fields as $key => $field) {
-			if (!is_numeric($key)) {
+			if ( ! is_numeric($key)) {
 				$field = $key;
 			}
-			if ($hasLocales && !isset($data[$field])) {
+			if ($hasLocales && ! isset($data[$field])) {
 				$data[$field] = array_fill_keys($locales, '');
-			} elseif (!isset($data[$field])) {
+			} elseif ( ! isset($data[$field])) {
 				$data[$field] = '';
 			}
 		}
@@ -526,7 +526,7 @@ 
  * @return mixed string or false
  */
 	protected function _getLocale(Model $Model) {
-		if (!isset($Model->locale) || $Model->locale === null) {
+		if ( ! isset($Model->locale) || $Model->locale === null) {
 			$I18n = I18n::getInstance();
 			$I18n->l10n->get(Configure::read('Config.language'));
 			$Model->locale = $I18n->l10n->locale;
@@ -545,8 +545,8 @@ 
  * @return Model
  */
 	public function translateModel(Model $Model) {
-		if (!isset($this->runtime[$Model->alias]['model'])) {
-			if (!isset($Model->translateModel) || empty($Model->translateModel)) {
+		if ( ! isset($this->runtime[$Model->alias]['model'])) {
+			if ( ! isset($Model->translateModel) || empty($Model->translateModel)) {
 				$className = 'I18nModel';
 			} else {
 				$className = $Model->translateModel;
@@ -554,7 +554,7 @@ 
 
 			$this->runtime[$Model->alias]['model'] = ClassRegistry::init($className);
 		}
-		if (!empty($Model->translateTable) && $Model->translateTable !== $this->runtime[$Model->alias]['model']->useTable) {
+		if ( ! empty($Model->translateTable) && $Model->translateTable !== $this->runtime[$Model->alias]['model']->useTable) {
 			$this->runtime[$Model->alias]['model']->setSource($Model->translateTable);
 		} elseif (empty($Model->translateTable) && empty($Model->translateModel)) {
 			$this->runtime[$Model->alias]['model']->setSource('i18n');
@@ -633,7 +633,7 @@ 
 			}
 		}
 
-		if (!empty($associations)) {
+		if ( ! empty($associations)) {
 			$Model->bindModel(array('hasMany' => $associations), $reset);
 		}
 		return true;
@@ -698,7 +698,7 @@ 
 			}
 		}
 
-		if (!empty($associations)) {
+		if ( ! empty($associations)) {
 			$Model->unbindModel(array('hasMany' => $associations), false);
 		}
 		return true;

lib/Cake/Model/Behavior/TreeBehavior.php

Doc Comments +4 added lines, -4 removed lines

@@ -87,7 +87,7 @@ 
  * @param Model $Model Model instance.
  * @param boolean $created indicates whether the node just saved was created or updated
  * @param array $options Options passed from Model::save().
- * @return boolean true on success, false on failure
+ * @return boolean|null true on success, false on failure
  */
 	public function afterSave(Model $Model, $created, $options = array()) {
 		extract($this->settings[$Model->alias]);
@@ -480,7 +480,7 @@ 
  *
  * @param Model $Model Model instance
  * @param integer|string $id The ID of the record to move
- * @param integer|boolean $number how many places to move the node or true to move to last position
+ * @param integer $number how many places to move the node or true to move to last position
  * @return boolean true on success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::moveDown
  */
@@ -538,7 +538,7 @@ 
  *
  * @param Model $Model Model instance
  * @param integer|string $id The ID of the record to move
- * @param integer|boolean $number how many places to move the node, or true to move to first position
+ * @param integer $number how many places to move the node, or true to move to first position
  * @return boolean true on success, false on failure
  * @link http://book.cakephp.org/2.0/en/core-libraries/behaviors/tree.html#TreeBehavior::moveUp
  */
@@ -1044,7 +1044,7 @@ 
  * @param Model $Model
  * @param integer $shift
  * @param string $dir
- * @param array $conditions
+ * @param string $conditions
  * @param boolean $created
  * @param string $field
  * @return void

Spacing +64 added lines, -64 removed lines

@@ -72,7 +72,7 @@ 
 		if (in_array($settings['scope'], $Model->getAssociated('belongsTo'))) {
 			$data = $Model->getAssociated($settings['scope']);
 			$Parent = $Model->{$settings['scope']};
-			$settings['scope'] = $Model->escapeField($data['foreignKey']) . ' = ' . $Parent->escapeField();
+			$settings['scope'] = $Model->escapeField($data['foreignKey']).' = '.$Parent->escapeField();
 			$settings['recursive'] = 0;
 		}
 		$this->settings[$Model->alias] = $settings;
@@ -109,7 +109,7 @@ 
  * @return array
  */
 	public function beforeFind(Model $Model, $query) {
-		if ($Model->findQueryType === 'threaded' && !isset($query['parent'])) {
+		if ($Model->findQueryType === 'threaded' && ! isset($query['parent'])) {
 			$query['parent'] = $this->settings[$Model->alias]['parent'];
 		}
 		return $query;
@@ -149,7 +149,7 @@ 
 		$data = $this->_deletedRow[$Model->alias];
 		$this->_deletedRow[$Model->alias] = null;
 
-		if (!$data[$right] || !$data[$left]) {
+		if ( ! $data[$right] || ! $data[$left]) {
 			return true;
 		}
 		$diff = $data[$right] - $data[$left] + 1;
@@ -158,10 +158,10 @@ 
 			if (is_string($scope)) {
 				$scope = array($scope);
 			}
-			$scope[][$Model->escapeField($left) . " BETWEEN ? AND ?"] = array($data[$left] + 1, $data[$right] - 1);
+			$scope[][$Model->escapeField($left)." BETWEEN ? AND ?"] = array($data[$left] + 1, $data[$right] - 1);
 			$Model->deleteAll($scope);
 		}
-		$this->_sync($Model, $diff, '-', '> ' . $data[$right]);
+		$this->_sync($Model, $diff, '-', '> '.$data[$right]);
 		return true;
 	}
 
@@ -182,13 +182,13 @@ 
 		extract($this->settings[$Model->alias]);
 
 		$this->_addToWhitelist($Model, array($left, $right));
-		if (!$Model->id || !$Model->exists()) {
+		if ( ! $Model->id || ! $Model->exists()) {
 			if (array_key_exists($parent, $Model->data[$Model->alias]) && $Model->data[$Model->alias][$parent]) {
 				$parentNode = $Model->find('first', array(
 					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),
 					'fields' => array($Model->primaryKey, $right), 'recursive' => $recursive
 				));
-				if (!$parentNode) {
+				if ( ! $parentNode) {
 					return false;
 				}
 				list($parentNode) = array_values($parentNode);
@@ -203,7 +203,7 @@ 
 			if ($Model->data[$Model->alias][$parent] != $Model->field($parent)) {
 				$this->settings[$Model->alias]['__parentChange'] = true;
 			}
-			if (!$Model->data[$Model->alias][$parent]) {
+			if ( ! $Model->data[$Model->alias][$parent]) {
 				$Model->data[$Model->alias][$parent] = null;
 				$this->_addToWhitelist($Model, $parent);
 			} else {
@@ -221,7 +221,7 @@ 
 					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),
 					'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
 				));
-				if (!$parentNode) {
+				if ( ! $parentNode) {
 					return false;
 				}
 				list($parentNode) = array_values($parentNode);
@@ -255,7 +255,7 @@ 
 		}
 		if ($id === null && $Model->id) {
 			$id = $Model->id;
-		} elseif (!$id) {
+		} elseif ( ! $id) {
 			$id = null;
 		}
 		extract($this->settings[$Model->alias]);
@@ -270,7 +270,7 @@ 
 			$data = $Model->data[$Model->alias];
 		} else {
 			$data = $Model->find('first', array('conditions' => array($scope, $Model->escapeField() => $id), 'recursive' => $recursive));
-			if (!$data) {
+			if ( ! $data) {
 				return 0;
 			}
 			$data = $data[$Model->alias];
@@ -303,7 +303,7 @@ 
 
 		if ($id === null && $Model->id) {
 			$id = $Model->id;
-		} elseif (!$id) {
+		} elseif ( ! $id) {
 			$id = null;
 		}
 
@@ -312,29 +312,29 @@ 
 		if ($overrideRecursive !== null) {
 			$recursive = $overrideRecursive;
 		}
-		if (!$order) {
-			$order = $Model->escapeField($left) . " asc";
+		if ( ! $order) {
+			$order = $Model->escapeField($left)." asc";
 		}
 		if ($direct) {
 			$conditions = array($scope, $Model->escapeField($parent) => $id);
 			return $Model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
 		}
 
-		if (!$id) {
+		if ( ! $id) {
 			$conditions = $scope;
 		} else {
-			$result = array_values((array)$Model->find('first', array(
+			$result = array_values((array) $Model->find('first', array(
 				'conditions' => array($scope, $Model->escapeField() => $id),
 				'fields' => array($left, $right),
 				'recursive' => $recursive
 			)));
 
-			if (empty($result) || !isset($result[0])) {
+			if (empty($result) || ! isset($result[0])) {
 				return array();
 			}
 			$conditions = array($scope,
-				$Model->escapeField($right) . ' <' => $result[0][$right],
-				$Model->escapeField($left) . ' >' => $result[0][$left]
+				$Model->escapeField($right).' <' => $result[0][$right],
+				$Model->escapeField($left).' >' => $result[0][$left]
 			);
 		}
 		return $Model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
@@ -360,30 +360,30 @@ 
 		}
 
 		$fields = null;
-		if (!$keyPath && !$valuePath && $Model->hasField($Model->displayField)) {
+		if ( ! $keyPath && ! $valuePath && $Model->hasField($Model->displayField)) {
 			$fields = array($Model->primaryKey, $Model->displayField, $left, $right);
 		}
 
-		if (!$keyPath) {
-			$keyPath = '{n}.' . $Model->alias . '.' . $Model->primaryKey;
+		if ( ! $keyPath) {
+			$keyPath = '{n}.'.$Model->alias.'.'.$Model->primaryKey;
 		}
 
-		if (!$valuePath) {
-			$valuePath = array('%s%s', '{n}.tree_prefix', '{n}.' . $Model->alias . '.' . $Model->displayField);
+		if ( ! $valuePath) {
+			$valuePath = array('%s%s', '{n}.tree_prefix', '{n}.'.$Model->alias.'.'.$Model->displayField);
 
 		} elseif (is_string($valuePath)) {
 			$valuePath = array('%s%s', '{n}.tree_prefix', $valuePath);
 
 		} else {
-			array_unshift($valuePath, '%s' . $valuePath[0], '{n}.tree_prefix');
+			array_unshift($valuePath, '%s'.$valuePath[0], '{n}.tree_prefix');
 		}
 
-		$conditions = (array)$conditions;
+		$conditions = (array) $conditions;
 		if ($scope) {
 			$conditions[] = $scope;
 		}
 
-		$order = $Model->escapeField($left) . " asc";
+		$order = $Model->escapeField($left)." asc";
 		$results = $Model->find('all', compact('conditions', 'fields', 'order', 'recursive'));
 		$stack = array();
 
@@ -467,7 +467,7 @@ 
 		}
 		$item = $result[0];
 		$results = $Model->find('all', array(
-			'conditions' => array($scope, $Model->escapeField($left) . ' <=' => $item[$left], $Model->escapeField($right) . ' >=' => $item[$right]),
+			'conditions' => array($scope, $Model->escapeField($left).' <=' => $item[$left], $Model->escapeField($right).' >=' => $item[$right]),
 			'fields' => $fields, 'order' => array($Model->escapeField($left) => 'asc'), 'recursive' => $recursive
 		));
 		return $results;
@@ -488,7 +488,7 @@ 
 		if (is_array($id)) {
 			extract(array_merge(array('id' => null), $id));
 		}
-		if (!$number) {
+		if ( ! $number) {
 			return false;
 		}
 		if (empty($id)) {
@@ -518,9 +518,9 @@ 
 			return false;
 		}
 		$edge = $this->_getMax($Model, $scope, $right, $recursive);
-		$this->_sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right]);
-		$this->_sync($Model, $nextNode[$left] - $node[$left], '-', 'BETWEEN ' . $nextNode[$left] . ' AND ' . $nextNode[$right]);
-		$this->_sync($Model, $edge - $node[$left] - ($nextNode[$right] - $nextNode[$left]), '-', '> ' . $edge);
+		$this->_sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN '.$node[$left].' AND '.$node[$right]);
+		$this->_sync($Model, $nextNode[$left] - $node[$left], '-', 'BETWEEN '.$nextNode[$left].' AND '.$nextNode[$right]);
+		$this->_sync($Model, $edge - $node[$left] - ($nextNode[$right] - $nextNode[$left]), '-', '> '.$edge);
 
 		if (is_int($number)) {
 			$number--;
@@ -546,7 +546,7 @@ 
 		if (is_array($id)) {
 			extract(array_merge(array('id' => null), $id));
 		}
-		if (!$number) {
+		if ( ! $number) {
 			return false;
 		}
 		if (empty($id)) {
@@ -578,9 +578,9 @@ 
 			return false;
 		}
 		$edge = $this->_getMax($Model, $scope, $right, $recursive);
-		$this->_sync($Model, $edge - $previousNode[$left] + 1, '+', 'BETWEEN ' . $previousNode[$left] . ' AND ' . $previousNode[$right]);
-		$this->_sync($Model, $node[$left] - $previousNode[$left], '-', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right]);
-		$this->_sync($Model, $edge - $previousNode[$left] - ($node[$right] - $node[$left]), '-', '> ' . $edge);
+		$this->_sync($Model, $edge - $previousNode[$left] + 1, '+', 'BETWEEN '.$previousNode[$left].' AND '.$previousNode[$right]);
+		$this->_sync($Model, $node[$left] - $previousNode[$left], '-', 'BETWEEN '.$node[$left].' AND '.$node[$right]);
+		$this->_sync($Model, $edge - $previousNode[$left] - ($node[$right] - $node[$left]), '-', '> '.$edge);
 		if (is_int($number)) {
 			$number--;
 		}
@@ -627,7 +627,7 @@ 
 			if ($missingParents) {
 				if ($missingParentAction === 'return') {
 					foreach ($missingParents as $id => $display) {
-						$this->errors[] = 'cannot find the parent for ' . $Model->alias . ' with id ' . $id . '(' . $display . ')';
+						$this->errors[] = 'cannot find the parent for '.$Model->alias.' with id '.$id.'('.$display.')';
 					}
 					return false;
 				} elseif ($missingParentAction === 'delete') {
@@ -679,7 +679,7 @@ 
 		}
 
 		$children = $Model->find('all', $params);
-		$hasChildren = (bool)$children;
+		$hasChildren = (bool) $children;
 
 		if ($parentId !== null) {
 			if ($hasChildren) {
@@ -746,13 +746,13 @@ 
 	public function reorder(Model $Model, $options = array()) {
 		$options = array_merge(array('id' => null, 'field' => $Model->displayField, 'order' => 'ASC', 'verify' => true), $options);
 		extract($options);
-		if ($verify && !$this->verify($Model)) {
+		if ($verify && ! $this->verify($Model)) {
 			return false;
 		}
 		$verify = false;
 		extract($this->settings[$Model->alias]);
 		$fields = array($Model->primaryKey, $field, $left, $right);
-		$sort = $field . ' ' . $order;
+		$sort = $field.' '.$order;
 		$nodes = $this->children($Model, $id, true, $fields, $sort, null, null, $recursive);
 
 		$cacheQueries = $Model->cacheQueries;
@@ -815,8 +815,8 @@ 
 			array($parent => $db->value($node[$parent], $parent)),
 			array($Model->escapeField($parent) => $node[$Model->primaryKey])
 		);
-		$this->_sync($Model, 1, '-', 'BETWEEN ' . ($node[$left] + 1) . ' AND ' . ($node[$right] - 1));
-		$this->_sync($Model, 2, '-', '> ' . ($node[$right]));
+		$this->_sync($Model, 1, '-', 'BETWEEN '.($node[$left] + 1).' AND '.($node[$right] - 1));
+		$this->_sync($Model, 2, '-', '> '.($node[$right]));
 		$Model->id = $id;
 
 		if ($delete) {
@@ -853,7 +853,7 @@ 
  */
 	public function verify(Model $Model) {
 		extract($this->settings[$Model->alias]);
-		if (!$Model->find('count', array('conditions' => $scope))) {
+		if ( ! $Model->find('count', array('conditions' => $scope))) {
 			return true;
 		}
 		$min = $this->_getMin($Model, $scope, $left, $recursive);
@@ -865,14 +865,14 @@ 
 				$scope, 'OR' => array($Model->escapeField($left) => $i, $Model->escapeField($right) => $i)
 			)));
 			if ($count != 1) {
-				if (!$count) {
+				if ( ! $count) {
 					$errors[] = array('index', $i, 'missing');
 				} else {
 					$errors[] = array('index', $i, 'duplicate');
 				}
 			}
 		}
-		$node = $Model->find('first', array('conditions' => array($scope, $Model->escapeField($right) . '< ' . $Model->escapeField($left)), 'recursive' => 0));
+		$node = $Model->find('first', array('conditions' => array($scope, $Model->escapeField($right).'< '.$Model->escapeField($left)), 'recursive' => 0));
 		if ($node) {
 			$errors[] = array('node', $node[$Model->alias][$Model->primaryKey], 'left greater than right.');
 		}
@@ -891,17 +891,17 @@ 
 				$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
 					'left and right values identical');
 			} elseif ($instance[$Model->alias][$parent]) {
-				if (!$instance['VerifyParent'][$Model->primaryKey]) {
+				if ( ! $instance['VerifyParent'][$Model->primaryKey]) {
 					$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
-						'The parent node ' . $instance[$Model->alias][$parent] . ' doesn\'t exist');
+						'The parent node '.$instance[$Model->alias][$parent].' doesn\'t exist');
 				} elseif ($instance[$Model->alias][$left] < $instance['VerifyParent'][$left]) {
 					$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
-						'left less than parent (node ' . $instance['VerifyParent'][$Model->primaryKey] . ').');
+						'left less than parent (node '.$instance['VerifyParent'][$Model->primaryKey].').');
 				} elseif ($instance[$Model->alias][$right] > $instance['VerifyParent'][$right]) {
 					$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
-						'right greater than parent (node ' . $instance['VerifyParent'][$Model->primaryKey] . ').');
+						'right greater than parent (node '.$instance['VerifyParent'][$Model->primaryKey].').');
 				}
-			} elseif ($Model->find('count', array('conditions' => array($scope, $Model->escapeField($left) . ' <' => $instance[$Model->alias][$left], $Model->escapeField($right) . ' >' => $instance[$Model->alias][$right]), 'recursive' => 0))) {
+			} elseif ($Model->find('count', array('conditions' => array($scope, $Model->escapeField($left).' <' => $instance[$Model->alias][$left], $Model->escapeField($right).' >' => $instance[$Model->alias][$right]), 'recursive' => 0))) {
 				$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey], 'The parent field is blank, but has a parent');
 			}
 		}
@@ -933,8 +933,8 @@ 
 		$edge = $this->_getMax($Model, $scope, $right, $recursive, $created);
 
 		if (empty($parentId)) {
-			$this->_sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
-			$this->_sync($Model, $node[$right] - $node[$left] + 1, '-', '> ' . $node[$left], $created);
+			$this->_sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN '.$node[$left].' AND '.$node[$right], $created);
+			$this->_sync($Model, $node[$right] - $node[$left] + 1, '-', '> '.$node[$left], $created);
 		} else {
 			$values = $Model->find('first', array(
 				'conditions' => array($scope, $Model->escapeField() => $parentId),
@@ -958,27 +958,27 @@ 
 				return false;
 			}
 			if (empty($node[$left]) && empty($node[$right])) {
-				$this->_sync($Model, 2, '+', '>= ' . $parentNode[$right], $created);
+				$this->_sync($Model, 2, '+', '>= '.$parentNode[$right], $created);
 				$result = $Model->save(
 					array($left => $parentNode[$right], $right => $parentNode[$right] + 1, $parent => $parentId),
 					array('validate' => false, 'callbacks' => false)
 				);
 				$Model->data = $result;
 			} else {
-				$this->_sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
+				$this->_sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN '.$node[$left].' AND '.$node[$right], $created);
 				$diff = $node[$right] - $node[$left] + 1;
 
 				if ($node[$left] > $parentNode[$left]) {
 					if ($node[$right] < $parentNode[$right]) {
-						$this->_sync($Model, $diff, '-', 'BETWEEN ' . $node[$right] . ' AND ' . ($parentNode[$right] - 1), $created);
-						$this->_sync($Model, $edge - $parentNode[$right] + $diff + 1, '-', '> ' . $edge, $created);
+						$this->_sync($Model, $diff, '-', 'BETWEEN '.$node[$right].' AND '.($parentNode[$right] - 1), $created);
+						$this->_sync($Model, $edge - $parentNode[$right] + $diff + 1, '-', '> '.$edge, $created);
 					} else {
-						$this->_sync($Model, $diff, '+', 'BETWEEN ' . $parentNode[$right] . ' AND ' . $node[$right], $created);
-						$this->_sync($Model, $edge - $parentNode[$right] + 1, '-', '> ' . $edge, $created);
+						$this->_sync($Model, $diff, '+', 'BETWEEN '.$parentNode[$right].' AND '.$node[$right], $created);
+						$this->_sync($Model, $edge - $parentNode[$right] + 1, '-', '> '.$edge, $created);
 					}
 				} else {
-					$this->_sync($Model, $diff, '-', 'BETWEEN ' . $node[$right] . ' AND ' . ($parentNode[$right] - 1), $created);
-					$this->_sync($Model, $edge - $parentNode[$right] + $diff + 1, '-', '> ' . $edge, $created);
+					$this->_sync($Model, $diff, '-', 'BETWEEN '.$node[$right].' AND '.($parentNode[$right] - 1), $created);
+					$this->_sync($Model, $edge - $parentNode[$right] + $diff + 1, '-', '> '.$edge, $created);
 				}
 			}
 		}
@@ -999,10 +999,10 @@ 
 		$db = ConnectionManager::getDataSource($Model->useDbConfig);
 		if ($created) {
 			if (is_string($scope)) {
-				$scope .= " AND " . $Model->escapeField() . " <> ";
+				$scope .= " AND ".$Model->escapeField()." <> ";
 				$scope .= $db->value($Model->id, $Model->getColumnType($Model->primaryKey));
 			} else {
-				$scope['NOT'][$Model->alias . '.' . $Model->primaryKey] = $Model->id;
+				$scope['NOT'][$Model->alias.'.'.$Model->primaryKey] = $Model->id;
 			}
 		}
 		$name = $Model->escapeField($right);
@@ -1059,7 +1059,7 @@ 
 			$field = $right;
 		}
 		if (is_string($conditions)) {
-			$conditions = array($Model->escapeField($field) . " {$conditions}");
+			$conditions = array($Model->escapeField($field)." {$conditions}");
 		}
 		if (($scope !== '1 = 1' && $scope !== true) && $scope) {
 			$conditions[] = $scope;
@@ -1067,7 +1067,7 @@ 
 		if ($created) {
 			$conditions['NOT'][$Model->escapeField()] = $Model->id;
 		}
-		$Model->updateAll(array($Model->escapeField($field) => $Model->escapeField($field) . ' ' . $dir . ' ' . $shift), $conditions);
+		$Model->updateAll(array($Model->escapeField($field) => $Model->escapeField($field).' '.$dir.' '.$shift), $conditions);
 		$Model->recursive = $ModelRecursive;
 	}
 

lib/Cake/Model/BehaviorCollection.php

Doc Comments +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
  *
  * @param string $behavior
  * @param array $config
- * @return void
+ * @return boolean
  * @deprecated Will be removed in 3.0. Replaced with load().
  */
 	public function attach($behavior, $config = array()) {

Spacing +11 added lines, -11 removed lines

@@ -61,7 +61,7 @@ 
 	public function init($modelName, $behaviors = array()) {
 		$this->modelName = $modelName;
 
-		if (!empty($behaviors)) {
+		if ( ! empty($behaviors)) {
 			foreach (BehaviorCollection::normalizeObjectArray($behaviors) as $config) {
 				$this->load($config['class'], $config['settings']);
 			}
@@ -110,21 +110,21 @@ 
 		unset($config['enabled'], $config['className'], $config['priority']);
 
 		list($plugin, $name) = pluginSplit($behavior, true);
-		if (!isset($alias)) {
+		if ( ! isset($alias)) {
 			$alias = $name;
 		}
 
-		$class = $name . 'Behavior';
+		$class = $name.'Behavior';
 
-		App::uses($class, $plugin . 'Model/Behavior');
-		if (!class_exists($class)) {
+		App::uses($class, $plugin.'Model/Behavior');
+		if ( ! class_exists($class)) {
 			throw new MissingBehaviorException(array(
 				'class' => $class,
 				'plugin' => substr($plugin, 0, -1)
 			));
 		}
 
-		if (!isset($this->{$alias})) {
+		if ( ! isset($this->{$alias})) {
 			if (ClassRegistry::isKeySet($class)) {
 				$this->_loaded[$alias] = ClassRegistry::getObject($class);
 			} else {
@@ -155,10 +155,10 @@ 
 		);
 
 		foreach ($methods as $m) {
-			if (!isset($parentMethods[$m])) {
+			if ( ! isset($parentMethods[$m])) {
 				$methodAllowed = (
-					$m[0] !== '_' && !array_key_exists($m, $this->_methods) &&
-					!in_array($m, $callbacks)
+					$m[0] !== '_' && ! array_key_exists($m, $this->_methods) &&
+					! in_array($m, $callbacks)
 				);
 				if ($methodAllowed) {
 					$this->_methods[$m] = array($alias, $m);
@@ -168,7 +168,7 @@ 
 
 		if ($configDisabled) {
 			$this->disable($alias);
-		} elseif (!$this->enabled($alias)) {
+		} elseif ( ! $this->enabled($alias)) {
 			$this->enable($alias);
 		} else {
 			$this->setPriority($alias, $priority);
@@ -263,7 +263,7 @@ 
 			return $callback ? $this->_methods[$method] : true;
 		}
 		foreach ($this->_mappedMethods as $pattern => $target) {
-			if (preg_match($pattern . 'i', $method)) {
+			if (preg_match($pattern.'i', $method)) {
 				if ($callback) {
 					$target[] = $method;
 					return $target;

lib/Cake/Model/Datasource/CakeSession.php

Doc Comments +2 added lines, -2 removed lines

@@ -305,7 +305,7 @@ 
 /**
  * Returns last occurred error as a string, if any.
  *
- * @return mixed Error description as a string, or false.
+ * @return string|false Error description as a string, or false.
  */
 	public static function error() {
 		if (self::$lastError) {
@@ -525,7 +525,7 @@ 
  * Find the handler class and make sure it implements the correct interface.
  *
  * @param string $handler
- * @return void
+ * @return CakeSessionHandlerInterface
  * @throws CakeSessionException
  */
 	protected static function _getHandler($handler) {

Spacing +26 added lines, -26 removed lines

@@ -137,13 +137,13 @@ 
 		self::$time = time();
 
 		if (env('HTTP_USER_AGENT')) {
-			self::$_userAgent = md5(env('HTTP_USER_AGENT') . Configure::read('Security.salt'));
+			self::$_userAgent = md5(env('HTTP_USER_AGENT').Configure::read('Security.salt'));
 		}
 
 		self::_setPath($base);
 		self::_setHost(env('HTTP_HOST'));
 
-		if (!self::$_initialized) {
+		if ( ! self::$_initialized) {
 			register_shutdown_function('session_write_close');
 		}
 
@@ -196,7 +196,7 @@ 
 		$id = self::id();
 		self::_startSession();
 
-		if (!$id && self::started()) {
+		if ( ! $id && self::started()) {
 			self::_checkValid();
 		}
 
@@ -221,7 +221,7 @@ 
  * @return boolean True if variable is there
  */
 	public static function check($name = null) {
-		if (!self::start()) {
+		if ( ! self::start()) {
 			return false;
 		}
 		if (empty($name)) {
@@ -264,7 +264,7 @@ 
 	public static function delete($name) {
 		if (self::check($name)) {
 			self::_overwrite($_SESSION, Hash::remove($_SESSION, $name));
-			return !self::check($name);
+			return ! self::check($name);
 		}
 		return false;
 	}
@@ -277,9 +277,9 @@ 
  * @return void
  */
 	protected static function _overwrite(&$old, $new) {
-		if (!empty($old)) {
+		if ( ! empty($old)) {
 			foreach ($old as $key => $var) {
-				if (!isset($new[$key])) {
+				if ( ! isset($new[$key])) {
 					unset($old[$key]);
 				}
 			}
@@ -296,7 +296,7 @@ 
  * @return string Error as string
  */
 	protected static function _error($errorNumber) {
-		if (!is_array(self::$error) || !array_key_exists($errorNumber, self::$error)) {
+		if ( ! is_array(self::$error) || ! array_key_exists($errorNumber, self::$error)) {
 			return false;
 		}
 		return self::$error[$errorNumber];
@@ -371,7 +371,7 @@ 
  * @return mixed The value of the session variable
  */
 	public static function read($name = null) {
-		if (!self::start()) {
+		if ( ! self::start()) {
 			return false;
 		}
 		if ($name === null) {
@@ -394,7 +394,7 @@ 
  * @return mixed Full $_SESSION array, or false on error.
  */
 	protected static function _returnSessionVars() {
-		if (!empty($_SESSION)) {
+		if ( ! empty($_SESSION)) {
 			return $_SESSION;
 		}
 		self::_setError(2, 'No Session vars set');
@@ -409,14 +409,14 @@ 
  * @return boolean True if the write was successful, false if the write failed
  */
 	public static function write($name, $value = null) {
-		if (!self::start()) {
+		if ( ! self::start()) {
 			return false;
 		}
 		if (empty($name)) {
 			return false;
 		}
 		$write = $name;
-		if (!is_array($name)) {
+		if ( ! is_array($name)) {
 			$write = array($name => $value);
 		}
 		foreach ($write as $key => $val) {
@@ -434,7 +434,7 @@ 
  * @return void
  */
 	public static function destroy() {
-		if (!self::started()) {
+		if ( ! self::started()) {
 			self::_startSession();
 		}
 
@@ -472,30 +472,30 @@ 
 				$sessionConfig = Hash::merge($defaults, $sessionConfig);
 			}
 		}
-		if (!isset($sessionConfig['ini']['session.cookie_secure']) && env('HTTPS')) {
+		if ( ! isset($sessionConfig['ini']['session.cookie_secure']) && env('HTTPS')) {
 			$sessionConfig['ini']['session.cookie_secure'] = 1;
 		}
-		if (isset($sessionConfig['timeout']) && !isset($sessionConfig['cookieTimeout'])) {
+		if (isset($sessionConfig['timeout']) && ! isset($sessionConfig['cookieTimeout'])) {
 			$sessionConfig['cookieTimeout'] = $sessionConfig['timeout'];
 		}
-		if (!isset($sessionConfig['ini']['session.cookie_lifetime'])) {
+		if ( ! isset($sessionConfig['ini']['session.cookie_lifetime'])) {
 			$sessionConfig['ini']['session.cookie_lifetime'] = $sessionConfig['cookieTimeout'] * 60;
 		}
-		if (!isset($sessionConfig['ini']['session.name'])) {
+		if ( ! isset($sessionConfig['ini']['session.name'])) {
 			$sessionConfig['ini']['session.name'] = $sessionConfig['cookie'];
 		}
-		if (!empty($sessionConfig['handler'])) {
+		if ( ! empty($sessionConfig['handler'])) {
 			$sessionConfig['ini']['session.save_handler'] = 'user';
 		}
-		if (!isset($sessionConfig['ini']['session.gc_maxlifetime'])) {
+		if ( ! isset($sessionConfig['ini']['session.gc_maxlifetime'])) {
 			$sessionConfig['ini']['session.gc_maxlifetime'] = $sessionConfig['timeout'] * 60;
 		}
-		if (!isset($sessionConfig['ini']['session.cookie_httponly'])) {
+		if ( ! isset($sessionConfig['ini']['session.cookie_httponly'])) {
 			$sessionConfig['ini']['session.cookie_httponly'] = 1;
 		}
 
 		if (empty($_SESSION)) {
-			if (!empty($sessionConfig['ini']) && is_array($sessionConfig['ini'])) {
+			if ( ! empty($sessionConfig['ini']) && is_array($sessionConfig['ini'])) {
 				foreach ($sessionConfig['ini'] as $setting => $value) {
 					if (ini_set($setting, $value) === false) {
 						throw new CakeSessionException(__d('cake_dev', 'Unable to configure the session, setting %s failed.', $setting));
@@ -503,10 +503,10 @@ 
 				}
 			}
 		}
-		if (!empty($sessionConfig['handler']) && !isset($sessionConfig['handler']['engine'])) {
+		if ( ! empty($sessionConfig['handler']) && ! isset($sessionConfig['handler']['engine'])) {
 			call_user_func_array('session_set_save_handler', $sessionConfig['handler']);
 		}
-		if (!empty($sessionConfig['handler']['engine'])) {
+		if ( ! empty($sessionConfig['handler']['engine'])) {
 			$handler = self::_getHandler($sessionConfig['handler']['engine']);
 			session_set_save_handler(
 				array($handler, 'open'),
@@ -530,8 +530,8 @@ 
  */
 	protected static function _getHandler($handler) {
 		list($plugin, $class) = pluginSplit($handler, true);
-		App::uses($class, $plugin . 'Model/Datasource/Session');
-		if (!class_exists($class)) {
+		App::uses($class, $plugin.'Model/Datasource/Session');
+		if ( ! class_exists($class)) {
 			throw new CakeSessionException(__d('cake_dev', 'Could not load %s to handle the session.', $class));
 		}
 		$handler = new $class();
@@ -566,7 +566,7 @@ 
 					'session.serialize_handler' => 'php',
 					'session.use_cookies' => 1,
 					'session.cookie_path' => self::$path,
-					'session.save_path' => TMP . 'sessions',
+					'session.save_path' => TMP.'sessions',
 					'session.save_handler' => 'files'
 				)
 			),

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

Doc Comments +2 added lines, -2 removed lines

@@ -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 (!$this->_useAlias) {
@@ -506,7 +506,7 @@ 
  *
  * @param array $compare Result of a CakeSchema::compare()
  * @param string $table
- * @return array Array of alter statements to make.
+ * @return false|string Array of alter statements to make.
  */
 	public function alterSchema($compare, $table = null) {
 		if (!is_array($compare)) {

Spacing +52 added lines, -52 removed lines

@@ -150,14 +150,14 @@ 
 			PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION
 		);
 
-		if (!empty($config['encoding'])) {
-			$flags[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $config['encoding'];
+		if ( ! empty($config['encoding'])) {
+			$flags[PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES '.$config['encoding'];
 		}
-		if (!empty($config['ssl_key']) && !empty($config['ssl_cert'])) {
+		if ( ! empty($config['ssl_key']) && ! empty($config['ssl_cert'])) {
 			$flags[PDO::MYSQL_ATTR_SSL_KEY] = $config['ssl_key'];
 			$flags[PDO::MYSQL_ATTR_SSL_CERT] = $config['ssl_cert'];
 		}
-		if (!empty($config['ssl_ca'])) {
+		if ( ! empty($config['ssl_ca'])) {
 			$flags[PDO::MYSQL_ATTR_SSL_CA] = $config['ssl_ca'];
 		}
 		if (empty($config['unix_socket'])) {
@@ -174,7 +174,7 @@ 
 				$flags
 			);
 			$this->connected = true;
-			if (!empty($config['settings'])) {
+			if ( ! empty($config['settings'])) {
 				foreach ($config['settings'] as $key => $value) {
 					$this->_execute("SET $key=$value");
 				}
@@ -187,7 +187,7 @@ 
 		}
 
 		$this->_charsets = array();
-		$this->_useAlias = (bool)version_compare($this->getVersion(), "4.1", ">=");
+		$this->_useAlias = (bool) version_compare($this->getVersion(), "4.1", ">=");
 
 		return $this->connected;
 	}
@@ -212,9 +212,9 @@ 
 		if ($cache) {
 			return $cache;
 		}
-		$result = $this->_execute('SHOW TABLES FROM ' . $this->name($this->config['database']));
+		$result = $this->_execute('SHOW TABLES FROM '.$this->name($this->config['database']));
 
-		if (!$result) {
+		if ( ! $result) {
 			$result->closeCursor();
 			return array();
 		}
@@ -247,7 +247,7 @@ 
 			} else {
 				$type = empty($column['native_type']) ? 'string' : $column['native_type'];
 			}
-			if (!empty($column['table']) && strpos($column['name'], $this->virtualFieldSeparator) === false) {
+			if ( ! empty($column['table']) && strpos($column['name'], $this->virtualFieldSeparator) === false) {
 				$this->map[$index++] = array($column['table'], $column['name'], $type);
 			} else {
 				$this->map[$index++] = array(0, $column['name'], $type);
@@ -292,7 +292,7 @@ 
  * @return string Character set name
  */
 	public function getCharsetName($name) {
-		if ((bool)version_compare($this->getVersion(), "5", "<")) {
+		if ((bool) version_compare($this->getVersion(), "5", "<")) {
 			return false;
 		}
 		if (isset($this->_charsets[$name])) {
@@ -328,8 +328,8 @@ 
 		$table = $this->fullTableName($model);
 
 		$fields = false;
-		$cols = $this->_execute('SHOW FULL COLUMNS FROM ' . $table);
-		if (!$cols) {
+		$cols = $this->_execute('SHOW FULL COLUMNS FROM '.$table);
+		if ( ! $cols) {
 			throw new CakeException(__d('cake_dev', 'Could not describe table for %s', $table));
 		}
 
@@ -340,11 +340,11 @@ 
 				'default' => $column->Default,
 				'length' => $this->length($column->Type),
 			);
-			if (!empty($column->Key) && isset($this->index[$column->Key])) {
+			if ( ! empty($column->Key) && isset($this->index[$column->Key])) {
 				$fields[$column->Field]['key'] = $this->index[$column->Key];
 			}
 			foreach ($this->fieldParameters as $name => $value) {
-				if (!empty($column->{$value['column']})) {
+				if ( ! empty($column->{$value['column']})) {
 					$fields[$column->Field][$name] = $column->{$value['column']};
 				}
 			}
@@ -370,22 +370,22 @@ 
  * @return array
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
-		if (!$this->_useAlias) {
+		if ( ! $this->_useAlias) {
 			return parent::update($model, $fields, $values, $conditions);
 		}
 
-		if (!$values) {
+		if ( ! $values) {
 			$combined = $fields;
 		} else {
 			$combined = array_combine($fields, $values);
 		}
 
 		$alias = $joins = false;
-		$fields = $this->_prepareUpdateFields($model, $combined, empty($conditions), !empty($conditions));
+		$fields = $this->_prepareUpdateFields($model, $combined, empty($conditions), ! empty($conditions));
 		$fields = implode(', ', $fields);
 		$table = $this->fullTableName($model);
 
-		if (!empty($conditions)) {
+		if ( ! empty($conditions)) {
 			$alias = $this->name($model->alias);
 			if ($model->name === $model->alias) {
 				$joins = implode(' ', $this->_getJoins($model));
@@ -397,7 +397,7 @@ 
 			return false;
 		}
 
-		if (!$this->execute($this->renderStatement('update', compact('table', 'alias', 'joins', 'fields', 'conditions')))) {
+		if ( ! $this->execute($this->renderStatement('update', compact('table', 'alias', 'joins', 'fields', 'conditions')))) {
 			$model->onError();
 			return false;
 		}
@@ -412,7 +412,7 @@ 
  * @return boolean Success
  */
 	public function delete(Model $model, $conditions = null) {
-		if (!$this->_useAlias) {
+		if ( ! $this->_useAlias) {
 			return parent::delete($model, $conditions);
 		}
 		$alias = $this->name($model->alias);
@@ -423,13 +423,13 @@ 
 			$alias = $joins = false;
 		}
 		$complexConditions = false;
-		foreach ((array)$conditions as $key => $value) {
+		foreach ((array) $conditions as $key => $value) {
 			if (strpos($key, $model->alias) === false) {
 				$complexConditions = true;
 				break;
 			}
 		}
-		if (!$complexConditions) {
+		if ( ! $complexConditions) {
 			$joins = false;
 		}
 
@@ -451,7 +451,7 @@ 
  * @return boolean
  */
 	public function setEncoding($enc) {
-		return $this->_execute('SET NAMES ' . $enc) !== false;
+		return $this->_execute('SET NAMES '.$enc) !== false;
 	}
 
 /**
@@ -465,14 +465,14 @@ 
 		$table = $this->fullTableName($model);
 		$old = version_compare($this->getVersion(), '4.1', '<=');
 		if ($table) {
-			$indexes = $this->_execute('SHOW INDEX FROM ' . $table);
+			$indexes = $this->_execute('SHOW INDEX FROM '.$table);
 			// @codingStandardsIgnoreStart
 			// MySQL columns don't match the cakephp conventions.
 			while ($idx = $indexes->fetch(PDO::FETCH_OBJ)) {
 				if ($old) {
-					$idx = (object)current((array)$idx);
+					$idx = (object) current((array) $idx);
 				}
-				if (!isset($index[$idx->Key_name]['column'])) {
+				if ( ! isset($index[$idx->Key_name]['column'])) {
 					$col = array();
 					$index[$idx->Key_name]['column'] = $idx->Column_name;
 
@@ -482,14 +482,14 @@ 
 						$index[$idx->Key_name]['unique'] = intval($idx->Non_unique == 0);
 					}
 				} else {
-					if (!empty($index[$idx->Key_name]['column']) && !is_array($index[$idx->Key_name]['column'])) {
+					if ( ! empty($index[$idx->Key_name]['column']) && ! is_array($index[$idx->Key_name]['column'])) {
 						$col[] = $index[$idx->Key_name]['column'];
 					}
 					$col[] = $idx->Column_name;
 					$index[$idx->Key_name]['column'] = $col;
 				}
-				if (!empty($idx->Sub_part)) {
-					if (!isset($index[$idx->Key_name]['length'])) {
+				if ( ! empty($idx->Sub_part)) {
+					if ( ! isset($index[$idx->Key_name]['length'])) {
 						$index[$idx->Key_name]['length'] = array();
 					}
 					$index[$idx->Key_name]['length'][$idx->Column_name] = $idx->Sub_part;
@@ -509,15 +509,15 @@ 
  * @return array Array of alter statements to make.
  */
 	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 = $tableParameters = $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'];
@@ -531,9 +531,9 @@ 
 						case 'add':
 							foreach ($column as $field => $col) {
 								$col['name'] = $field;
-								$alter = 'ADD ' . $this->buildColumn($col);
+								$alter = 'ADD '.$this->buildColumn($col);
 								if (isset($col['after'])) {
-									$alter .= ' AFTER ' . $this->name($col['after']);
+									$alter .= ' AFTER '.$this->name($col['after']);
 								}
 								$colList[] = $alter;
 							}
@@ -541,22 +541,22 @@ 
 						case 'drop':
 							foreach ($column as $field => $col) {
 								$col['name'] = $field;
-								$colList[] = 'DROP ' . $this->name($field);
+								$colList[] = 'DROP '.$this->name($field);
 							}
 							break;
 						case 'change':
 							foreach ($column as $field => $col) {
-								if (!isset($col['name'])) {
+								if ( ! isset($col['name'])) {
 									$col['name'] = $field;
 								}
-								$colList[] = 'CHANGE ' . $this->name($field) . ' ' . $this->buildColumn($col);
+								$colList[] = 'CHANGE '.$this->name($field).' '.$this->buildColumn($col);
 							}
 							break;
 					}
 				}
 				$colList = array_merge($colList, $this->_alterIndexes($curTable, $indexes));
 				$colList = array_merge($colList, $this->_alterTableParameters($curTable, $tableParameters));
-				$out .= "\t" . implode(",\n\t", $colList) . ";\n\n";
+				$out .= "\t".implode(",\n\t", $colList).";\n\n";
 			}
 		}
 		return $out;
@@ -569,7 +569,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).";";
 	}
 
 /**
@@ -602,15 +602,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 (isset($value['type']) && strtolower($value['type']) === 'fulltext') {
 				$out .= 'FULLTEXT ';
 			}
-			$out .= 'KEY ' . $name . ' (';
+			$out .= 'KEY '.$name.' (';
 
 			if (is_array($value['column'])) {
 				if (isset($value['length'])) {
@@ -653,7 +653,7 @@ 
 				if ($name === 'PRIMARY') {
 					$out .= 'PRIMARY KEY';
 				} else {
-					$out .= 'KEY ' . $this->startQuote . $name . $this->endQuote;
+					$out .= 'KEY '.$this->startQuote.$name.$this->endQuote;
 				}
 				$alter[] = $out;
 			}
@@ -661,7 +661,7 @@ 
 		if (isset($indexes['add'])) {
 			$add = $this->buildIndex($indexes['add']);
 			foreach ($add as $index) {
-				$alter[] = 'ADD ' . $index;
+				$alter[] = 'ADD '.$index;
 			}
 		}
 		return $alter;
@@ -678,10 +678,10 @@ 
 		if ($lengths === null) {
 			return '';
 		}
-		if (!isset($lengths[$column])) {
+		if ( ! isset($lengths[$column])) {
 			return '';
 		}
-		return '(' . $lengths[$column] . ')';
+		return '('.$lengths[$column].')';
 	}
 
 /**
@@ -693,19 +693,19 @@ 
 	public function listDetailedSources($name = null) {
 		$condition = '';
 		if (is_string($name)) {
-			$condition = ' WHERE name = ' . $this->value($name);
+			$condition = ' WHERE name = '.$this->value($name);
 		}
-		$result = $this->_connection->query('SHOW TABLE STATUS ' . $condition, PDO::FETCH_ASSOC);
+		$result = $this->_connection->query('SHOW TABLE STATUS '.$condition, PDO::FETCH_ASSOC);
 
-		if (!$result) {
+		if ( ! $result) {
 			$result->closeCursor();
 			return array();
 		}
 		$tables = array();
 		foreach ($result as $row) {
-			$tables[$row['Name']] = (array)$row;
+			$tables[$row['Name']] = (array) $row;
 			unset($tables[$row['Name']]['queryString']);
-			if (!empty($row['Collation'])) {
+			if ( ! empty($row['Collation'])) {
 				$charset = $this->getCharsetName($row['Collation']);
 				if ($charset) {
 					$tables[$row['Name']]['charset'] = $charset;
@@ -729,7 +729,7 @@ 
 		if (is_array($real)) {
 			$col = $real['name'];
 			if (isset($real['limit'])) {
-				$col .= '(' . $real['limit'] . ')';
+				$col .= '('.$real['limit'].')';
 			}
 			return $col;
 		}

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).";";
 	}
 
 /**