reginaldojunior / winners

lib/Cake/I18n/L10n.php

Doc Comments +2 added lines, -2 removed lines

@@ -344,7 +344,7 @@ 
  * the method will get the settings from L10n::_setLanguage();
  *
  * @param string $language Language (if null will use DEFAULT_LANGUAGE if defined)
- * @return mixed
+ * @return string|null
  */
 	public function get($language = null) {
 		if ($language !== null) {
@@ -362,7 +362,7 @@ 
  * If $language is null it will use the L10n::$default if defined
  *
  * @param string $language Language (if null will use L10n::$default if defined)
- * @return mixed
+ * @return string|null
  */
 	protected function _setLanguage($language = null) {
 		$catalog = false;

Spacing +3 added lines, -3 removed lines

@@ -351,7 +351,7 @@ 
 			return $this->_setLanguage($language);
 		}
 
-		if (!$this->_autoLanguage()) {
+		if ( ! $this->_autoLanguage()) {
 			$this->_setLanguage();
 		}
 		return $this->lang;
@@ -370,7 +370,7 @@ 
 			$catalog = $this->catalog($language);
 		}
 
-		if (!$catalog && $this->default) {
+		if ( ! $catalog && $this->default) {
 			$language = $this->default;
 			$catalog = $this->catalog($language);
 		}
@@ -393,7 +393,7 @@ 
 		if ($this->default && $language !== $this->default) {
 			$catalog = $this->catalog($this->default);
 			$fallback = $catalog['localeFallback'];
-			if (!in_array($fallback, $this->languagePath)) {
+			if ( ! in_array($fallback, $this->languagePath)) {
 				$this->languagePath[] = $fallback;
 			}
 		}

lib/Cake/I18n/Multibyte.php

Doc Comments +4 added lines, -4 removed lines

@@ -135,7 +135,7 @@ 
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is false.
- * @return integer|boolean The portion of $haystack, or false if $needle is not found.
+ * @return string|false The portion of $haystack, or false if $needle is not found.
  */
 	public static function stristr($haystack, $needle, $part = false) {
 		$php = (PHP_VERSION < 5.3);
@@ -253,7 +253,7 @@ 
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|false The portion of $haystack. or false if $needle is not found.
  */
 	public static function strrchr($haystack, $needle, $part = false) {
 		$check = Multibyte::utf8($haystack);
@@ -313,7 +313,7 @@ 
  *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
  *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
  *    Default value is false.
- * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @return string|false The portion of $haystack. or false if $needle is not found.
  */
 	public static function strrichr($haystack, $needle, $part = false) {
 		$check = Multibyte::strtoupper($haystack);
@@ -475,7 +475,7 @@ 
  *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
  *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
  *    Default value is FALSE.
- * @return string|boolean The portion of $haystack, or true if $needle is not found.
+ * @return string|false The portion of $haystack, or true if $needle is not found.
  */
 	public static function strstr($haystack, $needle, $part = false) {
 		$php = (PHP_VERSION < 5.3);

Spacing +30 added lines, -30 removed lines

@@ -166,22 +166,22 @@ 
 						$found = true;
 					}
 				}
-				if (!$found) {
+				if ( ! $found) {
 					$parts[] = $haystack[$position];
 					unset($haystack[$position]);
 				}
 				$position++;
 			}
 
-			if ($found && $part && !empty($parts)) {
+			if ($found && $part && ! empty($parts)) {
 				return Multibyte::ascii($parts);
-			} elseif ($found && !empty($haystack)) {
+			} elseif ($found && ! empty($haystack)) {
 				return Multibyte::ascii($haystack);
 			}
 			return false;
 		}
 
-		if (!$php) {
+		if ( ! $php) {
 			return stristr($haystack, $needle, $part);
 		}
 		return stristr($haystack, $needle);
@@ -289,16 +289,16 @@ 
 				}
 			}
 
-			if (!$found && isset($haystack[$position])) {
+			if ( ! $found && isset($haystack[$position])) {
 				$parts[] = $haystack[$position];
 				unset($haystack[$position]);
 			}
 			$position++;
 		}
 
-		if ($found && $part && !empty($parts)) {
+		if ($found && $part && ! empty($parts)) {
 			return Multibyte::ascii($parts);
-		} elseif ($found && !empty($haystack)) {
+		} elseif ($found && ! empty($haystack)) {
 			return Multibyte::ascii($haystack);
 		}
 		return false;
@@ -351,16 +351,16 @@ 
 				}
 			}
 
-			if (!$found && isset($haystack[$position])) {
+			if ( ! $found && isset($haystack[$position])) {
 				$parts[] = $haystack[$position];
 				unset($haystack[$position]);
 			}
 			$position++;
 		}
 
-		if ($found && $part && !empty($parts)) {
+		if ($found && $part && ! empty($parts)) {
 			return Multibyte::ascii($parts);
-		} elseif ($found && !empty($haystack)) {
+		} elseif ($found && ! empty($haystack)) {
 			return Multibyte::ascii($haystack);
 		}
 		return false;
@@ -402,7 +402,7 @@ 
 						}
 					}
 
-					if (!$offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
+					if ( ! $offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
 						$matches[$needle[0]] = $matches[$needle[0]] - 1;
 					} elseif ($i === $needleCount) {
 						$found = true;
@@ -452,7 +452,7 @@ 
 						}
 					}
 
-					if (!$offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
+					if ( ! $offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
 						$matches[$needle[0]] = $matches[$needle[0]] - 1;
 					} elseif ($i === $needleCount) {
 						$found = true;
@@ -504,22 +504,22 @@ 
 						$found = true;
 					}
 				}
-				if (!$found) {
+				if ( ! $found) {
 					$parts[] = $haystack[$position];
 					unset($haystack[$position]);
 				}
 				$position++;
 			}
 
-			if ($found && $part && !empty($parts)) {
+			if ($found && $part && ! empty($parts)) {
 				return Multibyte::ascii($parts);
-			} elseif ($found && !empty($haystack)) {
+			} elseif ($found && ! empty($haystack)) {
 				return Multibyte::ascii($haystack);
 			}
 			return false;
 		}
 
-		if (!$php) {
+		if ( ! $php) {
 			return strstr($haystack, $needle, $part);
 		}
 		return strstr($haystack, $needle);
@@ -552,7 +552,7 @@ 
 				$matched = false;
 				$keys = self::_find($char, 'upper');
 
-				if (!empty($keys)) {
+				if ( ! empty($keys)) {
 					foreach ($keys as $key => $value) {
 						if ($keys[$key]['upper'] == $char && count($keys[$key]['lower'][0]) === 1) {
 							$lowerCase[] = $keys[$key]['lower'][0];
@@ -599,7 +599,7 @@ 
 				$keys = self::_find($char);
 				$keyCount = count($keys);
 
-				if (!empty($keys)) {
+				if ( ! empty($keys)) {
 					foreach ($keys as $key => $value) {
 						$matched = false;
 						$replace = 0;
@@ -650,7 +650,7 @@ 
 					}
 				}
 			}
-			if ($matched === false && !in_array($char, $replaced, true)) {
+			if ($matched === false && ! in_array($char, $replaced, true)) {
 				$upperCase[] = $char;
 			}
 		}
@@ -732,7 +732,7 @@ 
  * @return string
  */
 	public static function mimeEncode($string, $charset = null, $newline = "\r\n") {
-		if (!Multibyte::checkMultibyte($string) && strlen($string) < 75) {
+		if ( ! Multibyte::checkMultibyte($string) && strlen($string) < 75) {
 			return $string;
 		}
 
@@ -741,9 +741,9 @@ 
 		}
 		$charset = strtoupper($charset);
 
-		$start = '=?' . $charset . '?B?';
+		$start = '=?'.$charset.'?B?';
 		$end = '?=';
-		$spacer = $end . $newline . ' ' . $start;
+		$spacer = $end.$newline.' '.$start;
 
 		$length = 75 - strlen($start) - strlen($end);
 		$length = $length - ($length % 4);
@@ -752,7 +752,7 @@ 
 			$maxchars = floor(($length * 3) / 4);
 			$stringLength = strlen($string);
 			while ($stringLength > $maxchars) {
-				$i = (int)$maxchars;
+				$i = (int) $maxchars;
 				$test = ord($string[$i]);
 				while ($test >= 128 && $test <= 191) {
 					$i--;
@@ -766,9 +766,9 @@ 
 			$string = implode($spacer, $parts);
 		} else {
 			$string = chunk_split(base64_encode($string), $length, $spacer);
-			$string = preg_replace('/' . preg_quote($spacer) . '$/', '', $string);
+			$string = preg_replace('/'.preg_quote($spacer).'$/', '', $string);
 		}
-		return $start . $string . $end;
+		return $start.$string.$end;
 	}
 
 /**
@@ -828,21 +828,21 @@ 
  */
 	protected static function _find($char, $type = 'lower') {
 		$found = array();
-		if (!isset(self::$_codeRange[$char])) {
+		if ( ! isset(self::$_codeRange[$char])) {
 			$range = self::_codepoint($char);
 			if ($range === false) {
 				return null;
 			}
-			if (!Configure::configured('_cake_core_')) {
+			if ( ! Configure::configured('_cake_core_')) {
 				App::uses('PhpReader', 'Configure');
-				Configure::config('_cake_core_', new PhpReader(CAKE . 'Config' . DS));
+				Configure::config('_cake_core_', new PhpReader(CAKE.'Config'.DS));
 			}
-			Configure::load('unicode' . DS . 'casefolding' . DS . $range, '_cake_core_');
+			Configure::load('unicode'.DS.'casefolding'.DS.$range, '_cake_core_');
 			self::$_caseFold[$range] = Configure::read($range);
 			Configure::delete($range);
 		}
 
-		if (!self::$_codeRange[$char]) {
+		if ( ! self::$_codeRange[$char]) {
 			return null;
 		}
 		self::$_table = self::$_codeRange[$char];

lib/Cake/Log/CakeLog.php

Doc Comments +3 added lines, -3 removed lines

@@ -500,7 +500,7 @@ 
  * Convenience method to log error messages
  *
  * @param string $message log message
- * @param string|array $scope The scope(s) a log message is being created in.
+ * @param string $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
  * @return boolean Success
  */
@@ -512,7 +512,7 @@ 
  * Convenience method to log warning messages
  *
  * @param string $message log message
- * @param string|array $scope The scope(s) a log message is being created in.
+ * @param string $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
  * @return boolean Success
  */
@@ -548,7 +548,7 @@ 
  * Convenience method to log info messages
  *
  * @param string $message log message
- * @param string|array $scope The scope(s) a log message is being created in.
+ * @param string $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
  * @return boolean Success
  */

Spacing +8 added lines, -8 removed lines

@@ -186,7 +186,7 @@ 
  * @throws CakeLogException
  */
 	public static function config($key, $config) {
-		if (!preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $key)) {
+		if ( ! preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/', $key)) {
 			throw new CakeLogException(__d('cake_dev', 'Invalid key name'));
 		}
 		if (empty($config['engine'])) {
@@ -310,7 +310,7 @@ 
 		if (empty(self::$_Collection)) {
 			self::_init();
 		}
-		if (!isset(self::$_Collection->{$streamName})) {
+		if ( ! isset(self::$_Collection->{$streamName})) {
 			throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
 		}
 		return self::$_Collection->enabled($streamName);
@@ -328,7 +328,7 @@ 
 		if (empty(self::$_Collection)) {
 			self::_init();
 		}
-		if (!isset(self::$_Collection->{$streamName})) {
+		if ( ! isset(self::$_Collection->{$streamName})) {
 			throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
 		}
 		self::$_Collection->enable($streamName);
@@ -347,7 +347,7 @@ 
 		if (empty(self::$_Collection)) {
 			self::_init();
 		}
-		if (!isset(self::$_Collection->{$streamName})) {
+		if ( ! isset(self::$_Collection->{$streamName})) {
 			throw new CakeLogException(__d('cake_dev', 'Stream %s not found', $streamName));
 		}
 		self::$_Collection->disable($streamName);
@@ -364,7 +364,7 @@ 
 		if (empty(self::$_Collection)) {
 			self::_init();
 		}
-		if (!empty(self::$_Collection->{$streamName})) {
+		if ( ! empty(self::$_Collection->{$streamName})) {
 			return self::$_Collection->{$streamName};
 		}
 		return false;
@@ -420,7 +420,7 @@ 
 		if (is_int($type) && isset(self::$_levels[$type])) {
 			$type = self::$_levels[$type];
 		}
-		if (is_string($type) && empty($scope) && !in_array($type, self::$_levels)) {
+		if (is_string($type) && empty($scope) && ! in_array($type, self::$_levels)) {
 			$scope = $type;
 		}
 		$logged = false;
@@ -436,7 +436,7 @@ 
 			if (isset($config['scopes'])) {
 				$scopes = $config['scopes'];
 			}
-			$inScope = (count(array_intersect((array)$scope, $scopes)) > 0);
+			$inScope = (count(array_intersect((array) $scope, $scopes)) > 0);
 			$correctLevel = in_array($type, $types);
 
 			if (
@@ -453,7 +453,7 @@ 
 				$logged = true;
 			}
 		}
-		if (!$logged) {
+		if ( ! $logged) {
 			self::_autoConfig();
 			self::stream('default')->write($type, $message);
 		}

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'
 				)
 			),