reginaldojunior / winners

lib/Cake/Controller/Component/Acl/PhpAcl.php

Doc Comments +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return boolean|null Success
  */
 	public function allow($aro, $aco, $action = "*") {
 		return $this->Aco->access($this->Aro->resolve($aro), $aco, $action, 'allow');
@@ -136,7 +136,7 @@ 
  * @param string $aro ARO The requesting object identifier.
  * @param string $aco ACO The controlled object identifier.
  * @param string $action Action (defaults to *)
- * @return boolean Success
+ * @return boolean|null Success
  */
 	public function deny($aro, $aco, $action = "*") {
 		return $this->Aco->access($this->Aro->resolve($aro), $aco, $action, 'deny');

Spacing +30 added lines, -30 removed lines

@@ -69,7 +69,7 @@ 
 	public function __construct() {
 		$this->options = array(
 			'policy' => self::DENY,
-			'config' => APP . 'Config' . DS . 'acl.php',
+			'config' => APP.'Config'.DS.'acl.php',
 		);
 	}
 
@@ -80,12 +80,12 @@ 
  * @return void
  */
 	public function initialize(Component $Component) {
-		if (!empty($Component->settings['adapter'])) {
+		if ( ! empty($Component->settings['adapter'])) {
 			$this->options = array_merge($this->options, $Component->settings['adapter']);
 		}
 
 		App::uses('PhpReader', 'Configure');
-		$Reader = new PhpReader(dirname($this->options['config']) . DS);
+		$Reader = new PhpReader(dirname($this->options['config']).DS);
 		$config = $Reader->read(basename($this->options['config']));
 		$this->build($config);
 		$Component->Aco = $this->Aco;
@@ -108,11 +108,11 @@ 
 			throw new AclException(__d('cake_dev', 'Neither "allow" nor "deny" rules were provided in configuration.'));
 		}
 
-		$rules['allow'] = !empty($config['rules']['allow']) ? $config['rules']['allow'] : array();
-		$rules['deny'] = !empty($config['rules']['deny']) ? $config['rules']['deny'] : array();
-		$roles = !empty($config['roles']) ? $config['roles'] : array();
-		$map = !empty($config['map']) ? $config['map'] : array();
-		$alias = !empty($config['alias']) ? $config['alias'] : array();
+		$rules['allow'] = ! empty($config['rules']['allow']) ? $config['rules']['allow'] : array();
+		$rules['deny'] = ! empty($config['rules']['deny']) ? $config['rules']['deny'] : array();
+		$roles = ! empty($config['roles']) ? $config['roles'] : array();
+		$map = ! empty($config['map']) ? $config['map'] : array();
+		$alias = ! empty($config['alias']) ? $config['alias'] : array();
 
 		$this->Aro = new PhpAro($roles, $map, $alias);
 		$this->Aco = new PhpAco($rules);
@@ -168,7 +168,7 @@ 
 		$prioritizedAros = $this->Aro->roles($aro);
 
 		if ($action && $action !== "*") {
-			$aco .= '/' . $action;
+			$aco .= '/'.$action;
 		}
 
 		$path = $this->Aco->path($aco);
@@ -179,12 +179,12 @@ 
 
 		foreach ($path as $node) {
 			foreach ($prioritizedAros as $aros) {
-				if (!empty($node['allow'])) {
+				if ( ! empty($node['allow'])) {
 					$allow = $allow || count(array_intersect($node['allow'], $aros));
 				}
 
-				if (!empty($node['deny'])) {
-					$allow = $allow && !count(array_intersect($node['deny'], $aros));
+				if ( ! empty($node['deny'])) {
+					$allow = $allow && ! count(array_intersect($node['deny'], $aros));
 				}
 			}
 		}
@@ -244,7 +244,7 @@ 
 		$root = $this->_tree;
 		$stack = array(array($root, 0));
 
-		while (!empty($stack)) {
+		while ( ! empty($stack)) {
 			list($root, $level) = array_pop($stack);
 
 			if (empty($path[$level])) {
@@ -252,12 +252,12 @@ 
 			}
 
 			foreach ($root as $node => $elements) {
-				$pattern = '/^' . str_replace(array_keys(self::$modifiers), array_values(self::$modifiers), $node) . '$/';
+				$pattern = '/^'.str_replace(array_keys(self::$modifiers), array_values(self::$modifiers), $node).'$/';
 
 				if ($node == $aco[$level] || preg_match($pattern, $aco[$level])) {
 					// merge allow/denies with $path of current level
 					foreach (array('allow', 'deny') as $policy) {
-						if (!empty($elements[$policy])) {
+						if ( ! empty($elements[$policy])) {
 							if (empty($path[$level][$policy])) {
 								$path[$level][$policy] = array();
 							}
@@ -266,7 +266,7 @@ 
 					}
 
 					// traverse
-					if (!empty($elements['children']) && isset($aco[$level + 1])) {
+					if ( ! empty($elements['children']) && isset($aco[$level + 1])) {
 						array_push($stack, array($elements['children'], $level + 1));
 					}
 				}
@@ -292,7 +292,7 @@ 
 		$tree = &$root;
 
 		foreach ($aco as $i => $node) {
-			if (!isset($tree[$node])) {
+			if ( ! isset($tree[$node])) {
 				$tree[$node] = array(
 					'children' => array(),
 				);
@@ -412,7 +412,7 @@ 
  * @param array $aliases
  */
 	public function __construct(array $aro = array(), array $map = array(), array $aliases = array()) {
-		if (!empty($map)) {
+		if ( ! empty($map)) {
 			$this->map = $map;
 		}
 
@@ -435,7 +435,7 @@ 
 		$aro = $this->resolve($aro);
 		$stack = array(array($aro, 0));
 
-		while (!empty($stack)) {
+		while ( ! empty($stack)) {
 			list($element, $depth) = array_pop($stack);
 			$aros[$depth][] = $element;
 
@@ -463,24 +463,24 @@ 
 
 			if (is_array($aro)) {
 				if (isset($aro['model']) && isset($aro['foreign_key']) && $aro['model'] === $aroGroup) {
-					$mapped = $aroGroup . '/' . $aro['foreign_key'];
+					$mapped = $aroGroup.'/'.$aro['foreign_key'];
 				} elseif (isset($aro[$model][$field])) {
-					$mapped = $aroGroup . '/' . $aro[$model][$field];
+					$mapped = $aroGroup.'/'.$aro[$model][$field];
 				} elseif (isset($aro[$field])) {
-					$mapped = $aroGroup . '/' . $aro[$field];
+					$mapped = $aroGroup.'/'.$aro[$field];
 				}
 			} elseif (is_string($aro)) {
 				$aro = ltrim($aro, '/');
 
 				if (strpos($aro, '/') === false) {
-					$mapped = $aroGroup . '/' . $aro;
+					$mapped = $aroGroup.'/'.$aro;
 				} else {
 					list($aroModel, $aroValue) = explode('/', $aro, 2);
 
 					$aroModel = Inflector::camelize($aroModel);
 
 					if ($aroModel === $model || $aroModel === $aroGroup) {
-						$mapped = $aroGroup . '/' . $aroValue;
+						$mapped = $aroGroup.'/'.$aroValue;
 					}
 				}
 			}
@@ -490,7 +490,7 @@ 
 			}
 
 			// is there a matching alias defined (e.g. Role/1 => Role/admin)?
-			if (!empty($this->aliases[$mapped])) {
+			if ( ! empty($this->aliases[$mapped])) {
 				return $this->aliases[$mapped];
 			}
 		}
@@ -505,11 +505,11 @@ 
  */
 	public function addRole(array $aro) {
 		foreach ($aro as $role => $inheritedRoles) {
-			if (!isset($this->_tree[$role])) {
+			if ( ! isset($this->_tree[$role])) {
 				$this->_tree[$role] = array();
 			}
 
-			if (!empty($inheritedRoles)) {
+			if ( ! empty($inheritedRoles)) {
 				if (is_string($inheritedRoles)) {
 					$inheritedRoles = array_map('trim', explode(',', $inheritedRoles));
 				}
@@ -522,14 +522,14 @@ 
 						$path = '';
 
 						foreach ($roles as $roleDependencies) {
-							$path .= implode('|', (array)$roleDependencies) . ' -> ';
+							$path .= implode('|', (array) $roleDependencies).' -> ';
 						}
 
-						trigger_error(__d('cake_dev', 'cycle detected when inheriting %s from %s. Path: %s', $role, $dependency, $path . $role));
+						trigger_error(__d('cake_dev', 'cycle detected when inheriting %s from %s. Path: %s', $role, $dependency, $path.$role));
 						continue;
 					}
 
-					if (!isset($this->_tree[$dependency])) {
+					if ( ! isset($this->_tree[$dependency])) {
 						$this->_tree[$dependency] = array();
 					}
 

lib/Cake/Controller/Component/Auth/BaseAuthenticate.php

Doc Comments +1 added lines, -1 removed lines

@@ -199,7 +199,7 @@
  * systems like basic and digest auth.
  *
  * @param CakeRequest $request Request object.
- * @return mixed Either false or an array of user information
+ * @return boolean Either false or an array of user information
  */
 	public function getUser(CakeRequest $request) {
 		return false;

Spacing +7 added lines, -7 removed lines

@@ -97,11 +97,11 @@ 
 			$conditions = $username;
 		} else {
 			$conditions = array(
-				$model . '.' . $fields['username'] => $username
+				$model.'.'.$fields['username'] => $username
 			);
 		}
 
-		if (!empty($this->settings['scope'])) {
+		if ( ! empty($this->settings['scope'])) {
 			$conditions = array_merge($conditions, $this->settings['scope']);
 		}
 
@@ -117,7 +117,7 @@ 
 
 		$user = $result[$model];
 		if ($password !== null) {
-			if (!$this->passwordHasher()->check($password, $user[$fields['password']])) {
+			if ( ! $this->passwordHasher()->check($password, $user[$fields['password']])) {
 				return false;
 			}
 			unset($user[$fields['password']]);
@@ -148,12 +148,12 @@ 
 			unset($config['className']);
 		}
 		list($plugin, $class) = pluginSplit($class, true);
-		$className = $class . 'PasswordHasher';
-		App::uses($className, $plugin . 'Controller/Component/Auth');
-		if (!class_exists($className)) {
+		$className = $class.'PasswordHasher';
+		App::uses($className, $plugin.'Controller/Component/Auth');
+		if ( ! class_exists($className)) {
 			throw new CakeException(__d('cake_dev', 'Password hasher class "%s" was not found.', $class));
 		}
-		if (!is_subclass_of($className, 'AbstractPasswordHasher')) {
+		if ( ! is_subclass_of($className, 'AbstractPasswordHasher')) {
 			throw new CakeException(__d('cake_dev', 'Password hasher must extend AbstractPasswordHasher class.'));
 		}
 		$this->_passwordHasher = new $className($config);

lib/Cake/Controller/Component/CookieComponent.php

Doc Comments -1 removed lines

@@ -291,7 +291,6 @@
 /**
  * Returns true if given variable is set in cookie.
  *
- * @param string $var Variable name to check for
  * @return boolean True if variable is there
  */
 	public function check($key = null) {

Spacing +14 added lines, -14 removed lines

@@ -223,7 +223,7 @@ 
 		$this->_encrypted = $encrypt;
 		$this->_expire($expires);
 
-		if (!is_array($key)) {
+		if ( ! is_array($key)) {
 			$key = array($key => $value);
 		}
 
@@ -235,7 +235,7 @@ 
 			$firstName = $names[0];
 			$isMultiValue = (is_array($value) || count($names) > 1);
 
-			if (!isset($this->_values[$this->name][$firstName]) && $isMultiValue) {
+			if ( ! isset($this->_values[$this->name][$firstName]) && $isMultiValue) {
 				$this->_values[$this->name][$firstName] = array();
 			}
 
@@ -248,7 +248,7 @@ 
 			} else {
 				$this->_values[$this->name][$firstName] = $value;
 			}
-			$this->_write('[' . $firstName . ']', $this->_values[$this->name][$firstName]);
+			$this->_write('['.$firstName.']', $this->_values[$this->name][$firstName]);
 		}
 		$this->_encrypted = true;
 	}
@@ -278,11 +278,11 @@ 
 			$names = explode('.', $key, 2);
 			$key = $names[0];
 		}
-		if (!isset($this->_values[$this->name][$key])) {
+		if ( ! isset($this->_values[$this->name][$key])) {
 			return null;
 		}
 
-		if (!empty($names[1])) {
+		if ( ! empty($names[1])) {
 			return Hash::get($this->_values[$this->name][$key], $names[1]);
 		}
 		return $this->_values[$this->name][$key];
@@ -338,7 +338,7 @@ 
 		if (isset($this->_values[$this->name][$names[0]])) {
 			$this->_values[$this->name][$names[0]] = Hash::remove($this->_values[$this->name][$names[0]], $names[1]);
 		}
-		$this->_delete('[' . implode('][', $names) . ']');
+		$this->_delete('['.implode('][', $names).']');
 	}
 
 /**
@@ -380,7 +380,7 @@ 
 			'cipher',
 			'rijndael'
 		);
-		if (!in_array($type, $availableTypes)) {
+		if ( ! in_array($type, $availableTypes)) {
 			trigger_error(__d('cake_dev', 'You must use cipher or rijndael for cookie encryption type'), E_USER_WARNING);
 			$type = 'cipher';
 		}
@@ -405,7 +405,7 @@ 
 			return $this->_expires;
 		}
 		$this->_reset = $this->_expires;
-		if (!$expires) {
+		if ( ! $expires) {
 			return $this->_expires = 0;
 		}
 		$now = new DateTime();
@@ -426,7 +426,7 @@ 
  */
 	protected function _write($name, $value) {
 		$this->_response->cookie(array(
-			'name' => $this->name . $name,
+			'name' => $this->name.$name,
 			'value' => $this->_encrypt($value),
 			'expire' => $this->_expires,
 			'path' => $this->path,
@@ -435,7 +435,7 @@ 
 			'httpOnly' => $this->httpOnly
 		));
 
-		if (!empty($this->_reset)) {
+		if ( ! empty($this->_reset)) {
 			$this->_expires = $this->_reset;
 			$this->_reset = null;
 		}
@@ -449,7 +449,7 @@ 
  */
 	protected function _delete($name) {
 		$this->_response->cookie(array(
-			'name' => $this->name . $name,
+			'name' => $this->name.$name,
 			'value' => '',
 			'expire' => time() - 42000,
 			'path' => $this->path,
@@ -472,7 +472,7 @@ 
 
 		if ($this->_encrypted === true) {
 			$type = $this->_type;
-			$value = "Q2FrZQ==." . base64_encode(Security::$type($value, $this->key, 'encrypt'));
+			$value = "Q2FrZQ==.".base64_encode(Security::$type($value, $this->key, 'encrypt'));
 		}
 		return $value;
 	}
@@ -487,7 +487,7 @@ 
 		$decrypted = array();
 		$type = $this->_type;
 
-		foreach ((array)$values as $name => $value) {
+		foreach ((array) $values as $name => $value) {
 			if (is_array($value)) {
 				foreach ($value as $key => $val) {
 					$pos = strpos($val, 'Q2FrZQ==.');
@@ -537,7 +537,7 @@ 
 		$array = array();
 		foreach (explode(',', $string) as $pair) {
 			$key = explode('|', $pair);
-			if (!isset($key[1])) {
+			if ( ! isset($key[1])) {
 				return $key[0];
 			}
 			$array[$key[0]] = $key[1];

lib/Cake/Controller/Component/SecurityComponent.php

Doc Comments +4 added lines, -4 removed lines

@@ -355,7 +355,7 @@ 
  * Check if HTTP methods are required
  *
  * @param Controller $controller Instantiating controller
- * @return boolean true if $method is required
+ * @return null|boolean true if $method is required
  */
 	protected function _methodsRequired(Controller $controller) {
 		foreach (array('Post', 'Get', 'Put', 'Delete') as $method) {
@@ -378,7 +378,7 @@ 
  * Check if access requires secure connection
  *
  * @param Controller $controller Instantiating controller
- * @return boolean true if secure connection required
+ * @return null|boolean true if secure connection required
  */
 	protected function _secureRequired(Controller $controller) {
 		if (is_array($this->requireSecure) && !empty($this->requireSecure)) {
@@ -399,7 +399,7 @@ 
  * Check if authentication is required
  *
  * @param Controller $controller Instantiating controller
- * @return boolean true if authentication required
+ * @return null|boolean true if authentication required
  */
 	protected function _authRequired(Controller $controller) {
 		if (is_array($this->requireAuth) && !empty($this->requireAuth) && !empty($this->request->data)) {
@@ -610,7 +610,7 @@ 
  *
  * @param Controller $controller Controller to run callback on
  * @param string $method Method to execute
- * @param array $params Parameters to send to method
+ * @param string[] $params Parameters to send to method
  * @return mixed Controller callback method's response
  * @throws BadRequestException When a the blackholeCallback is not callable.
  */

Spacing +28 added lines, -28 removed lines

@@ -226,7 +226,7 @@ 
 
 		$isPost = $this->request->is(array('post', 'put'));
 		$isNotRequestAction = (
-			!isset($controller->request->params['requested']) ||
+			! isset($controller->request->params['requested']) ||
 			$controller->request->params['requested'] != 1
 		);
 
@@ -234,7 +234,7 @@ 
 			return $this->blackHole($controller, 'auth');
 		}
 
-		if (!in_array($this->_action, (array)$this->unlockedActions) && $isPost && $isNotRequestAction) {
+		if ( ! in_array($this->_action, (array) $this->unlockedActions) && $isPost && $isNotRequestAction) {
 			if ($this->validatePost && $this->_validatePost($controller) === false) {
 				return $this->blackHole($controller, 'auth');
 			}
@@ -331,7 +331,7 @@ 
  * @throws BadRequestException
  */
 	public function blackHole(Controller $controller, $error = '') {
-		if (!$this->blackHoleCallback) {
+		if ( ! $this->blackHoleCallback) {
 			throw new BadRequestException(__d('cake_dev', 'The request has been black-holed'));
 		}
 		return $this->_callback($controller, $this->blackHoleCallback, array($error));
@@ -348,7 +348,7 @@ 
 		if (isset($actions[0]) && is_array($actions[0])) {
 			$actions = $actions[0];
 		}
-		$this->{'require' . $method} = (empty($actions)) ? array('*') : $actions;
+		$this->{'require'.$method} = (empty($actions)) ? array('*') : $actions;
 	}
 
 /**
@@ -359,12 +359,12 @@ 
  */
 	protected function _methodsRequired(Controller $controller) {
 		foreach (array('Post', 'Get', 'Put', 'Delete') as $method) {
-			$property = 'require' . $method;
-			if (is_array($this->$property) && !empty($this->$property)) {
+			$property = 'require'.$method;
+			if (is_array($this->$property) && ! empty($this->$property)) {
 				$require = $this->$property;
 				if (in_array($this->_action, $require) || $this->$property === array('*')) {
-					if (!$this->request->is($method)) {
-						if (!$this->blackHole($controller, $method)) {
+					if ( ! $this->request->is($method)) {
+						if ( ! $this->blackHole($controller, $method)) {
 							return null;
 						}
 					}
@@ -381,12 +381,12 @@ 
  * @return boolean true if secure connection required
  */
 	protected function _secureRequired(Controller $controller) {
-		if (is_array($this->requireSecure) && !empty($this->requireSecure)) {
+		if (is_array($this->requireSecure) && ! empty($this->requireSecure)) {
 			$requireSecure = $this->requireSecure;
 
 			if (in_array($this->_action, $requireSecure) || $this->requireSecure === array('*')) {
-				if (!$this->request->is('ssl')) {
-					if (!$this->blackHole($controller, 'secure')) {
+				if ( ! $this->request->is('ssl')) {
+					if ( ! $this->blackHole($controller, 'secure')) {
 						return null;
 					}
 				}
@@ -402,12 +402,12 @@ 
  * @return boolean true if authentication required
  */
 	protected function _authRequired(Controller $controller) {
-		if (is_array($this->requireAuth) && !empty($this->requireAuth) && !empty($this->request->data)) {
+		if (is_array($this->requireAuth) && ! empty($this->requireAuth) && ! empty($this->request->data)) {
 			$requireAuth = $this->requireAuth;
 
 			if (in_array($this->request->params['action'], $requireAuth) || $this->requireAuth === array('*')) {
-				if (!isset($controller->request->data['_Token'])) {
-					if (!$this->blackHole($controller, 'auth')) {
+				if ( ! isset($controller->request->data['_Token'])) {
+					if ( ! $this->blackHole($controller, 'auth')) {
 						return null;
 					}
 				}
@@ -416,17 +416,17 @@ 
 					$tData = $this->Session->read('_Token');
 
 					if (
-						!empty($tData['allowedControllers']) &&
-						!in_array($this->request->params['controller'], $tData['allowedControllers']) ||
-						!empty($tData['allowedActions']) &&
-						!in_array($this->request->params['action'], $tData['allowedActions'])
+						! empty($tData['allowedControllers']) &&
+						! in_array($this->request->params['controller'], $tData['allowedControllers']) ||
+						! empty($tData['allowedActions']) &&
+						! in_array($this->request->params['action'], $tData['allowedActions'])
 					) {
-						if (!$this->blackHole($controller, 'auth')) {
+						if ( ! $this->blackHole($controller, 'auth')) {
 							return null;
 						}
 					}
 				} else {
-					if (!$this->blackHole($controller, 'auth')) {
+					if ( ! $this->blackHole($controller, 'auth')) {
 						return null;
 					}
 				}
@@ -447,7 +447,7 @@ 
 		}
 		$data = $controller->request->data;
 
-		if (!isset($data['_Token']) || !isset($data['_Token']['fields']) || !isset($data['_Token']['unlocked'])) {
+		if ( ! isset($data['_Token']) || ! isset($data['_Token']['fields']) || ! isset($data['_Token']['unlocked'])) {
 			return false;
 		}
 
@@ -475,18 +475,18 @@ 
 				unset($fieldList[$i]);
 			}
 		}
-		if (!empty($multi)) {
+		if ( ! empty($multi)) {
 			$fieldList += array_unique($multi);
 		}
 
 		$unlockedFields = array_unique(
-			array_merge((array)$this->disabledFields, (array)$this->unlockedFields, $unlocked)
+			array_merge((array) $this->disabledFields, (array) $this->unlockedFields, $unlocked)
 		);
 
 		foreach ($fieldList as $i => $key) {
 			$isLocked = (is_array($locked) && in_array($key, $locked));
 
-			if (!empty($unlockedFields)) {
+			if ( ! empty($unlockedFields)) {
 				foreach ($unlockedFields as $off) {
 					$off = explode('.', $off);
 					$field = array_values(array_intersect(explode('.', $key), $off));
@@ -545,14 +545,14 @@ 
 		$tokenData = array();
 		if ($this->Session->check('_Token')) {
 			$tokenData = $this->Session->read('_Token');
-			if (!empty($tokenData['csrfTokens']) && is_array($tokenData['csrfTokens'])) {
+			if ( ! empty($tokenData['csrfTokens']) && is_array($tokenData['csrfTokens'])) {
 				$token['csrfTokens'] = $this->_expireTokens($tokenData['csrfTokens']);
 			}
 		}
 		if ($this->csrfUseOnce || empty($token['csrfTokens'])) {
 			$token['csrfTokens'][$authKey] = strtotime($this->csrfExpires);
 		}
-		if (!$this->csrfUseOnce) {
+		if ( ! $this->csrfUseOnce) {
 			$csrfTokens = array_keys($token['csrfTokens']);
 			$token['key'] = $csrfTokens[0];
 		}
@@ -577,7 +577,7 @@ 
 		$requestToken = $controller->request->data('_Token.key');
 		if (isset($token['csrfTokens'][$requestToken]) && $token['csrfTokens'][$requestToken] >= time()) {
 			if ($this->csrfUseOnce) {
-				$this->Session->delete('_Token.csrfTokens.' . $requestToken);
+				$this->Session->delete('_Token.csrfTokens.'.$requestToken);
 			}
 			return true;
 		}
@@ -615,7 +615,7 @@ 
  * @throws BadRequestException When a the blackholeCallback is not callable.
  */
 	protected function _callback(Controller $controller, $method, $params = array()) {
-		if (!is_callable(array($controller, $method))) {
+		if ( ! is_callable(array($controller, $method))) {
 			throw new BadRequestException(__d('cake_dev', 'The request has been black-holed'));
 		}
 		return call_user_func_array(array(&$controller, $method), empty($params) ? null : $params);

lib/Cake/Controller/Controller.php

Doc Comments +1 added lines, -1 removed lines

@@ -629,7 +629,7 @@
  * see Controller::loadModel(); for more info.
  * Loads Components and prepares them for initialization.
  *
- * @return mixed true if models found and instance created.
+ * @return boolean true if models found and instance created.
  * @see Controller::loadModel()
  * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::constructClasses
  * @throws MissingModelException

Spacing +36 added lines, -36 removed lines

@@ -320,7 +320,7 @@ 
 			$this->name = substr(get_class($this), 0, -10);
 		}
 
-		if (!$this->viewPath) {
+		if ( ! $this->viewPath) {
 			$this->viewPath = $this->name;
 		}
 
@@ -371,10 +371,10 @@ 
 
 		if ($name === $this->modelClass) {
 			list($plugin, $class) = pluginSplit($name, true);
-			if (!$plugin) {
-				$plugin = $this->plugin ? $this->plugin . '.' : null;
+			if ( ! $plugin) {
+				$plugin = $this->plugin ? $this->plugin.'.' : null;
 			}
-			return $this->loadModel($plugin . $this->modelClass);
+			return $this->loadModel($plugin.$this->modelClass);
 		}
 
 		return false;
@@ -459,10 +459,10 @@ 
 			$this->passedArgs = array_merge($request->params['pass'], $request->params['named']);
 		}
 
-		if (!empty($request->params['return']) && $request->params['return'] == 1) {
+		if ( ! empty($request->params['return']) && $request->params['return'] == 1) {
 			$this->autoRender = false;
 		}
-		if (!empty($request->params['bare'])) {
+		if ( ! empty($request->params['bare'])) {
 			$this->autoLayout = false;
 		}
 	}
@@ -483,7 +483,7 @@ 
 
 			if ($this->_isPrivateAction($method, $request)) {
 				throw new PrivateActionException(array(
-					'controller' => $this->name . "Controller",
+					'controller' => $this->name."Controller",
 					'action' => $request->params['action']
 				));
 			}
@@ -494,7 +494,7 @@ 
 				return $this->_getScaffold($request);
 			}
 			throw new MissingActionException(array(
-				'controller' => $this->name . "Controller",
+				'controller' => $this->name."Controller",
 				'action' => $request->params['action']
 			));
 		}
@@ -511,12 +511,12 @@ 
 	protected function _isPrivateAction(ReflectionMethod $method, CakeRequest $request) {
 		$privateAction = (
 			$method->name[0] === '_' ||
-			!$method->isPublic() ||
-			!in_array($method->name, $this->methods)
+			! $method->isPublic() ||
+			! in_array($method->name, $this->methods)
 		);
 		$prefixes = Router::prefixes();
 
-		if (!$privateAction && !empty($prefixes)) {
+		if ( ! $privateAction && ! empty($prefixes)) {
 			if (empty($request->params['prefix']) && strpos($request->params['action'], '_') > 0) {
 				list($prefix) = explode('_', $request->params['action']);
 				$privateAction = in_array($prefix, $prefixes);
@@ -547,12 +547,12 @@ 
 		$pluginVars = array();
 		$appVars = array();
 
-		if (!empty($this->plugin)) {
-			$pluginController = $this->plugin . 'AppController';
-			if (!is_subclass_of($this, $pluginController)) {
+		if ( ! empty($this->plugin)) {
+			$pluginController = $this->plugin.'AppController';
+			if ( ! is_subclass_of($this, $pluginController)) {
 				$pluginController = null;
 			}
-			$pluginDot = $this->plugin . '.';
+			$pluginDot = $this->plugin.'.';
 		}
 
 		if ($pluginController) {
@@ -560,7 +560,7 @@ 
 			$this->_mergeVars($merge, $pluginController);
 		}
 
-		if ($mergeParent || !empty($pluginController)) {
+		if ($mergeParent || ! empty($pluginController)) {
 			$appVars = get_class_vars($this->_mergeParent);
 			$merge = array('components', 'helpers');
 			$this->_mergeVars($merge, $this->_mergeParent, true);
@@ -570,10 +570,10 @@ 
 			$this->uses = false;
 		}
 		if ($this->uses === true) {
-			$this->uses = array($pluginDot . $this->modelClass);
+			$this->uses = array($pluginDot.$this->modelClass);
 		}
 		if (isset($appVars['uses']) && $appVars['uses'] === $this->uses) {
-			array_unshift($this->uses, $pluginDot . $this->modelClass);
+			array_unshift($this->uses, $pluginDot.$this->modelClass);
 		}
 		if ($pluginController) {
 			$pluginVars = get_class_vars($pluginController);
@@ -597,7 +597,7 @@ 
  * @return void
  */
 	protected function _mergeUses($merge) {
-		if (!isset($merge['uses'])) {
+		if ( ! isset($merge['uses'])) {
 			return;
 		}
 		if ($merge['uses'] === true) {
@@ -637,7 +637,7 @@ 
 	public function constructClasses() {
 		$this->_mergeControllerVars();
 		if ($this->uses) {
-			$this->uses = (array)$this->uses;
+			$this->uses = (array) $this->uses;
 			list(, $this->modelClass) = pluginSplit(reset($this->uses));
 		}
 		$this->Components->init($this);
@@ -726,17 +726,17 @@ 
 			$modelClass = $this->modelClass;
 		}
 
-		$this->uses = ($this->uses) ? (array)$this->uses : array();
-		if (!in_array($modelClass, $this->uses, true)) {
+		$this->uses = ($this->uses) ? (array) $this->uses : array();
+		if ( ! in_array($modelClass, $this->uses, true)) {
 			$this->uses[] = $modelClass;
 		}
 
 		list($plugin, $modelClass) = pluginSplit($modelClass, true);
 
 		$this->{$modelClass} = ClassRegistry::init(array(
-			'class' => $plugin . $modelClass, 'alias' => $modelClass, 'id' => $id
+			'class' => $plugin.$modelClass, 'alias' => $modelClass, 'id' => $id
 		));
-		if (!$this->{$modelClass}) {
+		if ( ! $this->{$modelClass}) {
 			throw new MissingModelException($modelClass);
 		}
 		return true;
@@ -911,7 +911,7 @@ 
 			$errors = array_merge($errors, $object->invalidFields());
 		}
 
-		return $this->validationErrors = (!empty($errors) ? $errors : false);
+		return $this->validationErrors = ( ! empty($errors) ? $errors : false);
 	}
 
 /**
@@ -930,7 +930,7 @@ 
 			return $this->response;
 		}
 
-		if (!empty($this->uses) && is_array($this->uses)) {
+		if ( ! empty($this->uses) && is_array($this->uses)) {
 			foreach ($this->uses as $model) {
 				list($plugin, $className) = pluginSplit($model);
 				$this->request->params['models'][$className] = compact('plugin', 'className');
@@ -946,7 +946,7 @@ 
 				$className = get_class($currentObject);
 				list($plugin) = pluginSplit(App::location($className));
 				$this->request->params['models'][$currentObject->alias] = compact('plugin', 'className');
-				$this->View->validationErrors[$currentObject->alias] =& $currentObject->validationErrors;
+				$this->View->validationErrors[$currentObject->alias] = & $currentObject->validationErrors;
 			}
 		}
 
@@ -964,7 +964,7 @@ 
  * @link http://book.cakephp.org/2.0/en/controllers.html#Controller::referer
  */
 	public function referer($default = null, $local = false) {
-		if (!$this->request) {
+		if ( ! $this->request) {
 			return '/';
 		}
 
@@ -1021,8 +1021,8 @@ 
  * @deprecated Will be removed in 3.0.
  */
 	public function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive = false) {
-		if (!is_array($data) || empty($data)) {
-			if (!empty($this->request->data)) {
+		if ( ! is_array($data) || empty($data)) {
+			if ( ! empty($this->request->data)) {
 				$data = $this->request->data;
 			} else {
 				return null;
@@ -1037,7 +1037,7 @@ 
 		$arrayOp = is_array($op);
 		foreach ($data as $model => $fields) {
 			foreach ($fields as $field => $value) {
-				$key = $model . '.' . $field;
+				$key = $model.'.'.$field;
 				$fieldOp = $op;
 				if ($arrayOp) {
 					if (array_key_exists($key, $op)) {
@@ -1053,10 +1053,10 @@ 
 				}
 				$fieldOp = strtoupper(trim($fieldOp));
 				if ($fieldOp === 'LIKE') {
-					$key = $key . ' LIKE';
-					$value = '%' . $value . '%';
+					$key = $key.' LIKE';
+					$value = '%'.$value.'%';
 				} elseif ($fieldOp && $fieldOp !== '=') {
-					$key = $key . ' ' . $fieldOp;
+					$key = $key.' '.$fieldOp;
 				}
 				$cond[$key] = $value;
 			}
@@ -1234,8 +1234,8 @@ 
 		$viewClass = $this->viewClass;
 		if ($this->viewClass !== 'View') {
 			list($plugin, $viewClass) = pluginSplit($viewClass, true);
-			$viewClass = $viewClass . 'View';
-			App::uses($viewClass, $plugin . 'View');
+			$viewClass = $viewClass.'View';
+			App::uses($viewClass, $plugin.'View');
 		}
 
 		return new $viewClass($this);

lib/Cake/Controller/Scaffold.php

Doc Comments +5 added lines, -5 removed lines

@@ -155,7 +155,7 @@ 
  * Renders a view action of scaffolded model.
  *
  * @param CakeRequest $request Request Object for scaffolding
- * @return mixed A rendered view of a row from Models database table
+ * @return null|CakeResponse A rendered view of a row from Models database table
  * @throws NotFoundException
  */
 	protected function _scaffoldView(CakeRequest $request) {
@@ -180,8 +180,8 @@ 
 /**
  * Renders index action of scaffolded model.
  *
- * @param array $params Parameters for scaffolding
- * @return mixed A rendered view listing rows from Models database table
+ * @param CakeRequest $params Parameters for scaffolding
+ * @return null|CakeResponse A rendered view listing rows from Models database table
  */
 	protected function _scaffoldIndex($params) {
 		if ($this->controller->beforeScaffold('index')) {
@@ -285,7 +285,7 @@ 
  * Performs a delete on given scaffolded Model.
  *
  * @param CakeRequest $request Request for scaffolding
- * @return mixed Success on delete, error if delete fails
+ * @return null|CakeResponse Success on delete, error if delete fails
  * @throws MethodNotAllowedException When HTTP method is not a DELETE
  * @throws NotFoundException When id being deleted does not exist.
  */
@@ -335,7 +335,7 @@ 
 /**
  * Show a scaffold error
  *
- * @return mixed A rendered view showing the error
+ * @return CakeResponse A rendered view showing the error
  */
 	protected function _scaffoldError() {
 		return $this->controller->render('error', $this->layout);

Spacing +18 added lines, -18 removed lines

@@ -118,14 +118,14 @@ 
 		$this->modelClass = $controller->modelClass;
 		$this->modelKey = $controller->modelKey;
 
-		if (!is_object($this->controller->{$this->modelClass})) {
+		if ( ! is_object($this->controller->{$this->modelClass})) {
 			throw new MissingModelException($this->modelClass);
 		}
 
 		$this->ScaffoldModel = $this->controller->{$this->modelClass};
 		$this->scaffoldTitle = Inflector::humanize(Inflector::underscore($this->viewPath));
 		$this->scaffoldActions = $controller->scaffold;
-		$title = __d('cake', 'Scaffold :: ') . Inflector::humanize($request->action) . ' :: ' . $this->scaffoldTitle;
+		$title = __d('cake', 'Scaffold :: ').Inflector::humanize($request->action).' :: '.$this->scaffoldTitle;
 		$modelClass = $this->controller->modelClass;
 		$primaryKey = $this->ScaffoldModel->primaryKey;
 		$displayField = $this->ScaffoldModel->displayField;
@@ -163,7 +163,7 @@ 
 			if (isset($request->params['pass'][0])) {
 				$this->ScaffoldModel->id = $request->params['pass'][0];
 			}
-			if (!$this->ScaffoldModel->exists()) {
+			if ( ! $this->ScaffoldModel->exists()) {
 				throw new NotFoundException(__d('cake', 'Invalid %s', Inflector::humanize($this->modelKey)));
 			}
 			$this->ScaffoldModel->recursive = 1;
@@ -230,12 +230,12 @@ 
 				if (isset($request->params['pass'][0])) {
 					$this->ScaffoldModel->id = $request['pass'][0];
 				}
-				if (!$this->ScaffoldModel->exists()) {
+				if ( ! $this->ScaffoldModel->exists()) {
 					throw new NotFoundException(__d('cake', 'Invalid %s', Inflector::humanize($this->modelKey)));
 				}
 			}
 
-			if (!empty($request->data)) {
+			if ( ! empty($request->data)) {
 				if ($action === 'create') {
 					$this->ScaffoldModel->create();
 				}
@@ -291,7 +291,7 @@ 
  */
 	protected function _scaffoldDelete(CakeRequest $request) {
 		if ($this->controller->beforeScaffold('delete')) {
-			if (!$request->is('post')) {
+			if ( ! $request->is('post')) {
 				throw new MethodNotAllowedException();
 			}
 			$id = false;
@@ -299,7 +299,7 @@ 
 				$id = $request->params['pass'][0];
 			}
 			$this->ScaffoldModel->id = $id;
-			if (!$this->ScaffoldModel->exists()) {
+			if ( ! $this->ScaffoldModel->exists()) {
 				throw new NotFoundException(__d('cake', 'Invalid %s', Inflector::humanize($this->modelClass)));
 			}
 			if ($this->ScaffoldModel->delete()) {
@@ -361,22 +361,22 @@ 
 				$this->scaffoldActions = array(
 					'index', 'list', 'view', 'add', 'create', 'edit', 'update', 'delete'
 				);
-			} elseif (!empty($prefixes) && in_array($scaffoldPrefix, $prefixes)) {
+			} elseif ( ! empty($prefixes) && in_array($scaffoldPrefix, $prefixes)) {
 				$this->scaffoldActions = array(
-					$scaffoldPrefix . '_index',
-					$scaffoldPrefix . '_list',
-					$scaffoldPrefix . '_view',
-					$scaffoldPrefix . '_add',
-					$scaffoldPrefix . '_create',
-					$scaffoldPrefix . '_edit',
-					$scaffoldPrefix . '_update',
-					$scaffoldPrefix . '_delete'
+					$scaffoldPrefix.'_index',
+					$scaffoldPrefix.'_list',
+					$scaffoldPrefix.'_view',
+					$scaffoldPrefix.'_add',
+					$scaffoldPrefix.'_create',
+					$scaffoldPrefix.'_edit',
+					$scaffoldPrefix.'_update',
+					$scaffoldPrefix.'_delete'
 				);
 			}
 
 			if (in_array($request->params['action'], $this->scaffoldActions)) {
-				if (!empty($prefixes)) {
-					$request->params['action'] = str_replace($scaffoldPrefix . '_', '', $request->params['action']);
+				if ( ! empty($prefixes)) {
+					$request->params['action'] = str_replace($scaffoldPrefix.'_', '', $request->params['action']);
 				}
 				switch ($request->params['action']) {
 					case 'index':

lib/Cake/Core/App.php

Doc Comments +1 added lines, -1 removed lines

@@ -394,7 +394,7 @@
  * `App::core('Cache/Engine'); will return the full path to the cache engines package`
  *
  * @param string $type
- * @return array full path to package
+ * @return string[] full path to package
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::core
  */
 	public static function core($type) {

Spacing +79 added lines, -79 removed lines

@@ -217,15 +217,15 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::path
  */
 	public static function path($type, $plugin = null) {
-		if (!empty(self::$legacy[$type])) {
+		if ( ! empty(self::$legacy[$type])) {
 			$type = self::$legacy[$type];
 		}
 
-		if (!empty($plugin)) {
+		if ( ! empty($plugin)) {
 			$path = array();
 			$pluginPath = self::pluginPath($plugin);
 			$packageFormat = self::_packageFormat();
-			if (!empty($packageFormat[$type])) {
+			if ( ! empty($packageFormat[$type])) {
 				foreach ($packageFormat[$type] as $f) {
 					$path[] = sprintf($f, $pluginPath);
 				}
@@ -233,7 +233,7 @@ 
 			return $path;
 		}
 
-		if (!isset(self::$_packages[$type])) {
+		if ( ! isset(self::$_packages[$type])) {
 			return array();
 		}
 		return self::$_packages[$type];
@@ -278,7 +278,7 @@ 
 		//Provides Backwards compatibility for old-style package names
 		$legacyPaths = array();
 		foreach ($paths as $type => $path) {
-			if (!empty(self::$legacy[$type])) {
+			if ( ! empty(self::$legacy[$type])) {
 				$type = self::$legacy[$type];
 			}
 			$legacyPaths[$type] = $path;
@@ -287,7 +287,7 @@ 
 
 		if ($mode === App::RESET) {
 			foreach ($paths as $type => $new) {
-				self::$_packages[$type] = (array)$new;
+				self::$_packages[$type] = (array) $new;
 				self::objects($type, null, false);
 			}
 			return;
@@ -328,14 +328,14 @@ 
 		}
 
 		foreach ($defaults as $type => $default) {
-			if (!empty(self::$_packages[$type])) {
+			if ( ! empty(self::$_packages[$type])) {
 				$path = self::$_packages[$type];
 			} else {
 				$path = $default;
 			}
 
-			if (!empty($paths[$type])) {
-				$newPath = (array)$paths[$type];
+			if ( ! empty($paths[$type])) {
+				$newPath = (array) $paths[$type];
 
 				if ($mode === App::PREPEND) {
 					$path = array_merge($newPath, $path);
@@ -377,13 +377,13 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::themePath
  */
 	public static function themePath($theme) {
-		$themeDir = 'Themed' . DS . Inflector::camelize($theme);
+		$themeDir = 'Themed'.DS.Inflector::camelize($theme);
 		foreach (self::$_packages['View'] as $path) {
-			if (is_dir($path . $themeDir)) {
-				return $path . $themeDir . DS;
+			if (is_dir($path.$themeDir)) {
+				return $path.$themeDir.DS;
 			}
 		}
-		return self::$_packages['View'][0] . $themeDir . DS;
+		return self::$_packages['View'][0].$themeDir.DS;
 	}
 
 /**
@@ -398,7 +398,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::core
  */
 	public static function core($type) {
-		return array(CAKE . str_replace('/', DS, $type) . DS);
+		return array(CAKE.str_replace('/', DS, $type).DS);
 	}
 
 /**
@@ -426,7 +426,7 @@ 
  */
 	public static function objects($type, $path = null, $cache = true) {
 		if (empty(self::$_objects) && $cache === true) {
-			self::$_objects = (array)Cache::read('object_map', '_cake_core_');
+			self::$_objects = (array) Cache::read('object_map', '_cake_core_');
 		}
 
 		$extension = '/\.php$/';
@@ -444,36 +444,36 @@ 
 
 		list($plugin, $type) = pluginSplit($type);
 
-		if (isset(self::$legacy[$type . 's'])) {
-			$type = self::$legacy[$type . 's'];
+		if (isset(self::$legacy[$type.'s'])) {
+			$type = self::$legacy[$type.'s'];
 		}
 
-		if ($type === 'file' && !$path) {
+		if ($type === 'file' && ! $path) {
 			return false;
 		} elseif ($type === 'file') {
 			$extension = '/\.php$/';
-			$name = $type . str_replace(DS, '', $path);
+			$name = $type.str_replace(DS, '', $path);
 		}
 
 		$cacheLocation = empty($plugin) ? 'app' : $plugin;
 
-		if ($cache !== true || !isset(self::$_objects[$cacheLocation][$name])) {
+		if ($cache !== true || ! isset(self::$_objects[$cacheLocation][$name])) {
 			$objects = array();
 
 			if (empty($path)) {
 				$path = self::path($type, $plugin);
 			}
 
-			foreach ((array)$path as $dir) {
+			foreach ((array) $path as $dir) {
 				if ($dir != APP && is_dir($dir)) {
 					$files = new RegexIterator(new DirectoryIterator($dir), $extension);
 					foreach ($files as $file) {
 						$fileName = basename($file);
-						if (!$file->isDot() && $fileName[0] !== '.') {
+						if ( ! $file->isDot() && $fileName[0] !== '.') {
 							$isDir = $file->isDir();
 							if ($isDir && $includeDirectories) {
 								$objects[] = $fileName;
-							} elseif (!$includeDirectories && !$isDir) {
+							} elseif ( ! $includeDirectories && ! $isDir) {
 								$objects[] = substr($fileName, 0, -4);
 							}
 						}
@@ -530,7 +530,7 @@ 
  * @return boolean
  */
 	public static function load($className) {
-		if (!isset(self::$_classMap[$className])) {
+		if ( ! isset(self::$_classMap[$className])) {
 			return false;
 		}
 		if (strpos($className, '..') !== false) {
@@ -548,18 +548,18 @@ 
 
 		if (empty($plugin)) {
 			$appLibs = empty(self::$_packages['Lib']) ? APPLIBS : current(self::$_packages['Lib']);
-			$paths[] = $appLibs . $package . DS;
-			$paths[] = APP . $package . DS;
-			$paths[] = CAKE . $package . DS;
+			$paths[] = $appLibs.$package.DS;
+			$paths[] = APP.$package.DS;
+			$paths[] = CAKE.$package.DS;
 		} else {
 			$pluginPath = self::pluginPath($plugin);
-			$paths[] = $pluginPath . 'Lib' . DS . $package . DS;
-			$paths[] = $pluginPath . $package . DS;
+			$paths[] = $pluginPath.'Lib'.DS.$package.DS;
+			$paths[] = $pluginPath.$package.DS;
 		}
 
 		$normalizedClassName = str_replace('\\', DS, $className);
 		foreach ($paths as $path) {
-			$file = $path . $normalizedClassName . '.php';
+			$file = $path.$normalizedClassName.'.php';
 			if (file_exists($file)) {
 				self::_map($file, $className, $plugin);
 				return include $file;
@@ -577,7 +577,7 @@ 
  * @link http://book.cakephp.org/2.0/en/core-utility-libraries/app.html#App::location
  */
 	public static function location($className) {
-		if (!empty(self::$_classMap[$className])) {
+		if ( ! empty(self::$_classMap[$className])) {
 			return self::$_classMap[$className];
 		}
 		return null;
@@ -612,13 +612,13 @@ 
 			extract($parent, EXTR_OVERWRITE);
 		}
 
-		if (!$name && !$file) {
+		if ( ! $name && ! $file) {
 			return false;
 		}
 
 		if (is_array($name)) {
 			foreach ($name as $class) {
-				if (!App::import(compact('type', 'parent', 'search', 'file', 'return') + array('name' => $class))) {
+				if ( ! App::import(compact('type', 'parent', 'search', 'file', 'return') + array('name' => $class))) {
 					return false;
 				}
 			}
@@ -627,21 +627,21 @@ 
 
 		$originalType = strtolower($type);
 		$specialPackage = in_array($originalType, array('file', 'vendor'));
-		if (!$specialPackage && isset(self::$legacy[$originalType . 's'])) {
-			$type = self::$legacy[$originalType . 's'];
+		if ( ! $specialPackage && isset(self::$legacy[$originalType.'s'])) {
+			$type = self::$legacy[$originalType.'s'];
 		}
 		list($plugin, $name) = pluginSplit($name);
-		if (!empty($plugin)) {
-			if (!CakePlugin::loaded($plugin)) {
+		if ( ! empty($plugin)) {
+			if ( ! CakePlugin::loaded($plugin)) {
 				return false;
 			}
 		}
 
-		if (!$specialPackage) {
+		if ( ! $specialPackage) {
 			return self::_loadClass($name, $plugin, $type, $originalType, $parent);
 		}
 
-		if ($originalType === 'file' && !empty($file)) {
+		if ($originalType === 'file' && ! empty($file)) {
 			return self::_loadFile($name, $plugin, $search, $file, $return);
 		}
 
@@ -680,14 +680,14 @@ 
 			}
 			App::uses($extends, $extendType);
 			if ($plugin && in_array($originalType, array('controller', 'model'))) {
-				App::uses($plugin . $extends, $plugin . '.' . $type);
+				App::uses($plugin.$extends, $plugin.'.'.$type);
 			}
 		}
 		if ($plugin) {
 			$plugin .= '.';
 		}
 		$name = Inflector::camelize($name);
-		App::uses($name, $plugin . $type);
+		App::uses($name, $plugin.$type);
 		return class_exists($name);
 	}
 
@@ -705,11 +705,11 @@ 
 		$mapped = self::_mapped($name, $plugin);
 		if ($mapped) {
 			$file = $mapped;
-		} elseif (!empty($search)) {
+		} elseif ( ! empty($search)) {
 			foreach ($search as $path) {
 				$found = false;
-				if (file_exists($path . $file)) {
-					$file = $path . $file;
+				if (file_exists($path.$file)) {
+					$file = $path.$file;
 					$found = true;
 					break;
 				}
@@ -718,13 +718,13 @@ 
 				}
 			}
 		}
-		if (!empty($file) && file_exists($file)) {
+		if ( ! empty($file) && file_exists($file)) {
 			self::_map($file, $name, $plugin);
 			$returnValue = include $file;
 			if ($return) {
 				return $returnValue;
 			}
-			return (bool)$returnValue;
+			return (bool) $returnValue;
 		}
 		return false;
 	}
@@ -740,7 +740,7 @@ 
  */
 	protected static function _loadVendor($name, $plugin, $file, $ext) {
 		if ($mapped = self::_mapped($name, $plugin)) {
-			return (bool)include_once $mapped;
+			return (bool) include_once $mapped;
 		}
 		$fileTries = array();
 		$paths = ($plugin) ? App::path('vendors', $plugin) : App::path('vendors');
@@ -748,17 +748,17 @@ 
 			$ext = 'php';
 		}
 		if (empty($file)) {
-			$fileTries[] = $name . '.' . $ext;
-			$fileTries[] = Inflector::underscore($name) . '.' . $ext;
+			$fileTries[] = $name.'.'.$ext;
+			$fileTries[] = Inflector::underscore($name).'.'.$ext;
 		} else {
 			$fileTries[] = $file;
 		}
 
 		foreach ($fileTries as $file) {
 			foreach ($paths as $path) {
-				if (file_exists($path . $file)) {
-					self::_map($path . $file, $name, $plugin);
-					return (bool)include $path . $file;
+				if (file_exists($path.$file)) {
+					self::_map($path.$file, $name, $plugin);
+					return (bool) include $path.$file;
 				}
 			}
 		}
@@ -771,7 +771,7 @@ 
  * @return void
  */
 	public static function init() {
-		self::$_map += (array)Cache::read('file_map', '_cake_core_');
+		self::$_map += (array) Cache::read('file_map', '_cake_core_');
 		register_shutdown_function(array('App', 'shutdown'));
 	}
 
@@ -786,15 +786,15 @@ 
 	protected static function _map($file, $name, $plugin = null) {
 		$key = $name;
 		if ($plugin) {
-			$key = 'plugin.' . $name;
+			$key = 'plugin.'.$name;
 		}
 		if ($plugin && empty(self::$_map[$name])) {
 			self::$_map[$key] = $file;
 		}
-		if (!$plugin && empty(self::$_map['plugin.' . $name])) {
+		if ( ! $plugin && empty(self::$_map['plugin.'.$name])) {
 			self::$_map[$key] = $file;
 		}
-		if (!self::$bootstrapping) {
+		if ( ! self::$bootstrapping) {
 			self::$_cacheChange = true;
 		}
 	}
@@ -809,7 +809,7 @@ 
 	protected static function _mapped($name, $plugin = null) {
 		$key = $name;
 		if ($plugin) {
-			$key = 'plugin.' . $name;
+			$key = 'plugin.'.$name;
 		}
 		return isset(self::$_map[$key]) ? self::$_map[$key] : false;
 	}
@@ -823,60 +823,60 @@ 
 		if (empty(self::$_packageFormat)) {
 			self::$_packageFormat = array(
 				'Model' => array(
-					'%s' . 'Model' . DS
+					'%s'.'Model'.DS
 				),
 				'Model/Behavior' => array(
-					'%s' . 'Model' . DS . 'Behavior' . DS
+					'%s'.'Model'.DS.'Behavior'.DS
 				),
 				'Model/Datasource' => array(
-					'%s' . 'Model' . DS . 'Datasource' . DS
+					'%s'.'Model'.DS.'Datasource'.DS
 				),
 				'Model/Datasource/Database' => array(
-					'%s' . 'Model' . DS . 'Datasource' . DS . 'Database' . DS
+					'%s'.'Model'.DS.'Datasource'.DS.'Database'.DS
 				),
 				'Model/Datasource/Session' => array(
-					'%s' . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
+					'%s'.'Model'.DS.'Datasource'.DS.'Session'.DS
 				),
 				'Controller' => array(
-					'%s' . 'Controller' . DS
+					'%s'.'Controller'.DS
 				),
 				'Controller/Component' => array(
-					'%s' . 'Controller' . DS . 'Component' . DS
+					'%s'.'Controller'.DS.'Component'.DS
 				),
 				'Controller/Component/Auth' => array(
-					'%s' . 'Controller' . DS . 'Component' . DS . 'Auth' . DS
+					'%s'.'Controller'.DS.'Component'.DS.'Auth'.DS
 				),
 				'Controller/Component/Acl' => array(
-					'%s' . 'Controller' . DS . 'Component' . DS . 'Acl' . DS
+					'%s'.'Controller'.DS.'Component'.DS.'Acl'.DS
 				),
 				'View' => array(
-					'%s' . 'View' . DS
+					'%s'.'View'.DS
 				),
 				'View/Helper' => array(
-					'%s' . 'View' . DS . 'Helper' . DS
+					'%s'.'View'.DS.'Helper'.DS
 				),
 				'Console' => array(
-					'%s' . 'Console' . DS
+					'%s'.'Console'.DS
 				),
 				'Console/Command' => array(
-					'%s' . 'Console' . DS . 'Command' . DS
+					'%s'.'Console'.DS.'Command'.DS
 				),
 				'Console/Command/Task' => array(
-					'%s' . 'Console' . DS . 'Command' . DS . 'Task' . DS
+					'%s'.'Console'.DS.'Command'.DS.'Task'.DS
 				),
 				'Lib' => array(
-					'%s' . 'Lib' . DS
+					'%s'.'Lib'.DS
 				),
 				'Locale' => array(
-					'%s' . 'Locale' . DS
+					'%s'.'Locale'.DS
 				),
 				'Vendor' => array(
-					'%s' . 'Vendor' . DS,
-					dirname(dirname(CAKE)) . DS . 'vendors' . DS,
+					'%s'.'Vendor'.DS,
+					dirname(dirname(CAKE)).DS.'vendors'.DS,
 				),
 				'Plugin' => array(
-					APP . 'Plugin' . DS,
-					dirname(dirname(CAKE)) . DS . 'plugins' . DS
+					APP.'Plugin'.DS,
+					dirname(dirname(CAKE)).DS.'plugins'.DS
 				)
 			);
 		}
@@ -909,7 +909,7 @@ 
  */
 	protected static function _checkFatalError() {
 		$lastError = error_get_last();
-		if (!is_array($lastError)) {
+		if ( ! is_array($lastError)) {
 			return;
 		}
 
@@ -923,7 +923,7 @@ 
 		} else {
 			$errorHandler = Configure::read('Error.handler');
 		}
-		if (!is_callable($errorHandler)) {
+		if ( ! is_callable($errorHandler)) {
 			return;
 		}
 		call_user_func($errorHandler, $lastError['type'], $lastError['message'], $lastError['file'], $lastError['line'], array());

lib/Cake/Core/Configure.php

Doc Comments +2 added lines, -2 removed lines

@@ -287,7 +287,7 @@ 
  * @param string $key name of configuration resource to load.
  * @param string $config Name of the configured reader to use to read the resource identified by $key.
  * @param boolean $merge if config files should be merged instead of simply overridden
- * @return mixed false if file not found, void if load successful.
+ * @return boolean false if file not found, void if load successful.
  * @throws ConfigureException Will throw any exceptions the reader raises.
  */
 	public static function load($key, $config = 'default', $merge = true) {
@@ -329,7 +329,7 @@ 
  * @param string $key The identifier to create in the config adapter.
  *   This could be a filename or a cache key depending on the adapter being used.
  * @param string $config The name of the configured adapter to dump data with.
- * @param array $keys The name of the top-level keys you want to dump.
+ * @param string[] $keys The name of the top-level keys you want to dump.
  *   This allows you save only some data stored in Configure.
  * @return boolean success
  * @throws ConfigureException if the adapter does not implement a `dump` method.

Indentation +6 added lines, -6 removed lines

@@ -425,12 +425,12 @@
 		return true;
 	}
 /**
- * Set the error and exception handlers.
- *
- * @param array $error The Error handling configuration.
- * @param array $exception The exception handling configuration.
- * @return void
- */
+	 * Set the error and exception handlers.
+	 *
+	 * @param array $error The Error handling configuration.
+	 * @param array $exception The exception handling configuration.
+	 * @return void
+	 */
 	protected static function _setErrorHandlers($error, $exception) {
 		$level = -1;
 		if (isset($error['level'])) {

Spacing +17 added lines, -17 removed lines

@@ -69,10 +69,10 @@ 
 		if ($boot) {
 			self::_appDefaults();
 
-			if (!include APP . 'Config' . DS . 'core.php') {
+			if ( ! include APP.'Config'.DS.'core.php') {
 				trigger_error(__d('cake_dev',
 						"Can't find application core file. Please create %s, and make sure it is readable by PHP.",
-						APP . 'Config' . DS . 'core.php'),
+						APP.'Config'.DS.'core.php'),
 					E_USER_ERROR
 				);
 			}
@@ -89,10 +89,10 @@ 
 			);
 			self::_setErrorHandlers($error, $exception);
 
-			if (!include APP . 'Config' . DS . 'bootstrap.php') {
+			if ( ! include APP.'Config'.DS.'bootstrap.php') {
 				trigger_error(__d('cake_dev',
 						"Can't find application bootstrap file. Please create %s, and make sure it is readable by PHP.",
-						APP . 'Config' . DS . 'bootstrap.php'),
+						APP.'Config'.DS.'bootstrap.php'),
 					E_USER_ERROR
 				);
 			}
@@ -116,7 +116,7 @@ 
  * @return void
  */
 	protected static function _appDefaults() {
-		self::write('App', (array)self::read('App') + array(
+		self::write('App', (array) self::read('App') + array(
 			'base' => false,
 			'baseUrl' => false,
 			'dir' => APP_DIR,
@@ -150,7 +150,7 @@ 
  * @return boolean True if write was successful
  */
 	public static function write($config, $value = null) {
-		if (!is_array($config)) {
+		if ( ! is_array($config)) {
 			$config = array($config => $value);
 		}
 
@@ -258,7 +258,7 @@ 
  * @return boolean Success
  */
 	public static function drop($name) {
-		if (!isset(self::$_readers[$name])) {
+		if ( ! isset(self::$_readers[$name])) {
 			return false;
 		}
 		unset(self::$_readers[$name]);
@@ -292,7 +292,7 @@ 
  */
 	public static function load($key, $config = 'default', $merge = true) {
 		$reader = self::_getReader($config);
-		if (!$reader) {
+		if ( ! $reader) {
 			return false;
 		}
 		$values = $reader->read($key);
@@ -336,17 +336,17 @@ 
  */
 	public static function dump($key, $config = 'default', $keys = array()) {
 		$reader = self::_getReader($config);
-		if (!$reader) {
+		if ( ! $reader) {
 			throw new ConfigureException(__d('cake_dev', 'There is no "%s" adapter.', $config));
 		}
-		if (!method_exists($reader, 'dump')) {
+		if ( ! method_exists($reader, 'dump')) {
 			throw new ConfigureException(__d('cake_dev', 'The "%s" adapter, does not have a %s method.', $config, 'dump()'));
 		}
 		$values = self::$_values;
-		if (!empty($keys) && is_array($keys)) {
+		if ( ! empty($keys) && is_array($keys)) {
 			$values = array_intersect_key($values, array_flip($keys));
 		}
-		return (bool)$reader->dump($key, $values);
+		return (bool) $reader->dump($key, $values);
 	}
 
 /**
@@ -357,7 +357,7 @@ 
  * @return mixed Reader instance or false
  */
 	protected static function _getReader($config) {
-		if (!isset(self::$_readers[$config])) {
+		if ( ! isset(self::$_readers[$config])) {
 			if ($config !== 'default') {
 				return false;
 			}
@@ -375,8 +375,8 @@ 
  * @return string Current version of CakePHP
  */
 	public static function version() {
-		if (!isset(self::$_values['Cake']['version'])) {
-			require CAKE . 'Config' . DS . 'config.php';
+		if ( ! isset(self::$_values['Cake']['version'])) {
+			require CAKE.'Config'.DS.'config.php';
 			self::write($config);
 		}
 		return self::$_values['Cake']['version'];
@@ -437,10 +437,10 @@ 
 			error_reporting($error['level']);
 			$level = $error['level'];
 		}
-		if (!empty($error['handler'])) {
+		if ( ! empty($error['handler'])) {
 			set_error_handler($error['handler'], $level);
 		}
-		if (!empty($exception['handler'])) {
+		if ( ! empty($exception['handler'])) {
 			set_exception_handler($exception['handler']);
 		}
 	}

lib/Cake/Core/Object.php

Doc Comments +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
  * POST and GET data can be simulated in requestAction. Use `$extra['url']` for
  * GET data. The `$extra['data']` parameter allows POST data simulation.
  *
- * @param string|array $url String or array-based URL. Unlike other URL arrays in CakePHP, this
+ * @param string $url String or array-based URL. Unlike other URL arrays in CakePHP, this
  *    URL will not automatically handle passed and named arguments in the $url parameter.
  * @param array $extra if array includes the key "return" it sets the AutoRender to true. Can
  *    also be used to submit GET/POST data, and named/passed arguments.
@@ -139,7 +139,7 @@ 
  * Stop execution of the current script. Wraps exit() making
  * testing easier.
  *
- * @param integer|string $status see http://php.net/exit for values
+ * @param integer $status see http://php.net/exit for values
  * @return void
  */
 	protected function _stop($status = 0) {

Spacing +5 added lines, -5 removed lines

@@ -78,10 +78,10 @@ 
 			unset($extra[$index]);
 		}
 		$arrayUrl = is_array($url);
-		if ($arrayUrl && !isset($extra['url'])) {
+		if ($arrayUrl && ! isset($extra['url'])) {
 			$extra['url'] = array();
 		}
-		if ($arrayUrl && !isset($extra['data'])) {
+		if ($arrayUrl && ! isset($extra['data'])) {
 			$extra['data'] = array();
 		}
 		$extra = array_merge(array('autoRender' => 0, 'return' => 1, 'bare' => 1, 'requested' => 1), $extra);
@@ -157,7 +157,7 @@ 
  * @return boolean Success of log write
  */
 	public function log($msg, $type = LOG_ERR, $scope = null) {
-		if (!is_string($msg)) {
+		if ( ! is_string($msg)) {
 			$msg = print_r($msg, true);
 		}
 
@@ -172,7 +172,7 @@ 
  * @return void
  */
 	protected function _set($properties = array()) {
-		if (is_array($properties) && !empty($properties)) {
+		if (is_array($properties) && ! empty($properties)) {
 			$vars = get_object_vars($this);
 			foreach ($properties as $key => $val) {
 				if (array_key_exists($key, $vars)) {
@@ -199,7 +199,7 @@ 
 		foreach ($properties as $var) {
 			if (
 				isset($classProperties[$var]) &&
-				!empty($classProperties[$var]) &&
+				! empty($classProperties[$var]) &&
 				is_array($this->{$var}) &&
 				$this->{$var} != $classProperties[$var]
 			) {