reginaldojunior / winners

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

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;
 	}
 }

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

Doc Comments +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
 /**
  * _stop method
  *
- * @return void
+ * @return integer
  */
 	protected function _stop($status = 0) {
 		$this->stopped = 'Stopped with status: ' . $status;
@@ -85,7 +85,7 @@ 
 /**
  * _getShell
  *
- * @param string $plugin
+ * @param string $shell
  * @return mixed
  */
 	protected function _getShell($shell) {

Spacing +9 added lines, -9 removed lines

@@ -68,7 +68,7 @@ 
  * @return void
  */
 	protected function _stop($status = 0) {
-		$this->stopped = 'Stopped with status: ' . $status;
+		$this->stopped = 'Stopped with status: '.$status;
 		return $status;
 	}
 
@@ -113,10 +113,10 @@ 
 		parent::setUp();
 		App::build(array(
 			'Plugin' => array(
-				CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS
+				CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS
 			),
 			'Console/Command' => array(
-				CAKE . 'Test' . DS . 'test_app' . DS . 'Console' . DS . 'Command' . DS
+				CAKE.'Test'.DS.'test_app'.DS.'Console'.DS.'Command'.DS
 			)
 		), App::RESET);
 		CakePlugin::load('TestPlugin');
@@ -161,7 +161,7 @@ 
 		$expected = array(
 			'app' => 'app',
 			'webroot' => 'webroot',
-			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH) . DS . 'app'),
+			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH).DS.'app'),
 			'root' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH)),
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
@@ -176,7 +176,7 @@ 
 		$expected = array(
 			'app' => 'new',
 			'webroot' => 'webroot',
-			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH) . DS . 'new'),
+			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH).DS.'new'),
 			'root' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH))
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
@@ -195,7 +195,7 @@ 
 		$expected = array(
 			'app' => 'new',
 			'webroot' => 'webroot',
-			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH) . DS . 'new'),
+			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH).DS.'new'),
 			'root' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH))
 		);
 
@@ -214,7 +214,7 @@ 
 		$expected = array(
 			'app' => 'new',
 			'webroot' => 'webroot',
-			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH) . DS . 'new'),
+			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH).DS.'new'),
 			'root' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH))
 		);
 		$Dispatcher->params = $Dispatcher->args = array();
@@ -232,7 +232,7 @@ 
 		);
 		$expected = array(
 			'app' => 'new',
-			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH) . DS . 'new'),
+			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH).DS.'new'),
 			'root' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH)),
 			'webroot' => 'webroot'
 		);
@@ -255,7 +255,7 @@ 
 		$expected = array(
 			'app' => 'app',
 			'webroot' => 'webroot',
-			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH) . DS . 'app'),
+			'working' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH).DS.'app'),
 			'root' => str_replace('\\', DS, dirname(CAKE_CORE_INCLUDE_PATH)),
 		);
 		$Dispatcher->params = $Dispatcher->args = array();

lib/Cake/Test/Case/Controller/Component/Acl/DbAclTest.php

Doc Comments +2 added lines, -2 removed lines

@@ -495,7 +495,7 @@ 
  * Generates a list of the current aro and aco structures and a grid dump of the permissions that are defined
  * Only designed to work with the db based ACL
  *
