reginaldojunior / winners

lib/Cake/Network/CakeResponse.php

Doc Comments +3 added lines, -6 removed lines

@@ -813,7 +813,7 @@ 
  *   if set to false, the response will be set to private
  *   if no value is provided, it will return whether the response is sharable or not
  * @param integer $time time in seconds after which the response should no longer be considered fresh
- * @return boolean
+ * @return null|boolean
  */
 	public function sharable($public = null, $time = null) {
 		if ($public === null) {
@@ -848,7 +848,7 @@ 
  * If called with no parameters, this function will return the current max-age value if any
  *
  * @param integer $seconds if null, the method will return the current s-maxage value
- * @return integer
+ * @return string|null
  */
 	public function sharedMaxAge($seconds = null) {
 		if ($seconds !== null) {
@@ -868,7 +868,7 @@ 
  * If called with no parameters, this function will return the current max-age value if any
  *
  * @param integer $seconds if null, the method will return the current max-age value
- * @return integer
+ * @return string|null
  */
 	public function maxAge($seconds = null) {
 		if ($seconds !== null) {
@@ -888,8 +888,6 @@ 
  * with the origin.
  * If called with no parameters, this function will return whether must-revalidate is present.
  *
- * @param integer $seconds if null, the method will return the current
- *   must-revalidate value
  * @return boolean
  */
 	public function mustRevalidate($enable = null) {
@@ -1029,7 +1027,6 @@ 
  *
  * If no parameters are passed, current Etag header is returned.
  *
- * @param string $hash the unique has that identifies this response
  * @param boolean $weak whether the response is semantically the same as
  *   other with the same hash or not
  * @return string

Spacing +33 added lines, -33 removed lines

@@ -393,7 +393,7 @@ 
 		if (isset($options['type'])) {
 			$this->type($options['type']);
 		}
-		if (!isset($options['charset'])) {
+		if ( ! isset($options['charset'])) {
 			$options['charset'] = Configure::read('App.encoding');
 		}
 		$this->charset($options['charset']);
@@ -417,7 +417,7 @@ 
 		$this->_setContentLength();
 		$this->_setContentType();
 		foreach ($this->_headers as $header => $values) {
-			foreach ((array)$values as $value) {
+			foreach ((array) $values as $value) {
 				$this->_sendHeader($header, $value);
 			}
 		}
@@ -492,12 +492,12 @@ 
  * @return void
  */
 	protected function _setContentLength() {
-		$shouldSetLength = !isset($this->_headers['Content-Length']) && !in_array($this->_status, range(301, 307));
+		$shouldSetLength = ! isset($this->_headers['Content-Length']) && ! in_array($this->_status, range(301, 307));
 		if (isset($this->_headers['Content-Length']) && $this->_headers['Content-Length'] === false) {
 			unset($this->_headers['Content-Length']);
 			return;
 		}
-		if ($shouldSetLength && !$this->outputCompressed()) {
+		if ($shouldSetLength && ! $this->outputCompressed()) {
 			$offset = ob_get_level() ? ob_get_length() : 0;
 			if (ini_get('mbstring.func_overload') & 2 && function_exists('mb_strlen')) {
 				$this->length($offset + mb_strlen($this->_body, '8bit'));
@@ -515,7 +515,7 @@ 
  * @return void
  */
 	protected function _sendHeader($name, $value = null) {
-		if (!headers_sent()) {
+		if ( ! headers_sent()) {
 			if ($value === null) {
 				header($name);
 			} else {
@@ -620,7 +620,7 @@ 
 		if ($code === null) {
 			return $this->_status;
 		}
-		if (!isset($this->_statusCodes[$code])) {
+		if ( ! isset($this->_statusCodes[$code])) {
 			throw new CakeException(__d('cake_dev', 'Unknown status code'));
 		}
 		return $this->_status = $code;
@@ -664,13 +664,13 @@ 
 		if (is_array($code)) {
 			$codes = array_keys($code);
 			$min = min($codes);
-			if (!is_int($min) || $min < 100 || max($codes) > 999) {
+			if ( ! is_int($min) || $min < 100 || max($codes) > 999) {
 				throw new CakeException(__d('cake_dev', 'Invalid status code'));
 			}
 			$this->_statusCodes = $code + $this->_statusCodes;
 			return true;
 		}
-		if (!isset($this->_statusCodes[$code])) {
+		if ( ! isset($this->_statusCodes[$code])) {
 			return null;
 		}
 		return array($code => $this->_statusCodes[$code]);
@@ -750,7 +750,7 @@ 
 		}
 
 		foreach ($this->_mimeTypes as $alias => $types) {
-			if (in_array($ctype, (array)$types)) {
+			if (in_array($ctype, (array) $types)) {
 				return $alias;
 			}
 		}
@@ -779,7 +779,7 @@ 
 	public function disableCache() {
 		$this->header(array(
 			'Expires' => 'Mon, 26 Jul 1997 05:00:00 GMT',
-			'Last-Modified' => gmdate("D, d M Y H:i:s") . " GMT",
+			'Last-Modified' => gmdate("D, d M Y H:i:s")." GMT",
 			'Cache-Control' => 'no-store, no-cache, must-revalidate, post-check=0, pre-check=0'
 		));
 	}
@@ -792,11 +792,11 @@ 
  * @return void
  */
 	public function cache($since, $time = '+1 day') {
-		if (!is_int($time)) {
+		if ( ! is_int($time)) {
 			$time = strtotime($time);
 		}
 		$this->header(array(
-			'Date' => gmdate("D, j M Y G:i:s ", time()) . 'GMT'
+			'Date' => gmdate("D, j M Y G:i:s ", time()).'GMT'
 		));
 		$this->modified($since);
 		$this->expires($time);
@@ -820,7 +820,7 @@ 
 			$public = array_key_exists('public', $this->_cacheDirectives);
 			$private = array_key_exists('private', $this->_cacheDirectives);
 			$noCache = array_key_exists('no-cache', $this->_cacheDirectives);
-			if (!$public && !$private && !$noCache) {
+			if ( ! $public && ! $private && ! $noCache) {
 				return null;
 			}
 			$sharable = $public || ! ($private || $noCache);
@@ -835,10 +835,10 @@ 
 			unset($this->_cacheDirectives['public']);
 			$this->maxAge($time);
 		}
-		if (!$time) {
+		if ( ! $time) {
 			$this->_setCacheControl();
 		}
-		return (bool)$public;
+		return (bool) $public;
 	}
 
 /**
@@ -936,7 +936,7 @@ 
 	public function expires($time = null) {
 		if ($time !== null) {
 			$date = $this->_getUTCDate($time);
-			$this->_headers['Expires'] = $date->format('D, j M Y H:i:s') . ' GMT';
+			$this->_headers['Expires'] = $date->format('D, j M Y H:i:s').' GMT';
 		}
 		if (isset($this->_headers['Expires'])) {
 			return $this->_headers['Expires'];
@@ -960,7 +960,7 @@ 
 	public function modified($time = null) {
 		if ($time !== null) {
 			$date = $this->_getUTCDate($time);
-			$this->_headers['Last-Modified'] = $date->format('D, j M Y H:i:s') . ' GMT';
+			$this->_headers['Last-Modified'] = $date->format('D, j M Y H:i:s').' GMT';
 		}
 		if (isset($this->_headers['Last-Modified'])) {
 			return $this->_headers['Last-Modified'];
@@ -1004,7 +1004,7 @@ 
  */
 	public function vary($cacheVariances = null) {
 		if ($cacheVariances !== null) {
-			$cacheVariances = (array)$cacheVariances;
+			$cacheVariances = (array) $cacheVariances;
 			$this->_headers['Vary'] = implode(', ', $cacheVariances);
 		}
 		if (isset($this->_headers['Vary'])) {
@@ -1093,7 +1093,7 @@ 
  * @return void
  */
 	public function download($filename) {
-		$this->header('Content-Disposition', 'attachment; filename="' . $filename . '"');
+		$this->header('Content-Disposition', 'attachment; filename="'.$filename.'"');
 	}
 
 /**
@@ -1153,7 +1153,7 @@ 
 		if (empty($checks)) {
 			return false;
 		}
-		$notModified = !in_array(false, $checks, true);
+		$notModified = ! in_array(false, $checks, true);
 		if ($notModified) {
 			$this->notModified();
 		}
@@ -1167,7 +1167,7 @@ 
  * @return string
  */
 	public function __toString() {
-		return (string)$this->_body;
+		return (string) $this->_body;
 	}
 
 /**
@@ -1216,7 +1216,7 @@ 
 		}
 
 		if (is_string($options)) {
-			if (!isset($this->_cookies[$options])) {
+			if ( ! isset($this->_cookies[$options])) {
 				return null;
 			}
 			return $this->_cookies[$options];
@@ -1266,12 +1266,12 @@ 
 			));
 		}
 
-		if (!is_file($path)) {
-			$path = APP . $path;
+		if ( ! is_file($path)) {
+			$path = APP.$path;
 		}
 
 		$file = new File($path);
-		if (!$file->exists() || !$file->readable()) {
+		if ( ! $file->exists() || ! $file->readable()) {
 			if (Configure::read('debug')) {
 				throw new NotFoundException(__d('cake_dev', 'The requested file %s was not found or not readable', $path));
 			}
@@ -1280,7 +1280,7 @@ 
 
 		$extension = strtolower($file->ext());
 		$download = $options['download'];
-		if ((!$extension || $this->type($extension) === false) && $download === null) {
+		if (( ! $extension || $this->type($extension) === false) && $download === null) {
 			$download = true;
 		}
 
@@ -1294,7 +1294,7 @@ 
 				$contentType = 'application/force-download';
 			}
 
-			if (!empty($contentType)) {
+			if ( ! empty($contentType)) {
 				$this->type($contentType);
 			}
 			if ($options['name'] === null) {
@@ -1347,14 +1347,14 @@ 
 		if ($start > $end || $end > $lastByte || $start > $lastByte) {
 			$this->statusCode(416);
 			$this->header(array(
-				'Content-Range' => 'bytes 0-' . $lastByte . '/' . $fileSize
+				'Content-Range' => 'bytes 0-'.$lastByte.'/'.$fileSize
 			));
 			return;
 		}
 
 		$this->header(array(
 			'Content-Length' => $end - $start + 1,
-			'Content-Range' => 'bytes ' . $start . '-' . $end . '/' . $fileSize
+			'Content-Range' => 'bytes '.$start.'-'.$end.'/'.$fileSize
 		));
 
 		$this->statusCode(206);
@@ -1383,8 +1383,8 @@ 
 		$bufferSize = 8192;
 		set_time_limit(0);
 		session_write_close();
-		while (!feof($file->handle)) {
-			if (!$this->_isActive()) {
+		while ( ! feof($file->handle)) {
+			if ( ! $this->_isActive()) {
 				$file->close();
 				return false;
 			}
@@ -1396,7 +1396,7 @@ 
 				$bufferSize = $end - $offset + 1;
 			}
 			echo fread($file->handle, $bufferSize);
-			if (!$compress) {
+			if ( ! $compress) {
 				$this->_flushBuffer();
 			}
 		}
@@ -1410,7 +1410,7 @@ 
  * @return boolean
  */
 	protected function _isActive() {
-		return connection_status() === CONNECTION_NORMAL && !connection_aborted();
+		return connection_status() === CONNECTION_NORMAL && ! connection_aborted();
 	}
 
 /**

lib/Cake/Network/CakeSocket.php

Doc Comments +1 added lines, -1 removed lines

@@ -288,7 +288,7 @@
  * established.
  *
  * @param integer $length Optional buffer length to read; defaults to 1024
- * @return mixed Socket data
+ * @return false|string Socket data
  */
 	public function read($length = 1024) {
 		if (!$this->connected) {

Spacing +19 added lines, -19 removed lines

@@ -116,7 +116,7 @@ 
  */
 	public function __construct($config = array()) {
 		$this->config = array_merge($this->_baseConfig, $config);
-		if (!is_numeric($this->config['protocol'])) {
+		if ( ! is_numeric($this->config['protocol'])) {
 			$this->config['protocol'] = getprotobyname($this->config['protocol']);
 		}
 	}
@@ -137,7 +137,7 @@ 
 			$scheme = 'ssl://';
 		}
 
-		if (!empty($this->config['context'])) {
+		if ( ! empty($this->config['context'])) {
 			$context = stream_context_create($this->config['context']);
 		} else {
 			$context = stream_context_create();
@@ -150,7 +150,7 @@ 
 
 		set_error_handler(array($this, '_connectionErrorHandler'));
 		$this->connection = stream_socket_client(
-			$scheme . $this->config['host'] . ':' . $this->config['port'],
+			$scheme.$this->config['host'].':'.$this->config['port'],
 			$errNum,
 			$errStr,
 			$this->config['timeout'],
@@ -159,12 +159,12 @@ 
 		);
 		restore_error_handler();
 
-		if (!empty($errNum) || !empty($errStr)) {
+		if ( ! empty($errNum) || ! empty($errStr)) {
 			$this->setLastError($errNum, $errStr);
 			throw new SocketException($errStr, $errNum);
 		}
 
-		if (!$this->connection && $this->_connectionErrors) {
+		if ( ! $this->connection && $this->_connectionErrors) {
 			$message = implode("\n", $this->_connectionErrors);
 			throw new SocketException($message, E_WARNING);
 		}
@@ -196,7 +196,7 @@ 
  * @return null|array Null when there is no connection, an array when there is.
  */
 	public function context() {
-		if (!$this->connection) {
+		if ( ! $this->connection) {
 			return;
 		}
 		return stream_context_get_options($this->connection);
@@ -244,8 +244,8 @@ 
  * @return string Last error
  */
 	public function lastError() {
-		if (!empty($this->lastError)) {
-			return $this->lastError['num'] . ': ' . $this->lastError['str'];
+		if ( ! empty($this->lastError)) {
+			return $this->lastError['num'].': '.$this->lastError['str'];
 		}
 		return null;
 	}
@@ -268,8 +268,8 @@ 
  * @return boolean Success
  */
 	public function write($data) {
-		if (!$this->connected) {
-			if (!$this->connect()) {
+		if ( ! $this->connected) {
+			if ( ! $this->connect()) {
 				return false;
 			}
 		}
@@ -291,13 +291,13 @@ 
  * @return mixed Socket data
  */
 	public function read($length = 1024) {
-		if (!$this->connected) {
-			if (!$this->connect()) {
+		if ( ! $this->connected) {
+			if ( ! $this->connect()) {
 				return false;
 			}
 		}
 
-		if (!feof($this->connection)) {
+		if ( ! feof($this->connection)) {
 			$buffer = fread($this->connection, $length);
 			$info = stream_get_meta_data($this->connection);
 			if ($info['timed_out']) {
@@ -315,16 +315,16 @@ 
  * @return boolean Success
  */
 	public function disconnect() {
-		if (!is_resource($this->connection)) {
+		if ( ! is_resource($this->connection)) {
 			$this->connected = false;
 			return true;
 		}
-		$this->connected = !fclose($this->connection);
+		$this->connected = ! fclose($this->connection);
 
-		if (!$this->connected) {
+		if ( ! $this->connected) {
 			$this->connection = null;
 		}
-		return !$this->connected;
+		return ! $this->connected;
 	}
 
 /**
@@ -367,12 +367,12 @@ 
  * @see stream_socket_enable_crypto
  */
 	public function enableCrypto($type, $clientOrServer = 'client', $enable = true) {
-		if (!array_key_exists($type . '_' . $clientOrServer, $this->_encryptMethods)) {
+		if ( ! array_key_exists($type.'_'.$clientOrServer, $this->_encryptMethods)) {
 			throw new InvalidArgumentException(__d('cake_dev', 'Invalid encryption scheme chosen'));
 		}
 		$enableCryptoResult = false;
 		try {
-			$enableCryptoResult = stream_socket_enable_crypto($this->connection, $enable, $this->_encryptMethods[$type . '_' . $clientOrServer]);
+			$enableCryptoResult = stream_socket_enable_crypto($this->connection, $enable, $this->_encryptMethods[$type.'_'.$clientOrServer]);
 		} catch (Exception $e) {
 			$this->setLastError(null, $e->getMessage());
 			throw new SocketException($e->getMessage());

lib/Cake/Network/Email/CakeEmail.php

Doc Comments +4 added lines, -4 removed lines

@@ -666,7 +666,7 @@ 
  * Add header for the message
  *
  * @param array $headers
- * @return object $this
+ * @return CakeEmail $this
  * @throws SocketException
  */
 	public function addHeaders($headers) {
@@ -1308,7 +1308,7 @@ 
  *
  * @param string $message Message to wrap
  * @param integer $wrapLength The line length
- * @return array Wrapped message
+ * @return string[] Wrapped message
  */
 	protected function _wrap($message, $wrapLength = CakeEmail::LINE_LENGTH_MUST) {
 		if (strlen($message) === 0) {
@@ -1586,7 +1586,7 @@ 
 /**
  * Gets the text body types that are in this email message
  *
- * @return array Array of types. Valid types are 'text' and 'html'
+ * @return string[] Array of types. Valid types are 'text' and 'html'
  */
 	protected function _getTypes() {
 		$types = array($this->_emailFormat);
@@ -1668,7 +1668,7 @@ 
 /**
  * Return the Content-Transfer Encoding value based on the set charset
  *
- * @return void
+ * @return string
  */
 	protected function _getContentTransferEncoding() {
 		$charset = strtoupper($this->charset);

Spacing +76 added lines, -76 removed lines

@@ -555,8 +555,8 @@ 
  * @throws SocketException
  */
 	protected function _setEmail($varName, $email, $name) {
-		if (!is_array($email)) {
-			if (!Validation::email($email, false, $this->_emailPattern)) {
+		if ( ! is_array($email)) {
+			if ( ! Validation::email($email, false, $this->_emailPattern)) {
 				throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $email));
 			}
 			if ($name === null) {
@@ -570,7 +570,7 @@ 
 			if (is_int($key)) {
 				$key = $value;
 			}
-			if (!Validation::email($key, false, $this->_emailPattern)) {
+			if ( ! Validation::email($key, false, $this->_emailPattern)) {
 				throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $key));
 			}
 			$list[$key] = $value;
@@ -609,8 +609,8 @@ 
  * @throws SocketException
  */
 	protected function _addEmail($varName, $email, $name) {
-		if (!is_array($email)) {
-			if (!Validation::email($email, false, $this->_emailPattern)) {
+		if ( ! is_array($email)) {
+			if ( ! Validation::email($email, false, $this->_emailPattern)) {
 				throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $email));
 			}
 			if ($name === null) {
@@ -624,7 +624,7 @@ 
 			if (is_int($key)) {
 				$key = $value;
 			}
-			if (!Validation::email($key, false, $this->_emailPattern)) {
+			if ( ! Validation::email($key, false, $this->_emailPattern)) {
 				throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $key));
 			}
 			$list[$key] = $value;
@@ -643,7 +643,7 @@ 
 		if ($subject === null) {
 			return $this->_subject;
 		}
-		$this->_subject = $this->_encode((string)$subject);
+		$this->_subject = $this->_encode((string) $subject);
 		return $this;
 	}
 
@@ -655,7 +655,7 @@ 
  * @throws SocketException
  */
 	public function setHeaders($headers) {
-		if (!is_array($headers)) {
+		if ( ! is_array($headers)) {
 			throw new SocketException(__d('cake_dev', '$headers should be an array.'));
 		}
 		$this->_headers = $headers;
@@ -670,7 +670,7 @@ 
  * @throws SocketException
  */
 	public function addHeaders($headers) {
-		if (!is_array($headers)) {
+		if ( ! is_array($headers)) {
 			throw new SocketException(__d('cake_dev', '$headers should be an array.'));
 		}
 		$this->_headers = array_merge($this->_headers, $headers);
@@ -710,7 +710,7 @@ 
 		);
 		foreach ($relation as $var => $header) {
 			if ($include[$var]) {
-				$var = '_' . $var;
+				$var = '_'.$var;
 				$headers[$header] = current($this->_formatAddress($this->{$var}));
 			}
 		}
@@ -724,21 +724,21 @@ 
 
 		foreach (array('to', 'cc', 'bcc') as $var) {
 			if ($include[$var]) {
-				$classVar = '_' . $var;
+				$classVar = '_'.$var;
 				$headers[ucfirst($var)] = implode(', ', $this->_formatAddress($this->{$classVar}));
 			}
 		}
 
 		$headers += $this->_headers;
-		if (!isset($headers['X-Mailer'])) {
+		if ( ! isset($headers['X-Mailer'])) {
 			$headers['X-Mailer'] = self::EMAIL_CLIENT;
 		}
-		if (!isset($headers['Date'])) {
+		if ( ! isset($headers['Date'])) {
 			$headers['Date'] = date(DATE_RFC2822);
 		}
 		if ($this->_messageId !== false) {
 			if ($this->_messageId === true) {
-				$headers['Message-ID'] = '<' . str_replace('-', '', String::UUID()) . '@' . $this->_domain . '>';
+				$headers['Message-ID'] = '<'.str_replace('-', '', String::UUID()).'@'.$this->_domain.'>';
 			} else {
 				$headers['Message-ID'] = $this->_messageId;
 			}
@@ -749,12 +749,12 @@ 
 		}
 
 		$headers['MIME-Version'] = '1.0';
-		if (!empty($this->_attachments) || $this->_emailFormat === 'both') {
-			$headers['Content-Type'] = 'multipart/mixed; boundary="' . $this->_boundary . '"';
+		if ( ! empty($this->_attachments) || $this->_emailFormat === 'both') {
+			$headers['Content-Type'] = 'multipart/mixed; boundary="'.$this->_boundary.'"';
 		} elseif ($this->_emailFormat === 'text') {
-			$headers['Content-Type'] = 'text/plain; charset=' . $this->_getContentTypeCharset();
+			$headers['Content-Type'] = 'text/plain; charset='.$this->_getContentTypeCharset();
 		} elseif ($this->_emailFormat === 'html') {
-			$headers['Content-Type'] = 'text/html; charset=' . $this->_getContentTypeCharset();
+			$headers['Content-Type'] = 'text/html; charset='.$this->_getContentTypeCharset();
 		}
 		$headers['Content-Transfer-Encoding'] = $this->_getContentTransferEncoding();
 
@@ -779,7 +779,7 @@ 
 			} else {
 				$encoded = $this->_encode($alias);
 				if ($encoded === $alias && preg_match('/[^a-z0-9 ]/i', $encoded)) {
-					$encoded = '"' . str_replace('"', '\"', $encoded) . '"';
+					$encoded = '"'.str_replace('"', '\"', $encoded).'"';
 				}
 				$return[] = sprintf('%s <%s>', $encoded, $email);
 			}
@@ -832,7 +832,7 @@ 
 		if ($viewVars === null) {
 			return $this->_viewVars;
 		}
-		$this->_viewVars = array_merge($this->_viewVars, (array)$viewVars);
+		$this->_viewVars = array_merge($this->_viewVars, (array) $viewVars);
 		return $this;
 	}
 
@@ -860,7 +860,7 @@ 
 		if ($helpers === null) {
 			return $this->_helpers;
 		}
-		$this->_helpers = (array)$helpers;
+		$this->_helpers = (array) $helpers;
 		return $this;
 	}
 
@@ -875,7 +875,7 @@ 
 		if ($format === null) {
 			return $this->_emailFormat;
 		}
-		if (!in_array($format, $this->_emailFormatAvailable)) {
+		if ( ! in_array($format, $this->_emailFormatAvailable)) {
 			throw new SocketException(__d('cake_dev', 'Format not available.'));
 		}
 		$this->_emailFormat = $format;
@@ -892,7 +892,7 @@ 
 		if ($name === null) {
 			return $this->_transportName;
 		}
-		$this->_transportName = (string)$name;
+		$this->_transportName = (string) $name;
 		$this->_transportClass = null;
 		return $this;
 	}
@@ -909,10 +909,10 @@ 
 		}
 		list($plugin, $transportClassname) = pluginSplit($this->_transportName, true);
 		$transportClassname .= 'Transport';
-		App::uses($transportClassname, $plugin . 'Network/Email');
-		if (!class_exists($transportClassname)) {
+		App::uses($transportClassname, $plugin.'Network/Email');
+		if ( ! class_exists($transportClassname)) {
 			throw new SocketException(__d('cake_dev', 'Class "%s" not found.', $transportClassname));
-		} elseif (!method_exists($transportClassname, 'send')) {
+		} elseif ( ! method_exists($transportClassname, 'send')) {
 			throw new SocketException(__d('cake_dev', 'The "%s" does not have a %s method.', $transportClassname, 'send()'));
 		}
 
@@ -933,7 +933,7 @@ 
 		if (is_bool($message)) {
 			$this->_messageId = $message;
 		} else {
-			if (!preg_match('/^\<.+@.+\>$/', $message)) {
+			if ( ! preg_match('/^\<.+@.+\>$/', $message)) {
 				throw new SocketException(__d('cake_dev', 'Invalid format for Message-ID. The text should be something like "<uuid@server.com>"'));
 			}
 			$this->_messageId = $message;
@@ -1007,12 +1007,12 @@ 
 			return $this->_attachments;
 		}
 		$attach = array();
-		foreach ((array)$attachments as $name => $fileInfo) {
-			if (!is_array($fileInfo)) {
+		foreach ((array) $attachments as $name => $fileInfo) {
+			if ( ! is_array($fileInfo)) {
 				$fileInfo = array('file' => $fileInfo);
 			}
-			if (!isset($fileInfo['file'])) {
-				if (!isset($fileInfo['data'])) {
+			if ( ! isset($fileInfo['file'])) {
+				if ( ! isset($fileInfo['data'])) {
 					throw new SocketException(__d('cake_dev', 'No file or data specified.'));
 				}
 				if (is_int($name)) {
@@ -1022,14 +1022,14 @@ 
 			} else {
 				$fileName = $fileInfo['file'];
 				$fileInfo['file'] = realpath($fileInfo['file']);
-				if ($fileInfo['file'] === false || !file_exists($fileInfo['file'])) {
+				if ($fileInfo['file'] === false || ! file_exists($fileInfo['file'])) {
 					throw new SocketException(__d('cake_dev', 'File not found: "%s"', $fileName));
 				}
 				if (is_int($name)) {
 					$name = basename($fileInfo['file']);
 				}
 			}
-			if (!isset($fileInfo['mimetype'])) {
+			if ( ! isset($fileInfo['mimetype'])) {
 				$fileInfo['mimetype'] = 'application/octet-stream';
 			}
 			$attach[$name] = $fileInfo;
@@ -1089,8 +1089,8 @@ 
 		if ($config === null) {
 			return $this->_config;
 		}
-		if (!is_array($config)) {
-			$config = (string)$config;
+		if ( ! is_array($config)) {
+			$config = (string) $config;
 		}
 
 		$this->_applyConfig($config);
@@ -1113,26 +1113,26 @@ 
 		}
 
 		if (is_array($content)) {
-			$content = implode("\n", $content) . "\n";
+			$content = implode("\n", $content)."\n";
 		}
 
 		$this->_message = $this->_render($this->_wrap($content));
 
 		$contents = $this->transportClass()->send($this);
-		if (!empty($this->_config['log'])) {
+		if ( ! empty($this->_config['log'])) {
 			$config = array(
 				'level' => LOG_DEBUG,
 				'scope' => 'email'
 			);
 			if ($this->_config['log'] !== true) {
-				if (!is_array($this->_config['log'])) {
+				if ( ! is_array($this->_config['log'])) {
 					$this->_config['log'] = array('level' => $this->_config['log']);
 				}
 				$config = array_merge($config, $this->_config['log']);
 			}
 			CakeLog::write(
 				$config['level'],
-				PHP_EOL . $contents['headers'] . PHP_EOL . $contents['message'],
+				PHP_EOL.$contents['headers'].PHP_EOL.$contents['message'],
 				$config['scope']
 			);
 		}
@@ -1183,20 +1183,20 @@ 
  */
 	protected function _applyConfig($config) {
 		if (is_string($config)) {
-			if (!class_exists($this->_configClass) && !config('email')) {
-				throw new ConfigureException(__d('cake_dev', '%s not found.', APP . 'Config' . DS . 'email.php'));
+			if ( ! class_exists($this->_configClass) && ! config('email')) {
+				throw new ConfigureException(__d('cake_dev', '%s not found.', APP.'Config'.DS.'email.php'));
 			}
 			$configs = new $this->_configClass();
-			if (!isset($configs->{$config})) {
+			if ( ! isset($configs->{$config})) {
 				throw new ConfigureException(__d('cake_dev', 'Unknown email configuration "%s".', $config));
 			}
 			$config = $configs->{$config};
 		}
 		$this->_config = array_merge($this->_config, $config);
-		if (!empty($config['charset'])) {
+		if ( ! empty($config['charset'])) {
 			$this->charset = $config['charset'];
 		}
-		if (!empty($config['headerCharset'])) {
+		if ( ! empty($config['headerCharset'])) {
 			$this->headerCharset = $config['headerCharset'];
 		}
 		if (empty($this->headerCharset)) {
@@ -1297,7 +1297,7 @@ 
  * @return string
  */
 	protected function _encodeString($text, $charset) {
-		if ($this->_appCharset === $charset || !function_exists('mb_convert_encoding')) {
+		if ($this->_appCharset === $charset || ! function_exists('mb_convert_encoding')) {
 			return $text;
 		}
 		return mb_convert_encoding($text, $charset, $this->_appCharset);
@@ -1328,7 +1328,7 @@ 
 				$formatted[] = $line;
 				continue;
 			}
-			if (!preg_match('/<[a-z]+.*>/i', $line)) {
+			if ( ! preg_match('/<[a-z]+.*>/i', $line)) {
 				$formatted = array_merge(
 					$formatted,
 					explode("\n", wordwrap($line, $wrapLength, "\n", $cut))
@@ -1402,7 +1402,7 @@ 
 					}
 				}
 			}
-			if (!empty($tmpLine)) {
+			if ( ! empty($tmpLine)) {
 				$formatted[] = $tmpLine;
 			}
 		}
@@ -1416,7 +1416,7 @@ 
  * @return void
  */
 	protected function _createBoundary() {
-		if (!empty($this->_attachments) || $this->_emailFormat === 'both') {
+		if ( ! empty($this->_attachments) || $this->_emailFormat === 'both') {
 			$this->_boundary = md5(uniqid(time()));
 		}
 	}
@@ -1434,19 +1434,19 @@ 
 
 		$msg = array();
 		foreach ($this->_attachments as $filename => $fileInfo) {
-			if (!empty($fileInfo['contentId'])) {
+			if ( ! empty($fileInfo['contentId'])) {
 				continue;
 			}
 			$data = isset($fileInfo['data']) ? $fileInfo['data'] : $this->_readFile($fileInfo['file']);
 
-			$msg[] = '--' . $boundary;
-			$msg[] = 'Content-Type: ' . $fileInfo['mimetype'];
+			$msg[] = '--'.$boundary;
+			$msg[] = 'Content-Type: '.$fileInfo['mimetype'];
 			$msg[] = 'Content-Transfer-Encoding: base64';
 			if (
-				!isset($fileInfo['contentDisposition']) ||
+				! isset($fileInfo['contentDisposition']) ||
 				$fileInfo['contentDisposition']
 			) {
-				$msg[] = 'Content-Disposition: attachment; filename="' . $filename . '"';
+				$msg[] = 'Content-Disposition: attachment; filename="'.$filename.'"';
 			}
 			$msg[] = '';
 			$msg[] = $data;
@@ -1484,11 +1484,11 @@ 
 			}
 			$data = isset($fileInfo['data']) ? $fileInfo['data'] : $this->_readFile($fileInfo['file']);
 
-			$msg[] = '--' . $boundary;
-			$msg[] = 'Content-Type: ' . $fileInfo['mimetype'];
+			$msg[] = '--'.$boundary;
+			$msg[] = 'Content-Type: '.$fileInfo['mimetype'];
 			$msg[] = 'Content-Transfer-Encoding: base64';
-			$msg[] = 'Content-ID: <' . $fileInfo['contentId'] . '>';
-			$msg[] = 'Content-Disposition: inline; filename="' . $filename . '"';
+			$msg[] = 'Content-ID: <'.$fileInfo['contentId'].'>';
+			$msg[] = 'Content-Disposition: inline; filename="'.$filename.'"';
 			$msg[] = '';
 			$msg[] = $data;
 			$msg[] = '';
@@ -1511,32 +1511,32 @@ 
 		$this->_createBoundary();
 		$msg = array();
 
-		$contentIds = array_filter((array)Hash::extract($this->_attachments, '{s}.contentId'));
+		$contentIds = array_filter((array) Hash::extract($this->_attachments, '{s}.contentId'));
 		$hasInlineAttachments = count($contentIds) > 0;
-		$hasAttachments = !empty($this->_attachments);
+		$hasAttachments = ! empty($this->_attachments);
 		$hasMultipleTypes = count($rendered) > 1;
 
 		$boundary = $relBoundary = $textBoundary = $this->_boundary;
 
 		if ($hasInlineAttachments) {
-			$msg[] = '--' . $boundary;
-			$msg[] = 'Content-Type: multipart/related; boundary="rel-' . $boundary . '"';
+			$msg[] = '--'.$boundary;
+			$msg[] = 'Content-Type: multipart/related; boundary="rel-'.$boundary.'"';
 			$msg[] = '';
-			$relBoundary = $textBoundary = 'rel-' . $boundary;
+			$relBoundary = $textBoundary = 'rel-'.$boundary;
 		}
 
 		if ($hasMultipleTypes) {
-			$msg[] = '--' . $relBoundary;
-			$msg[] = 'Content-Type: multipart/alternative; boundary="alt-' . $boundary . '"';
+			$msg[] = '--'.$relBoundary;
+			$msg[] = 'Content-Type: multipart/alternative; boundary="alt-'.$boundary.'"';
 			$msg[] = '';
-			$textBoundary = 'alt-' . $boundary;
+			$textBoundary = 'alt-'.$boundary;
 		}
 
 		if (isset($rendered['text'])) {
 			if ($textBoundary !== $boundary || $hasAttachments) {
-				$msg[] = '--' . $textBoundary;
-				$msg[] = 'Content-Type: text/plain; charset=' . $this->_getContentTypeCharset();
-				$msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
+				$msg[] = '--'.$textBoundary;
+				$msg[] = 'Content-Type: text/plain; charset='.$this->_getContentTypeCharset();
+				$msg[] = 'Content-Transfer-Encoding: '.$this->_getContentTransferEncoding();
 				$msg[] = '';
 			}
 			$this->_textMessage = $rendered['text'];
@@ -1547,9 +1547,9 @@ 
 
 		if (isset($rendered['html'])) {
 			if ($textBoundary !== $boundary || $hasAttachments) {
-				$msg[] = '--' . $textBoundary;
-				$msg[] = 'Content-Type: text/html; charset=' . $this->_getContentTypeCharset();
-				$msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
+				$msg[] = '--'.$textBoundary;
+				$msg[] = 'Content-Type: text/html; charset='.$this->_getContentTypeCharset();
+				$msg[] = 'Content-Transfer-Encoding: '.$this->_getContentTransferEncoding();
 				$msg[] = '';
 			}
 			$this->_htmlMessage = $rendered['html'];
@@ -1559,7 +1559,7 @@ 
 		}
 
 		if ($hasMultipleTypes) {
-			$msg[] = '--' . $textBoundary . '--';
+			$msg[] = '--'.$textBoundary.'--';
 			$msg[] = '';
 		}
 
@@ -1567,7 +1567,7 @@ 
 			$attachments = $this->_attachInlineFiles($relBoundary);
 			$msg = array_merge($msg, $attachments);
 			$msg[] = '';
-			$msg[] = '--' . $relBoundary . '--';
+			$msg[] = '--'.$relBoundary.'--';
 			$msg[] = '';
 		}
 
@@ -1577,7 +1577,7 @@ 
 		}
 		if ($hasAttachments || $hasMultipleTypes) {
 			$msg[] = '';
-			$msg[] = '--' . $boundary . '--';
+			$msg[] = '--'.$boundary.'--';
 			$msg[] = '';
 		}
 		return $msg;
@@ -1617,7 +1617,7 @@ 
 		if ($viewClass !== 'View') {
 			list($plugin, $viewClass) = pluginSplit($viewClass, true);
 			$viewClass .= 'View';
-			App::uses($viewClass, $plugin . 'View');
+			App::uses($viewClass, $plugin.'View');
 		}
 
 		$View = new $viewClass(null);
@@ -1650,7 +1650,7 @@ 
 
 		foreach ($types as $type) {
 			$View->hasRendered = false;
-			$View->viewPath = $View->layoutPath = 'Emails' . DS . $type;
+			$View->viewPath = $View->layoutPath = 'Emails'.DS.$type;
 
 			$render = $View->render($this->_template, $this->_layout);
 			$render = str_replace(array("\r\n", "\r"), "\n", $render);

lib/Cake/Network/Email/SmtpTransport.php

Doc Comments +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
  * Send mail
  *
  * @param CakeEmail $email CakeEmail
- * @return array
+ * @return string
  * @throws SocketException
  */
 	public function send(CakeEmail $email) {

Spacing +10 added lines, -10 removed lines

@@ -96,7 +96,7 @@ 
  */
 	protected function _connect() {
 		$this->_generateSocket();
-		if (!$this->_socket->connect()) {
+		if ( ! $this->_socket->connect()) {
 			throw new SocketException(__d('cake_dev', 'Unable to connect to SMTP server.'));
 		}
 		$this->_smtpSend(null, '220');
@@ -138,10 +138,10 @@ 
 		if (isset($this->_config['username']) && isset($this->_config['password'])) {
 			$authRequired = $this->_smtpSend('AUTH LOGIN', '334|503');
 			if ($authRequired == '334') {
-				if (!$this->_smtpSend(base64_encode($this->_config['username']), '334')) {
+				if ( ! $this->_smtpSend(base64_encode($this->_config['username']), '334')) {
 					throw new SocketException(__d('cake_dev', 'SMTP server did not accept the username.'));
 				}
-				if (!$this->_smtpSend(base64_encode($this->_config['password']), '235')) {
+				if ( ! $this->_smtpSend(base64_encode($this->_config['password']), '235')) {
 					throw new SocketException(__d('cake_dev', 'SMTP server did not accept the password.'));
 				}
 			} elseif ($authRequired == '504') {
@@ -163,14 +163,14 @@ 
 		if (empty($from)) {
 			$from = $this->_cakeEmail->from();
 		}
-		$this->_smtpSend('MAIL FROM:<' . key($from) . '>');
+		$this->_smtpSend('MAIL FROM:<'.key($from).'>');
 
 		$to = $this->_cakeEmail->to();
 		$cc = $this->_cakeEmail->cc();
 		$bcc = $this->_cakeEmail->bcc();
 		$emails = array_merge(array_keys($to), array_keys($cc), array_keys($bcc));
 		foreach ($emails as $email) {
-			$this->_smtpSend('RCPT TO:<' . $email . '>');
+			$this->_smtpSend('RCPT TO:<'.$email.'>');
 		}
 	}
 
@@ -188,14 +188,14 @@ 
 		$lines = $this->_cakeEmail->message();
 		$messages = array();
 		foreach ($lines as $line) {
-			if ((!empty($line)) && ($line[0] === '.')) {
-				$messages[] = '.' . $line;
+			if (( ! empty($line)) && ($line[0] === '.')) {
+				$messages[] = '.'.$line;
 			} else {
 				$messages[] = $line;
 			}
 		}
 		$message = implode("\r\n", $messages);
-		$this->_smtpSend($headers . "\r\n\r\n" . $message . "\r\n\r\n\r\n.");
+		$this->_smtpSend($headers."\r\n\r\n".$message."\r\n\r\n\r\n.");
 		$this->_content = array('headers' => $headers, 'message' => $message);
 	}
 
@@ -230,7 +230,7 @@ 
  */
 	protected function _smtpSend($data, $checkCode = '250') {
 		if ($data !== null) {
-			$this->_socket->write($data . "\r\n");
+			$this->_socket->write($data."\r\n");
 		}
 		while ($checkCode !== false) {
 			$response = '';
@@ -244,7 +244,7 @@ 
 			$responseLines = explode("\r\n", rtrim($response, "\r\n"));
 			$response = end($responseLines);
 
-			if (preg_match('/^(' . $checkCode . ')(.)/', $response, $code)) {
+			if (preg_match('/^('.$checkCode.')(.)/', $response, $code)) {
 				if ($code[2] === '-') {
 					continue;
 				}

lib/Cake/Network/Http/HttpSocket.php

Doc Comments +2 added lines, -2 removed lines

@@ -545,7 +545,7 @@ 
  *
  * @param string|array Either a string or array of URL options to create a URL with.
  * @param string $uriTemplate A template string to use for URL formatting.
- * @return mixed Either false on failure or a string containing the composed URL.
+ * @return false|string Either false on failure or a string containing the composed URL.
  */
 	public function url($url = null, $uriTemplate = null) {
 		if ($url === null) {
@@ -698,7 +698,7 @@ 
  *
  * @param string|array $uri Either A $uri array, or a request string. Will use $this->config if left empty.
  * @param string $uriTemplate The Uri template/format to use.
- * @return mixed A fully qualified URL formatted according to $uriTemplate, or false on failure
+ * @return false|string A fully qualified URL formatted according to $uriTemplate, or false on failure
  */
 	protected function _buildUri($uri = array(), $uriTemplate = '%scheme://%user:%pass@%host:%port/%path?%query#%fragment') {
 		if (is_string($uri)) {

Spacing +64 added lines, -64 removed lines

@@ -240,7 +240,7 @@ 
 			$this->_contentResource = null;
 			return;
 		}
-		if (!is_resource($resource)) {
+		if ( ! is_resource($resource)) {
 			throw new SocketException(__d('cake_dev', 'Invalid resource.'));
 		}
 		$this->_contentResource = $resource;
@@ -259,15 +259,15 @@ 
 
 		if (is_string($request)) {
 			$request = array('uri' => $request);
-		} elseif (!is_array($request)) {
+		} elseif ( ! is_array($request)) {
 			return false;
 		}
 
-		if (!isset($request['uri'])) {
+		if ( ! isset($request['uri'])) {
 			$request['uri'] = null;
 		}
 		$uri = $this->_parseUri($request['uri']);
-		if (!isset($uri['host'])) {
+		if ( ! isset($uri['host'])) {
 			$host = $this->config['host'];
 		}
 		if (isset($request['host'])) {
@@ -281,11 +281,11 @@ 
 		$this->_configUri($this->request['uri']);
 
 		$Host = $this->request['uri']['host'];
-		if (!empty($this->config['request']['cookies'][$Host])) {
-			if (!isset($this->request['cookies'])) {
+		if ( ! empty($this->config['request']['cookies'][$Host])) {
+			if ( ! isset($this->request['cookies'])) {
 				$this->request['cookies'] = array();
 			}
-			if (!isset($request['cookies'])) {
+			if ( ! isset($request['cookies'])) {
 				$request['cookies'] = array();
 			}
 			$this->request['cookies'] = array_merge($this->request['cookies'], $this->config['request']['cookies'][$Host], $request['cookies']);
@@ -300,7 +300,7 @@ 
 		$cookies = null;
 
 		if (is_array($this->request['header'])) {
-			if (!empty($this->request['cookies'])) {
+			if ( ! empty($this->request['cookies'])) {
 				$cookies = $this->buildCookies($this->request['cookies']);
 			}
 			$scheme = '';
@@ -316,7 +316,7 @@ 
 				($scheme === 'https' && $port != 443) ||
 				($port != 80 && $port != 443)
 			) {
-				$Host .= ':' . $port;
+				$Host .= ':'.$port;
 			}
 			$this->request['header'] = array_merge(compact('Host'), $this->request['header']);
 		}
@@ -333,11 +333,11 @@ 
 			$this->request['body'] = http_build_query($this->request['body'], '', '&');
 		}
 
-		if (!empty($this->request['body']) && !isset($this->request['header']['Content-Type'])) {
+		if ( ! empty($this->request['body']) && ! isset($this->request['header']['Content-Type'])) {
 			$this->request['header']['Content-Type'] = 'application/x-www-form-urlencoded';
 		}
 
-		if (!empty($this->request['body']) && !isset($this->request['header']['Content-Length'])) {
+		if ( ! empty($this->request['body']) && ! isset($this->request['header']['Content-Length'])) {
 			$this->request['header']['Content-Length'] = strlen($this->request['body']);
 		}
 
@@ -345,7 +345,7 @@ 
 		if (isset($this->request['header']['Connection'])) {
 			$connectionType = $this->request['header']['Connection'];
 		}
-		$this->request['header'] = $this->_buildHeader($this->request['header']) . $cookies;
+		$this->request['header'] = $this->_buildHeader($this->request['header']).$cookies;
 
 		if (empty($this->request['line'])) {
 			$this->request['line'] = $this->_buildRequestLine($this->request);
@@ -399,14 +399,14 @@ 
 		}
 
 		list($plugin, $responseClass) = pluginSplit($this->responseClass, true);
-		App::uses($responseClass, $plugin . 'Network/Http');
-		if (!class_exists($responseClass)) {
+		App::uses($responseClass, $plugin.'Network/Http');
+		if ( ! class_exists($responseClass)) {
 			throw new SocketException(__d('cake_dev', 'Class %s not found.', $this->responseClass));
 		}
 		$this->response = new $responseClass($response);
 
-		if (!empty($this->response->cookies)) {
-			if (!isset($this->config['request']['cookies'][$Host])) {
+		if ( ! empty($this->response->cookies)) {
+			if ( ! isset($this->config['request']['cookies'][$Host])) {
 				$this->config['request']['cookies'][$Host] = array();
 			}
 			$this->config['request']['cookies'][$Host] = array_merge($this->config['request']['cookies'][$Host], $this->response->cookies);
@@ -445,7 +445,7 @@ 
  * @return mixed Result of request, either false on failure or the response to the request.
  */
 	public function get($uri = null, $query = array(), $request = array()) {
-		if (!empty($query)) {
+		if ( ! empty($query)) {
 			$uri = $this->_parseUri($uri, $this->config['request']['uri']);
 			if (isset($uri['query'])) {
 				$uri['query'] = array_merge($uri['query'], $query);
@@ -561,12 +561,12 @@ 
 				$port = $port[0];
 			}
 			if ($url{0} === '/') {
-				$url = $this->config['request']['uri']['host'] . ':' . $port . $url;
+				$url = $this->config['request']['uri']['host'].':'.$port.$url;
 			}
-			if (!preg_match('/^.+:\/\/|\*|^\//', $url)) {
-				$url = $scheme . '://' . $url;
+			if ( ! preg_match('/^.+:\/\/|\*|^\//', $url)) {
+				$url = $scheme.'://'.$url;
 			}
-		} elseif (!is_array($url) && !empty($url)) {
+		} elseif ( ! is_array($url) && ! empty($url)) {
 			return false;
 		}
 
@@ -577,7 +577,7 @@ 
 			$url = $this->config['request']['uri'];
 		}
 
-		if (!empty($uriTemplate)) {
+		if ( ! empty($uriTemplate)) {
 			return $this->_buildUri($url, $uriTemplate);
 		}
 		return $this->_buildUri($url);
@@ -595,13 +595,13 @@ 
 		}
 		$method = key($this->_auth);
 		list($plugin, $authClass) = pluginSplit($method, true);
-		$authClass = Inflector::camelize($authClass) . 'Authentication';
-		App::uses($authClass, $plugin . 'Network/Http');
+		$authClass = Inflector::camelize($authClass).'Authentication';
+		App::uses($authClass, $plugin.'Network/Http');
 
-		if (!class_exists($authClass)) {
+		if ( ! class_exists($authClass)) {
 			throw new SocketException(__d('cake_dev', 'Unknown authentication method.'));
 		}
-		if (!method_exists($authClass, 'authentication')) {
+		if ( ! method_exists($authClass, 'authentication')) {
 			throw new SocketException(__d('cake_dev', 'The %s does not support authentication.', $authClass));
 		}
 		call_user_func_array("$authClass::authentication", array($this, &$this->_auth[$method]));
@@ -614,23 +614,23 @@ 
  * @throws SocketException
  */
 	protected function _setProxy() {
-		if (empty($this->_proxy) || !isset($this->_proxy['host'], $this->_proxy['port'])) {
+		if (empty($this->_proxy) || ! isset($this->_proxy['host'], $this->_proxy['port'])) {
 			return;
 		}
 		$this->config['host'] = $this->_proxy['host'];
 		$this->config['port'] = $this->_proxy['port'];
 
-		if (empty($this->_proxy['method']) || !isset($this->_proxy['user'], $this->_proxy['pass'])) {
+		if (empty($this->_proxy['method']) || ! isset($this->_proxy['user'], $this->_proxy['pass'])) {
 			return;
 		}
 		list($plugin, $authClass) = pluginSplit($this->_proxy['method'], true);
-		$authClass = Inflector::camelize($authClass) . 'Authentication';
-		App::uses($authClass, $plugin . 'Network/Http');
+		$authClass = Inflector::camelize($authClass).'Authentication';
+		App::uses($authClass, $plugin.'Network/Http');
 
-		if (!class_exists($authClass)) {
+		if ( ! class_exists($authClass)) {
 			throw new SocketException(__d('cake_dev', 'Unknown authentication method for proxy.'));
 		}
-		if (!method_exists($authClass, 'proxyAuthentication')) {
+		if ( ! method_exists($authClass, 'proxyAuthentication')) {
 			throw new SocketException(__d('cake_dev', 'The %s does not support proxy authentication.', $authClass));
 		}
 		call_user_func_array("$authClass::proxyAuthentication", array($this, &$this->_proxy));
@@ -653,7 +653,7 @@ 
 			$uri = $this->_parseUri($uri, true);
 		}
 
-		if (!isset($uri['host'])) {
+		if ( ! isset($uri['host'])) {
 			return false;
 		}
 		$config = array(
@@ -685,9 +685,9 @@ 
 			unset($this->config[$key]);
 		}
 		if (empty($this->config['context']['ssl']['cafile'])) {
-			$this->config['context']['ssl']['cafile'] = CAKE . 'Config' . DS . 'cacert.pem';
+			$this->config['context']['ssl']['cafile'] = CAKE.'Config'.DS.'cacert.pem';
 		}
-		if (!empty($this->config['context']['ssl']['verify_host'])) {
+		if ( ! empty($this->config['context']['ssl']['verify_host'])) {
 			$this->config['context']['ssl']['CN_match'] = $host;
 		}
 		unset($this->config['context']['ssl']['verify_host']);
@@ -706,7 +706,7 @@ 
 		}
 		$uri = $this->_parseUri($uri, true);
 
-		if (!is_array($uri) || empty($uri)) {
+		if ( ! is_array($uri) || empty($uri)) {
 			return false;
 		}
 
@@ -731,7 +731,7 @@ 
 			$uriTemplate = str_replace(':%port', null, $uriTemplate);
 		}
 		foreach ($uri as $property => $value) {
-			$uriTemplate = str_replace('%' . $property, $value, $uriTemplate);
+			$uriTemplate = str_replace('%'.$property, $value, $uriTemplate);
 		}
 
 		if ($uriTemplate === '/*') {
@@ -763,7 +763,7 @@ 
 		if (is_string($uri)) {
 			$uri = parse_url($uri);
 		}
-		if (!is_array($uri) || empty($uri)) {
+		if ( ! is_array($uri) || empty($uri)) {
 			return false;
 		}
 		if ($base === true) {
@@ -771,14 +771,14 @@ 
 		}
 
 		if (isset($base['port'], $base['scheme']) && is_array($base['port']) && is_array($base['scheme'])) {
-			if (isset($uri['scheme']) && !isset($uri['port'])) {
+			if (isset($uri['scheme']) && ! isset($uri['port'])) {
 				$base['port'] = $base['port'][array_search($uri['scheme'], $base['scheme'])];
-			} elseif (isset($uri['port']) && !isset($uri['scheme'])) {
+			} elseif (isset($uri['port']) && ! isset($uri['scheme'])) {
 				$base['scheme'] = $base['scheme'][array_search($uri['port'], $base['port'])];
 			}
 		}
 
-		if (is_array($base) && !empty($base)) {
+		if (is_array($base) && ! empty($base)) {
 			$uri = array_merge($base, $uri);
 		}
 
@@ -793,7 +793,7 @@ 
 			$uri['query'] = $this->_parseQuery($uri['query']);
 		}
 
-		if (!array_intersect_key($uriBase, $uri)) {
+		if ( ! array_intersect_key($uriBase, $uri)) {
 			return false;
 		}
 		return $uri;
@@ -820,7 +820,7 @@ 
 
 		$parsedQuery = array();
 
-		if (is_string($query) && !empty($query)) {
+		if (is_string($query) && ! empty($query)) {
 			$query = preg_replace('/^\?/', '', $query);
 			$items = explode('&', $query);
 
@@ -838,13 +838,13 @@ 
 				if (preg_match_all('/\[([^\[\]]*)\]/iUs', $key, $matches)) {
 					$subKeys = $matches[1];
 					$rootKey = substr($key, 0, strpos($key, '['));
-					if (!empty($rootKey)) {
+					if ( ! empty($rootKey)) {
 						array_unshift($subKeys, $rootKey);
 					}
-					$queryNode =& $parsedQuery;
+					$queryNode = & $parsedQuery;
 
 					foreach ($subKeys as $subKey) {
-						if (!is_array($queryNode)) {
+						if ( ! is_array($queryNode)) {
 							$queryNode = array();
 						}
 
@@ -853,15 +853,15 @@ 
 							end($queryNode);
 							$subKey = key($queryNode);
 						}
-						$queryNode =& $queryNode[$subKey];
+						$queryNode = & $queryNode[$subKey];
 					}
 					$queryNode = $value;
 					continue;
 				}
-				if (!isset($parsedQuery[$key])) {
+				if ( ! isset($parsedQuery[$key])) {
 					$parsedQuery[$key] = $value;
 				} else {
-					$parsedQuery[$key] = (array)$parsedQuery[$key];
+					$parsedQuery[$key] = (array) $parsedQuery[$key];
 					$parsedQuery[$key][] = $value;
 				}
 			}
@@ -882,28 +882,28 @@ 
 
 		if (is_string($request)) {
 			$isValid = preg_match("/(.+) (.+) (.+)\r\n/U", $request, $match);
-			if (!$this->quirksMode && (!$isValid || ($match[2] === '*' && !in_array($match[3], $asteriskMethods)))) {
+			if ( ! $this->quirksMode && ( ! $isValid || ($match[2] === '*' && ! in_array($match[3], $asteriskMethods)))) {
 				throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - Passed an invalid request line string. Activate quirks mode to do this.'));
 			}
 			return $request;
-		} elseif (!is_array($request)) {
+		} elseif ( ! is_array($request)) {
 			return false;
-		} elseif (!array_key_exists('uri', $request)) {
+		} elseif ( ! array_key_exists('uri', $request)) {
 			return false;
 		}
 
 		$request['uri'] = $this->_parseUri($request['uri']);
 		$request = array_merge(array('method' => 'GET'), $request);
-		if (!empty($this->_proxy['host'])) {
+		if ( ! empty($this->_proxy['host'])) {
 			$request['uri'] = $this->_buildUri($request['uri'], '%scheme://%host:%port/%path?%query');
 		} else {
 			$request['uri'] = $this->_buildUri($request['uri'], '/%path?%query');
 		}
 
-		if (!$this->quirksMode && $request['uri'] === '*' && !in_array($request['method'], $asteriskMethods)) {
+		if ( ! $this->quirksMode && $request['uri'] === '*' && ! in_array($request['method'], $asteriskMethods)) {
 			throw new SocketException(__d('cake_dev', 'HttpSocket::_buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', implode(',', $asteriskMethods)));
 		}
-		return $request['method'] . ' ' . $request['uri'] . ' ' . $versionToken . "\r\n";
+		return $request['method'].' '.$request['uri'].' '.$versionToken."\r\n";
 	}
 
 /**
@@ -916,7 +916,7 @@ 
 	protected function _buildHeader($header, $mode = 'standard') {
 		if (is_string($header)) {
 			return $header;
-		} elseif (!is_array($header)) {
+		} elseif ( ! is_array($header)) {
 			return false;
 		}
 
@@ -936,11 +936,11 @@ 
 			if (is_array($contents) && $mode === 'standard') {
 				$contents = implode(',', $contents);
 			}
-			foreach ((array)$contents as $content) {
+			foreach ((array) $contents as $content) {
 				$contents = preg_replace("/\r\n(?![\t ])/", "\r\n ", $content);
 				$field = $this->_escapeToken($field);
 
-				$returnHeader .= $field . ': ' . $contents . "\r\n";
+				$returnHeader .= $field.': '.$contents."\r\n";
 			}
 		}
 		return $returnHeader;
@@ -963,7 +963,7 @@ 
 			} else {
 				$value = $this->_escapeToken($cookie, array(';'));
 			}
-			$header[] = $name . '=' . $value;
+			$header[] = $name.'='.$value;
 		}
 		return $this->_buildHeader(array('Cookie' => implode('; ', $header)), 'pragmatic');
 	}
@@ -976,7 +976,7 @@ 
  * @return string Escaped token
  */
 	protected function _escapeToken($token, $chars = null) {
-		$regex = '/([' . implode('', $this->_tokenEscapeChars(true, $chars)) . '])/';
+		$regex = '/(['.implode('', $this->_tokenEscapeChars(true, $chars)).'])/';
 		$token = preg_replace($regex, '"\\1"', $token);
 		return $token;
 	}
@@ -989,7 +989,7 @@ 
  * @return array Escape chars
  */
 	protected function _tokenEscapeChars($hex = true, $chars = null) {
-		if (!empty($chars)) {
+		if ( ! empty($chars)) {
 			$escape = $chars;
 		} else {
 			$escape = array('"', "(", ")", "<", ">", "@", ",", ";", ":", "\\", "/", "[", "]", "?", "=", "{", "}", " ");
@@ -999,11 +999,11 @@ 
 			$escape[] = chr(127);
 		}
 
-		if (!$hex) {
+		if ( ! $hex) {
 			return $escape;
 		}
 		foreach ($escape as $key => $char) {
-			$escape[$key] = '\\x' . str_pad(dechex(ord($char)), 2, '0', STR_PAD_LEFT);
+			$escape[$key] = '\\x'.str_pad(dechex(ord($char)), 2, '0', STR_PAD_LEFT);
 		}
 		return $escape;
 	}
@@ -1020,7 +1020,7 @@ 
 		if (empty($initalState)) {
 			$initalState = get_class_vars(__CLASS__);
 		}
-		if (!$full) {
+		if ( ! $full) {
 			$this->request = $initalState['request'];
 			$this->response = $initalState['response'];
 			return true;

lib/Cake/Network/Http/HttpSocketResponse.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
  *
  * @param string $name Header name
  * @param array $headers
- * @return mixed String if header exists or null
+ * @return string|boolean String if header exists or null
  */
 	public function getHeader($name, $headers = null) {
 		if (!is_array($headers)) {

Spacing +27 added lines, -27 removed lines

@@ -96,7 +96,7 @@ 
  * @return string
  */
 	public function body() {
-		return (string)$this->body;
+		return (string) $this->body;
 	}
 
 /**
@@ -107,8 +107,8 @@ 
  * @return mixed String if header exists or null
  */
 	public function getHeader($name, $headers = null) {
-		if (!is_array($headers)) {
-			$headers =& $this->headers;
+		if ( ! is_array($headers)) {
+			$headers = & $this->headers;
 		}
 		if (isset($headers[$name])) {
 			return $headers[$name];
@@ -147,17 +147,17 @@ 
  * @throws SocketException
  */
 	public function parseResponse($message) {
-		if (!is_string($message)) {
+		if ( ! is_string($message)) {
 			throw new SocketException(__d('cake_dev', 'Invalid response.'));
 		}
 
-		if (!preg_match("/^(.+\r\n)(.*)(?<=\r\n)\r\n/Us", $message, $match)) {
+		if ( ! preg_match("/^(.+\r\n)(.*)(?<=\r\n)\r\n/Us", $message, $match)) {
 			throw new SocketException(__d('cake_dev', 'Invalid HTTP response.'));
 		}
 
 		list(, $statusLine, $header) = $match;
 		$this->raw = $message;
-		$this->body = (string)substr($message, strlen($match[0]));
+		$this->body = (string) substr($message, strlen($match[0]));
 
 		if (preg_match("/(.+) ([0-9]{3})\s*([^ ]*)\r\n/DU", $statusLine, $match)) {
 			$this->httpVersion = $match[1];
@@ -170,11 +170,11 @@ 
 		$decoded = $this->_decodeBody($this->body, $transferEncoding);
 		$this->body = $decoded['body'];
 
-		if (!empty($decoded['header'])) {
-			$this->headers = $this->_parseHeader($this->_buildHeader($this->headers) . $this->_buildHeader($decoded['header']));
+		if ( ! empty($decoded['header'])) {
+			$this->headers = $this->_parseHeader($this->_buildHeader($this->headers).$this->_buildHeader($decoded['header']));
 		}
 
-		if (!empty($this->headers)) {
+		if ( ! empty($this->headers)) {
 			$this->cookies = $this->parseCookies($this->headers);
 		}
 	}
@@ -188,15 +188,15 @@ 
  * @return mixed Array of response headers and body or false.
  */
 	protected function _decodeBody($body, $encoding = 'chunked') {
-		if (!is_string($body)) {
+		if ( ! is_string($body)) {
 			return false;
 		}
 		if (empty($encoding)) {
 			return array('body' => $body, 'header' => false);
 		}
-		$decodeMethod = '_decode' . Inflector::camelize(str_replace('-', '_', $encoding)) . 'Body';
+		$decodeMethod = '_decode'.Inflector::camelize(str_replace('-', '_', $encoding)).'Body';
 
-		if (!is_callable(array(&$this, $decodeMethod))) {
+		if ( ! is_callable(array(&$this, $decodeMethod))) {
 			return array('body' => $body, 'header' => false);
 		}
 		return $this->{$decodeMethod}($body);
@@ -211,7 +211,7 @@ 
  * @throws SocketException
  */
 	protected function _decodeChunkedBody($body) {
-		if (!is_string($body)) {
+		if ( ! is_string($body)) {
 			return false;
 		}
 
@@ -219,7 +219,7 @@ 
 		$chunkLength = null;
 
 		while ($chunkLength !== 0) {
-			if (!preg_match('/^([0-9a-f]+) *(?:;(.+)=(.+))?(?:\r\n|\n)/iU', $body, $match)) {
+			if ( ! preg_match('/^([0-9a-f]+) *(?:;(.+)=(.+))?(?:\r\n|\n)/iU', $body, $match)) {
 				throw new SocketException(__d('cake_dev', 'HttpSocket::_decodeChunkedBody - Could not parse malformed chunk.'));
 			}
 
@@ -246,7 +246,7 @@ 
 		}
 
 		$entityHeader = false;
-		if (!empty($body)) {
+		if ( ! empty($body)) {
 			$entityHeader = $this->_parseHeader($body);
 		}
 		return array('body' => $decodedBody, 'header' => $entityHeader);
@@ -261,7 +261,7 @@ 
 	protected function _parseHeader($header) {
 		if (is_array($header)) {
 			return $header;
-		} elseif (!is_string($header)) {
+		} elseif ( ! is_string($header)) {
 			return false;
 		}
 
@@ -276,10 +276,10 @@ 
 
 			$field = $this->_unescapeToken($field);
 
-			if (!isset($header[$field])) {
+			if ( ! isset($header[$field])) {
 				$header[$field] = $value;
 			} else {
-				$header[$field] = array_merge((array)$header[$field], (array)$value);
+				$header[$field] = array_merge((array) $header[$field], (array) $value);
 			}
 		}
 		return $header;
@@ -293,12 +293,12 @@ 
  */
 	public function parseCookies($header) {
 		$cookieHeader = $this->getHeader('Set-Cookie', $header);
-		if (!$cookieHeader) {
+		if ( ! $cookieHeader) {
 			return false;
 		}
 
 		$cookies = array();
-		foreach ((array)$cookieHeader as $cookie) {
+		foreach ((array) $cookieHeader as $cookie) {
 			if (strpos($cookie, '";"') !== false) {
 				$cookie = str_replace('";"', "{__cookie_replace__}", $cookie);
 				$parts = str_replace("{__cookie_replace__}", '";"', explode(';', $cookie));
@@ -318,7 +318,7 @@ 
 				}
 
 				$key = strtolower($key);
-				if (!isset($cookies[$name][$key])) {
+				if ( ! isset($cookies[$name][$key])) {
 					$cookies[$name][$key] = $value;
 				}
 			}
@@ -334,7 +334,7 @@ 
  * @return string Unescaped token
  */
 	protected function _unescapeToken($token, $chars = null) {
-		$regex = '/"([' . implode('', $this->_tokenEscapeChars(true, $chars)) . '])"/';
+		$regex = '/"(['.implode('', $this->_tokenEscapeChars(true, $chars)).'])"/';
 		$token = preg_replace($regex, '\\1', $token);
 		return $token;
 	}
@@ -347,7 +347,7 @@ 
  * @return array Escape chars
  */
 	protected function _tokenEscapeChars($hex = true, $chars = null) {
-		if (!empty($chars)) {
+		if ( ! empty($chars)) {
 			$escape = $chars;
 		} else {
 			$escape = array('"', "(", ")", "<", ">", "@", ",", ";", ":", "\\", "/", "[", "]", "?", "=", "{", "}", " ");
@@ -357,11 +357,11 @@ 
 			$escape[] = chr(127);
 		}
 
-		if (!$hex) {
+		if ( ! $hex) {
 			return $escape;
 		}
 		foreach ($escape as $key => $char) {
-			$escape[$key] = '\\x' . str_pad(dechex(ord($char)), 2, '0', STR_PAD_LEFT);
+			$escape[$key] = '\\x'.str_pad(dechex(ord($char)), 2, '0', STR_PAD_LEFT);
 		}
 		return $escape;
 	}
@@ -389,10 +389,10 @@ 
 				if ($this->raw[$firstLineLength] === "\r") {
 					$header = null;
 				} else {
-					$header = substr($this->raw, $firstLineLength, strpos($this->raw, "\r\n\r\n") - $firstLineLength) . "\r\n";
+					$header = substr($this->raw, $firstLineLength, strpos($this->raw, "\r\n\r\n") - $firstLineLength)."\r\n";
 				}
 				return array(
-					'status-line' => $this->httpVersion . ' ' . $this->code . ' ' . $this->reasonPhrase . "\r\n",
+					'status-line' => $this->httpVersion.' '.$this->code.' '.$this->reasonPhrase."\r\n",
 					'header' => $header,
 					'body' => $this->body,
 					'response' => $this->raw

lib/Cake/Routing/Dispatcher.php

Doc Comments +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
  * Load controller and return controller class name
  *
  * @param CakeRequest $request
- * @return string|boolean Name of controller class name
+ * @return string|false Name of controller class name
  */
 	protected function _loadController($request) {
 		$pluginName = $pluginPath = $controller = null;

Spacing +16 added lines, -16 removed lines

@@ -64,7 +64,7 @@ 
  * @return CakeEventManager
  */
 	public function getEventManager() {
-		if (!$this->_eventManager) {
+		if ( ! $this->_eventManager) {
 			$this->_eventManager = new CakeEventManager();
 			$this->_eventManager->attach($this);
 			$this->_attachFilters($this->_eventManager);
@@ -101,8 +101,8 @@ 
 			}
 			if (is_string($filter['callable'])) {
 				list($plugin, $callable) = pluginSplit($filter['callable'], true);
-				App::uses($callable, $plugin . 'Routing/Filter');
-				if (!class_exists($callable)) {
+				App::uses($callable, $plugin.'Routing/Filter');
+				if ( ! class_exists($callable)) {
 					throw new MissingDispatcherFilterException($callable);
 				}
 				$manager->attach(new $callable);
@@ -112,7 +112,7 @@ 
 				if (isset($filter['priority'])) {
 					$options = array('priority' => $filter['priority']);
 				}
-				$manager->attach($filter['callable'], 'Dispatcher.' . $on . 'Dispatch', $options);
+				$manager->attach($filter['callable'], 'Dispatcher.'.$on.'Dispatch', $options);
 			}
 		}
 	}
@@ -150,9 +150,9 @@ 
 
 		$controller = $this->_getController($request, $response);
 
-		if (!($controller instanceof Controller)) {
+		if ( ! ($controller instanceof Controller)) {
 			throw new MissingControllerException(array(
-				'class' => Inflector::camelize($request->params['controller']) . 'Controller',
+				'class' => Inflector::camelize($request->params['controller']).'Controller',
 				'plugin' => empty($request->params['plugin']) ? null : Inflector::camelize($request->params['plugin'])
 			));
 		}
@@ -190,7 +190,7 @@ 
 
 		if ($render && $controller->autoRender) {
 			$response = $controller->render();
-		} elseif (!($result instanceof CakeResponse) && $response->body() === null) {
+		} elseif ( ! ($result instanceof CakeResponse) && $response->body() === null) {
 			$response->body($result);
 		}
 		$controller->shutdownProcess();
@@ -211,7 +211,7 @@ 
 		$params = Router::parse($request->url);
 		$request->addParams($params);
 
-		if (!empty($event->data['additionalParams'])) {
+		if ( ! empty($event->data['additionalParams'])) {
 			$request->addParams($event->data['additionalParams']);
 		}
 	}
@@ -225,7 +225,7 @@ 
  */
 	protected function _getController($request, $response) {
 		$ctrlClass = $this->_loadController($request);
-		if (!$ctrlClass) {
+		if ( ! $ctrlClass) {
 			return false;
 		}
 		$reflection = new ReflectionClass($ctrlClass);
@@ -243,18 +243,18 @@ 
  */
 	protected function _loadController($request) {
 		$pluginName = $pluginPath = $controller = null;
-		if (!empty($request->params['plugin'])) {
+		if ( ! empty($request->params['plugin'])) {
 			$pluginName = $controller = Inflector::camelize($request->params['plugin']);
-			$pluginPath = $pluginName . '.';
+			$pluginPath = $pluginName.'.';
 		}
-		if (!empty($request->params['controller'])) {
+		if ( ! empty($request->params['controller'])) {
 			$controller = Inflector::camelize($request->params['controller']);
 		}
-		if ($pluginPath . $controller) {
-			$class = $controller . 'Controller';
+		if ($pluginPath.$controller) {
+			$class = $controller.'Controller';
 			App::uses('AppController', 'Controller');
-			App::uses($pluginName . 'AppController', $pluginPath . 'Controller');
-			App::uses($class, $pluginPath . 'Controller');
+			App::uses($pluginName.'AppController', $pluginPath.'Controller');
+			App::uses($class, $pluginPath.'Controller');
 			if (class_exists($class)) {
 				return $class;
 			}

lib/Cake/Routing/Route/CakeRoute.php

Doc Comments +3 added lines, -3 removed lines

@@ -109,7 +109,7 @@ 
  * Modifies defaults property so all necessary keys are set
  * and populates $this->names with the named routing elements.
  *
- * @return array Returns a string regular expression of the compiled route.
+ * @return string Returns a string regular expression of the compiled route.
  */
 	public function compile() {
 		if ($this->compiled()) {
@@ -332,7 +332,7 @@ 
  * Currently implemented rule types are controller, action and match that can be combined with each other.
  *
  * @param string $val The value of the named parameter
- * @param array $rule The rule(s) to apply, can also be a match string
+ * @param string $rule The rule(s) to apply, can also be a match string
  * @param string $context An array with additional context information (controller / action)
  * @return boolean
  */
@@ -393,7 +393,7 @@ 
  * This method handles the reverse routing or conversion of URL arrays into string URLs.
  *
  * @param array $url An array of parameters to check matching with.
- * @return mixed Either a string URL for the parameters if they match or false.
+ * @return false|string Either a string URL for the parameters if they match or false.
  */
 	public function match($url) {
 		if (!$this->compiled()) {

Spacing +42 added lines, -42 removed lines

@@ -90,8 +90,8 @@ 
  */
 	public function __construct($template, $defaults = array(), $options = array()) {
 		$this->template = $template;
-		$this->defaults = (array)$defaults;
-		$this->options = (array)$options;
+		$this->defaults = (array) $defaults;
+		$this->options = (array) $options;
 	}
 
 /**
@@ -100,7 +100,7 @@ 
  * @return boolean
  */
 	public function compiled() {
-		return !empty($this->_compiledRoute);
+		return ! empty($this->_compiledRoute);
 	}
 
 /**
@@ -139,20 +139,20 @@ 
 
 		preg_match_all('#:([A-Za-z0-9_-]+[A-Z0-9a-z])#', $route, $namedElements);
 		foreach ($namedElements[1] as $i => $name) {
-			$search = '\\' . $namedElements[0][$i];
+			$search = '\\'.$namedElements[0][$i];
 			if (isset($this->options[$name])) {
 				$option = null;
 				if ($name !== 'plugin' && array_key_exists($name, $this->defaults)) {
 					$option = '?';
 				}
-				$slashParam = '/\\' . $namedElements[0][$i];
+				$slashParam = '/\\'.$namedElements[0][$i];
 				if (strpos($parsed, $slashParam) !== false) {
-					$routeParams[$slashParam] = '(?:/(?P<' . $name . '>' . $this->options[$name] . ')' . $option . ')' . $option;
+					$routeParams[$slashParam] = '(?:/(?P<'.$name.'>'.$this->options[$name].')'.$option.')'.$option;
 				} else {
-					$routeParams[$search] = '(?:(?P<' . $name . '>' . $this->options[$name] . ')' . $option . ')' . $option;
+					$routeParams[$search] = '(?:(?P<'.$name.'>'.$this->options[$name].')'.$option.')'.$option;
 				}
 			} else {
-				$routeParams[$search] = '(?:(?P<' . $name . '>[^/]+))';
+				$routeParams[$search] = '(?:(?P<'.$name.'>[^/]+))';
 			}
 			$names[] = $name;
 		}
@@ -166,7 +166,7 @@ 
 		}
 		krsort($routeParams);
 		$parsed = str_replace(array_keys($routeParams), array_values($routeParams), $parsed);
-		$this->_compiledRoute = '#^' . $parsed . '[/]*$#';
+		$this->_compiledRoute = '#^'.$parsed.'[/]*$#';
 		$this->keys = $names;
 
 		// Remove defaults that are also keys. They can cause match failures
@@ -189,23 +189,23 @@ 
  * @return mixed Boolean false on failure, otherwise an array or parameters
  */
 	public function parse($url) {
-		if (!$this->compiled()) {
+		if ( ! $this->compiled()) {
 			$this->compile();
 		}
-		if (!preg_match($this->_compiledRoute, urldecode($url), $route)) {
+		if ( ! preg_match($this->_compiledRoute, urldecode($url), $route)) {
 			return false;
 		}
 		foreach ($this->defaults as $key => $val) {
-			$key = (string)$key;
+			$key = (string) $key;
 			if ($key[0] === '[' && preg_match('/^\[(\w+)\]$/', $key, $header)) {
 				if (isset($this->_headerMap[$header[1]])) {
 					$header = $this->_headerMap[$header[1]];
 				} else {
-					$header = 'http_' . $header[1];
+					$header = 'http_'.$header[1];
 				}
 				$header = strtoupper($header);
 
-				$val = (array)$val;
+				$val = (array) $val;
 				$h = false;
 
 				foreach ($val as $v) {
@@ -213,7 +213,7 @@ 
 						$h = true;
 					}
 				}
-				if (!$h) {
+				if ( ! $h) {
 					return false;
 				}
 			}
@@ -276,9 +276,9 @@ 
 		$namedConfig = Router::namedConfig();
 		$greedy = $namedConfig['greedyNamed'];
 		$rules = $namedConfig['rules'];
-		if (!empty($this->options['named'])) {
+		if ( ! empty($this->options['named'])) {
 			$greedy = isset($this->options['greedyNamed']) && $this->options['greedyNamed'] === true;
-			foreach ((array)$this->options['named'] as $key => $val) {
+			foreach ((array) $this->options['named'] as $key => $val) {
 				if (is_numeric($key)) {
 					$rules[$val] = true;
 					continue;
@@ -293,10 +293,10 @@ 
 			}
 
 			$separatorIsPresent = strpos($param, $namedConfig['separator']) !== false;
-			if ((!isset($this->options['named']) || !empty($this->options['named'])) && $separatorIsPresent) {
+			if (( ! isset($this->options['named']) || ! empty($this->options['named'])) && $separatorIsPresent) {
 				list($key, $val) = explode($namedConfig['separator'], $param, 2);
 				$hasRule = isset($rules[$key]);
-				$passIt = (!$hasRule && !$greedy) || ($hasRule && !$this->_matchNamed($val, $rules[$key], $context));
+				$passIt = ( ! $hasRule && ! $greedy) || ($hasRule && ! $this->_matchNamed($val, $rules[$key], $context));
 				if ($passIt) {
 					$pass[] = $param;
 				} else {
@@ -343,25 +343,25 @@ 
 		if (is_string($rule)) {
 			$rule = array('match' => $rule);
 		}
-		if (!is_array($rule)) {
+		if ( ! is_array($rule)) {
 			return false;
 		}
 
 		$controllerMatches = (
-			!isset($rule['controller'], $context['controller']) ||
-			in_array($context['controller'], (array)$rule['controller'])
+			! isset($rule['controller'], $context['controller']) ||
+			in_array($context['controller'], (array) $rule['controller'])
 		);
-		if (!$controllerMatches) {
+		if ( ! $controllerMatches) {
 			return false;
 		}
 		$actionMatches = (
-			!isset($rule['action'], $context['action']) ||
-			in_array($context['action'], (array)$rule['action'])
+			! isset($rule['action'], $context['action']) ||
+			in_array($context['action'], (array) $rule['action'])
 		);
-		if (!$actionMatches) {
+		if ( ! $actionMatches) {
 			return false;
 		}
-		return (!isset($rule['match']) || preg_match('/' . $rule['match'] . '/', $val));
+		return ( ! isset($rule['match']) || preg_match('/'.$rule['match'].'/', $val));
 	}
 
 /**
@@ -374,11 +374,11 @@ 
  * @return array An array with persistent parameters applied.
  */
 	public function persistParams($url, $params) {
-		if (empty($this->options['persist']) || !is_array($this->options['persist'])) {
+		if (empty($this->options['persist']) || ! is_array($this->options['persist'])) {
 			return $url;
 		}
 		foreach ($this->options['persist'] as $persistKey) {
-			if (array_key_exists($persistKey, $params) && !isset($url[$persistKey])) {
+			if (array_key_exists($persistKey, $params) && ! isset($url[$persistKey])) {
 				$url[$persistKey] = $params[$persistKey];
 			}
 		}
@@ -396,7 +396,7 @@ 
  * @return mixed Either a string URL for the parameters if they match or false.
  */
 	public function match($url) {
-		if (!$this->compiled()) {
+		if ( ! $this->compiled()) {
 			$this->compile();
 		}
 		$defaults = $this->defaults;
@@ -451,27 +451,27 @@ 
 			if (
 				($greedyNamed || isset($allowedNamedParams[$key])) &&
 				($value !== false && $value !== null) &&
-				(!in_array($key, $prefixes))
+				( ! in_array($key, $prefixes))
 			) {
 				$named[$key] = $value;
 				continue;
 			}
 
 			// keys that don't exist are different.
-			if (!$defaultExists && !empty($value)) {
+			if ( ! $defaultExists && ! empty($value)) {
 				return false;
 			}
 		}
 
 		//if a not a greedy route, no extra params are allowed.
-		if (!$this->_greedy && (!empty($pass) || !empty($named))) {
+		if ( ! $this->_greedy && ( ! empty($pass) || ! empty($named))) {
 			return false;
 		}
 
 		//check patterns for routed params
-		if (!empty($this->options)) {
+		if ( ! empty($this->options)) {
 			foreach ($this->options as $key => $pattern) {
-				if (array_key_exists($key, $url) && !preg_match('#^' . $pattern . '$#', $url[$key])) {
+				if (array_key_exists($key, $url) && ! preg_match('#^'.$pattern.'$#', $url[$key])) {
 					return false;
 				}
 			}
@@ -490,7 +490,7 @@ 
  */
 	protected function _writeUrl($params) {
 		if (isset($params['prefix'])) {
-			$prefixed = $params['prefix'] . '_';
+			$prefixed = $params['prefix'].'_';
 		}
 		if (isset($prefixed, $params['action']) && strpos($params['action'], $prefixed) === 0) {
 			$params['action'] = substr($params['action'], strlen($prefixed));
@@ -504,23 +504,23 @@ 
 		$namedConfig = Router::namedConfig();
 		$separator = $namedConfig['separator'];
 
-		if (!empty($params['named']) && is_array($params['named'])) {
+		if ( ! empty($params['named']) && is_array($params['named'])) {
 			$named = array();
 			foreach ($params['named'] as $key => $value) {
 				if (is_array($value)) {
 					$flat = Hash::flatten($value, '%5D%5B');
 					foreach ($flat as $namedKey => $namedValue) {
-						$named[] = $key . "%5B{$namedKey}%5D" . $separator . rawurlencode($namedValue);
+						$named[] = $key."%5B{$namedKey}%5D".$separator.rawurlencode($namedValue);
 					}
 				} else {
-					$named[] = $key . $separator . rawurlencode($value);
+					$named[] = $key.$separator.rawurlencode($value);
 				}
 			}
-			$params['pass'] = $params['pass'] . '/' . implode('/', $named);
+			$params['pass'] = $params['pass'].'/'.implode('/', $named);
 		}
 		$out = $this->template;
 
-		if (!empty($this->keys)) {
+		if ( ! empty($this->keys)) {
 			$search = $replace = array();
 
 			foreach ($this->keys as $key) {
@@ -530,7 +530,7 @@ 
 				} elseif (strpos($out, $key) != strlen($out) - strlen($key)) {
 					$key .= '/';
 				}
-				$search[] = ':' . $key;
+				$search[] = ':'.$key;
 				$replace[] = $string;
 			}
 			$out = str_replace($search, $replace, $out);

lib/Cake/Routing/Route/PluginShortRoute.php

Doc Comments +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
  * controller parameter
  *
  * @param string $url The URL to parse
- * @return mixed false on failure, or an array of request parameters
+ * @return boolean false on failure, or an array of request parameters
  */
 	public function parse($url) {
 		$params = parent::parse($url);
@@ -44,7 +44,7 @@ 
  * are not the same the match is an auto fail.
  *
  * @param array $url Array of parameters to convert to a string.
- * @return mixed either false or a string URL.
+ * @return false|string either false or a string URL.
  */
 	public function match($url) {
 		if (isset($url['controller']) && isset($url['plugin']) && $url['plugin'] != $url['controller']) {

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
  */
 	public function parse($url) {
 		$params = parent::parse($url);
-		if (!$params) {
+		if ( ! $params) {
 			return false;
 		}
 		$params['controller'] = $params['plugin'];