reginaldojunior / winners

lib/Cake/Utility/Folder.php

Doc Comments +2 added lines, -2 removed lines

@@ -369,7 +369,7 @@ 
  * @param string $path The path to chmod
  * @param integer $mode octal value 0755
  * @param boolean $recursive chmod recursively, set to false to only change the current directory.
- * @param array $exceptions array of files, directories to skip
+ * @param string[] $exceptions array of files, directories to skip
  * @return boolean Returns TRUE on success, FALSE on failure
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::chmod
  */
@@ -565,7 +565,7 @@ 
  * Recursively Remove directories if the system allows.
  *
  * @param string $path Path of directory to delete
- * @return boolean Success
+ * @return null|boolean Success
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::delete
  */
 	public function delete($path = null) {

Spacing +38 added lines, -38 removed lines

@@ -115,13 +115,13 @@ 
 			$this->mode = $mode;
 		}
 
-		if (!file_exists($path) && $create === true) {
+		if ( ! file_exists($path) && $create === true) {
 			$this->create($path, $this->mode);
 		}
-		if (!Folder::isAbsolute($path)) {
+		if ( ! Folder::isAbsolute($path)) {
 			$path = realpath($path);
 		}
-		if (!empty($path)) {
+		if ( ! empty($path)) {
 			$this->cd($path);
 		}
 	}
@@ -165,7 +165,7 @@ 
 	public function read($sort = true, $exceptions = false, $fullPath = false) {
 		$dirs = $files = array();
 
-		if (!$this->pwd()) {
+		if ( ! $this->pwd()) {
 			return array($dirs, $files);
 		}
 		if (is_array($exceptions)) {
@@ -213,7 +213,7 @@ 
  */
 	public function find($regexpPattern = '.*', $sort = false) {
 		list(, $files) = $this->read($sort);
-		return array_values(preg_grep('/^' . $regexpPattern . '$/i', $files));
+		return array_values(preg_grep('/^'.$regexpPattern.'$/i', $files));
 	}
 
 /**
@@ -225,7 +225,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::findRecursive
  */
 	public function findRecursive($pattern = '.*', $sort = false) {
-		if (!$this->pwd()) {
+		if ( ! $this->pwd()) {
 			return array();
 		}
 		$startsOn = $this->path;
@@ -246,7 +246,7 @@ 
 		$found = array();
 
 		foreach ($files as $file) {
-			if (preg_match('/^' . $pattern . '$/i', $file)) {
+			if (preg_match('/^'.$pattern.'$/i', $file)) {
 				$found[] = Folder::addPathElement($this->path, $file);
 			}
 		}
@@ -278,7 +278,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::isAbsolute
  */
 	public static function isAbsolute($path) {
-		return !empty($path) && ($path[0] === '/' || preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) === '\\\\');
+		return ! empty($path) && ($path[0] === '/' || preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) === '\\\\');
 	}
 
 /**
@@ -314,7 +314,7 @@ 
 		if (Folder::isSlashTerm($path)) {
 			return $path;
 		}
-		return $path . Folder::correctSlashFor($path);
+		return $path.Folder::correctSlashFor($path);
 	}
 
 /**
@@ -326,7 +326,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::addPathElement
  */
 	public static function addPathElement($path, $element) {
-		return rtrim($path, DS) . DS . $element;
+		return rtrim($path, DS).DS.$element;
 	}
 
 /**
@@ -338,7 +338,7 @@ 
  */
 	public function inCakePath($path = '') {
 		$dir = substr(Folder::slashTerm(ROOT), 0, -1);
-		$newdir = $dir . $path;
+		$newdir = $dir.$path;
 
 		return $this->inPath($newdir);
 	}
@@ -355,12 +355,12 @@ 
 		$dir = Folder::slashTerm($path);
 		$current = Folder::slashTerm($this->pwd());
 
-		if (!$reverse) {
-			$return = preg_match('/^(.*)' . preg_quote($dir, '/') . '(.*)/', $current);
+		if ( ! $reverse) {
+			$return = preg_match('/^(.*)'.preg_quote($dir, '/').'(.*)/', $current);
 		} else {
-			$return = preg_match('/^(.*)' . preg_quote($current, '/') . '(.*)/', $dir);
+			$return = preg_match('/^(.*)'.preg_quote($current, '/').'(.*)/', $dir);
 		}
-		return (bool)$return;
+		return (bool) $return;
 	}
 
 /**
@@ -374,7 +374,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::chmod
  */
 	public function chmod($path, $mode = false, $recursive = true, $exceptions = array()) {
-		if (!$mode) {
+		if ( ! $mode) {
 			$mode = $this->mode;
 		}
 
@@ -430,7 +430,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::tree
  */
 	public function tree($path = null, $exceptions = false, $type = null) {
-		if (!$path) {
+		if ( ! $path) {
 			$path = $this->path;
 		}
 		$files = array();
@@ -460,18 +460,18 @@ 
 		foreach ($iterator as $itemPath => $fsIterator) {
 			if ($skipHidden) {
 				$subPathName = $fsIterator->getSubPathname();
-				if ($subPathName{0} === '.' || strpos($subPathName, DS . '.') !== false) {
+				if ($subPathName{0} === '.' || strpos($subPathName, DS.'.') !== false) {
 					continue;
 				}
 			}
 			$item = $fsIterator->current();
-			if (!empty($exceptions) && isset($exceptions[$item->getFilename()])) {
+			if ( ! empty($exceptions) && isset($exceptions[$item->getFilename()])) {
 				continue;
 			}
 
 			if ($item->isFile()) {
 				$files[] = $itemPath;
-			} elseif ($item->isDir() && !$item->isDot()) {
+			} elseif ($item->isDir() && ! $item->isDot()) {
 				$directories[] = $itemPath;
 			}
 		}
@@ -498,7 +498,7 @@ 
 			return true;
 		}
 
-		if (!$mode) {
+		if ( ! $mode) {
 			$mode = $this->mode;
 		}
 
@@ -510,7 +510,7 @@ 
 		$nextPathname = substr($pathname, 0, strrpos($pathname, DS));
 
 		if ($this->create($nextPathname, $mode)) {
-			if (!file_exists($pathname)) {
+			if ( ! file_exists($pathname)) {
 				$old = umask(0);
 				if (mkdir($pathname, $mode)) {
 					umask($old);
@@ -546,9 +546,9 @@ 
 						if ($entry === '.' || $entry === '..') {
 							continue;
 						}
-						$add = $stack[$i] . $entry;
+						$add = $stack[$i].$entry;
 
-						if (is_dir($stack[$i] . $entry)) {
+						if (is_dir($stack[$i].$entry)) {
 							$add = Folder::slashTerm($add);
 						}
 						$stack[] = $add;
@@ -569,10 +569,10 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::delete
  */
 	public function delete($path = null) {
-		if (!$path) {
+		if ( ! $path) {
 			$path = $this->pwd();
 		}
-		if (!$path) {
+		if ( ! $path) {
 			return null;
 		}
 		$path = Folder::slashTerm($path);
@@ -594,7 +594,7 @@ 
 					} else {
 						$this->_errors[] = __d('cake_dev', '%s NOT removed', $filePath);
 					}
-				} elseif ($item->isDir() && !$item->isDot()) {
+				} elseif ($item->isDir() && ! $item->isDot()) {
 					//@codingStandardsIgnoreStart
 					if (@rmdir($filePath)) {
 						//@codingStandardsIgnoreEnd
@@ -635,7 +635,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder::copy
  */
 	public function copy($options) {
-		if (!$this->pwd()) {
+		if ( ! $this->pwd()) {
 			return false;
 		}
 		$to = null;
@@ -649,16 +649,16 @@ 
 		$toDir = $options['to'];
 		$mode = $options['mode'];
 
-		if (!$this->cd($fromDir)) {
+		if ( ! $this->cd($fromDir)) {
 			$this->_errors[] = __d('cake_dev', '%s not found', $fromDir);
 			return false;
 		}
 
-		if (!is_dir($toDir)) {
+		if ( ! is_dir($toDir)) {
 			$this->create($toDir, $mode);
 		}
 
-		if (!is_writable($toDir)) {
+		if ( ! is_writable($toDir)) {
 			$this->_errors[] = __d('cake_dev', '%s not writable', $toDir);
 			return false;
 		}
@@ -669,7 +669,7 @@ 
 			//@codingStandardsIgnoreEnd
 			while (($item = readdir($handle)) !== false) {
 				$to = Folder::addPathElement($toDir, $item);
-				if (($options['scheme'] != Folder::SKIP || !is_dir($to)) && !in_array($item, $exceptions)) {
+				if (($options['scheme'] != Folder::SKIP || ! is_dir($to)) && ! in_array($item, $exceptions)) {
 					$from = Folder::addPathElement($fromDir, $item);
 					if (is_file($from)) {
 						if (copy($from, $to)) {
@@ -685,7 +685,7 @@ 
 						$this->delete($to);
 					}
 
-					if (is_dir($from) && !file_exists($to)) {
+					if (is_dir($from) && ! file_exists($to)) {
 						$old = umask(0);
 						if (mkdir($to, $mode)) {
 							umask($old);
@@ -709,7 +709,7 @@ 
 			return false;
 		}
 
-		if (!empty($this->_errors)) {
+		if ( ! empty($this->_errors)) {
 			return false;
 		}
 		return true;
@@ -734,7 +734,7 @@ 
 		$to = null;
 		if (is_string($options)) {
 			$to = $options;
-			$options = (array)$options;
+			$options = (array) $options;
 		}
 		$options = array_merge(
 			array('to' => $to, 'from' => $this->path, 'mode' => $this->mode, 'skip' => array()),
@@ -743,7 +743,7 @@ 
 
 		if ($this->copy($options)) {
 			if ($this->delete($options['from'])) {
-				return (bool)$this->cd($options['to']);
+				return (bool) $this->cd($options['to']);
 			}
 		}
 		return false;
@@ -789,7 +789,7 @@ 
 	public function realpath($path) {
 		$path = str_replace('/', DS, trim($path));
 		if (strpos($path, '..') === false) {
-			if (!Folder::isAbsolute($path)) {
+			if ( ! Folder::isAbsolute($path)) {
 				$path = Folder::addPathElement($this->path, $path);
 			}
 			return $path;
@@ -806,7 +806,7 @@ 
 				continue;
 			}
 			if ($part === '..') {
-				if (!empty($newparts)) {
+				if ( ! empty($newparts)) {
 					array_pop($newparts);
 					continue;
 				}

lib/Cake/Utility/Hash.php

Doc Comments -2 removed lines

@@ -630,7 +630,6 @@ 
 /**
  * Checks to see if all the values in the array are numeric
  *
- * @param array $array The array to check.
  * @return boolean true if values are numeric, false otherwise
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::numeric
  */
@@ -648,7 +647,6 @@ 
  * If you have an un-even or heterogenous array, consider using Hash::maxDimensions()
  * to get the dimensions of the array.
  *
- * @param array $array Array to count dimensions on
  * @return integer The number of dimensions in $data
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::dimensions
  */

Spacing +51 added lines, -51 removed lines

@@ -51,7 +51,7 @@ 
 		}
 		foreach ($parts as $key) {
 			if (is_array($data) && isset($data[$key])) {
-				$data =& $data[$key];
+				$data = & $data[$key];
 			} else {
 				return null;
 			}
@@ -94,8 +94,8 @@ 
 		}
 
 		// Simple paths.
-		if (!preg_match('/[{\[]/', $path)) {
-			return (array)self::get($data, $path);
+		if ( ! preg_match('/[{\[]/', $path)) {
+			return (array) self::get($data, $path);
 		}
 
 		if (strpos($path, '[') === false) {
@@ -119,7 +119,7 @@ 
 			}
 
 			foreach ($context[$_key] as $item) {
-				foreach ((array)$item as $k => $v) {
+				foreach ((array) $item as $k => $v) {
 					if (self::_matchToken($k, $token)) {
 						$next[] = $v;
 					}
@@ -183,12 +183,12 @@ 
 			$val = isset($cond['val']) ? $cond['val'] : null;
 
 			// Presence test.
-			if (empty($op) && empty($val) && !isset($data[$attr])) {
+			if (empty($op) && empty($val) && ! isset($data[$attr])) {
 				return false;
 			}
 
 			// Empty attribute = fail.
-			if (!(isset($data[$attr]) || array_key_exists($attr, $data))) {
+			if ( ! (isset($data[$attr]) || array_key_exists($attr, $data))) {
 				return false;
 			}
 
@@ -202,7 +202,7 @@ 
 
 			// Pattern matches and other operators.
 			if ($op === '=' && $val && $val[0] === '/') {
-				if (!preg_match($val, $prop)) {
+				if ( ! preg_match($val, $prop)) {
 					return false;
 				}
 			} elseif (
@@ -256,7 +256,7 @@ 
  * @return array $data.
  */
 	protected static function _simpleOp($op, $data, $path, $values = null) {
-		$_list =& $data;
+		$_list = & $data;
 
 		$count = count($path);
 		$last = $count - 1;
@@ -269,11 +269,11 @@ 
 					$_list[$key] = $values;
 					return $data;
 				}
-				if (!isset($_list[$key])) {
+				if ( ! isset($_list[$key])) {
 					$_list[$key] = array();
 				}
-				$_list =& $_list[$key];
-				if (!is_array($_list)) {
+				$_list = & $_list[$key];
+				if ( ! is_array($_list)) {
 					$_list = array();
 				}
 			} elseif ($op === 'remove') {
@@ -281,10 +281,10 @@ 
 					unset($_list[$key]);
 					return $data;
 				}
-				if (!isset($_list[$key])) {
+				if ( ! isset($_list[$key])) {
 					return $data;
 				}
-				$_list =& $_list[$key];
+				$_list = & $_list[$key];
 			}
 		}
 	}
@@ -347,10 +347,10 @@ 
 			return array();
 		}
 
-		if (!empty($valuePath) && is_array($valuePath)) {
+		if ( ! empty($valuePath) && is_array($valuePath)) {
 			$format = array_shift($valuePath);
 			$vals = self::format($data, $valuePath, $format);
-		} elseif (!empty($valuePath)) {
+		} elseif ( ! empty($valuePath)) {
 			$vals = self::extract($data, $valuePath);
 		}
 		if (empty($vals)) {
@@ -366,13 +366,13 @@ 
 
 		if ($groupPath !== null) {
 			$group = self::extract($data, $groupPath);
-			if (!empty($group)) {
+			if ( ! empty($group)) {
 				$c = count($keys);
 				for ($i = 0; $i < $c; $i++) {
-					if (!isset($group[$i])) {
+					if ( ! isset($group[$i])) {
 						$group[$i] = 0;
 					}
-					if (!isset($out[$group[$i]])) {
+					if ( ! isset($out[$group[$i]])) {
 						$out[$group[$i]] = array();
 					}
 					$out[$group[$i]][$keys[$i]] = $vals[$i];
@@ -411,7 +411,7 @@ 
 		$extracted = array();
 		$count = count($paths);
 
-		if (!$count) {
+		if ( ! $count) {
 			return;
 		}
 
@@ -449,7 +449,7 @@ 
 		}
 		$stack = array();
 
-		while (!empty($needle)) {
+		while ( ! empty($needle)) {
 			$key = key($needle);
 			$val = $needle[$key];
 			unset($needle[$key]);
@@ -458,14 +458,14 @@ 
 				$next = $data[$key];
 				unset($data[$key]);
 
-				if (!empty($val)) {
+				if ( ! empty($val)) {
 					$stack[] = array($val, $next);
 				}
-			} elseif (!array_key_exists($key, $data) || $data[$key] != $val) {
+			} elseif ( ! array_key_exists($key, $data) || $data[$key] != $val) {
 				return false;
 			}
 
-			if (empty($needle) && !empty($stack)) {
+			if (empty($needle) && ! empty($stack)) {
 				list($needle, $data) = array_pop($stack);
 			}
 		}
@@ -487,7 +487,7 @@ 
  */
 	public static function check(array $data, $path) {
 		$results = self::extract($data, $path);
-		if (!is_array($results)) {
+		if ( ! is_array($results)) {
 			return false;
 		}
 		return count($results) > 0;
@@ -518,7 +518,7 @@ 
  * @return boolean
  */
 	protected static function _filter($var) {
-		if ($var === 0 || $var === '0' || !empty($var)) {
+		if ($var === 0 || $var === '0' || ! empty($var)) {
 			return true;
 		}
 		return false;
@@ -540,23 +540,23 @@ 
 		$path = null;
 
 		reset($data);
-		while (!empty($data)) {
+		while ( ! empty($data)) {
 			$key = key($data);
 			$element = $data[$key];
 			unset($data[$key]);
 
-			if (is_array($element) && !empty($element)) {
-				if (!empty($data)) {
+			if (is_array($element) && ! empty($element)) {
+				if ( ! empty($data)) {
 					$stack[] = array($data, $path);
 				}
 				$data = $element;
 				reset($data);
-				$path .= $key . $separator;
+				$path .= $key.$separator;
 			} else {
-				$result[$path . $key] = $element;
+				$result[$path.$key] = $element;
 			}
 
-			if (empty($data) && !empty($stack)) {
+			if (empty($data) && ! empty($stack)) {
 				list($data, $path) = array_pop($stack);
 				reset($data);
 			}
@@ -614,8 +614,8 @@ 
 		$return = current($args);
 
 		while (($arg = next($args)) !== false) {
-			foreach ((array)$arg as $key => $val) {
-				if (!empty($return[$key]) && is_array($return[$key]) && is_array($val)) {
+			foreach ((array) $arg as $key => $val) {
+				if ( ! empty($return[$key]) && is_array($return[$key]) && is_array($val)) {
 					$return[$key] = self::merge($return[$key], $val);
 				} elseif (is_int($key) && isset($return[$key])) {
 					$return[] = $val;
@@ -661,7 +661,7 @@ 
 		while ($elem = array_shift($data)) {
 			if (is_array($elem)) {
 				$depth += 1;
-				$data =& $elem;
+				$data = & $elem;
 			} else {
 				break;
 			}
@@ -681,7 +681,7 @@ 
 		$depth = array();
 		if (is_array($data) && reset($data) !== false) {
 			foreach ($data as $value) {
-				$depth[] = self::dimensions((array)$value) + 1;
+				$depth[] = self::dimensions((array) $value) + 1;
 			}
 		}
 		return max($depth);
@@ -698,7 +698,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::map
  */
 	public static function map(array $data, $path, $function) {
-		$values = (array)self::extract($data, $path);
+		$values = (array) self::extract($data, $path);
 		return array_map($function, $values);
 	}
 
@@ -712,7 +712,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::reduce
  */
 	public static function reduce(array $data, $path, $function) {
-		$values = (array)self::extract($data, $path);
+		$values = (array) self::extract($data, $path);
 		return array_reduce($values, $function);
 	}
 
@@ -737,7 +737,7 @@ 
  * @return mixed The results of the applied method.
  */
 	public static function apply(array $data, $path, $function) {
-		$values = (array)self::extract($data, $path);
+		$values = (array) self::extract($data, $path);
 		return call_user_func($function, $values);
 	}
 
@@ -838,7 +838,7 @@ 
 			if ($key !== null) {
 				$id = $key;
 			}
-			if (is_array($r) && !empty($r)) {
+			if (is_array($r) && ! empty($r)) {
 				$stack = array_merge($stack, self::_squash($r, $id));
 			} else {
 				$stack[] = array('id' => $id, 'value' => $r);
@@ -860,10 +860,10 @@ 
  */
 	public static function diff(array $data, $compare) {
 		if (empty($data)) {
-			return (array)$compare;
+			return (array) $compare;
 		}
 		if (empty($compare)) {
-			return (array)$data;
+			return (array) $data;
 		}
 		$intersection = array_intersect_key($data, $compare);
 		while (($key = key($intersection)) !== null) {
@@ -885,14 +885,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::mergeDiff
  */
 	public static function mergeDiff(array $data, $compare) {
-		if (empty($data) && !empty($compare)) {
+		if (empty($data) && ! empty($compare)) {
 			return $compare;
 		}
 		if (empty($compare)) {
 			return $data;
 		}
 		foreach ($compare as $key => $value) {
-			if (!array_key_exists($key, $data)) {
+			if ( ! array_key_exists($key, $data)) {
 				$data[$key] = $value;
 			} elseif (is_array($value)) {
 				$data[$key] = self::mergeDiff($data[$key], $compare[$key]);
@@ -914,15 +914,15 @@ 
 		$count = count($keys);
 		$numeric = true;
 
-		if (!$assoc) {
+		if ( ! $assoc) {
 			for ($i = 0; $i < $count; $i++) {
-				if (!is_int($keys[$i])) {
+				if ( ! is_int($keys[$i])) {
 					$numeric = false;
 					break;
 				}
 			}
 		}
-		if (!$numeric || $assoc) {
+		if ( ! $numeric || $assoc) {
 			$newList = array();
 			for ($i = 0; $i < $count; $i++) {
 				if (is_int($keys[$i])) {
@@ -955,7 +955,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::nest
  */
 	public static function nest(array $data, $options = array()) {
-		if (!$data) {
+		if ( ! $data) {
 			return $data;
 		}
 
@@ -983,14 +983,14 @@ 
 			$parentId = self::get($result, $parentKeys);
 
 			if (isset($idMap[$id][$options['children']])) {
-				$idMap[$id] = array_merge($result, (array)$idMap[$id]);
+				$idMap[$id] = array_merge($result, (array) $idMap[$id]);
 			} else {
 				$idMap[$id] = array_merge($result, array($options['children'] => array()));
 			}
-			if (!$parentId || !in_array($parentId, $ids)) {
-				$return[] =& $idMap[$id];
+			if ( ! $parentId || ! in_array($parentId, $ids)) {
+				$return[] = & $idMap[$id];
 			} else {
-				$idMap[$parentId][$options['children']][] =& $idMap[$id];
+				$idMap[$parentId][$options['children']][] = & $idMap[$id];
 			}
 		}
 

lib/Cake/Utility/ObjectCollection.php

Doc Comments -4 removed lines

@@ -83,10 +83,6 @@
  *    Defaults to false.
  *
  *
- * @param string $callback|CakeEvent Method to fire on all the objects. Its assumed all the objects implement
- *   the method you are calling. If an instance of CakeEvent is provided, then then Event name will parsed to
- *   get the callback name. This is done by getting the last word after any dot in the event name
- *   (eg. `Model.afterSave` event will trigger the `afterSave` callback)
  * @param array $params Array of parameters for the triggered callback.
  * @param array $options Array of options.
  * @return mixed Either the last result or all results if collectReturn is on.

Spacing +11 added lines, -11 removed lines

@@ -99,7 +99,7 @@ 
 		if ($callback instanceof CakeEvent) {
 			$event = $callback;
 			if (is_array($event->data)) {
-				$params =& $event->data;
+				$params = & $event->data;
 			}
 			if (empty($event->omitSubject)) {
 				$subject = $event->subject();
@@ -124,7 +124,7 @@ 
 		);
 		$collected = array();
 		$list = array_keys($this->_enabled);
-		if ($options['modParams'] !== false && !isset($params[$options['modParams']])) {
+		if ($options['modParams'] !== false && ! isset($params[$options['modParams']])) {
 			throw new CakeException(__d('cake_dev', 'Cannot use modParams with indexes that do not exist.'));
 		}
 		$result = null;
@@ -138,7 +138,7 @@ 
 				(is_array($options['breakOn']) && in_array($result, $options['breakOn'], true)))
 			) {
 				return $result;
-			} elseif ($options['modParams'] !== false && !in_array($result, array(true, false, null), true)) {
+			} elseif ($options['modParams'] !== false && ! in_array($result, array(true, false, null), true)) {
 				$params[$options['modParams']] = $result;
 			}
 		}
@@ -180,8 +180,8 @@ 
  */
 	public function enable($name, $prioritize = true) {
 		$enabled = false;
-		foreach ((array)$name as $object) {
-			if (isset($this->_loaded[$object]) && !isset($this->_enabled[$object])) {
+		foreach ((array) $name as $object) {
+			if (isset($this->_loaded[$object]) && ! isset($this->_enabled[$object])) {
 				$priority = $this->defaultPriority;
 				if (isset($this->_loaded[$object]->settings['priority'])) {
 					$priority = $this->_loaded[$object]->settings['priority'];
@@ -245,7 +245,7 @@ 
  * @return void
  */
 	public function disable($name) {
-		foreach ((array)$name as $object) {
+		foreach ((array) $name as $object) {
 			unset($this->_enabled[$object]);
 		}
 	}
@@ -259,7 +259,7 @@ 
  *   Otherwise, returns an array of all enabled objects.
  */
 	public function enabled($name = null) {
-		if (!empty($name)) {
+		if ( ! empty($name)) {
 			return isset($this->_enabled[$name]);
 		}
 		return array_keys($this->_enabled);
@@ -287,7 +287,7 @@ 
  *    Otherwise, returns an array of all loaded objects.
  */
 	public function loaded($name = null) {
-		if (!empty($name)) {
+		if ( ! empty($name)) {
 			return isset($this->_loaded[$name]);
 		}
 		return array_keys($this->_loaded);
@@ -312,7 +312,7 @@ 
  * @return array Loaded objects
  */
 	public function set($name = null, $object = null) {
-		if (!empty($name) && !empty($object)) {
+		if ( ! empty($name) && ! empty($object)) {
 			list(, $name) = pluginSplit($name);
 			$this->_loaded[$name] = $object;
 		}
@@ -330,8 +330,8 @@ 
 		$normal = array();
 		foreach ($objects as $i => $objectName) {
 			$options = array();
-			if (!is_int($i)) {
-				$options = (array)$objectName;
+			if ( ! is_int($i)) {
+				$options = (array) $objectName;
 				$objectName = $i;
 			}
 			list(, $name) = pluginSplit($objectName);

lib/Cake/Utility/Sanitize.php

Doc Comments +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
  * Removes any non-alphanumeric characters.
  *
  * @param string $string String to sanitize
- * @param array $allowed An array of additional characters that are not to be removed.
+ * @param string[] $allowed An array of additional characters that are not to be removed.
  * @return string Sanitized string
  */
 	public static function paranoid($string, $allowed = array()) {
@@ -184,7 +184,7 @@ 
  *
  * Will remove all `<b>`, `<p>`, and `<div>` tags from the $dirty string.
  *
- * @param string $str,... String to sanitize
+ * @param string $str
  * @return string sanitized String
  */
 	public static function stripTags($str) {

Spacing +9 added lines, -9 removed lines

@@ -40,13 +40,13 @@ 
  */
 	public static function paranoid($string, $allowed = array()) {
 		$allow = null;
-		if (!empty($allowed)) {
+		if ( ! empty($allowed)) {
 			foreach ($allowed as $value) {
 				$allow .= "\\$value";
 			}
 		}
 
-		if (!is_array($string)) {
+		if ( ! is_array($string)) {
 			return preg_replace("/[^{$allow}a-zA-Z0-9]/", '', $string);
 		}
 
@@ -154,10 +154,10 @@ 
  */
 	public static function stripScripts($str) {
 		$regex =
-			'/(<link[^>]+rel="[^"]*stylesheet"[^>]*>|' .
-			'<img[^>]*>|style="[^"]*")|' .
-			'<script[^>]*>.*?<\/script>|' .
-			'<style[^>]*>.*?<\/style>|' .
+			'/(<link[^>]+rel="[^"]*stylesheet"[^>]*>|'.
+			'<img[^>]*>|style="[^"]*")|'.
+			'<script[^>]*>.*?<\/script>|'.
+			'<style[^>]*>.*?<\/style>|'.
 			'<!--.*?-->/is';
 		return preg_replace($regex, '', $str);
 	}
@@ -191,8 +191,8 @@ 
 		$params = func_get_args();
 
 		for ($i = 1, $count = count($params); $i < $count; $i++) {
-			$str = preg_replace('/<' . $params[$i] . '\b[^>]*>/i', '', $str);
-			$str = preg_replace('/<\/' . $params[$i] . '[^>]*>/i', '', $str);
+			$str = preg_replace('/<'.$params[$i].'\b[^>]*>/i', '', $str);
+			$str = preg_replace('/<\/'.$params[$i].'[^>]*>/i', '', $str);
 		}
 		return $str;
 	}
@@ -220,7 +220,7 @@ 
 			return $data;
 		}
 
-		if (!is_array($options)) {
+		if ( ! is_array($options)) {
 			$options = array('connection' => $options);
 		}
 

lib/Cake/Utility/Set.php

Doc Comments +2 added lines, -2 removed lines

@@ -928,7 +928,7 @@ 
  *
  * @param array $results
  * @param string $key
- * @return array
+ * @return string
  */
 	protected static function _flatten($results, $key = null) {
 		$stack = array();
@@ -996,7 +996,7 @@ 
  * Allows the application of a callback method to elements of an
  * array extracted by a Set::extract() compatible path.
  *
- * @param mixed $path Set-compatible path to the array value
+ * @param string $path Set-compatible path to the array value
  * @param array $data An array of data to extract from & then process with the $callback.
  * @param mixed $callback Callback method to be applied to extracted data.
  * See http://ca2.php.net/manual/en/language.pseudo-types.php#language.types.callback for examples

Spacing +49 added lines, -49 removed lines

@@ -46,10 +46,10 @@ 
 	public static function merge($data, $merge = null) {
 		$args = func_get_args();
 		if (empty($args[1]) && count($args) <= 2) {
-			return (array)$args[0];
+			return (array) $args[0];
 		}
-		if (!is_array($args[0])) {
-			$args[0] = (array)$args[0];
+		if ( ! is_array($args[0])) {
+			$args[0] = (array) $args[0];
 		}
 		return call_user_func_array('Hash::merge', $args);
 	}
@@ -74,12 +74,12 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/set.html#Set::pushDiff
  */
 	public static function pushDiff($array, $array2) {
-		if (empty($array) && !empty($array2)) {
+		if (empty($array) && ! empty($array2)) {
 			return $array2;
 		}
-		if (!empty($array) && !empty($array2)) {
+		if ( ! empty($array) && ! empty($array2)) {
 			foreach ($array2 as $key => $value) {
-				if (!array_key_exists($key, $array)) {
+				if ( ! array_key_exists($key, $array)) {
 					$array[$key] = $value;
 				} else {
 					if (is_array($value)) {
@@ -144,7 +144,7 @@ 
 					$out[$key] = Set::_map($value, $class);
 					if (is_object($out[$key])) {
 						if ($primary !== true && is_array($value) && Set::countDim($value, true) === 2) {
-							if (!isset($out[$key]->_name_)) {
+							if ( ! isset($out[$key]->_name_)) {
 								$out[$key]->_name_ = $primary;
 							}
 						}
@@ -152,7 +152,7 @@ 
 				} elseif (is_array($value)) {
 					if ($primary === true) {
 						// @codingStandardsIgnoreStart Legacy junk
-						if (!isset($out->_name_)) {
+						if ( ! isset($out->_name_)) {
 							$out->_name_ = $key;
 						}
 						// @codingStandardsIgnoreEnd
@@ -161,10 +161,10 @@ 
 							$out->{$key2} = Set::_map($value2, true);
 						}
 					} else {
-						if (!is_numeric($key)) {
+						if ( ! is_numeric($key)) {
 							$out->{$key} = Set::_map($value, true, $key);
-							if (is_object($out->{$key}) && !is_numeric($key)) {
-								if (!isset($out->{$key}->_name_)) {
+							if (is_object($out->{$key}) && ! is_numeric($key)) {
+								if ( ! isset($out->{$key}->_name_)) {
 									$out->{$key}->_name_ = $key;
 								}
 							}
@@ -235,7 +235,7 @@ 
 		$extracted = array();
 		$count = count($keys);
 
-		if (!$count) {
+		if ( ! $count) {
 			return;
 		}
 
@@ -328,9 +328,9 @@ 
 		}
 		$contexts = $data;
 		$options = array_merge(array('flatten' => true), $options);
-		if (!isset($contexts[0])) {
+		if ( ! isset($contexts[0])) {
 			$current = current($data);
-			if ((is_array($current) && count($data) < 1) || !is_array($current) || !Set::numeric(array_keys($data))) {
+			if ((is_array($current) && count($data) < 1) || ! is_array($current) || ! Set::numeric(array_keys($data))) {
 				$contexts = array($data);
 			}
 		}
@@ -345,19 +345,19 @@ 
 			}
 			$matches = array();
 			foreach ($contexts as $key => $context) {
-				if (!isset($context['trace'])) {
+				if ( ! isset($context['trace'])) {
 					$context = array('trace' => array(null), 'item' => $context, 'key' => $key);
 				}
 				if ($token === '..') {
 					if (count($context['trace']) === 1) {
 						$context['trace'][] = $context['key'];
 					}
-					$parent = implode('/', $context['trace']) . '/.';
+					$parent = implode('/', $context['trace']).'/.';
 					$context['item'] = Set::extract($parent, $data);
 					$context['key'] = array_pop($context['trace']);
 					if (isset($context['trace'][1]) && $context['trace'][1] > 0) {
 						$context['item'] = $context['item'][0];
-					} elseif (!empty($context['item'][$key])) {
+					} elseif ( ! empty($context['item'][$key])) {
 						$context['item'] = $context['item'][$key];
 					} else {
 						$context['item'] = array_shift($context['item']);
@@ -367,27 +367,27 @@ 
 				}
 				if ($token === '@*' && is_array($context['item'])) {
 					$matches[] = array(
-						'trace' => array_merge($context['trace'], (array)$key),
+						'trace' => array_merge($context['trace'], (array) $key),
 						'key' => $key,
 						'item' => array_keys($context['item']),
 					);
 				} elseif (is_array($context['item'])
 					&& array_key_exists($token, $context['item'])
-					&& !(strval($key) === strval($token) && count($tokens) === 1 && $tokens[0] === '.')) {
+					&& ! (strval($key) === strval($token) && count($tokens) === 1 && $tokens[0] === '.')) {
 					$items = $context['item'][$token];
-					if (!is_array($items)) {
+					if ( ! is_array($items)) {
 						$items = array($items);
-					} elseif (!isset($items[0])) {
+					} elseif ( ! isset($items[0])) {
 						$current = current($items);
 						$currentKey = key($items);
-						if (!is_array($current) || (is_array($current) && count($items) <= 1 && !is_numeric($currentKey))) {
+						if ( ! is_array($current) || (is_array($current) && count($items) <= 1 && ! is_numeric($currentKey))) {
 							$items = array($items);
 						}
 					}
 
 					foreach ($items as $key => $item) {
 						$ctext = array($context['key']);
-						if (!is_numeric($key)) {
+						if ( ! is_numeric($key)) {
 							$ctext[] = $token;
 							$tok = array_shift($tokens);
 							if (isset($items[$tok])) {
@@ -443,7 +443,7 @@ 
 		$r = array();
 
 		foreach ($matches as $match) {
-			if ((!$options['flatten'] || is_array($match['item'])) && !is_int($match['key'])) {
+			if (( ! $options['flatten'] || is_array($match['item'])) && ! is_int($match['key'])) {
 				$r[] = array($match['key'] => $match['item']);
 			} else {
 				$r[] = $match['item'];
@@ -467,7 +467,7 @@ 
 			return true;
 		}
 		if (is_string($conditions)) {
-			return (bool)Set::extract($conditions, $data);
+			return (bool) Set::extract($conditions, $data);
 		}
 		foreach ($conditions as $condition) {
 			if ($condition === ':last') {
@@ -481,20 +481,20 @@ 
 				}
 				continue;
 			}
-			if (!preg_match('/(.+?)([><!]?[=]|[><])(.*)/', $condition, $match)) {
+			if ( ! preg_match('/(.+?)([><!]?[=]|[><])(.*)/', $condition, $match)) {
 				if (ctype_digit($condition)) {
 					if ($i != $condition) {
 						return false;
 					}
 				} elseif (preg_match_all('/(?:^[0-9]+|(?<=,)[0-9]+)/', $condition, $matches)) {
 					return in_array($i, $matches[0]);
-				} elseif (!array_key_exists($condition, $data)) {
+				} elseif ( ! array_key_exists($condition, $data)) {
 					return false;
 				}
 				continue;
 			}
 			list(, $key, $op, $expected) = $match;
-			if (!(isset($data[$key]) || array_key_exists($key, $data))) {
+			if ( ! (isset($data[$key]) || array_key_exists($key, $data))) {
 				return false;
 			}
 
@@ -541,7 +541,7 @@ 
 			return $data;
 		}
 		if (is_object($data)) {
-			if (!($data instanceof ArrayAccess || $data instanceof Traversable)) {
+			if ( ! ($data instanceof ArrayAccess || $data instanceof Traversable)) {
 				$data = get_object_vars($data);
 			}
 		}
@@ -594,7 +594,7 @@ 
 				$pattern = substr($key, 1, -1);
 
 				foreach ($data as $j => $val) {
-					if (preg_match('/^' . $pattern . '/s', $j) !== 0) {
+					if (preg_match('/^'.$pattern.'/s', $j) !== 0) {
 						$tmpPath = array_slice($path, $i + 1);
 						if (empty($tmpPath)) {
 							$tmp[$j] = $val;
@@ -652,7 +652,7 @@ 
 		if (empty($path)) {
 			return $data;
 		}
-		if (!is_array($path)) {
+		if ( ! is_array($path)) {
 			$path = explode('.', $path);
 		}
 
@@ -664,10 +664,10 @@ 
 				return (is_array($data) && array_key_exists($key, $data));
 			}
 
-			if (!is_array($data) || !array_key_exists($key, $data)) {
+			if ( ! is_array($data) || ! array_key_exists($key, $data)) {
 				return false;
 			}
-			$data =& $data[$key];
+			$data = & $data[$key];
 		}
 		return true;
 	}
@@ -683,10 +683,10 @@ 
  */
 	public static function diff($val1, $val2 = null) {
 		if (empty($val1)) {
-			return (array)$val2;
+			return (array) $val2;
 		}
 		if (empty($val2)) {
-			return (array)$val1;
+			return (array) $val1;
 		}
 		$intersection = array_intersect_key($val1, $val2);
 		while (($key = key($intersection)) !== null) {
@@ -717,7 +717,7 @@ 
 			if (is_numeric($key)) {
 				Set::contains($val, $val1);
 			} else {
-				if (!isset($val1[$key]) || $val1[$key] != $val) {
+				if ( ! isset($val1[$key]) || $val1[$key] != $val) {
 					return false;
 				}
 			}
@@ -800,7 +800,7 @@ 
 		}
 
 		if (is_object($data)) {
-			if (!($data instanceof ArrayAccess || $data instanceof Traversable)) {
+			if ( ! ($data instanceof ArrayAccess || $data instanceof Traversable)) {
 				$data = get_object_vars($data);
 			}
 		}
@@ -815,10 +815,10 @@ 
 			return array();
 		}
 
-		if (!empty($path2) && is_array($path2)) {
+		if ( ! empty($path2) && is_array($path2)) {
 			$format = array_shift($path2);
 			$vals = Set::format($data, $format, $path2);
-		} elseif (!empty($path2)) {
+		} elseif ( ! empty($path2)) {
 			$vals = Set::extract($data, $path2);
 		} else {
 			$count = count($keys);
@@ -829,13 +829,13 @@ 
 
 		if ($groupPath) {
 			$group = Set::extract($data, $groupPath);
-			if (!empty($group)) {
+			if ( ! empty($group)) {
 				$c = count($keys);
 				for ($i = 0; $i < $c; $i++) {
-					if (!isset($group[$i])) {
+					if ( ! isset($group[$i])) {
 						$group[$i] = 0;
 					}
-					if (!isset($out[$group[$i]])) {
+					if ( ! isset($out[$group[$i]])) {
 						$out[$group[$i]] = array();
 					}
 					$out[$group[$i]][$keys[$i]] = $vals[$i];
@@ -868,7 +868,7 @@ 
 			$new = array();
 			foreach ($keys as $key => $value) {
 				if (is_array($value)) {
-					$new[$key] = (array)Set::reverse($value);
+					$new[$key] = (array) Set::reverse($value);
 				} else {
 					// @codingStandardsIgnoreStart Legacy junk
 					if (isset($value->_name_)) {
@@ -937,7 +937,7 @@ 
 			if ($key !== null) {
 				$id = $key;
 			}
-			if (is_array($r) && !empty($r)) {
+			if (is_array($r) && ! empty($r)) {
 				$stack = array_merge($stack, Set::_flatten($r, $id));
 			} else {
 				$stack[] = array('id' => $id, 'value' => $r);
@@ -1036,7 +1036,7 @@ 
  * @link
  */
 	public static function nest($data, $options = array()) {
-		if (!$data) {
+		if ( ! $data) {
 			return $data;
 		}
 
@@ -1060,14 +1060,14 @@ 
 			$parentId = Set::get($result, $parentKeys);
 
 			if (isset($idMap[$id][$options['children']])) {
-				$idMap[$id] = array_merge($result, (array)$idMap[$id]);
+				$idMap[$id] = array_merge($result, (array) $idMap[$id]);
 			} else {
 				$idMap[$id] = array_merge($result, array($options['children'] => array()));
 			}
-			if (!$parentId || !in_array($parentId, $ids)) {
-				$return[] =& $idMap[$id];
+			if ( ! $parentId || ! in_array($parentId, $ids)) {
+				$return[] = & $idMap[$id];
 			} else {
-				$idMap[$parentId][$options['children']][] =& $idMap[$id];
+				$idMap[$parentId][$options['children']][] = & $idMap[$id];
 			}
 		}
 

lib/Cake/Utility/String.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
  * Generate a random UUID
  *
  * @see http://www.ietf.org/rfc/rfc4122.txt
- * @return RFC 4122 UUID
+ * @return string 4122 UUID
  */
 	public static function uuid() {
 		$node = env('SERVER_ADDR');

Spacing +33 added lines, -33 removed lines

@@ -36,7 +36,7 @@ 
 		if (strpos($node, ':') !== false) {
 			if (substr_count($node, '::')) {
 				$node = str_replace(
-					'::', str_repeat(':0000', 8 - substr_count($node, ':')) . ':', $node
+					'::', str_repeat(':0000', 8 - substr_count($node, ':')).':', $node
 				);
 			}
 			$node = explode(':', $node);
@@ -59,7 +59,7 @@ 
 				$host = env('HOST');
 			}
 
-			if (!empty($host)) {
+			if ( ! empty($host)) {
 				$ip = gethostbyname($host);
 
 				if ($ip === $host) {
@@ -86,13 +86,13 @@ 
 			$pid = getmypid();
 		}
 
-		if (!$pid || $pid > 65535) {
+		if ( ! $pid || $pid > 65535) {
 			$pid = mt_rand(0, 0xfff) | 0x4000;
 		}
 
 		list($timeMid, $timeLow) = explode(' ', microtime());
 		return sprintf(
-			"%08x-%04x-%04x-%02x%02x-%04x%08x", (int)$timeLow, (int)substr($timeMid, 2) & 0xffff,
+			"%08x-%04x-%04x-%02x%02x-%04x%08x", (int) $timeLow, (int) substr($timeMid, 2) & 0xffff,
 			mt_rand(0, 0xfff) | 0x4000, mt_rand(0, 0x3f) | 0x80, mt_rand(0, 0xff), $pid, $node
 		);
 	}
@@ -133,7 +133,7 @@ 
 			}
 			if ($tmpOffset !== -1) {
 				$buffer .= substr($data, $offset, ($tmpOffset - $offset));
-				if (!$depth && $data{$tmpOffset} == $separator) {
+				if ( ! $depth && $data{$tmpOffset} == $separator) {
 					$results[] = $buffer;
 					$buffer = '';
 				} else {
@@ -148,7 +148,7 @@ 
 					}
 				} else {
 					if ($data{$tmpOffset} == $leftBound) {
-						if (!$open) {
+						if ( ! $open) {
 							$depth++;
 							$open = true;
 						} else {
@@ -158,15 +158,15 @@ 
 				}
 				$offset = ++$tmpOffset;
 			} else {
-				$results[] = $buffer . substr($data, $offset);
+				$results[] = $buffer.substr($data, $offset);
 				$offset = $length + 1;
 			}
 		}
-		if (empty($results) && !empty($buffer)) {
+		if (empty($results) && ! empty($buffer)) {
 			$results[] = $buffer;
 		}
 
-		if (!empty($results)) {
+		if ( ! empty($results)) {
 			return array_map('trim', $results);
 		}
 
@@ -200,12 +200,12 @@ 
 		);
 		$options += $defaults;
 		$format = $options['format'];
-		$data = (array)$data;
+		$data = (array) $data;
 		if (empty($data)) {
 			return ($options['clean']) ? String::cleanInsert($str, $options) : $str;
 		}
 
-		if (!isset($format)) {
+		if ( ! isset($format)) {
 			$format = sprintf(
 				'/(?<!%s)%s%%s%s/',
 				preg_quote($options['escape'], '/'),
@@ -241,8 +241,8 @@ 
 			$str = str_replace($tmpHash, $tmpValue, $str);
 		}
 
-		if (!isset($options['format']) && isset($options['before'])) {
-			$str = str_replace($options['escape'] . $options['before'], $options['before'], $str);
+		if ( ! isset($options['format']) && isset($options['before'])) {
+			$str = str_replace($options['escape'].$options['before'], $options['before'], $str);
 		}
 		return ($options['clean']) ? String::cleanInsert($str, $options) : $str;
 	}
@@ -260,13 +260,13 @@ 
  */
 	public static function cleanInsert($str, $options) {
 		$clean = $options['clean'];
-		if (!$clean) {
+		if ( ! $clean) {
 			return $str;
 		}
 		if ($clean === true) {
 			$clean = array('method' => 'text');
 		}
-		if (!is_array($clean)) {
+		if ( ! is_array($clean)) {
 			$clean = array('method' => $options['clean']);
 		}
 		switch ($clean['method']) {
@@ -336,10 +336,10 @@ 
 		} else {
 			$wrapped = trim(chunk_split($text, $options['width'] - 1, "\n"));
 		}
-		if (!empty($options['indent'])) {
+		if ( ! empty($options['indent'])) {
 			$chunks = explode("\n", $wrapped);
 			for ($i = $options['indentAt'], $len = count($chunks); $i < $len; $i++) {
-				$chunks[$i] = $options['indent'] . $chunks[$i];
+				$chunks[$i] = $options['indent'].$chunks[$i];
 			}
 			$wrapped = implode("\n", $chunks);
 		}
@@ -429,7 +429,7 @@ 
 			$with = array();
 
 			foreach ($phrase as $key => $segment) {
-				$segment = '(' . preg_quote($segment, '|') . ')';
+				$segment = '('.preg_quote($segment, '|').')';
 				if ($html) {
 					$segment = "(?![^<]+>)$segment(?![^<]+>)";
 				}
@@ -441,7 +441,7 @@ 
 			return preg_replace($replace, $with, $text);
 		}
 
-		$phrase = '(' . preg_quote($phrase, '|') . ')';
+		$phrase = '('.preg_quote($phrase, '|').')';
 		if ($html) {
 			$phrase = "(?![^<]+>)$phrase(?![^<]+>)";
 		}
@@ -483,7 +483,7 @@ 
 		$options = array_merge($default, $options);
 		extract($options);
 
-		if (!function_exists('mb_strlen')) {
+		if ( ! function_exists('mb_strlen')) {
 			class_exists('Multibyte');
 		}
 
@@ -492,12 +492,12 @@ 
 		}
 
 		$truncate = mb_substr($text, mb_strlen($text) - $length + mb_strlen($ellipsis));
-		if (!$exact) {
+		if ( ! $exact) {
 			$spacepos = mb_strpos($truncate, ' ');
 			$truncate = $spacepos === false ? '' : trim(mb_substr($truncate, $spacepos));
 		}
 
-		return $ellipsis . $truncate;
+		return $ellipsis.$truncate;
 	}
 
 /**
@@ -524,13 +524,13 @@ 
 		);
 		if (isset($options['ending'])) {
 			$default['ellipsis'] = $options['ending'];
-		} elseif (!empty($options['html']) && Configure::read('App.encoding') === 'UTF-8') {
+		} elseif ( ! empty($options['html']) && Configure::read('App.encoding') === 'UTF-8') {
 			$default['ellipsis'] = "\xe2\x80\xa6";
 		}
 		$options = array_merge($default, $options);
 		extract($options);
 
-		if (!function_exists('mb_strlen')) {
+		if ( ! function_exists('mb_strlen')) {
 			class_exists('Multibyte');
 		}
 
@@ -544,7 +544,7 @@ 
 
 			preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
 			foreach ($tags as $tag) {
-				if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) {
+				if ( ! preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) {
 					if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) {
 						array_unshift($openTags, $tag[2]);
 					} elseif (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) {
@@ -587,7 +587,7 @@ 
 			}
 			$truncate = mb_substr($text, 0, $length - mb_strlen($ellipsis));
 		}
-		if (!$exact) {
+		if ( ! $exact) {
 			$spacepos = mb_strrpos($truncate, ' ');
 			if ($html) {
 				$truncateCheck = mb_substr($truncate, 0, $spacepos);
@@ -600,10 +600,10 @@ 
 				}
 				$bits = mb_substr($truncate, $spacepos);
 				preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER);
-				if (!empty($droppedTags)) {
-					if (!empty($openTags)) {
+				if ( ! empty($droppedTags)) {
+					if ( ! empty($openTags)) {
 						foreach ($droppedTags as $closingTag) {
-							if (!in_array($closingTag[1], $openTags)) {
+							if ( ! in_array($closingTag[1], $openTags)) {
 								array_unshift($openTags, $closingTag[1]);
 							}
 						}
@@ -620,7 +620,7 @@ 
 
 		if ($html) {
 			foreach ($openTags as $tag) {
-				$truncate .= '</' . $tag . '>';
+				$truncate .= '</'.$tag.'>';
 			}
 		}
 
@@ -650,7 +650,7 @@ 
 
 		$pos = mb_strpos(mb_strtolower($text), mb_strtolower($phrase));
 		if ($pos === false) {
-			return mb_substr($text, 0, $radius) . $ellipsis;
+			return mb_substr($text, 0, $radius).$ellipsis;
 		}
 
 		$startPos = $pos - $radius;
@@ -666,7 +666,7 @@ 
 		}
 
 		$excerpt = mb_substr($text, $startPos, $endPos - $startPos);
-		$excerpt = $prepend . $excerpt . $append;
+		$excerpt = $prepend.$excerpt.$append;
 
 		return $excerpt;
 	}
@@ -682,7 +682,7 @@ 
  */
 	public static function toList($list, $and = 'and', $separator = ', ') {
 		if (count($list) > 1) {
-			return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop($list);
+			return implode($separator, array_slice($list, null, -1)).' '.$and.' '.array_pop($list);
 		}
 
 		return array_pop($list);

lib/Cake/Utility/Validation.php

Doc Comments +10 added lines, -10 removed lines

@@ -58,7 +58,7 @@ 
  * $check can be passed as an array:
  * array('check' => 'valueToCheck');
  *
- * @param string|array $check Value to check
+ * @param string $check Value to check
  * @return boolean Success
  */
 	public static function notEmpty($check) {
@@ -130,7 +130,7 @@ 
  * Validation of credit card numbers.
  * Returns true if $check is in the proper credit card format.
  *
- * @param string|array $check credit card number to validate
+ * @param string $check credit card number to validate
  * @param string|array $type 'all' may be passed as a sting, defaults to fast which checks format of most major credit cards
  *    if an array is used only the values of the array are checked.
  *    Example: array('amex', 'bankcard', 'maestro')
@@ -485,7 +485,7 @@ 
  * Check that value has a valid file extension.
  *
  * @param string|array $check Value to check
- * @param array $extensions file extensions to allow. By default extensions are 'gif', 'jpeg', 'png', 'jpg'
+ * @param string[] $extensions file extensions to allow. By default extensions are 'gif', 'jpeg', 'png', 'jpg'
  * @return boolean Success
  */
 	public static function extension($check, $extensions = array('gif', 'jpeg', 'png', 'jpg')) {
@@ -622,7 +622,7 @@ 
 /**
  * Check that a value is a valid phone number.
  *
- * @param string|array $check Value to check (string or array)
+ * @param string $check Value to check (string or array)
  * @param string $regex Regular expression to use
  * @param string $country Country code (defaults to 'all')
  * @return boolean Success
@@ -667,7 +667,7 @@ 
 /**
  * Checks that a given value is a valid postal code.
  *
- * @param string|array $check Value to check
+ * @param string $check Value to check
  * @param string $regex Regular expression to use
  * @param string $country Country to use for formatting
  * @return boolean Success
@@ -728,7 +728,7 @@ 
 /**
  * Checks that a value is a valid Social Security Number.
  *
- * @param string|array $check Value to check
+ * @param string $check Value to check
  * @param string $regex Regular expression to use
  * @param string $country Country
  * @return boolean Success
@@ -800,11 +800,11 @@ 
 /**
  * Runs an user-defined validation.
  *
- * @param string|array $check value that will be validated in user-defined methods.
- * @param object $object class that holds validation method
+ * @param string $check value that will be validated in user-defined methods.
+ * @param CustomValidator $object class that holds validation method
  * @param string $method class method name for validation to run
  * @param array $args arguments to send to method
- * @return mixed user-defined class class method returns
+ * @return boolean user-defined class class method returns
  */
 	public static function userDefined($check, $object, $method, $args = null) {
 		return call_user_func_array(array($object, $method), array($check, $args));
@@ -919,7 +919,7 @@ 
  * Checks the mime type of a file
  *
  * @param string|array $check
- * @param array $mimeTypes to check for
+ * @param string[] $mimeTypes to check for
  * @return boolean Success
  * @throws CakeException when mime type can not be determined.
  */

Indentation +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @since         CakePHP(tm) v 1.2.0.3830
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
+	 *
+	 *
+	 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+	 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 *
+	 * Licensed under The MIT License
+	 * For full copyright and license information, please see the LICENSE.txt
+	 * Redistributions of files must retain the above copyright notice.
+	 *
+	 * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 * @link          http://cakephp.org CakePHP(tm) Project
+	 * @since         CakePHP(tm) v 1.2.0.3830
+	 * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+	 */
 
 App::uses('Multibyte', 'I18n');
 App::uses('File', 'Utility');

Spacing +43 added lines, -43 removed lines

@@ -20,7 +20,7 @@ 
 App::uses('CakeNumber', 'Utility');
 
 // Load multibyte if the extension is missing.
-if (!function_exists('mb_strlen')) {
+if ( ! function_exists('mb_strlen')) {
 	class_exists('Multibyte');
 }
 
@@ -123,7 +123,7 @@ 
 		if (is_array($check)) {
 			extract(self::_defaults($check));
 		}
-		return !self::_check($check, '/[^\\s]/');
+		return ! self::_check($check, '/[^\\s]/');
 	}
 
 /**
@@ -308,31 +308,31 @@ 
 		$separator = '([- /.])';
 		$fourDigitYear = '(([1][9][0-9][0-9])|([2][0-9][0-9][0-9]))';
 		$twoDigitYear = '([0-9]{2})';
-		$year = '(?:' . $fourDigitYear . '|' . $twoDigitYear . ')';
+		$year = '(?:'.$fourDigitYear.'|'.$twoDigitYear.')';
 
-		$regex['dmy'] = '%^(?:(?:31(\\/|-|\\.|\\x20)(?:0?[13578]|1[02]))\\1|(?:(?:29|30)' .
-			$separator . '(?:0?[1,3-9]|1[0-2])\\2))(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$|^(?:29' .
-			$separator . '0?2\\3(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00))))$|^(?:0?[1-9]|1\\d|2[0-8])' .
-			$separator . '(?:(?:0?[1-9])|(?:1[0-2]))\\4(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$%';
+		$regex['dmy'] = '%^(?:(?:31(\\/|-|\\.|\\x20)(?:0?[13578]|1[02]))\\1|(?:(?:29|30)'.
+			$separator.'(?:0?[1,3-9]|1[0-2])\\2))(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$|^(?:29'.
+			$separator.'0?2\\3(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00))))$|^(?:0?[1-9]|1\\d|2[0-8])'.
+			$separator.'(?:(?:0?[1-9])|(?:1[0-2]))\\4(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$%';
 
-		$regex['mdy'] = '%^(?:(?:(?:0?[13578]|1[02])(\\/|-|\\.|\\x20)31)\\1|(?:(?:0?[13-9]|1[0-2])' .
-			$separator . '(?:29|30)\\2))(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$|^(?:0?2' . $separator . '29\\3(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00))))$|^(?:(?:0?[1-9])|(?:1[0-2]))' .
-			$separator . '(?:0?[1-9]|1\\d|2[0-8])\\4(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$%';
+		$regex['mdy'] = '%^(?:(?:(?:0?[13578]|1[02])(\\/|-|\\.|\\x20)31)\\1|(?:(?:0?[13-9]|1[0-2])'.
+			$separator.'(?:29|30)\\2))(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$|^(?:0?2'.$separator.'29\\3(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00))))$|^(?:(?:0?[1-9])|(?:1[0-2]))'.
+			$separator.'(?:0?[1-9]|1\\d|2[0-8])\\4(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$%';
 
-		$regex['ymd'] = '%^(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))' .
-			$separator . '(?:0?2\\1(?:29)))|(?:(?:(?:1[6-9]|[2-9]\\d)?\\d{2})' .
-			$separator . '(?:(?:(?:0?[13578]|1[02])\\2(?:31))|(?:(?:0?[1,3-9]|1[0-2])\\2(29|30))|(?:(?:0?[1-9])|(?:1[0-2]))\\2(?:0?[1-9]|1\\d|2[0-8]))))$%';
+		$regex['ymd'] = '%^(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))'.
+			$separator.'(?:0?2\\1(?:29)))|(?:(?:(?:1[6-9]|[2-9]\\d)?\\d{2})'.
+			$separator.'(?:(?:(?:0?[13578]|1[02])\\2(?:31))|(?:(?:0?[1,3-9]|1[0-2])\\2(29|30))|(?:(?:0?[1-9])|(?:1[0-2]))\\2(?:0?[1-9]|1\\d|2[0-8]))))$%';
 
 		$regex['dMy'] = '/^((31(?!\\ (Feb(ruary)?|Apr(il)?|June?|(Sep(?=\\b|t)t?|Nov)(ember)?)))|((30|29)(?!\\ Feb(ruary)?))|(29(?=\\ Feb(ruary)?\\ (((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))))|(0?[1-9])|1\\d|2[0-8])\\ (Jan(uary)?|Feb(ruary)?|Ma(r(ch)?|y)|Apr(il)?|Ju((ly?)|(ne?))|Aug(ust)?|Oct(ober)?|(Sep(?=\\b|t)t?|Nov|Dec)(ember)?)\\ ((1[6-9]|[2-9]\\d)\\d{2})$/';
 
 		$regex['Mdy'] = '/^(?:(((Jan(uary)?|Ma(r(ch)?|y)|Jul(y)?|Aug(ust)?|Oct(ober)?|Dec(ember)?)\\ 31)|((Jan(uary)?|Ma(r(ch)?|y)|Apr(il)?|Ju((ly?)|(ne?))|Aug(ust)?|Oct(ober)?|(Sep)(tember)?|(Nov|Dec)(ember)?)\\ (0?[1-9]|([12]\\d)|30))|(Feb(ruary)?\\ (0?[1-9]|1\\d|2[0-8]|(29(?=,?\\ ((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))))))\\,?\\ ((1[6-9]|[2-9]\\d)\\d{2}))$/';
 
-		$regex['My'] = '%^(Jan(uary)?|Feb(ruary)?|Ma(r(ch)?|y)|Apr(il)?|Ju((ly?)|(ne?))|Aug(ust)?|Oct(ober)?|(Sep(?=\\b|t)t?|Nov|Dec)(ember)?)' .
-			$separator . '((1[6-9]|[2-9]\\d)\\d{2})$%';
+		$regex['My'] = '%^(Jan(uary)?|Feb(ruary)?|Ma(r(ch)?|y)|Apr(il)?|Ju((ly?)|(ne?))|Aug(ust)?|Oct(ober)?|(Sep(?=\\b|t)t?|Nov|Dec)(ember)?)'.
+			$separator.'((1[6-9]|[2-9]\\d)\\d{2})$%';
 
-		$regex['my'] = '%^(' . $month . $separator . $year . ')$%';
-		$regex['ym'] = '%^(' . $year . $separator . $month . ')$%';
-		$regex['y'] = '%^(' . $fourDigitYear . ')$%';
+		$regex['my'] = '%^('.$month.$separator.$year.')$%';
+		$regex['ym'] = '%^('.$year.$separator.$month.')$%';
+		$regex['y'] = '%^('.$fourDigitYear.')$%';
 
 		$format = (is_array($format)) ? array_values($format) : array($format);
 		foreach ($format as $key) {
@@ -358,7 +358,7 @@ 
 	public static function datetime($check, $dateFormat = 'ymd', $regex = null) {
 		$valid = false;
 		$parts = explode(' ', $check);
-		if (!empty($parts) && count($parts) > 1) {
+		if ( ! empty($parts) && count($parts) > 1) {
 			$time = array_pop($parts);
 			$date = implode(' ', $parts);
 			$valid = self::date($date, $dateFormat, $regex) && self::time($time);
@@ -420,7 +420,7 @@ 
 				$regex = "/^{$sign}{$dnum}{$exp}$/";
 
 			} elseif (is_numeric($places)) {
-				$places = '[0-9]{' . $places . '}';
+				$places = '[0-9]{'.$places.'}';
 				$dnum = "(?:[0-9]*[\.]{$places}|{$lnum}[\.]{$places})";
 				$regex = "/^{$sign}{$dnum}{$exp}$/";
 			}
@@ -451,14 +451,14 @@ 
 		}
 
 		if ($regex === null) {
-			$regex = '/^[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+)*@' . self::$_pattern['hostname'] . '$/ui';
+			$regex = '/^[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+)*@'.self::$_pattern['hostname'].'$/ui';
 		}
 		$return = self::_check($check, $regex);
 		if ($deep === false || $deep === null) {
 			return $return;
 		}
 
-		if ($return === true && preg_match('/@(' . self::$_pattern['hostname'] . ')$/i', $check, $regs)) {
+		if ($return === true && preg_match('/@('.self::$_pattern['hostname'].')$/i', $check, $regs)) {
 			if (function_exists('getmxrr') && getmxrr($regs[1], $mxhosts)) {
 				return true;
 			}
@@ -517,7 +517,7 @@ 
 		if ($type === 'ipv6') {
 			$flags = FILTER_FLAG_IPV6;
 		}
-		return (bool)filter_var($check, FILTER_VALIDATE_IP, array('flags' => $flags));
+		return (bool) filter_var($check, FILTER_VALIDATE_IP, array('flags' => $flags));
 	}
 
 /**
@@ -552,9 +552,9 @@ 
 	public static function money($check, $symbolPosition = 'left') {
 		$money = '(?!0,?\d)(?:\d{1,3}(?:([, .])\d{3})?(?:\1\d{3})*|(?:\d+))((?!\1)[,.]\d{1,2})?';
 		if ($symbolPosition === 'right') {
-			$regex = '/^' . $money . '(?<!\x{00a2})\p{Sc}?$/u';
+			$regex = '/^'.$money.'(?<!\x{00a2})\p{Sc}?$/u';
 		} else {
-			$regex = '/^(?!\x{00a2})\p{Sc}?' . $money . '$/u';
+			$regex = '/^(?!\x{00a2})\p{Sc}?'.$money.'$/u';
 		}
 		return self::_check($check, $regex);
 	}
@@ -576,7 +576,7 @@ 
 	public static function multiple($check, $options = array(), $strict = true) {
 		$defaults = array('in' => null, 'max' => null, 'min' => null);
 		$options = array_merge($defaults, $options);
-		$check = array_filter((array)$check);
+		$check = array_filter((array) $check);
 		if (empty($check)) {
 			return false;
 		}
@@ -588,7 +588,7 @@ 
 		}
 		if ($options['in'] && is_array($options['in'])) {
 			foreach ($check as $val) {
-				if (!in_array($val, $options['in'], $strict)) {
+				if ( ! in_array($val, $options['in'], $strict)) {
 					return false;
 				}
 			}
@@ -644,7 +644,7 @@ 
 
 					// Area code 555, X11 is not allowed.
 					$areaCode = '(?![2-9]11)(?!555)([2-9][0-8][0-9])';
-					$regex .= '(?:\(\s*' . $areaCode . '\s*\)|' . $areaCode . ')';
+					$regex .= '(?:\(\s*'.$areaCode.'\s*\)|'.$areaCode.')';
 					$regex .= '\s*(?:[.-]\s*)?)';
 
 					// Exchange and 555-XXXX numbers
@@ -716,7 +716,7 @@ 
  * @return boolean Success
  */
 	public static function range($check, $lower = null, $upper = null) {
-		if (!is_numeric($check)) {
+		if ( ! is_numeric($check)) {
 			return false;
 		}
 		if (isset($lower) && isset($upper)) {
@@ -776,12 +776,12 @@ 
  */
 	public static function url($check, $strict = false) {
 		self::_populateIp();
-		$validChars = '([' . preg_quote('!"$&\'()*+,-.@_:;=~[]') . '\/0-9\p{L}\p{N}]|(%[0-9a-f]{2}))';
-		$regex = '/^(?:(?:https?|ftps?|sftp|file|news|gopher):\/\/)' . (!empty($strict) ? '' : '?') .
-			'(?:' . self::$_pattern['IPv4'] . '|\[' . self::$_pattern['IPv6'] . '\]|' . self::$_pattern['hostname'] . ')(?::[1-9][0-9]{0,4})?' .
-			'(?:\/?|\/' . $validChars . '*)?' .
-			'(?:\?' . $validChars . '*)?' .
-			'(?:#' . $validChars . '*)?$/iu';
+		$validChars = '(['.preg_quote('!"$&\'()*+,-.@_:;=~[]').'\/0-9\p{L}\p{N}]|(%[0-9a-f]{2}))';
+		$regex = '/^(?:(?:https?|ftps?|sftp|file|news|gopher):\/\/)'.( ! empty($strict) ? '' : '?').
+			'(?:'.self::$_pattern['IPv4'].'|\['.self::$_pattern['IPv6'].'\]|'.self::$_pattern['hostname'].')(?::[1-9][0-9]{0,4})?'.
+			'(?:\/?|\/'.$validChars.'*)?'.
+			'(?:\?'.$validChars.'*)?'.
+			'(?:#'.$validChars.'*)?$/iu';
 		return self::_check($check, $regex);
 	}
 
@@ -832,16 +832,16 @@ 
  * @return mixed Return of Passed method, false on failure
  */
 	protected static function _pass($method, $check, $classPrefix) {
-		$className = ucwords($classPrefix) . 'Validation';
-		if (!class_exists($className)) {
+		$className = ucwords($classPrefix).'Validation';
+		if ( ! class_exists($className)) {
 			trigger_error(__d('cake_dev', 'Could not find %s class, unable to complete validation.', $className), E_USER_WARNING);
 			return false;
 		}
-		if (!method_exists($className, $method)) {
+		if ( ! method_exists($className, $method)) {
 			trigger_error(__d('cake_dev', 'Method %s does not exist on %s unable to complete validation.', $method, $className), E_USER_WARNING);
 			return false;
 		}
-		$check = (array)$check;
+		$check = (array) $check;
 		return call_user_func_array(array($className, $method), $check);
 	}
 
@@ -897,7 +897,7 @@ 
 		if ($deep !== true) {
 			return true;
 		}
-		if ((int)$check === 0) {
+		if ((int) $check === 0) {
 			return false;
 		}
 		$sum = 0;
@@ -970,7 +970,7 @@ 
 			$check = $check['error'];
 		}
 
-		return (int)$check === UPLOAD_ERR_OK;
+		return (int) $check === UPLOAD_ERR_OK;
 	}
 
 /**
@@ -979,7 +979,7 @@ 
  * @return void
  */
 	protected static function _populateIp() {
-		if (!isset(self::$_pattern['IPv6'])) {
+		if ( ! isset(self::$_pattern['IPv6'])) {
 			$pattern = '((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}';
 			$pattern .= '(:|((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})';
 			$pattern .= '|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})';
@@ -997,7 +997,7 @@ 
 
 			self::$_pattern['IPv6'] = $pattern;
 		}
-		if (!isset(self::$_pattern['IPv4'])) {
+		if ( ! isset(self::$_pattern['IPv4'])) {
 			$pattern = '(?:(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])';
 			self::$_pattern['IPv4'] = $pattern;
 		}

lib/Cake/View/Helper/FormHelper.php

Doc Comments +3 added lines, -3 removed lines

@@ -622,7 +622,7 @@ 
  * @param boolean $lock Whether this field should be part of the validation
  *     or excluded as part of the unlockedFields.
  * @param string $field Reference to field to be secured. Should be dot separated to indicate nesting.
- * @param mixed $value Field value, if value should not be tampered with.
+ * @param string $value Field value, if value should not be tampered with.
  * @return mixed|null Not used yet
  */
 	protected function _secure($lock, $field = null, $value = null) {
@@ -1235,7 +1235,7 @@ 
  *
  * @param string $fieldName
  * @param array $options
- * @return boolean|string false or Generated label element
+ * @return false|string false or Generated label element
  */
 	protected function _getLabel($fieldName, $options) {
 		if ($options['type'] === 'radio') {
@@ -1726,7 +1726,7 @@ 
  * - Other options is the same of button method.
  *
  * @param string $title The button's caption. Not automatically HTML encoded
- * @param string|array $url URL as string or array
+ * @param string $url URL as string or array
  * @param array $options Array of options and HTML attributes.
  * @return string A HTML button tag.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::postButton

Spacing +139 added lines, -139 removed lines

@@ -133,7 +133,7 @@ 
  */
 	public function __construct(View $View, $settings = array()) {
 		parent::__construct($View, $settings);
-		$this->validationErrors =& $View->validationErrors;
+		$this->validationErrors = & $View->validationErrors;
 	}
 
 /**
@@ -145,7 +145,7 @@ 
  */
 	protected function _getModel($model) {
 		$object = null;
-		if (!$model || $model === 'Model') {
+		if ( ! $model || $model === 'Model') {
 			return $object;
 		}
 
@@ -159,7 +159,7 @@ 
 			$plugin = $this->request->params['models'][$model]['plugin'];
 			$plugin .= ($plugin) ? '.' : null;
 			$object = ClassRegistry::init(array(
-				'class' => $plugin . $this->request->params['models'][$model]['className'],
+				'class' => $plugin.$this->request->params['models'][$model]['className'],
 				'alias' => $model
 			));
 		} elseif (ClassRegistry::isKeySet($this->defaultModel)) {
@@ -172,7 +172,7 @@ 
 		}
 
 		$this->_models[$model] = $object;
-		if (!$object) {
+		if ( ! $object) {
 			return null;
 		}
 
@@ -202,7 +202,7 @@ 
  */
 	protected function _introspectModel($model, $key, $field = null) {
 		$object = $this->_getModel($model);
-		if (!$object) {
+		if ( ! $object) {
 			return;
 		}
 
@@ -211,7 +211,7 @@ 
 		}
 
 		if ($key === 'fields') {
-			if (!isset($this->fieldset[$model]['fields'])) {
+			if ( ! isset($this->fieldset[$model]['fields'])) {
 				$this->fieldset[$model]['fields'] = $object->schema();
 				foreach ($object->hasAndBelongsToMany as $alias => $assocData) {
 					$this->fieldset[$object->alias]['fields'][$alias] = array('type' => 'multiple');
@@ -225,14 +225,14 @@ 
 			return isset($object->hasAndBelongsToMany[$field]) ? array('type' => 'multiple') : null;
 		}
 
-		if ($key === 'errors' && !isset($this->validationErrors[$model])) {
-			$this->validationErrors[$model] =& $object->validationErrors;
+		if ($key === 'errors' && ! isset($this->validationErrors[$model])) {
+			$this->validationErrors[$model] = & $object->validationErrors;
 			return $this->validationErrors[$model];
 		} elseif ($key === 'errors' && isset($this->validationErrors[$model])) {
 			return $this->validationErrors[$model];
 		}
 
-		if ($key === 'validates' && !isset($this->fieldset[$model]['validates'])) {
+		if ($key === 'validates' && ! isset($this->fieldset[$model]['validates'])) {
 			$validates = array();
 			foreach (iterator_to_array($object->validator(), true) as $validateField => $validateProperties) {
 				if ($this->_isRequiredField($validateProperties)) {
@@ -269,7 +269,7 @@ 
 				continue;
 			}
 
-			return !$rule->allowEmpty;
+			return ! $rule->allowEmpty;
 		}
 		return false;
 	}
@@ -293,10 +293,10 @@ 
 		}
 
 		$errors = array();
-		if (!empty($entity) && isset($this->validationErrors[$model])) {
+		if ( ! empty($entity) && isset($this->validationErrors[$model])) {
 			$errors = $this->validationErrors[$model];
 		}
-		if (!empty($entity) && empty($errors)) {
+		if ( ! empty($entity) && empty($errors)) {
 			$errors = $this->_introspectModel($model, 'errors');
 		}
 		if (empty($errors)) {
@@ -341,7 +341,7 @@ 
 			$model = null;
 		}
 
-		if (empty($model) && $model !== false && !empty($this->request->params['models'])) {
+		if (empty($model) && $model !== false && ! empty($this->request->params['models'])) {
 			$model = key($this->request->params['models']);
 		} elseif (empty($model) && empty($this->request->params['models'])) {
 			$model = false;
@@ -351,15 +351,15 @@ 
 		$key = null;
 		if ($model !== false) {
 			list($plugin, $model) = pluginSplit($model, true);
-			$key = $this->_introspectModel($plugin . $model, 'key');
+			$key = $this->_introspectModel($plugin.$model, 'key');
 			$this->setEntity($model, true);
 		}
 
 		if ($model !== false && $key) {
 			$recordExists = (
 				isset($this->request->data[$model]) &&
-				!empty($this->request->data[$model][$key]) &&
-				!is_array($this->request->data[$model][$key])
+				! empty($this->request->data[$model][$key]) &&
+				! is_array($this->request->data[$model][$key])
 			);
 
 			if ($recordExists) {
@@ -379,18 +379,18 @@ 
 		$this->inputDefaults($options['inputDefaults']);
 		unset($options['inputDefaults']);
 
-		if (!isset($options['id'])) {
+		if ( ! isset($options['id'])) {
 			$domId = isset($options['action']) ? $options['action'] : $this->request['action'];
-			$options['id'] = $this->domId($domId . 'Form');
+			$options['id'] = $this->domId($domId.'Form');
 		}
 
 		if ($options['action'] === null && $options['url'] === null) {
 			$options['action'] = $this->request->here(false);
 		} elseif (empty($options['url']) || is_array($options['url'])) {
 			if (empty($options['url']['controller'])) {
-				if (!empty($model)) {
+				if ( ! empty($model)) {
 					$options['url']['controller'] = Inflector::underscore(Inflector::pluralize($model));
-				} elseif (!empty($this->request->params['controller'])) {
+				} elseif ( ! empty($this->request->params['controller'])) {
 					$options['url']['controller'] = Inflector::underscore($this->request->params['controller']);
 				}
 			}
@@ -407,8 +407,8 @@ 
 				'controller' => $this->_View->viewPath,
 				'action' => $options['action'],
 			);
-			$options['action'] = array_merge($actionDefaults, (array)$options['url']);
-			if (empty($options['action'][0]) && !empty($id)) {
+			$options['action'] = array_merge($actionDefaults, (array) $options['url']);
+			if (empty($options['action'][0]) && ! empty($id)) {
 				$options['action'][0] = $id;
 			}
 		} elseif (is_string($options['url'])) {
@@ -438,15 +438,15 @@ 
 		$action = $this->url($options['action']);
 		unset($options['type'], $options['action']);
 
-		if (!$options['default']) {
-			if (!isset($options['onsubmit'])) {
+		if ( ! $options['default']) {
+			if ( ! isset($options['onsubmit'])) {
 				$options['onsubmit'] = '';
 			}
-			$htmlAttributes['onsubmit'] = $options['onsubmit'] . 'event.returnValue = false; return false;';
+			$htmlAttributes['onsubmit'] = $options['onsubmit'].'event.returnValue = false; return false;';
 		}
 		unset($options['default']);
 
-		if (!empty($options['encoding'])) {
+		if ( ! empty($options['encoding'])) {
 			$htmlAttributes['accept-charset'] = $options['encoding'];
 			unset($options['encoding']);
 		}
@@ -458,7 +458,7 @@ 
 			$append .= $this->_csrfField();
 		}
 
-		if (!empty($append)) {
+		if ( ! empty($append)) {
 			$append = $this->Html->useTag('hiddenblock', $append);
 		}
 
@@ -467,7 +467,7 @@ 
 			$this->_introspectModel($model, 'fields');
 		}
 		$this->_lastAction = $action;
-		return $this->Html->useTag('form', $action, $htmlAttributes) . $append;
+		return $this->Html->useTag('form', $action, $htmlAttributes).$append;
 	}
 
 /**
@@ -480,13 +480,13 @@ 
 		if (empty($this->request->params['_Token'])) {
 			return '';
 		}
-		if (!empty($this->request['_Token']['unlockedFields'])) {
-			foreach ((array)$this->request['_Token']['unlockedFields'] as $unlocked) {
+		if ( ! empty($this->request['_Token']['unlockedFields'])) {
+			foreach ((array) $this->request['_Token']['unlockedFields'] as $unlocked) {
 				$this->_unlockedFields[] = $unlocked;
 			}
 		}
 		return $this->hidden('_Token.key', array(
-			'value' => $this->request->params['_Token']['key'], 'id' => 'Token' . mt_rand(),
+			'value' => $this->request->params['_Token']['key'], 'id' => 'Token'.mt_rand(),
 			'secure' => self::SECURE_SKIP
 		));
 	}
@@ -531,7 +531,7 @@ 
 		if (
 			$this->requestType !== 'get' &&
 			isset($this->request['_Token']) &&
-			!empty($this->request['_Token'])
+			! empty($this->request['_Token'])
 		) {
 			$out .= $this->secure($this->fields);
 			$this->fields = array();
@@ -552,14 +552,14 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::secure
  */
 	public function secure($fields = array()) {
-		if (!isset($this->request['_Token']) || empty($this->request['_Token'])) {
+		if ( ! isset($this->request['_Token']) || empty($this->request['_Token'])) {
 			return;
 		}
 		$locked = array();
 		$unlockedFields = $this->_unlockedFields;
 
 		foreach ($fields as $key => $value) {
-			if (!is_int($key)) {
+			if ( ! is_int($key)) {
 				$locked[$key] = $value;
 				unset($fields[$key]);
 			}
@@ -581,12 +581,12 @@ 
 		$fields = Security::hash(implode('', $hashParts), 'sha1');
 
 		$out = $this->hidden('_Token.fields', array(
-			'value' => urlencode($fields . ':' . $locked),
-			'id' => 'TokenFields' . mt_rand()
+			'value' => urlencode($fields.':'.$locked),
+			'id' => 'TokenFields'.mt_rand()
 		));
 		$out .= $this->hidden('_Token.unlocked', array(
 			'value' => urlencode($unlocked),
-			'id' => 'TokenUnlocked' . mt_rand()
+			'id' => 'TokenUnlocked'.mt_rand()
 		));
 		return $this->Html->useTag('hiddenblock', $out);
 	}
@@ -605,7 +605,7 @@ 
 		if ($name === null) {
 			return $this->_unlockedFields;
 		}
-		if (!in_array($name, $this->_unlockedFields)) {
+		if ( ! in_array($name, $this->_unlockedFields)) {
 			$this->_unlockedFields[] = $name;
 		}
 		$index = array_search($name, $this->fields);
@@ -626,7 +626,7 @@ 
  * @return mixed|null Not used yet
  */
 	protected function _secure($lock, $field = null, $value = null) {
-		if (!$field) {
+		if ( ! $field) {
 			$field = $this->entity();
 		} elseif (is_string($field)) {
 			$field = Hash::filter(explode('.', $field));
@@ -643,7 +643,7 @@ 
 		$field = preg_replace('/(\.\d+)+$/', '', $field);
 
 		if ($lock) {
-			if (!in_array($field, $this->fields)) {
+			if ( ! in_array($field, $this->fields)) {
 				if ($value !== null) {
 					return $this->fields[$field] = $value;
 				}
@@ -663,7 +663,7 @@ 
  */
 	public function isFieldError($field) {
 		$this->setEntity($field);
-		return (bool)$this->tagIsInvalid();
+		return (bool) $this->tagIsInvalid();
 	}
 
 /**
@@ -871,21 +871,21 @@ 
 		$modelFields = array();
 		$model = $this->model();
 		if ($model) {
-			$modelFields = array_keys((array)$this->_introspectModel($model, 'fields'));
+			$modelFields = array_keys((array) $this->_introspectModel($model, 'fields'));
 		}
 		if (is_array($fields)) {
-			if (array_key_exists('legend', $fields) && !in_array('legend', $modelFields)) {
+			if (array_key_exists('legend', $fields) && ! in_array('legend', $modelFields)) {
 				$legend = $fields['legend'];
 				unset($fields['legend']);
 			}
 
-			if (isset($fields['fieldset']) && !in_array('fieldset', $modelFields)) {
+			if (isset($fields['fieldset']) && ! in_array('fieldset', $modelFields)) {
 				$fieldset = $fields['fieldset'];
 				unset($fields['fieldset']);
 			}
 		} elseif ($fields !== null) {
 			$fieldset = $legend = $fields;
-			if (!is_bool($fieldset)) {
+			if ( ! is_bool($fieldset)) {
 				$fieldset = true;
 			}
 			$fields = array();
@@ -917,7 +917,7 @@ 
 
 		$out = null;
 		foreach ($fields as $name => $options) {
-			if (is_numeric($name) && !is_array($options)) {
+			if (is_numeric($name) && ! is_array($options)) {
 				$name = $options;
 				$options = array();
 			}
@@ -940,7 +940,7 @@ 
 
 		if ($fieldset) {
 			if ($legend) {
-				$out = $this->Html->useTag('legend', $legend) . $out;
+				$out = $this->Html->useTag('legend', $legend).$out;
 			}
 			$out = $this->Html->useTag('fieldset', $fieldsetClass, $out);
 		}
@@ -988,7 +988,7 @@ 
 		unset($options['div']);
 
 		if ($options['type'] === 'radio' && isset($options['options'])) {
-			$radioOptions = (array)$options['options'];
+			$radioOptions = (array) $options['options'];
 			unset($options['options']);
 		}
 
@@ -1040,7 +1040,7 @@ 
 			$output .= $out[$element];
 		}
 
-		if (!empty($divOptions['tag'])) {
+		if ( ! empty($divOptions['tag'])) {
 			$tag = $divOptions['tag'];
 			unset($divOptions['tag']);
 			$output = $this->Html->tag($tag, $output, $divOptions);
@@ -1101,7 +1101,7 @@ 
 			$options
 		);
 
-		if (!isset($options['type'])) {
+		if ( ! isset($options['type'])) {
 			$options = $this->_magicOptions($options);
 		}
 
@@ -1133,7 +1133,7 @@ 
 			Inflector::pluralize(preg_replace('/_id$/', '', $this->field()))
 		);
 		$varOptions = $this->_View->get($varName);
-		if (!is_array($varOptions)) {
+		if ( ! is_array($varOptions)) {
 			return $options;
 		}
 		if ($options['type'] !== 'radio') {
@@ -1185,7 +1185,7 @@ 
 			if (
 				$options['type'] === 'number' &&
 				$type === 'float' &&
-				!isset($options['step'])
+				! isset($options['step'])
 			) {
 				$options['step'] = 'any';
 			}
@@ -1197,7 +1197,7 @@ 
 
 		if ($modelKey === $fieldKey) {
 			$options['type'] = 'select';
-			if (!isset($options['multiple'])) {
+			if ( ! isset($options['multiple'])) {
 				$options['multiple'] = 'multiple';
 			}
 		}
@@ -1262,7 +1262,7 @@ 
 	protected function _maxLength($options) {
 		$fieldDef = $this->_introspectModel($this->model(), 'fields', $this->field());
 		$autoLength = (
-			!array_key_exists('maxlength', $options) &&
+			! array_key_exists('maxlength', $options) &&
 			isset($fieldDef['length']) &&
 			is_scalar($fieldDef['length']) &&
 			$options['type'] !== 'select'
@@ -1286,7 +1286,7 @@ 
 			return array();
 		}
 		$div = $this->_extractOption('div', $options, true);
-		if (!$div) {
+		if ( ! $div) {
 			return array();
 		}
 
@@ -1303,7 +1303,7 @@ 
 		) {
 			$divOptions = $this->addClass($divOptions, 'required');
 		}
-		if (!isset($divOptions['tag'])) {
+		if ( ! isset($divOptions['tag'])) {
 			$divOptions['tag'] = 'div';
 		}
 		return $divOptions;
@@ -1345,7 +1345,7 @@ 
 				($options['dateFormat'] === null || $options['dateFormat'] === 'NONE')
 			) {
 				$firstInput = 'H';
-			} elseif (!empty($options['dateFormat'])) {
+			} elseif ( ! empty($options['dateFormat'])) {
 				$firstInput = substr($options['dateFormat'], 0, 1);
 			}
 			switch ($firstInput) {
@@ -1423,14 +1423,14 @@ 
 		$output = '';
 
 		if (
-			(!isset($options['checked']) && !empty($value) && $value == $options['value']) ||
-			!empty($options['checked'])
+			( ! isset($options['checked']) && ! empty($value) && $value == $options['value']) ||
+			! empty($options['checked'])
 		) {
 			$options['checked'] = 'checked';
 		}
 		if ($options['hiddenField']) {
 			$hiddenOptions = array(
-				'id' => $options['id'] . '_',
+				'id' => $options['id'].'_',
 				'name' => $options['name'],
 				'value' => ($options['hiddenField'] !== true ? $options['hiddenField'] : '0'),
 				'form' => isset($options['form']) ? $options['form'] : null,
@@ -1443,7 +1443,7 @@ 
 		}
 		unset($options['hiddenField']);
 
-		return $output . $this->Html->useTag('checkbox', $options['name'], array_diff_key($options, array('name' => null)));
+		return $output.$this->Html->useTag('checkbox', $options['name'], array_diff_key($options, array('name' => null)));
 	}
 
 /**
@@ -1535,10 +1535,10 @@ 
 				$optionsHere['checked'] = 'checked';
 			}
 			$isNumeric = is_numeric($optValue);
-			if ($disabled && (!is_array($disabled) || in_array((string)$optValue, $disabled, !$isNumeric))) {
+			if ($disabled && ( ! is_array($disabled) || in_array((string) $optValue, $disabled, ! $isNumeric))) {
 				$optionsHere['disabled'] = true;
 			}
-			$tagName = $attributes['id'] . $this->domIdSuffix($optValue);
+			$tagName = $attributes['id'].$this->domIdSuffix($optValue);
 
 			if ($label) {
 				$labelOpts = is_array($label) ? $label : array();
@@ -1558,22 +1558,22 @@ 
 		$hidden = null;
 
 		if ($hiddenField) {
-			if (!isset($value) || $value === '') {
+			if ( ! isset($value) || $value === '') {
 				$hidden = $this->hidden($fieldName, array(
 					'form' => isset($attributes['form']) ? $attributes['form'] : null,
-					'id' => $attributes['id'] . '_',
+					'id' => $attributes['id'].'_',
 					'value' => '',
 					'name' => $attributes['name']
 				));
 			}
 		}
-		$out = $hidden . implode($separator, $out);
+		$out = $hidden.implode($separator, $out);
 
 		if (is_array($between)) {
 			$between = '';
 		}
 		if ($legend) {
-			$out = $this->Html->useTag('fieldset', '', $this->Html->useTag('legend', $legend) . $between . $out);
+			$out = $this->Html->useTag('fieldset', '', $this->Html->useTag('legend', $legend).$between.$out);
 		}
 		return $out;
 	}
@@ -1607,7 +1607,7 @@ 
 		if (isset($params[1])) {
 			$options = $params[1];
 		}
-		if (!isset($options['type'])) {
+		if ( ! isset($options['type'])) {
 			$options['type'] = $method;
 		}
 		$options = $this->_initInputField($params[0], $options);
@@ -1632,7 +1632,7 @@ 
 
 		if (array_key_exists('value', $options)) {
 			$value = $options['value'];
-			if (!array_key_exists('escape', $options) || $options['escape'] !== false) {
+			if ( ! array_key_exists('escape', $options) || $options['escape'] !== false) {
 				$value = h($value);
 			}
 			unset($options['value']);
@@ -1659,7 +1659,7 @@ 
 		));
 
 		if ($secure === true) {
-			$this->_secure(true, null, '' . $options['value']);
+			$this->_secure(true, null, ''.$options['value']);
 		}
 
 		return $this->Html->useTag('hidden', $options['name'], array_diff_key($options, array('name' => null)));
@@ -1768,11 +1768,11 @@ 
  */
 	public function postLink($title, $url = null, $options = array(), $confirmMessage = false) {
 		$requestMethod = 'POST';
-		if (!empty($options['method'])) {
+		if ( ! empty($options['method'])) {
 			$requestMethod = strtoupper($options['method']);
 			unset($options['method']);
 		}
-		if (!empty($options['confirm'])) {
+		if ( ! empty($options['confirm'])) {
 			$confirmMessage = $options['confirm'];
 			unset($options['confirm']);
 		}
@@ -1810,11 +1810,11 @@ 
 		$out .= $this->Html->useTag('formend');
 
 		$url = '#';
-		$onClick = 'document.' . $formName . '.submit();';
+		$onClick = 'document.'.$formName.'.submit();';
 		if ($confirmMessage) {
 			$options['onclick'] = $this->_confirm($confirmMessage, $onClick, '', $options);
 		} else {
-			$options['onclick'] = $onClick . ' ';
+			$options['onclick'] = $onClick.' ';
 		}
 		$options['onclick'] .= 'event.returnValue = false; return false;';
 
@@ -1851,7 +1851,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/form.html#FormHelper::submit
  */
 	public function submit($caption = null, $options = array()) {
-		if (!is_string($caption) && empty($caption)) {
+		if ( ! is_string($caption) && empty($caption)) {
 			$caption = __d('cake', 'Submit');
 		}
 		$out = null;
@@ -1891,7 +1891,7 @@ 
 			$unlockFields = array('x', 'y');
 			if (isset($options['name'])) {
 				$unlockFields = array(
-					$options['name'] . '_x', $options['name'] . '_y'
+					$options['name'].'_x', $options['name'].'_y'
 				);
 			}
 			foreach ($unlockFields as $ignore) {
@@ -1905,7 +1905,7 @@ 
 		} elseif ($isImage) {
 			unset($options['type']);
 			if ($caption{0} !== '/') {
-				$url = $this->webroot(Configure::read('App.imageBaseUrl') . $caption);
+				$url = $this->webroot(Configure::read('App.imageBaseUrl').$caption);
 			} else {
 				$url = $this->webroot(trim($caption, '/'));
 			}
@@ -1915,7 +1915,7 @@ 
 			$options['value'] = $caption;
 			$tag = $this->Html->useTag('submit', $options);
 		}
-		$out = $before . $tag . $after;
+		$out = $before.$tag.$after;
 
 		if (isset($divOptions)) {
 			$tag = $divOptions['tag'];
@@ -2008,26 +2008,26 @@ 
 		$id = $this->_extractOption('id', $attributes);
 
 		$attributes = $this->_initInputField($fieldName, array_merge(
-			(array)$attributes, array('secure' => self::SECURE_SKIP)
+			(array) $attributes, array('secure' => self::SECURE_SKIP)
 		));
 
 		if (is_string($options) && isset($this->_options[$options])) {
 			$options = $this->_generateOptions($options);
-		} elseif (!is_array($options)) {
+		} elseif ( ! is_array($options)) {
 			$options = array();
 		}
 		if (isset($attributes['type'])) {
 			unset($attributes['type']);
 		}
 
-		if (!empty($attributes['multiple'])) {
+		if ( ! empty($attributes['multiple'])) {
 			$style = ($attributes['multiple'] === 'checkbox') ? 'checkbox' : null;
 			$template = ($style) ? 'checkboxmultiplestart' : 'selectmultiplestart';
 			$tag = $template;
 			if ($hiddenField) {
 				$hiddenAttributes = array(
 					'value' => '',
-					'id' => $attributes['id'] . ($style ? '' : '_'),
+					'id' => $attributes['id'].($style ? '' : '_'),
 					'secure' => false,
 					'form' => isset($attributes['form']) ? $attributes['form'] : null,
 					'name' => $attributes['name']
@@ -2042,21 +2042,21 @@ 
 			unset($attributes['required']);
 		}
 
-		if (!empty($tag) || isset($template)) {
+		if ( ! empty($tag) || isset($template)) {
 			$hasOptions = (count($options) > 0 || $showEmpty);
 			// Secure the field if there are options, or its a multi select.
 			// Single selects with no options don't submit, but multiselects do.
 			if (
-				(!isset($secure) || $secure) &&
+				( ! isset($secure) || $secure) &&
 				empty($attributes['disabled']) &&
-				(!empty($attributes['multiple']) || $hasOptions)
+				( ! empty($attributes['multiple']) || $hasOptions)
 			) {
 				$this->_secure(true, $this->_secureFieldName($attributes));
 			}
 			$select[] = $this->Html->useTag($tag, $attributes['name'], array_diff_key($attributes, array('name' => null, 'value' => null)));
 		}
 		$emptyMulti = (
-			$showEmpty !== null && $showEmpty !== false && !(
+			$showEmpty !== null && $showEmpty !== false && ! (
 				empty($showEmpty) && (isset($attributes) &&
 				array_key_exists('multiple', $attributes))
 			)
@@ -2067,7 +2067,7 @@ 
 			$options = array('' => $showEmpty) + $options;
 		}
 
-		if (!$id) {
+		if ( ! $id) {
 			$attributes['id'] = Inflector::camelize($attributes['id']);
 		}
 
@@ -2113,7 +2113,7 @@ 
 		$count = 1;
 		$suffix = $value;
 		while (in_array($suffix, $this->_domIdSuffixes)) {
-			$suffix = $value . $count++;
+			$suffix = $value.$count++;
 		}
 		$this->_domIdSuffixes[] = $suffix;
 		return $suffix;
@@ -2146,7 +2146,7 @@ 
 		} elseif ($attributes['value'] === false) {
 			$attributes['value'] = null;
 		}
-		return $this->select($fieldName . ".day", $this->_generateOptions('day'), $attributes);
+		return $this->select($fieldName.".day", $this->_generateOptions('day'), $attributes);
 	}
 
 /**
@@ -2176,10 +2176,10 @@ 
 				$attributes['value'] = $year;
 			} else {
 				if (empty($value)) {
-					if (!$attributes['empty'] && !$maxYear) {
+					if ( ! $attributes['empty'] && ! $maxYear) {
 						$attributes['value'] = 'now';
 
-					} elseif (!$attributes['empty'] && $maxYear && !$attributes['value']) {
+					} elseif ( ! $attributes['empty'] && $maxYear && ! $attributes['value']) {
 						$attributes['value'] = $maxYear;
 					}
 				} else {
@@ -2203,7 +2203,7 @@ 
 			unset($attributes['orderYear']);
 		}
 		return $this->select(
-			$fieldName . '.year', $this->_generateOptions('year', $yearOptions),
+			$fieldName.'.year', $this->_generateOptions('year', $yearOptions),
 			$attributes
 		);
 	}
@@ -2238,12 +2238,12 @@ 
 			$attributes['value'] = null;
 		}
 		$defaults = array('monthNames' => true);
-		$attributes = array_merge($defaults, (array)$attributes);
+		$attributes = array_merge($defaults, (array) $attributes);
 		$monthNames = $attributes['monthNames'];
 		unset($attributes['monthNames']);
 
 		return $this->select(
-			$fieldName . ".month",
+			$fieldName.".month",
 			$this->_generateOptions('month', array('monthNames' => $monthNames)),
 			$attributes
 		);
@@ -2283,15 +2283,15 @@ 
 			$attributes['value'] = null;
 		}
 
-		if ($attributes['value'] > 12 && !$format24Hours) {
+		if ($attributes['value'] > 12 && ! $format24Hours) {
 			$attributes['value'] -= 12;
 		}
-		if (($attributes['value'] === 0 || $attributes['value'] === '00') && !$format24Hours) {
+		if (($attributes['value'] === 0 || $attributes['value'] === '00') && ! $format24Hours) {
 			$attributes['value'] = 12;
 		}
 
 		return $this->select(
-			$fieldName . ".hour",
+			$fieldName.".hour",
 			$this->_generateOptions($format24Hours ? 'hour24' : 'hour'),
 			$attributes
 		);
@@ -2331,7 +2331,7 @@ 
 			unset($attributes['interval']);
 		}
 		return $this->select(
-			$fieldName . ".min", $this->_generateOptions('minute', $minuteOptions),
+			$fieldName.".min", $this->_generateOptions('minute', $minuteOptions),
 			$attributes
 		);
 	}
@@ -2350,7 +2350,7 @@ 
 				$attributes['value'] = isset($value[$select]) ? $value[$select] : null;
 			} else {
 				if (empty($value)) {
-					if (!$attributes['empty']) {
+					if ( ! $attributes['empty']) {
 						$attributes['value'] = 'now';
 					}
 				} else {
@@ -2384,7 +2384,7 @@ 
 				$attributes['value'] = $meridian;
 			} else {
 				if (empty($value)) {
-					if (!$attributes['empty']) {
+					if ( ! $attributes['empty']) {
 						$attributes['value'] = date('a');
 					}
 				} else {
@@ -2401,7 +2401,7 @@ 
 			$attributes['value'] = null;
 		}
 		return $this->select(
-			$fieldName . ".meridian", $this->_generateOptions('meridian'),
+			$fieldName.".meridian", $this->_generateOptions('meridian'),
 			$attributes
 		);
 	}
@@ -2440,12 +2440,12 @@ 
 
 		if ($attributes['value'] === null && $attributes['empty'] != true) {
 			$attributes['value'] = time();
-			if (!empty($attributes['maxYear']) && $attributes['maxYear'] < date('Y')) {
-				$attributes['value'] = strtotime(date($attributes['maxYear'] . '-m-d'));
+			if ( ! empty($attributes['maxYear']) && $attributes['maxYear'] < date('Y')) {
+				$attributes['value'] = strtotime(date($attributes['maxYear'].'-m-d'));
 			}
 		}
 
-		if (!empty($attributes['value'])) {
+		if ( ! empty($attributes['value'])) {
 			list($year, $month, $day, $hour, $min, $meridian) = $this->_getDateTimeValue(
 				$attributes['value'],
 				$timeFormat
@@ -2456,7 +2456,7 @@ 
 			'minYear' => null, 'maxYear' => null, 'separator' => '-',
 			'interval' => 1, 'monthNames' => true, 'round' => null
 		);
-		$attributes = array_merge($defaults, (array)$attributes);
+		$attributes = array_merge($defaults, (array) $attributes);
 		if (isset($attributes['minuteInterval'])) {
 			$attributes['interval'] = $attributes['minuteInterval'];
 			unset($attributes['minuteInterval']);
@@ -2469,7 +2469,7 @@ 
 		$round = $attributes['round'];
 		$attributes = array_diff_key($attributes, $defaults);
 
-		if (!empty($interval) && $interval > 1 && !empty($min)) {
+		if ( ! empty($interval) && $interval > 1 && ! empty($min)) {
 			$current = new DateTime();
 			if ($year !== null) {
 				$current->setDate($year, $month, $day);
@@ -2516,7 +2516,7 @@ 
 		if ($hasId && is_string($attributes['id'])) {
 			// build out an array version
 			foreach ($keys as $key) {
-				$attrs[$key]['id'] = $attributes['id'] . $key;
+				$attrs[$key]['id'] = $attributes['id'].$key;
 			}
 		}
 
@@ -2561,15 +2561,15 @@ 
 			case '24':
 				$attrs['Hour']['value'] = $hour;
 				$attrs['Minute']['value'] = $min;
-				$opt .= $this->hour($fieldName, true, $attrs['Hour']) . ':' .
+				$opt .= $this->hour($fieldName, true, $attrs['Hour']).':'.
 				$this->minute($fieldName, $attrs['Minute']);
 				break;
 			case '12':
 				$attrs['Hour']['value'] = $hour;
 				$attrs['Minute']['value'] = $min;
 				$attrs['Meridian']['value'] = $meridian;
-				$opt .= $this->hour($fieldName, false, $attrs['Hour']) . ':' .
-				$this->minute($fieldName, $attrs['Minute']) . ' ' .
+				$opt .= $this->hour($fieldName, false, $attrs['Hour']).':'.
+				$this->minute($fieldName, $attrs['Minute']).' '.
 				$this->meridian($fieldName, $attrs['Meridian']);
 				break;
 		}
@@ -2608,7 +2608,7 @@ 
 			$days[1] = $value;
 		}
 
-		if (!empty($timeFormat)) {
+		if ( ! empty($timeFormat)) {
 			$time = explode(':', $days[1]);
 
 			if ($time[0] >= 12) {
@@ -2640,7 +2640,7 @@ 
 				$options = 0;
 			}
 
-			if (!empty($field)) {
+			if ( ! empty($field)) {
 				$this->setEntity($field);
 			}
 
@@ -2653,7 +2653,7 @@ 
 			$name = $model === $entity[0] && isset($entity[1]) ? $entity[1] : $entity[0];
 			$last = $entity[count($entity) - 1];
 			if (in_array($last, $this->_fieldSuffixes)) {
-				$name .= '[' . $last . ']';
+				$name .= '['.$last.']';
 			}
 
 			if (is_array($options)) {
@@ -2686,8 +2686,8 @@ 
 		$this->_domIdSuffixes = array();
 		foreach ($elements as $name => $title) {
 			$htmlOptions = array();
-			if (is_array($title) && (!isset($title['name']) || !isset($title['value']))) {
-				if (!empty($name)) {
+			if (is_array($title) && ( ! isset($title['name']) || ! isset($title['value']))) {
+				if ( ! empty($name)) {
 					if ($attributes['style'] === 'checkbox') {
 						$select[] = $this->Html->useTag('fieldsetend');
 					} else {
@@ -2699,7 +2699,7 @@ 
 					$title, $parents, $showParents, $attributes
 				));
 
-				if (!empty($name)) {
+				if ( ! empty($name)) {
 					$name = $attributes['escape'] ? h($name) : $name;
 					if ($attributes['style'] === 'checkbox') {
 						$select[] = $this->Html->useTag('fieldsetstart', $name);
@@ -2718,8 +2718,8 @@ 
 			if ($name !== null) {
 				$isNumeric = is_numeric($name);
 				if (
-					(!$selectedIsArray && !$selectedIsEmpty && (string)$attributes['value'] == (string)$name) ||
-					($selectedIsArray && in_array((string)$name, $attributes['value'], !$isNumeric))
+					( ! $selectedIsArray && ! $selectedIsEmpty && (string) $attributes['value'] == (string) $name) ||
+					($selectedIsArray && in_array((string) $name, $attributes['value'], ! $isNumeric))
 				) {
 					if ($attributes['style'] === 'checkbox') {
 						$htmlOptions['checked'] = true;
@@ -2728,10 +2728,10 @@ 
 					}
 				}
 
-				if ($showParents || (!in_array($title, $parents))) {
+				if ($showParents || ( ! in_array($title, $parents))) {
 					$title = ($attributes['escape']) ? h($title) : $title;
 
-					$hasDisabled = !empty($attributes['disabled']);
+					$hasDisabled = ! empty($attributes['disabled']);
 					if ($hasDisabled) {
 						$disabledIsArray = is_array($attributes['disabled']);
 						if ($disabledIsArray) {
@@ -2741,18 +2741,18 @@ 
 					if (
 						$hasDisabled &&
 						$disabledIsArray &&
-						in_array((string)$name, $attributes['disabled'], !$disabledIsNumeric)
+						in_array((string) $name, $attributes['disabled'], ! $disabledIsNumeric)
 					) {
 						$htmlOptions['disabled'] = 'disabled';
 					}
-					if ($hasDisabled && !$disabledIsArray && $attributes['style'] === 'checkbox') {
+					if ($hasDisabled && ! $disabledIsArray && $attributes['style'] === 'checkbox') {
 						$htmlOptions['disabled'] = $attributes['disabled'] === true ? 'disabled' : $attributes['disabled'];
 					}
 
 					if ($attributes['style'] === 'checkbox') {
 						$htmlOptions['value'] = $name;
 
-						$tagName = $attributes['id'] . $this->domIdSuffix($name);
+						$tagName = $attributes['id'].$this->domIdSuffix($name);
 						$htmlOptions['id'] = $tagName;
 						$label = array('for' => $tagName);
 
@@ -2765,11 +2765,11 @@ 
 						if (empty($attributes['class'])) {
 							$attributes['class'] = 'checkbox';
 						} elseif ($attributes['class'] === 'form-error') {
-							$attributes['class'] = 'checkbox ' . $attributes['class'];
+							$attributes['class'] = 'checkbox '.$attributes['class'];
 						}
 						$label = $this->label(null, $title, $label);
 						$item = $this->Html->useTag('checkboxmultiple', $name, $htmlOptions);
-						$select[] = $this->Html->div($attributes['class'], $item . $label);
+						$select[] = $this->Html->div($attributes['class'], $item.$label);
 					} else {
 						if ($attributes['escape']) {
 							$name = h($name);
@@ -2791,7 +2791,7 @@ 
  * @return array
  */
 	protected function _generateOptions($name, $options = array()) {
-		if (!empty($this->options[$name])) {
+		if ( ! empty($this->options[$name])) {
 			return $this->options[$name];
 		}
 		$data = array();
@@ -2862,20 +2862,20 @@ 
 			case 'year':
 				$current = intval(date('Y'));
 
-				$min = !isset($options['min']) ? $current - 20 : (int)$options['min'];
-				$max = !isset($options['max']) ? $current + 20 : (int)$options['max'];
+				$min = ! isset($options['min']) ? $current - 20 : (int) $options['min'];
+				$max = ! isset($options['max']) ? $current + 20 : (int) $options['max'];
 
 				if ($min > $max) {
 					list($min, $max) = array($max, $min);
 				}
 				if (
-					!empty($options['value']) &&
-					(int)$options['value'] < $min &&
-					(int)$options['value'] > 0
+					! empty($options['value']) &&
+					(int) $options['value'] < $min &&
+					(int) $options['value'] > 0
 				) {
-					$min = (int)$options['value'];
-				} elseif (!empty($options['value']) && (int)$options['value'] > $max) {
-					$max = (int)$options['value'];
+					$min = (int) $options['value'];
+				} elseif ( ! empty($options['value']) && (int) $options['value'] > $max) {
+					$max = (int) $options['value'];
 				}
 
 				for ($i = $min; $i <= $max; $i++) {
@@ -2912,7 +2912,7 @@ 
 			$secure = $options['secure'];
 			unset($options['secure']);
 		} else {
-			$secure = (isset($this->request['_Token']) && !empty($this->request['_Token']));
+			$secure = (isset($this->request['_Token']) && ! empty($this->request['_Token']));
 		}
 
 		$disabledIndex = array_search('disabled', $options, true);
@@ -2926,11 +2926,11 @@ 
 			$result = $this->addClass($result, 'form-error');
 		}
 
-		if (!empty($result['disabled'])) {
+		if ( ! empty($result['disabled'])) {
 			return $result;
 		}
 
-		if (!isset($result['required']) &&
+		if ( ! isset($result['required']) &&
 			$this->_introspectModel($this->model(), 'validates', $this->field())
 		) {
 			$result['required'] = true;
@@ -2973,9 +2973,9 @@ 
 	public function inputDefaults($defaults = null, $merge = false) {
 		if ($defaults !== null) {
 			if ($merge) {
-				$this->_inputDefaults = array_merge($this->_inputDefaults, (array)$defaults);
+				$this->_inputDefaults = array_merge($this->_inputDefaults, (array) $defaults);
 			} else {
-				$this->_inputDefaults = (array)$defaults;
+				$this->_inputDefaults = (array) $defaults;
 			}
 		}
 		return $this->_inputDefaults;

lib/Cake/View/Helper/HtmlHelper.php

Doc Comments +4 added lines, -4 removed lines

@@ -510,9 +510,9 @@ 
  * - `plugin` False value will prevent parsing path as a plugin
  * - `fullBase` If true the url will get a full address for the script file.
  *
- * @param string|array $url String or array of javascript files to include
+ * @param string $url String or array of javascript files to include
  * @param array|boolean $options Array of options, and html attributes see above. If boolean sets $options['inline'] = value
- * @return mixed String of `<script />` tags or null if $inline is false or if $once is true and the file has been
+ * @return string|null String of `<script />` tags or null if $inline is false or if $once is true and the file has been
  *   included before.
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::script
  */
@@ -573,7 +573,7 @@ 
  * @param string $script The script to wrap
  * @param array $options The options to use. Options not listed above will be
  *    treated as HTML attributes.
- * @return mixed string or null depending on the value of `$options['block']`
+ * @return string|null string or null depending on the value of `$options['block']`
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::scriptBlock
  */
 	public function scriptBlock($script, $options = array()) {
@@ -621,7 +621,7 @@ 
  * Generates a script tag inline or in `$scripts_for_layout` depending on the settings
  * used when the scriptBlock was started
  *
- * @return mixed depending on the settings of scriptStart() either a script tag or null
+ * @return string|null depending on the settings of scriptStart() either a script tag or null
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::scriptEnd
  */
 	public function scriptEnd() {

Spacing +44 added lines, -44 removed lines

@@ -163,7 +163,7 @@ 
 		} else {
 			$this->response = new CakeResponse();
 		}
-		if (!empty($settings['configFile'])) {
+		if ( ! empty($settings['configFile'])) {
 			$this->loadConfig($settings['configFile']);
 		}
 	}
@@ -238,12 +238,12 @@ 
  */
 	public function meta($type, $url = null, $options = array()) {
 		$options += array('inline' => true, 'block' => null);
-		if (!$options['inline'] && empty($options['block'])) {
+		if ( ! $options['inline'] && empty($options['block'])) {
 			$options['block'] = __FUNCTION__;
 		}
 		unset($options['inline']);
 
-		if (!is_array($type)) {
+		if ( ! is_array($type)) {
 			$types = array(
 				'rss' => array('type' => 'application/rss+xml', 'rel' => 'alternate', 'title' => $type, 'link' => $url),
 				'atom' => array('type' => 'application/atom+xml', 'title' => $type, 'link' => $url),
@@ -258,7 +258,7 @@ 
 
 			if (isset($types[$type])) {
 				$type = $types[$type];
-			} elseif (!isset($options['type']) && $url !== null) {
+			} elseif ( ! isset($options['type']) && $url !== null) {
 				if (is_array($url) && isset($url['ext'])) {
 					$type = $types[$url['ext']];
 				} else {
@@ -304,7 +304,7 @@ 
 		if (empty($charset)) {
 			$charset = strtolower(Configure::read('App.encoding'));
 		}
-		return sprintf($this->_tags['charset'], (!empty($charset) ? $charset : 'utf-8'));
+		return sprintf($this->_tags['charset'], ( ! empty($charset) ? $charset : 'utf-8'));
 	}
 
 /**
@@ -353,13 +353,13 @@ 
 			$title = htmlentities($title, ENT_QUOTES, $escapeTitle);
 		}
 
-		if (!empty($options['confirm'])) {
+		if ( ! empty($options['confirm'])) {
 			$confirmMessage = $options['confirm'];
 			unset($options['confirm']);
 		}
 		if ($confirmMessage) {
 			$options['onclick'] = $this->_confirm($confirmMessage, 'return true;', 'return false;', $options);
-		} elseif (isset($options['default']) && !$options['default']) {
+		} elseif (isset($options['default']) && ! $options['default']) {
 			if (isset($options['onclick'])) {
 				$options['onclick'] .= ' ';
 			} else {
@@ -410,7 +410,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::css
  */
 	public function css($path, $options = array()) {
-		if (!is_array($options)) {
+		if ( ! is_array($options)) {
 			$rel = $options;
 			$options = array();
 			if ($rel) {
@@ -423,7 +423,7 @@ 
 		}
 
 		$options += array('block' => null, 'inline' => true, 'rel' => 'stylesheet');
-		if (!$options['inline'] && empty($options['block'])) {
+		if ( ! $options['inline'] && empty($options['block'])) {
 			$options['block'] = __FUNCTION__;
 		}
 		unset($options['inline']);
@@ -431,10 +431,10 @@ 
 		if (is_array($path)) {
 			$out = '';
 			foreach ($path as $i) {
-				$out .= "\n\t" . $this->css($i, $options);
+				$out .= "\n\t".$this->css($i, $options);
 			}
 			if (empty($options['block'])) {
-				return $out . "\n";
+				return $out."\n";
 			}
 			return;
 		}
@@ -448,7 +448,7 @@ 
 			if (Configure::read('Asset.filter.css')) {
 				$pos = strpos($url, Configure::read('App.cssBaseUrl'));
 				if ($pos !== false) {
-					$url = substr($url, 0, $pos) . 'ccss/' . substr($url, $pos + strlen(Configure::read('App.cssBaseUrl')));
+					$url = substr($url, 0, $pos).'ccss/'.substr($url, $pos + strlen(Configure::read('App.cssBaseUrl')));
 				}
 			}
 		}
@@ -457,7 +457,7 @@ 
 			$out = sprintf(
 				$this->_tags['style'],
 				$this->_parseAttributes($options, array('rel', 'block'), '', ' '),
-				'@import url(' . $url . ');'
+				'@import url('.$url.');'
 			);
 		} else {
 			$out = sprintf(
@@ -522,7 +522,7 @@ 
 			$options['inline'] = $inline;
 		}
 		$options = array_merge(array('block' => null, 'inline' => true, 'once' => true), $options);
-		if (!$options['inline'] && empty($options['block'])) {
+		if ( ! $options['inline'] && empty($options['block'])) {
 			$options['block'] = __FUNCTION__;
 		}
 		unset($options['inline']);
@@ -530,10 +530,10 @@ 
 		if (is_array($url)) {
 			$out = '';
 			foreach ($url as $i) {
-				$out .= "\n\t" . $this->script($i, $options);
+				$out .= "\n\t".$this->script($i, $options);
 			}
 			if (empty($options['block'])) {
-				return $out . "\n";
+				return $out."\n";
 			}
 			return null;
 		}
@@ -579,9 +579,9 @@ 
 	public function scriptBlock($script, $options = array()) {
 		$options += array('type' => 'text/javascript', 'safe' => true, 'inline' => true);
 		if ($options['safe']) {
-			$script = "\n" . '//<![CDATA[' . "\n" . $script . "\n" . '//]]>' . "\n";
+			$script = "\n".'//<![CDATA['."\n".$script."\n".'//]]>'."\n";
 		}
-		if (!$options['inline'] && empty($options['block'])) {
+		if ( ! $options['inline'] && empty($options['block'])) {
 			$options['block'] = 'script';
 		}
 		unset($options['inline'], $options['safe']);
@@ -649,12 +649,12 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::style
  */
 	public function style($data, $oneline = true) {
-		if (!is_array($data)) {
+		if ( ! is_array($data)) {
 			return $data;
 		}
 		$out = array();
 		foreach ($data as $key => $value) {
-			$out[] = $key . ':' . $value . ';';
+			$out[] = $key.':'.$value.';';
 		}
 		if ($oneline) {
 			return implode(' ', $out);
@@ -680,10 +680,10 @@ 
  */
 	public function getCrumbs($separator = '&raquo;', $startText = false) {
 		$crumbs = $this->_prepareCrumbs($startText);
-		if (!empty($crumbs)) {
+		if ( ! empty($crumbs)) {
 			$out = array();
 			foreach ($crumbs as $crumb) {
-				if (!empty($crumb[1])) {
+				if ( ! empty($crumb[1])) {
 					$out[] = $this->link($crumb[0], $crumb[1], $crumb[2]);
 				} else {
 					$out[] = $crumb[0];
@@ -714,7 +714,7 @@ 
  */
 	public function getCrumbList($options = array(), $startText = false) {
 		$defaults = array('firstClass' => 'first', 'lastClass' => 'last', 'separator' => '', 'escape' => true);
-		$options = array_merge($defaults, (array)$options);
+		$options = array_merge($defaults, (array) $options);
 		$firstClass = $options['firstClass'];
 		$lastClass = $options['lastClass'];
 		$separator = $options['separator'];
@@ -736,12 +736,12 @@ 
 			} else {
 				$elementContent = $this->link($crumb[0], $crumb[1], $crumb[2]);
 			}
-			if (!$which && $firstClass !== false) {
+			if ( ! $which && $firstClass !== false) {
 				$options['class'] = $firstClass;
 			} elseif ($which == $crumbCount - 1 && $lastClass !== false) {
 				$options['class'] = $lastClass;
 			}
-			if (!empty($separator) && ($crumbCount - $which >= 2)) {
+			if ( ! empty($separator) && ($crumbCount - $which >= 2)) {
 				$elementContent .= $separator;
 			}
 			$result .= $this->tag('li', $elementContent, $options);
@@ -759,7 +759,7 @@ 
 	protected function _prepareCrumbs($startText, $escape = true) {
 		$crumbs = $this->_crumbs;
 		if ($startText) {
-			if (!is_array($startText)) {
+			if ( ! is_array($startText)) {
 				$startText = array(
 					'url' => '/',
 					'text' => $startText
@@ -804,12 +804,12 @@ 
 		$path = $this->assetUrl($path, $options + array('pathPrefix' => Configure::read('App.imageBaseUrl')));
 		$options = array_diff_key($options, array('fullBase' => null, 'pathPrefix' => null));
 
-		if (!isset($options['alt'])) {
+		if ( ! isset($options['alt'])) {
 			$options['alt'] = '';
 		}
 
 		$url = false;
-		if (!empty($options['url'])) {
+		if ( ! empty($options['url'])) {
 			$url = $options['url'];
 			unset($options['url']);
 		}
@@ -835,7 +835,7 @@ 
 	public function tableHeaders($names, $trOptions = null, $thOptions = null) {
 		$out = array();
 		foreach ($names as $arg) {
-			if (!is_array($arg)) {
+			if ( ! is_array($arg)) {
 				$out[] = sprintf($this->_tags['tableheader'], $this->_parseAttributes($thOptions), $arg);
 			} else {
 				$out[] = sprintf($this->_tags['tableheader'], $this->_parseAttributes(current($arg)), key($arg));
@@ -857,7 +857,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::tableCells
  */
 	public function tableCells($data, $oddTrOptions = null, $evenTrOptions = null, $useCount = false, $continueOddEven = true) {
-		if (empty($data[0]) || !is_array($data[0])) {
+		if (empty($data[0]) || ! is_array($data[0])) {
 			$data = array($data);
 		}
 
@@ -888,7 +888,7 @@ 
 					$cellOptions = $cell[1];
 					$cell = $cell[0];
 				} elseif ($useCount) {
-					$cellOptions['class'] = 'column-' . ++$i;
+					$cellOptions['class'] = 'column-'.++$i;
 				}
 				$cellsOut[] = sprintf($this->_tags['tablecell'], $this->_parseAttributes($cellOptions), $cell);
 			}
@@ -936,7 +936,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::useTag
  */
 	public function useTag($tag) {
-		if (!isset($this->_tags[$tag])) {
+		if ( ! isset($this->_tags[$tag])) {
 			return '';
 		}
 		$args = func_get_args();
@@ -964,7 +964,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::div
  */
 	public function div($class = null, $text = null, $options = array()) {
-		if (!empty($class)) {
+		if ( ! empty($class)) {
 			$options['class'] = $class;
 		}
 		return $this->tag('div', $text, $options);
@@ -987,7 +987,7 @@ 
 		if (isset($options['escape'])) {
 			$text = h($text);
 		}
-		if ($class && !empty($class)) {
+		if ($class && ! empty($class)) {
 			$options['class'] = $class;
 		}
 		$tag = 'para';
@@ -1056,7 +1056,7 @@ 
 			'text' => ''
 		);
 
-		if (!empty($options['tag'])) {
+		if ( ! empty($options['tag'])) {
 			$tag = $options['tag'];
 		} else {
 			$tag = null;
@@ -1070,7 +1070,7 @@ 
 						'src' => $source,
 					);
 				}
-				if (!isset($source['type'])) {
+				if ( ! isset($source['type'])) {
 					$ext = pathinfo($source['src'], PATHINFO_EXTENSION);
 					$source['type'] = $this->response->getMimeType($ext);
 				}
@@ -1078,10 +1078,10 @@ 
 				$sourceTags .= $this->useTag('tagselfclosing', 'source', $source);
 			}
 			unset($source);
-			$options['text'] = $sourceTags . $options['text'];
+			$options['text'] = $sourceTags.$options['text'];
 			unset($options['fullBase']);
 		} else {
-			if (empty($path) && !empty($options['src'])) {
+			if (empty($path) && ! empty($options['src'])) {
 				$path = $options['src'];
 			}
 			$options['src'] = $this->assetUrl($path, $options);
@@ -1149,7 +1149,7 @@ 
 		$index = 1;
 		foreach ($items as $key => $item) {
 			if (is_array($item)) {
-				$item = $key . $this->nestedList($item, $options, $itemOptions, $tag);
+				$item = $key.$this->nestedList($item, $options, $itemOptions, $tag);
 			}
 			if (isset($itemOptions['even']) && $index % 2 === 0) {
 				$itemOptions['class'] = $itemOptions['even'];
@@ -1204,13 +1204,13 @@ 
  * @link http://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#changing-the-tags-output-by-htmlhelper
  */
 	public function loadConfig($configFile, $path = null) {
-		if (!$path) {
-			$path = APP . 'Config' . DS;
+		if ( ! $path) {
+			$path = APP.'Config'.DS;
 		}
 		$file = null;
 		$reader = 'php';
 
-		if (!is_array($configFile)) {
+		if ( ! is_array($configFile)) {
 			$file = $configFile;
 		} elseif (isset($configFile[0])) {
 			$file = $configFile[0];
@@ -1221,9 +1221,9 @@ 
 			throw new ConfigureException(__d('cake_dev', 'Cannot load the configuration file. Wrong "configFile" configuration.'));
 		}
 
-		$readerClass = Inflector::camelize($reader) . 'Reader';
+		$readerClass = Inflector::camelize($reader).'Reader';
 		App::uses($readerClass, 'Configure');
-		if (!class_exists($readerClass)) {
+		if ( ! class_exists($readerClass)) {
 			throw new ConfigureException(__d('cake_dev', 'Cannot load the configuration file. Unknown reader.'));
 		}