- * @param boolean $treesToo
+ * @param boolean $printTreesToo
  * @return void
  */
 	protected function _debug($printTreesToo = false) {
@@ -543,7 +543,7 @@ 
  *
  * @param string $string
  * @param integer $len
- * @return void
+ * @return string
  */
 	protected function _pad($string = '', $len = 14) {
 		return str_pad($string, $len);

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
 App::uses('DbAcl', 'Controller/Component/Acl');
 App::uses('AclNode', 'Model');
 App::uses('Permission', 'Model');
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . DS . 'Model' . DS . 'models.php';
+require_once dirname(dirname(dirname(dirname(__FILE__)))).DS.'Model'.DS.'models.php';
 
 /**
  * AclNodeTwoTestBase class
@@ -214,24 +214,24 @@ 
  */
 	public function testCreate() {
 		$this->Acl->Aro->create(array('alias' => 'Chotchkey'));
-		$this->assertTrue((bool)$this->Acl->Aro->save());
+		$this->assertTrue((bool) $this->Acl->Aro->save());
 
 		$parent = $this->Acl->Aro->id;
 
 		$this->Acl->Aro->create(array('parent_id' => $parent, 'alias' => 'Joanna'));
-		$this->assertTrue((bool)$this->Acl->Aro->save());
+		$this->assertTrue((bool) $this->Acl->Aro->save());
 
 		$this->Acl->Aro->create(array('parent_id' => $parent, 'alias' => 'Stapler'));
-		$this->assertTrue((bool)$this->Acl->Aro->save());
+		$this->assertTrue((bool) $this->Acl->Aro->save());
 
 		$root = $this->Acl->Aco->node('ROOT');
 		$parent = $root[0]['AcoTwoTest']['id'];
 
 		$this->Acl->Aco->create(array('parent_id' => $parent, 'alias' => 'Drinks'));
-		$this->assertTrue((bool)$this->Acl->Aco->save());
+		$this->assertTrue((bool) $this->Acl->Aco->save());
 
 		$this->Acl->Aco->create(array('parent_id' => $parent, 'alias' => 'PiecesOfFlair'));
-		$this->assertTrue((bool)$this->Acl->Aco->save());
+		$this->assertTrue((bool) $this->Acl->Aco->save());
 	}
 
 /**

lib/Cake/Test/Case/Controller/Component/AuthComponentTest.php

Doc Comments +3 added lines, -2 removed lines

@@ -119,6 +119,7 @@ 
 /**
  * construct method
  *
+ * @param CakeRequest $request
  */
 	public function __construct($request, $response) {
 		$request->addParams(Router::parse('/auth_test'));
@@ -184,7 +185,7 @@ 
  * @param string|array $url
  * @param mixed $status
  * @param mixed $exit
- * @return void
+ * @return boolean
  */
 	public function redirect($url, $status = null, $exit = true) {
 		$this->testUrl = Router::url($url);
@@ -257,7 +258,7 @@ 
  * @param string|array $url
  * @param mixed $status
  * @param mixed $exit
- * @return void
+ * @return boolean
  */
 	public function redirect($url, $status = null, $exit = true) {
 		$this->testUrl = Router::url($url);

Spacing +3 added lines, -3 removed lines

@@ -1090,7 +1090,7 @@ 
 		$pref = Configure::read('Routing.prefixes');
 		Configure::write('Routing.prefixes', array('admin'));
 		Router::reload();
-		require CAKE . 'Config' . DS . 'routes.php';
+		require CAKE.'Config'.DS.'routes.php';
 
 		$url = '/admin/auth_test/add';
 		$this->Auth->request->addParams(Router::parse($url));
@@ -1117,7 +1117,7 @@ 
  */
 	public function testAjaxLogin() {
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
 
@@ -1141,7 +1141,7 @@ 
 		$admin = Configure::read('Routing.prefixes');
 		Configure::write('Routing.prefixes', array('admin'));
 		Router::reload();
-		require CAKE . 'Config' . DS . 'routes.php';
+		require CAKE.'Config'.DS.'routes.php';
 
 		$url = '/admin/auth_test/login';
 		$this->Auth->request->addParams(Router::parse($url));

lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php

Doc Comments +1 added lines, -2 removed lines

@@ -86,8 +86,7 @@
 /**
  * find method
  *
- * @param mixed $type
- * @param array $options
+ * @param array $conditions
  * @return void
  */
 	public function find($conditions = null, $fields = array(), $order = null, $recursive = null) {

Indentation +12 added lines, -12 removed lines

@@ -1029,10 +1029,10 @@ 
 		$this->assertEquals('desc', $result['order']['Child.something']);
 	}
 /**
- * test that multiple sort works.
- *
- * @return void
- */
+	 * test that multiple sort works.
+	 *
+	 * @return void
+	 */
 	public function testValidateSortMultiple() {
 		$model = $this->getMock('Model');
 		$model->alias = 'model';
@@ -1233,10 +1233,10 @@ 
 		$this->assertFalse($result['prevPage']);
 	}
 /**
- * test paginate() and custom find with fields array, to make sure the correct count is returned.
- *
- * @return void
- */
+	 * test paginate() and custom find with fields array, to make sure the correct count is returned.
+	 *
+	 * @return void
+	 */
 	public function testPaginateCustomFindFieldsArray() {
 		$Controller = new Controller($this->request);
 		$Controller->uses = array('PaginatorCustomPost');
@@ -1265,10 +1265,10 @@ 
 		$this->assertFalse($result['prevPage']);
 	}
 /**
- * test paginate() and custom find with customFind key, to make sure the correct count is returned.
- *
- * @return void
- */
+	 * test paginate() and custom find with customFind key, to make sure the correct count is returned.
+	 *
+	 * @return void
+	 */
 	public function testPaginateCustomFindWithCustomFindKey() {
 		$Controller = new Controller($this->request);
 		$Controller->uses = array('PaginatorCustomPost');

Spacing +9 added lines, -9 removed lines

@@ -92,7 +92,7 @@ 
  */
 	public function find($conditions = null, $fields = array(), $order = null, $recursive = null) {
 		if ($conditions === 'popular') {
-			$conditions = array($this->name . '.' . $this->primaryKey . ' > ' => '1');
+			$conditions = array($this->name.'.'.$this->primaryKey.' > ' => '1');
 			$options = Hash::merge($fields, compact('conditions'));
 			return parent::find('all', $options);
 		}
@@ -260,7 +260,7 @@ 
  */
 	protected function _findTotalsOperation($state, $query, $results = array()) {
 		if ($state === 'before') {
-			if (!empty($query['operation']) && $query['operation'] === 'count') {
+			if ( ! empty($query['operation']) && $query['operation'] === 'count') {
 				unset($query['limit']);
 				$query['recursive'] = -1;
 				$query['fields'] = array('COUNT(DISTINCT author_id) AS count');
@@ -452,7 +452,7 @@ 
 		$result = $Controller->Paginator->paginate('PaginatorControllerPost');
 		$this->assertEquals(1, $Controller->params['paging']['PaginatorControllerPost']['page']);
 		$this->assertEquals(array(1, 2, 3), Hash::extract($result, '{n}.PaginatorControllerPost.id'));
-		$this->assertTrue(!isset($Controller->PaginatorControllerPost->lastQueries[1]['contain']));
+		$this->assertTrue( ! isset($Controller->PaginatorControllerPost->lastQueries[1]['contain']));
 
 		$Controller->request->params['named'] = array('page' => '-1');
 		$Controller->Paginator->settings = array(
@@ -588,7 +588,7 @@ 
 		$Controller->params['url'] = array();
 		$Controller->constructClasses();
 		$Controller->PaginatorControllerPost->order = array(
-			$Controller->PaginatorControllerPost->alias . '.created' => 'desc'
+			$Controller->PaginatorControllerPost->alias.'.created' => 'desc'
 		);
 
 		$Controller->Paginator->settings = array(
@@ -1204,7 +1204,7 @@ 
 		$data = array('author_id' => 3, 'title' => 'Fourth Article', 'body' => 'Article Body, unpublished', 'published' => 'N');
 		$Controller->PaginatorCustomPost->create($data);
 		$result = $Controller->PaginatorCustomPost->save();
-		$this->assertTrue(!empty($result));
+		$this->assertTrue( ! empty($result));
 
 		$result = $Controller->paginate();
 		$this->assertEquals(array(1, 2, 3, 4), Hash::extract($result, '{n}.PaginatorCustomPost.id'));
@@ -1244,7 +1244,7 @@ 
 		$data = array('author_id' => 3, 'title' => 'Fourth Article', 'body' => 'Article Body, unpublished', 'published' => 'N');
 		$Controller->PaginatorCustomPost->create($data);
 		$result = $Controller->PaginatorCustomPost->save();
-		$this->assertTrue(!empty($result));
+		$this->assertTrue( ! empty($result));
 
 		$Controller->paginate = array(
 			'list',
@@ -1276,7 +1276,7 @@ 
 		$data = array('author_id' => 3, 'title' => 'Fourth Article', 'body' => 'Article Body, unpublished', 'published' => 'N');
 		$Controller->PaginatorCustomPost->create($data);
 		$result = $Controller->PaginatorCustomPost->save();
-		$this->assertTrue(!empty($result));
+		$this->assertTrue( ! empty($result));
 
 		$Controller->paginate = array(
 			'conditions' => array('PaginatorCustomPost.published' => 'Y'),
@@ -1309,7 +1309,7 @@ 
 		$data = array('author_id' => 2, 'title' => 'Fourth Article', 'body' => 'Article Body, unpublished', 'published' => 'N');
 		$Controller->PaginatorCustomPost->create($data);
 		$result = $Controller->PaginatorCustomPost->save();
-		$this->assertTrue(!empty($result));
+		$this->assertTrue( ! empty($result));
 
 		$Controller->paginate = array(
 			'totals',
@@ -1374,7 +1374,7 @@ 
 		$data = array('author_id' => 2, 'title' => 'Fourth Article', 'body' => 'Article Body, unpublished', 'published' => 'N');
 		$Controller->PaginatorCustomPost->create($data);
 		$result = $Controller->PaginatorCustomPost->save();
-		$this->assertTrue(!empty($result));
+		$this->assertTrue( ! empty($result));
 
 		$Controller->paginate = array(
 			'totalsOperation',

lib/Cake/Test/Case/Controller/Component/SecurityComponentTest.php

Doc Comments -1 removed lines

@@ -79,7 +79,6 @@
  * redirect method
  *
  * @param string|array $url
- * @param mixed $code
  * @param mixed $exit
  * @return void
  */

Spacing +9 added lines, -9 removed lines

@@ -550,7 +550,7 @@ 
 
 		// a corrupted serialized object, so we can see if it ever gets to deserialize
 		$attack = 'O:3:"App":1:{s:5:"__map";a:1:{s:3:"foo";s:7:"Hacked!";s:1:"fail"}}';
-		$fields .= urlencode(':' . str_rot13($attack));
+		$fields .= urlencode(':'.str_rot13($attack));
 
 		$this->Controller->request->data = array(
 			'Model' => array('username' => 'mark', 'password' => 'foo', 'valid' => '0'),
@@ -794,9 +794,9 @@ 
 		$unlocked = 'Model.username';
 		$fields = array('Model.hidden', 'Model.password');
 		$fields = urlencode(Security::hash(
-			'/posts/index' .
-			serialize($fields) .
-			$unlocked .
+			'/posts/index'.
+			serialize($fields).
+			$unlocked.
 			Configure::read('Security.salt'))
 		);
 
@@ -822,7 +822,7 @@ 
 		$this->Controller->Security->startup($this->Controller);
 		$key = $this->Controller->request->params['_Token']['key'];
 		$fields = array('Model.hidden', 'Model.password', 'Model.username');
-		$fields = urlencode(Security::hash(serialize($fields) . Configure::read('Security.salt')));
+		$fields = urlencode(Security::hash(serialize($fields).Configure::read('Security.salt')));
 
 		$this->Controller->request->data = array(
 			'Model' => array(
@@ -847,7 +847,7 @@ 
 		$key = $this->Controller->request->params['_Token']['key'];
 		$unlocked = 'Model.username';
 		$fields = array('Model.hidden', 'Model.password');
-		$fields = urlencode(Security::hash(serialize($fields) . $unlocked . Configure::read('Security.salt')));
+		$fields = urlencode(Security::hash(serialize($fields).$unlocked.Configure::read('Security.salt')));
 
 		// Tamper the values.
 		$unlocked = 'Model.username|Model.password';
@@ -970,9 +970,9 @@ 
 		$hashFields = array('TaxonomyData');
 		$fields = urlencode(
 			Security::hash(
-			'/posts/index' .
-			serialize($hashFields) .
-			$unlocked .
+			'/posts/index'.
+			serialize($hashFields).
+			$unlocked.
 			Configure::read('Security.salt'), 'sha1')
 		);
 

lib/Cake/Test/Case/Controller/ControllerTest.php

Doc Comments +2 added lines, -2 removed lines

@@ -235,7 +235,7 @@ 
  * index method
  *
  * @param mixed $testId
- * @param mixed $test2Id
+ * @param mixed $testTwoId
  * @return void
  */
 	public function index($testId, $testTwoId) {
@@ -249,7 +249,7 @@ 
  * view method
  *
  * @param mixed $testId
- * @param mixed $test2Id
+ * @param mixed $testTwoId
  * @return void
  */
 	public function view($testId, $testTwoId) {

Spacing +14 added lines, -14 removed lines

@@ -97,7 +97,7 @@ 
  */
 	public function find($type = 'first', $options = array()) {
 		if ($type === 'popular') {
-			$conditions = array($this->name . '.' . $this->primaryKey . ' > ' => '1');
+			$conditions = array($this->name.'.'.$this->primaryKey.' > ' => '1');
 			$options = Hash::merge($options, compact('conditions'));
 			return parent::find('all', $options);
 		}
@@ -448,9 +448,9 @@ 
  */
 	public function testLoadModelInPlugins() {
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'Controller' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
-			'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS),
+			'Controller' => array(CAKE.'Test'.DS.'test_app'.DS.'Controller'.DS),
+			'Model' => array(CAKE.'Test'.DS.'test_app'.DS.'Model'.DS)
 		));
 		CakePlugin::load('TestPlugin');
 		App::uses('TestPluginAppController', 'TestPlugin.Controller');
@@ -489,7 +489,7 @@ 
 
 		unset($Controller);
 
-		App::build(array('Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
+		App::build(array('Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)));
 		CakePlugin::load('TestPlugin');
 
 		$Controller = new Controller($request);
@@ -567,7 +567,7 @@ 
 		$this->assertEquals($expected, $result);
 
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 		$Controller = new Controller($request);
 		$Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
@@ -626,7 +626,7 @@ 
  */
 	public function testRender() {
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		), App::RESET);
 		ClassRegistry::flush();
 		$request = new CakeRequest('controller_posts/index');
@@ -636,14 +636,14 @@ 
 		$Controller->viewPath = 'Posts';
 
 		$result = $Controller->render('index');
-		$this->assertRegExp('/posts index/', (string)$result);
+		$this->assertRegExp('/posts index/', (string) $result);
 
 		$Controller->view = 'index';
 		$result = $Controller->render();
-		$this->assertRegExp('/posts index/', (string)$result);
+		$this->assertRegExp('/posts index/', (string) $result);
 
 		$result = $Controller->render('/Elements/test_element');
-		$this->assertRegExp('/this is the test element/', (string)$result);
+		$this->assertRegExp('/this is the test element/', (string) $result);
 		$Controller->view = null;
 
 		$Controller = new TestController($request, new CakeResponse());
@@ -678,7 +678,7 @@ 
 	public function testComponentBeforeRenderChangingViewClass() {
 		App::build(array(
 			'View' => array(
-				CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS
+				CAKE.'Test'.DS.'test_app'.DS.'View'.DS
 			)
 		), true);
 		$Controller = new Controller($this->getMock('CakeRequest'), new CakeResponse());
@@ -689,7 +689,7 @@ 
 		$Controller->viewPath = 'Posts';
 		$Controller->theme = 'TestTheme';
 		$result = $Controller->render('index');
-		$this->assertRegExp('/default test_theme layout/', (string)$result);
+		$this->assertRegExp('/default test_theme layout/', (string) $result);
 		App::build();
 	}
 
@@ -757,7 +757,7 @@ 
 		$Controller->response->expects($this->once())->method('header')
 			->with('Location', 'http://cakephp.org');
 
-		$Controller->redirect('http://cakephp.org', (int)$code, false);
+		$Controller->redirect('http://cakephp.org', (int) $code, false);
 		$this->assertFalse($Controller->autoRender);
 	}
 
@@ -922,7 +922,7 @@ 
 		$components = is_array($appVars['components'])
 						? array_merge($appVars['components'], $testVars['components'])
 						: $testVars['components'];
-		if (!in_array('Session', $components)) {
+		if ( ! in_array('Session', $components)) {
 			$components[] = 'Session';
 		}
 		$helpers = is_array($appVars['helpers'])

lib/Cake/Test/Case/Core/ObjectTest.php

Doc Comments +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
 /**
  * test_request_action method
  *
- * @return void
+ * @return string
  */
 	public function test_request_action() {
 		return 'This is a test';
@@ -73,7 +73,7 @@ 
 /**
  * normal_request_action method
  *
- * @return void
+ * @return string
  */
 	public function normal_request_action() {
 		return 'Hello World';
@@ -91,7 +91,7 @@ 
 /**
  * paginate_request_action method
  *
- * @return void
+ * @return boolean
  */
 	public function paginate_request_action() {
 		$this->paginate();
@@ -110,7 +110,7 @@ 
 /**
  * test param passing and parsing.
  *
- * @return array
+ * @return CakeRequest
  */
 	public function params_pass() {
 		return $this->request;

Spacing +15 added lines, -15 removed lines

@@ -313,28 +313,28 @@ 
  * @return void
  */
 	public function testLog() {
-		if (file_exists(LOGS . 'error.log')) {
-			unlink(LOGS . 'error.log');
+		if (file_exists(LOGS.'error.log')) {
+			unlink(LOGS.'error.log');
 		}
 		$this->assertTrue($this->object->log('Test warning 1'));
 		$this->assertTrue($this->object->log(array('Test' => 'warning 2')));
-		$result = file(LOGS . 'error.log');
+		$result = file(LOGS.'error.log');
 		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Error: Test warning 1$/', $result[0]);
 		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Error: Array$/', $result[1]);
 		$this->assertRegExp('/^\($/', $result[2]);
 		$this->assertRegExp('/\[Test\] => warning 2$/', $result[3]);
 		$this->assertRegExp('/^\)$/', $result[4]);
-		unlink(LOGS . 'error.log');
+		unlink(LOGS.'error.log');
 
 		$this->assertTrue($this->object->log('Test warning 1', LOG_WARNING));
 		$this->assertTrue($this->object->log(array('Test' => 'warning 2'), LOG_WARNING));
-		$result = file(LOGS . 'error.log');
+		$result = file(LOGS.'error.log');
 		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 1$/', $result[0]);
 		$this->assertRegExp('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Array$/', $result[1]);
 		$this->assertRegExp('/^\($/', $result[2]);
 		$this->assertRegExp('/\[Test\] => warning 2$/', $result[3]);
 		$this->assertRegExp('/^\)$/', $result[4]);
-		unlink(LOGS . 'error.log');
+		unlink(LOGS.'error.log');
 	}
 
 /**
@@ -440,9 +440,9 @@ 
  */
 	public function testRequestAction() {
 		App::build(array(
-			'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),
-			'Controller' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS)
+			'Model' => array(CAKE.'Test'.DS.'test_app'.DS.'Model'.DS),
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS),
+			'Controller' => array(CAKE.'Test'.DS.'test_app'.DS.'Controller'.DS)
 		), App::RESET);
 		$this->assertNull(Router::getRequest(), 'request stack should be empty.');
 
@@ -454,7 +454,7 @@ 
 		$this->assertEquals($expected, $result);
 
 		$result = $this->object->requestAction(
-			Configure::read('App.fullBaseUrl') . '/request_action/test_request_action'
+			Configure::read('App.fullBaseUrl').'/request_action/test_request_action'
 		);
 		$expected = 'This is a test';
 		$this->assertEquals($expected, $result);
@@ -488,7 +488,7 @@ 
  */
 	public function testRequestActionPlugins() {
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS),
 		), App::RESET);
 		CakePlugin::load('TestPlugin');
 		Router::reload();
@@ -525,10 +525,10 @@ 
  */
 	public function testRequestActionArray() {
 		App::build(array(
-			'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS),
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),
-			'Controller' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS),
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			'Model' => array(CAKE.'Test'.DS.'test_app'.DS.'Model'.DS),
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS),
+			'Controller' => array(CAKE.'Test'.DS.'test_app'.DS.'Controller'.DS),
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)
 		), App::RESET);
 		CakePlugin::load(array('TestPlugin'));