reginaldojunior / winners

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'];

lib/Cake/Routing/Route/RedirectRoute.php

Doc Comments +2 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
  * redirection
  *
  * @param string $url The URL to parse
- * @return boolean False on failure
+ * @return false|null False on failure
  */
 	public function parse($url) {
 		$params = parent::parse($url);
@@ -103,7 +103,7 @@ 
  * There is no reverse routing redirection routes
  *
  * @param array $url Array of parameters to convert to a string.
- * @return mixed either false or a string URL.
+ * @return boolean either false or a string URL.
  */
 	public function match($url) {
 		return false;
@@ -113,7 +113,6 @@ 
  * Stop execution of the current script. Wraps exit() making
  * testing easier.
  *
- * @param integer|string $status see http://php.net/exit for values
  * @return void
  */
 	protected function _stop($code = 0) {

Spacing +4 added lines, -4 removed lines

@@ -56,7 +56,7 @@ 
  */
 	public function __construct($template, $defaults = array(), $options = array()) {
 		parent::__construct($template, $defaults, $options);
-		$this->redirect = (array)$defaults;
+		$this->redirect = (array) $defaults;
 	}
 
 /**
@@ -68,14 +68,14 @@ 
  */
 	public function parse($url) {
 		$params = parent::parse($url);
-		if (!$params) {
+		if ( ! $params) {
 			return false;
 		}
-		if (!$this->response) {
+		if ( ! $this->response) {
 			$this->response = new CakeResponse();
 		}
 		$redirect = $this->redirect;
-		if (count($this->redirect) === 1 && !isset($this->redirect['controller'])) {
+		if (count($this->redirect) === 1 && ! isset($this->redirect['controller'])) {
 			$redirect = $this->redirect[0];
 		}
 		if (isset($this->options['persist']) && is_array($redirect)) {

lib/Cake/Routing/Router.php

Doc Comments +5 added lines, -5 removed lines

@@ -208,7 +208,7 @@ 
  * Set the default route class to use or return the current one
  *
  * @param string $routeClass to set as default
- * @return mixed void|string
+ * @return string|null void|string
  * @throws RouterException
  */
 	public static function defaultRouteClass($routeClass = null) {
@@ -471,7 +471,7 @@ 
  * @param array $named A list of named parameters. Key value pairs are accepted where values are
  *    either regex strings to match, or arrays as seen above.
  * @param array $options Allows to control all settings: separator, greedy, reset, default
- * @return array
+ * @return string
  */
 	public static function connectNamed($named, $options = array()) {
 		if (isset($options['separator'])) {
@@ -508,7 +508,7 @@ 
 /**
  * Gets the current named parameter configuration values.
  *
- * @return array
+ * @return string
  * @see Router::$_namedConfig
  */
 	public static function namedConfig() {
@@ -526,7 +526,7 @@ 
  *    integer values and UUIDs.
  * - 'prefix' - URL prefix to use for the generated routes. Defaults to '/'.
  *
- * @param string|array $controller A controller name or array of controller names (i.e. "Posts" or "ListItems")
+ * @param string $controller A controller name or array of controller names (i.e. "Posts" or "ListItems")
  * @param array $options Options to use when generating REST routes
  * @return array Array of mapped resources
  */
@@ -1054,7 +1054,7 @@ 
  *    an array of arguments to convert into a query string.
  * @param array $extra Extra querystring parameters.
  * @param boolean $escape Whether or not to use escaped &
- * @return array
+ * @return null|string
  */
 	public static function queryString($q, $extra = array(), $escape = false) {
 		if (empty($q) && empty($extra)) {

Spacing +55 added lines, -55 removed lines

@@ -229,7 +229,7 @@ 
 	protected static function _validateRouteClass($routeClass) {
 		if (
 			$routeClass !== 'CakeRoute' &&
-			(!class_exists($routeClass) || !is_subclass_of($routeClass, 'CakeRoute'))
+			( ! class_exists($routeClass) || ! is_subclass_of($routeClass, 'CakeRoute'))
 		) {
 			throw new RouterException(__d('cake_dev', 'Route class not found, or route class is not a subclass of CakeRoute'));
 		}
@@ -243,8 +243,8 @@ 
  */
 	protected static function _setPrefixes() {
 		$routing = Configure::read('Routing');
-		if (!empty($routing['prefixes'])) {
-			self::$_prefixes = array_merge(self::$_prefixes, (array)$routing['prefixes']);
+		if ( ! empty($routing['prefixes'])) {
+			self::$_prefixes = array_merge(self::$_prefixes, (array) $routing['prefixes']);
 		}
 	}
 
@@ -534,27 +534,27 @@ 
 		$hasPrefix = isset($options['prefix']);
 		$options = array_merge(array(
 			'prefix' => '/',
-			'id' => self::ID . '|' . self::UUID
+			'id' => self::ID.'|'.self::UUID
 		), $options);
 
 		$prefix = $options['prefix'];
 		if (strpos($prefix, '/') !== 0) {
-			$prefix = '/' . $prefix;
+			$prefix = '/'.$prefix;
 		}
 		if (substr($prefix, -1) !== '/') {
 			$prefix .= '/';
 		}
 
-		foreach ((array)$controller as $name) {
+		foreach ((array) $controller as $name) {
 			list($plugin, $name) = pluginSplit($name);
 			$urlName = Inflector::underscore($name);
 			$plugin = Inflector::underscore($plugin);
-			if ($plugin && !$hasPrefix) {
-				$prefix = '/' . $plugin . '/';
+			if ($plugin && ! $hasPrefix) {
+				$prefix = '/'.$plugin.'/';
 			}
 
 			foreach (self::$_resourceMap as $params) {
-				$url = $prefix . $urlName . (($params['id']) ? '/:id' : '');
+				$url = $prefix.$urlName.(($params['id']) ? '/:id' : '');
 
 				Router::connect($url,
 					array(
@@ -587,7 +587,7 @@ 
  * @return array Parsed elements from URL
  */
 	public static function parse($url) {
-		if (!self::$initialized) {
+		if ( ! self::$initialized) {
 			self::_loadRoutes();
 		}
 
@@ -595,7 +595,7 @@ 
 		$out = array();
 
 		if (strlen($url) && strpos($url, '/') !== 0) {
-			$url = '/' . $url;
+			$url = '/'.$url;
 		}
 		if (strpos($url, '?') !== false) {
 			list($url, $queryParameters) = explode('?', $url, 2);
@@ -605,23 +605,23 @@ 
 		extract(self::_parseExtension($url));
 
 		for ($i = 0, $len = count(self::$routes); $i < $len; $i++) {
-			$route =& self::$routes[$i];
+			$route = & self::$routes[$i];
 
 			if (($r = $route->parse($url)) !== false) {
-				self::$_currentRoute[] =& $route;
+				self::$_currentRoute[] = & $route;
 				$out = $r;
 				break;
 			}
 		}
 		if (isset($out['prefix'])) {
-			$out['action'] = $out['prefix'] . '_' . $out['action'];
+			$out['action'] = $out['prefix'].'_'.$out['action'];
 		}
 
-		if (!empty($ext) && !isset($out['ext'])) {
+		if ( ! empty($ext) && ! isset($out['ext'])) {
 			$out['ext'] = $ext;
 		}
 
-		if (!empty($queryParameters) && !isset($out['?'])) {
+		if ( ! empty($queryParameters) && ! isset($out['?'])) {
 			$out['?'] = $queryParameters;
 		}
 		return $out;
@@ -640,12 +640,12 @@ 
 			if (preg_match('/\.[0-9a-zA-Z]*$/', $url, $match) === 1) {
 				$match = substr($match[0], 1);
 				if (empty(self::$_validExtensions)) {
-					$url = substr($url, 0, strpos($url, '.' . $match));
+					$url = substr($url, 0, strpos($url, '.'.$match));
 					$ext = $match;
 				} else {
 					foreach (self::$_validExtensions as $name) {
 						if (strcasecmp($name, $match) === 0) {
-							$url = substr($url, 0, strpos($url, '.' . $name));
+							$url = substr($url, 0, strpos($url, '.'.$name));
 							$ext = $match;
 							break;
 						}
@@ -748,7 +748,7 @@ 
 		if ($current) {
 			return self::$_requests[count(self::$_requests) - 1];
 		}
-		if (!isset(self::$_requests[0])) {
+		if ( ! isset(self::$_requests[0])) {
 			return array('base' => null);
 		}
 		return array('base' => self::$_requests[0]->base);
@@ -785,10 +785,10 @@ 
 		if ($which === null) {
 			$which = count(self::$routes) - 1;
 		}
-		if (!isset(self::$routes[$which])) {
+		if ( ! isset(self::$routes[$which])) {
 			return false;
 		}
-		$route =& self::$routes[$which];
+		$route = & self::$routes[$which];
 		unset(self::$routes[$which]);
 		array_unshift(self::$routes, $route);
 		return true;
@@ -824,7 +824,7 @@ 
  * @return string Full translated URL with base path.
  */
 	public static function url($url = null, $full = false) {
-		if (!self::$initialized) {
+		if ( ! self::$initialized) {
 			self::_loadRoutes();
 		}
 
@@ -837,7 +837,7 @@ 
 		}
 
 		$path = array('base' => null);
-		if (!empty(self::$_requests)) {
+		if ( ! empty(self::$_requests)) {
 			$request = self::$_requests[count(self::$_requests) - 1];
 			$params = $request->params;
 			$path = array('base' => $request->base, 'here' => $request->here);
@@ -852,7 +852,7 @@ 
 		if (empty($url)) {
 			$output = isset($path['here']) ? $path['here'] : '/';
 			if ($full) {
-				$output = self::fullBaseUrl() . $output;
+				$output = self::fullBaseUrl().$output;
 			}
 			return $output;
 		} elseif (is_array($url)) {
@@ -869,11 +869,11 @@ 
 				unset($url['?']);
 			}
 			if (isset($url['#'])) {
-				$frag = '#' . $url['#'];
+				$frag = '#'.$url['#'];
 				unset($url['#']);
 			}
 			if (isset($url['ext'])) {
-				$extension = '.' . $url['ext'];
+				$extension = '.'.$url['ext'];
 				unset($url['ext']);
 			}
 			if (empty($url['action'])) {
@@ -886,12 +886,12 @@ 
 
 			$prefixExists = (array_intersect_key($url, array_flip(self::$_prefixes)));
 			foreach (self::$_prefixes as $prefix) {
-				if (!empty($params[$prefix]) && !$prefixExists) {
+				if ( ! empty($params[$prefix]) && ! $prefixExists) {
 					$url[$prefix] = true;
-				} elseif (isset($url[$prefix]) && !$url[$prefix]) {
+				} elseif (isset($url[$prefix]) && ! $url[$prefix]) {
 					unset($url[$prefix]);
 				}
-				if (isset($url[$prefix]) && strpos($url['action'], $prefix . '_') === 0) {
+				if (isset($url[$prefix]) && strpos($url['action'], $prefix.'_') === 0) {
 					$url['action'] = substr($url['action'], strlen($prefix) + 1);
 				}
 			}
@@ -923,28 +923,28 @@ 
 			} else {
 				foreach (self::$_prefixes as $prefix) {
 					if (isset($params[$prefix])) {
-						$output .= $prefix . '/';
+						$output .= $prefix.'/';
 						break;
 					}
 				}
-				if (!empty($params['plugin']) && $params['plugin'] !== $params['controller']) {
-					$output .= Inflector::underscore($params['plugin']) . '/';
+				if ( ! empty($params['plugin']) && $params['plugin'] !== $params['controller']) {
+					$output .= Inflector::underscore($params['plugin']).'/';
 				}
-				$output .= Inflector::underscore($params['controller']) . '/' . $url;
+				$output .= Inflector::underscore($params['controller']).'/'.$url;
 			}
 		}
 		$protocol = preg_match('#^[a-z][a-z0-9+\-.]*\://#i', $output);
 		if ($protocol === 0) {
-			$output = str_replace('//', '/', $base . '/' . $output);
+			$output = str_replace('//', '/', $base.'/'.$output);
 
 			if ($full) {
-				$output = self::fullBaseUrl() . $output;
+				$output = self::fullBaseUrl().$output;
 			}
-			if (!empty($extension)) {
+			if ( ! empty($extension)) {
 				$output = rtrim($output, '/');
 			}
 		}
-		return $output . $extension . self::queryString($q, array(), $escape) . $frag;
+		return $output.$extension.self::queryString($q, array(), $escape).$frag;
 	}
 
 /**
@@ -1003,14 +1003,14 @@ 
 
 		list($args, $named) = array(Hash::filter($args), Hash::filter($named));
 		foreach (self::$_prefixes as $prefix) {
-			$prefixed = $prefix . '_';
-			if (!empty($url[$prefix]) && strpos($url['action'], $prefixed) === 0) {
+			$prefixed = $prefix.'_';
+			if ( ! empty($url[$prefix]) && strpos($url['action'], $prefixed) === 0) {
 				$url['action'] = substr($url['action'], strlen($prefixed) * -1);
 				break;
 			}
 		}
 
-		if (empty($named) && empty($args) && (!isset($url['action']) || $url['action'] === 'index')) {
+		if (empty($named) && empty($args) && ( ! isset($url['action']) || $url['action'] === 'index')) {
 			$url['action'] = null;
 		}
 
@@ -1028,19 +1028,19 @@ 
 		}
 		$output = implode('/', $urlOut);
 
-		if (!empty($args)) {
-			$output .= '/' . implode('/', array_map('rawurlencode', $args));
+		if ( ! empty($args)) {
+			$output .= '/'.implode('/', array_map('rawurlencode', $args));
 		}
 
-		if (!empty($named)) {
+		if ( ! empty($named)) {
 			foreach ($named as $name => $value) {
 				if (is_array($value)) {
 					$flattend = Hash::flatten($value, '%5D%5B');
 					foreach ($flattend as $namedKey => $namedValue) {
-						$output .= '/' . $name . "%5B{$namedKey}%5D" . self::$_namedConfig['separator'] . rawurlencode($namedValue);
+						$output .= '/'.$name."%5B{$namedKey}%5D".self::$_namedConfig['separator'].rawurlencode($namedValue);
 					}
 				} else {
-					$output .= '/' . $name . self::$_namedConfig['separator'] . rawurlencode($value);
+					$output .= '/'.$name.self::$_namedConfig['separator'].rawurlencode($value);
 				}
 			}
 		}
@@ -1081,7 +1081,7 @@ 
 		$out .= $addition;
 
 		if (isset($out[0]) && $out[0] !== '?') {
-			$out = '?' . $out;
+			$out = '?'.$out;
 		}
 		return $out;
 	}
@@ -1117,7 +1117,7 @@ 
 			$params['_Token']
 		);
 		$params = array_merge($params, $pass, $named);
-		if (!empty($url)) {
+		if ( ! empty($url)) {
 			$params['?'] = $url;
 		}
 		return Router::url($params, $full);
@@ -1141,10 +1141,10 @@ 
 		}
 		$request = Router::getRequest();
 
-		if (!empty($request->base) && stristr($url, $request->base)) {
-			$url = preg_replace('/^' . preg_quote($request->base, '/') . '/', '', $url, 1);
+		if ( ! empty($request->base) && stristr($url, $request->base)) {
+			$url = preg_replace('/^'.preg_quote($request->base, '/').'/', '', $url, 1);
 		}
-		$url = '/' . $url;
+		$url = '/'.$url;
 
 		while (strpos($url, '//') !== false) {
 			$url = str_replace('//', '/', $url);
@@ -1185,7 +1185,7 @@ 
  */
 	public static function stripPlugin($base, $plugin = null) {
 		if ($plugin) {
-			$base = preg_replace('/(?:' . $plugin . ')/', '', $base);
+			$base = preg_replace('/(?:'.$plugin.')/', '', $base);
 			$base = str_replace('//', '', $base);
 			$pos1 = strrpos($base, '/');
 			$char = strlen($base) - 1;
@@ -1230,7 +1230,7 @@ 
  * @return array Array of extensions Router is configured to parse.
  */
 	public static function extensions() {
-		if (!self::$initialized) {
+		if ( ! self::$initialized) {
 			self::_loadRoutes();
 		}
 
@@ -1247,10 +1247,10 @@ 
  * @return array
  */
 	public static function setExtensions($extensions, $merge = true) {
-		if (!is_array($extensions)) {
+		if ( ! is_array($extensions)) {
 			return self::$_validExtensions;
 		}
-		if (!$merge) {
+		if ( ! $merge) {
 			return self::$_validExtensions = $extensions;
 		}
 		return self::$_validExtensions = array_merge(self::$_validExtensions, $extensions);
@@ -1263,7 +1263,7 @@ 
  */
 	protected static function _loadRoutes() {
 		self::$initialized = true;
-		include APP . 'Config' . DS . 'routes.php';
+		include APP.'Config'.DS.'routes.php';
 	}
 
 }

lib/Cake/Test/Case/Console/AllConsoleTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 /**
  * suite method, defines tests for this suite.
  *
- * @return void
+ * @return CakeTestSuite
  */
 	public static function suite() {
 		$suite = new CakeTestSuite('All console classes');

Indentation +15 added lines, -15 removed lines

@@ -1,20 +1,20 @@
 <?php
 /**
- * AllConsoleTest file
- *
- * 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
- * @package       Cake.Test.Case.Console
- * @since         CakePHP(tm) v 2.0
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
+	 * AllConsoleTest file
+	 *
+	 * 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
+	 * @package       Cake.Test.Case.Console
+	 * @since         CakePHP(tm) v 2.0
+	 * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+	 */
 
 /**
  * AllConsoleTest class

Spacing +4 added lines, -4 removed lines

@@ -33,11 +33,11 @@
 	public static function suite() {
 		$suite = new CakeTestSuite('All console classes');
 
-		$path = CORE_TEST_CASES . DS . 'Console' . DS;
+		$path = CORE_TEST_CASES.DS.'Console'.DS;
 
-		$suite->addTestFile($path . 'AllConsoleLibsTest.php');
-		$suite->addTestFile($path . 'AllTasksTest.php');
-		$suite->addTestFile($path . 'AllShellsTest.php');
+		$suite->addTestFile($path.'AllConsoleLibsTest.php');
+		$suite->addTestFile($path.'AllTasksTest.php');
+		$suite->addTestFile($path.'AllShellsTest.php');
 		return $suite;
 	}
 }