reginaldojunior / winners

lib/Cake/Console/Command/TestShell.php

Doc Comments +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 /**
  * get the option parser for the test suite.
  *
- * @return void
+ * @return ConsoleOptionParser
  */
 	public function getOptionParser() {
 		$parser = new ConsoleOptionParser($this->name);
@@ -336,7 +336,7 @@ 
  * @param string $file
  * @param string $category
  * @param boolean $throwOnMissingFile
- * @return array array(type, case)
+ * @return false|string array(type, case)
  * @throws Exception
  */
 	protected function _mapFileToCase($file, $category, $throwOnMissingFile = true) {

Spacing +9 added lines, -9 removed lines

@@ -170,7 +170,7 @@ 
 	public function initialize() {
 		$this->_dispatcher = new CakeTestSuiteDispatcher();
 		$success = $this->_dispatcher->loadTestFramework();
-		if (!$success) {
+		if ( ! $success) {
 			throw new Exception(__d('cake_dev', 'Please install PHPUnit framework v3.7 <info>(http://www.phpunit.de)</info>'));
 		}
 	}
@@ -222,7 +222,7 @@ 
 		$params = $this->params;
 		unset($params['help']);
 
-		if (!empty($params['no-colors'])) {
+		if ( ! empty($params['no-colors'])) {
 			unset($params['no-colors'], $params['colors']);
 		} else {
 			$params['colors'] = true;
@@ -232,7 +232,7 @@ 
 			if ($value === false) {
 				continue;
 			}
-			$options[] = '--' . $param;
+			$options[] = '--'.$param;
 			if (is_string($value)) {
 				$options[] = $value;
 			}
@@ -290,7 +290,7 @@ 
 			$title = "App Test Cases:";
 			$category = 'app';
 		} elseif ($plugin) {
-			$title = Inflector::humanize($plugin) . " Test Cases:";
+			$title = Inflector::humanize($plugin)." Test Cases:";
 			$category = $plugin;
 		}
 
@@ -340,7 +340,7 @@ 
  * @throws Exception
  */
 	protected function _mapFileToCase($file, $category, $throwOnMissingFile = true) {
-		if (!$category || (substr($file, -4) !== '.php')) {
+		if ( ! $category || (substr($file, -4) !== '.php')) {
 			return false;
 		}
 
@@ -377,9 +377,9 @@ 
 			$testCase = str_replace(DS, '/', $file);
 			$testCase = preg_replace('@.*lib/Cake/@', '', $file);
 			$testCase[0] = strtoupper($testCase[0]);
-			$testFile = CAKE . 'Test/Case/' . $testCase . 'Test.php';
+			$testFile = CAKE.'Test/Case/'.$testCase.'Test.php';
 
-			if (!file_exists($testFile) && $throwOnMissingFile) {
+			if ( ! file_exists($testFile) && $throwOnMissingFile) {
 				throw new Exception(__d('cake_dev', 'Test case %s not found', $testFile));
 			}
 
@@ -387,7 +387,7 @@ 
 		}
 
 		if ($category === 'app') {
-			$testFile = str_replace(APP, APP . 'Test/Case/', $file) . 'Test.php';
+			$testFile = str_replace(APP, APP.'Test/Case/', $file).'Test.php';
 		} else {
 			$testFile = preg_replace(
 				"@((?:plugins|Plugin)[\\/]{$category}[\\/])(.*)$@",
@@ -396,7 +396,7 @@ 
 			);
 		}
 
-		if (!file_exists($testFile) && $throwOnMissingFile) {
+		if ( ! file_exists($testFile) && $throwOnMissingFile) {
 			throw new Exception(__d('cake_dev', 'Test case %s not found', $testFile));
 		}
 

lib/Cake/Console/ConsoleOutput.php

Doc Comments +2 added lines, -2 removed lines

@@ -232,7 +232,7 @@ 
  * Writes a message to the output stream.
  *
  * @param string $message Message to write.
- * @return boolean success
+ * @return integer success
  */
 	protected function _write($message) {
 		return fwrite($this->_output, $message);
@@ -282,7 +282,7 @@ 
  * Get/Set the output type to use. The output type how formatting tags are treated.
  *
  * @param integer $type The output type to use. Should be one of the class constants.
- * @return mixed Either null or the value if getting.
+ * @return integer|null Either null or the value if getting.
  */
 	public function outputAs($type = null) {
 		if ($type === null) {

Spacing +7 added lines, -7 removed lines

@@ -161,7 +161,7 @@ 
 	public function __construct($stream = 'php://stdout') {
 		$this->_output = fopen($stream, 'w');
 
-		if (DS === '\\' && !(bool)env('ANSICON')) {
+		if (DS === '\\' && ! (bool) env('ANSICON')) {
 			$this->_outputAs = self::PLAIN;
 		}
 	}
@@ -178,7 +178,7 @@ 
 		if (is_array($message)) {
 			$message = implode(self::LF, $message);
 		}
-		return $this->_write($this->styleText($message . str_repeat(self::LF, $newlines)));
+		return $this->_write($this->styleText($message.str_repeat(self::LF, $newlines)));
 	}
 
 /**
@@ -193,7 +193,7 @@ 
 		}
 		if ($this->_outputAs == self::PLAIN) {
 			$tags = implode('|', array_keys(self::$_styles));
-			return preg_replace('#</?(?:' . $tags . ')>#', '', $text);
+			return preg_replace('#</?(?:'.$tags.')>#', '', $text);
 		}
 		return preg_replace_callback(
 			'/<(?P<tag>[a-z0-9-_]+)>(?P<text>.*?)<\/(\1)>/ims', array($this, '_replaceTags'), $text
@@ -209,14 +209,14 @@ 
 	protected function _replaceTags($matches) {
 		$style = $this->styles($matches['tag']);
 		if (empty($style)) {
-			return '<' . $matches['tag'] . '>' . $matches['text'] . '</' . $matches['tag'] . '>';
+			return '<'.$matches['tag'].'>'.$matches['text'].'</'.$matches['tag'].'>';
 		}
 
 		$styleInfo = array();
-		if (!empty($style['text']) && isset(self::$_foregroundColors[$style['text']])) {
+		if ( ! empty($style['text']) && isset(self::$_foregroundColors[$style['text']])) {
 			$styleInfo[] = self::$_foregroundColors[$style['text']];
 		}
-		if (!empty($style['background']) && isset(self::$_backgroundColors[$style['background']])) {
+		if ( ! empty($style['background']) && isset(self::$_backgroundColors[$style['background']])) {
 			$styleInfo[] = self::$_backgroundColors[$style['background']];
 		}
 		unset($style['text'], $style['background']);
@@ -225,7 +225,7 @@ 
 				$styleInfo[] = self::$_options[$option];
 			}
 		}
-		return "\033[" . implode($styleInfo, ';') . 'm' . $matches['text'] . "\033[0m";
+		return "\033[".implode($styleInfo, ';').'m'.$matches['text']."\033[0m";
 	}
 
 /**

lib/Cake/Console/Shell.php

Doc Comments +6 added lines, -6 removed lines

@@ -255,7 +255,7 @@ 
  * Lazy loads models using the loadModel() method if declared in $uses
  *
  * @param string $name
- * @return void
+ * @return boolean|null
  */
 	public function __isset($name) {
 		if (is_array($this->uses)) {
@@ -273,7 +273,7 @@ 
  *
  * @param string $modelClass Name of model class to load
  * @param mixed $id Initial ID the instanced model class should have
- * @return mixed true when single model found and instance created, error returned if model not found.
+ * @return boolean true when single model found and instance created, error returned if model not found.
  * @throws MissingModelException if the model class cannot be found.
  */
 	public function loadModel($modelClass = null, $id = null) {
@@ -365,7 +365,7 @@ 
  *
  * `return $this->dispatchShell('schema', 'create', 'i18n', '--dry');`
  *
- * @return mixed The return of the other shell.
+ * @return boolean The return of the other shell.
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::dispatchShell
  */
 	public function dispatchShell() {
@@ -497,7 +497,7 @@ 
  * @param string $prompt Prompt text.
  * @param string|array $options Array or string of options.
  * @param string $default Default input value.
- * @return mixed Either the default value, or the user-provided input.
+ * @return string|null Either the default value, or the user-provided input.
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::in
  */
 	public function in($prompt, $options = null, $default = null) {
@@ -535,7 +535,7 @@ 
  * @param string $prompt Prompt text.
  * @param string|array $options Array or string of options.
  * @param string $default Default input value.
- * @return Either the default value, or the user-provided input.
+ * @return null|string the default value, or the user-provided input.
  */
 	protected function _getInput($prompt, $options, $default) {
 		if (!is_array($options)) {
@@ -690,7 +690,7 @@ 
  *
  * @param string $path Where to put the file.
  * @param string $contents Content to put in the file.
- * @return boolean Success
+ * @return null|boolean Success
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::createFile
  */
 	public function createFile($path, $contents) {

Spacing +34 added lines, -34 removed lines

@@ -176,7 +176,7 @@ 
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell
  */
 	public function __construct($stdout = null, $stderr = null, $stdin = null) {
-		if (!$this->name) {
+		if ( ! $this->name) {
 			$this->name = Inflector::camelize(str_replace(array('Shell', 'Task'), '', get_class($this)));
 		}
 		$this->Tasks = new TaskCollection($this);
@@ -190,7 +190,7 @@ 
 		if ($this->tasks !== null && $this->tasks !== false) {
 			$this->_mergeVars(array('tasks'), $parent, true);
 		}
-		if (!empty($this->uses)) {
+		if ( ! empty($this->uses)) {
 			$this->_mergeVars(array('uses'), $parent, false);
 		}
 	}
@@ -229,7 +229,7 @@ 
  */
 	protected function _welcome() {
 		$this->out();
-		$this->out(__d('cake_console', '<info>Welcome to CakePHP %s Console</info>', 'v' . Configure::version()));
+		$this->out(__d('cake_console', '<info>Welcome to CakePHP %s Console</info>', 'v'.Configure::version()));
 		$this->hr();
 		$this->out(__d('cake_console', 'App : %s', APP_DIR));
 		$this->out(__d('cake_console', 'Path: %s', APP));
@@ -281,20 +281,20 @@ 
 			$modelClass = $this->modelClass;
 		}
 
-		$this->uses = ($this->uses) ? (array)$this->uses : array();
-		if (!in_array($modelClass, $this->uses)) {
+		$this->uses = ($this->uses) ? (array) $this->uses : array();
+		if ( ! in_array($modelClass, $this->uses)) {
 			$this->uses[] = $modelClass;
 		}
 
 		list($plugin, $modelClass) = pluginSplit($modelClass, true);
-		if (!isset($this->modelClass)) {
+		if ( ! isset($this->modelClass)) {
 			$this->modelClass = $modelClass;
 		}
 
 		$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;
@@ -309,7 +309,7 @@ 
 		if ($this->tasks === true || empty($this->tasks) || empty($this->Tasks)) {
 			return true;
 		}
-		$this->_taskMap = TaskCollection::normalizeObjectArray((array)$this->tasks);
+		$this->_taskMap = TaskCollection::normalizeObjectArray((array) $this->tasks);
 		$this->taskNames = array_merge($this->taskNames, array_keys($this->_taskMap));
 		return true;
 	}
@@ -335,7 +335,7 @@ 
 	public function hasMethod($name) {
 		try {
 			$method = new ReflectionMethod($this, $name);
-			if (!$method->isPublic() || substr($name, 0, 1) === '_') {
+			if ( ! $method->isPublic() || substr($name, 0, 1) === '_') {
 				return false;
 			}
 			if ($method->getDeclaringClass()->name === 'Shell') {
@@ -414,14 +414,14 @@ 
 			return false;
 		}
 
-		if (!empty($this->params['quiet'])) {
+		if ( ! empty($this->params['quiet'])) {
 			$this->_useLogger(false);
 		}
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			CakePlugin::load($this->params['plugin']);
 		}
 		$this->command = $command;
-		if (!empty($this->params['help'])) {
+		if ( ! empty($this->params['help'])) {
 			return $this->_displayHelp($command);
 		}
 
@@ -451,7 +451,7 @@ 
  */
 	protected function _displayHelp($command) {
 		$format = 'text';
-		if (!empty($this->args[0]) && $this->args[0] === 'xml') {
+		if ( ! empty($this->args[0]) && $this->args[0] === 'xml') {
 			$format = 'xml';
 			$this->stdout->outputAs(ConsoleOutput::RAW);
 		} else {
@@ -468,7 +468,7 @@ 
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::getOptionParser
  */
 	public function getOptionParser() {
-		$name = ($this->plugin ? $this->plugin . '.' : '') . $this->name;
+		$name = ($this->plugin ? $this->plugin.'.' : '').$this->name;
 		$parser = new ConsoleOptionParser($name);
 		return $parser;
 	}
@@ -483,8 +483,8 @@ 
 		if (empty($this->{$name}) && in_array($name, $this->taskNames)) {
 			$properties = $this->_taskMap[$name];
 			$this->{$name} = $this->Tasks->load($properties['class'], $properties['settings']);
-			$this->{$name}->args =& $this->args;
-			$this->{$name}->params =& $this->params;
+			$this->{$name}->args = & $this->args;
+			$this->{$name}->params = & $this->params;
 			$this->{$name}->initialize();
 			$this->{$name}->loadTasks();
 		}
@@ -501,7 +501,7 @@ 
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::in
  */
 	public function in($prompt, $options = null, $default = null) {
-		if (!$this->interactive) {
+		if ( ! $this->interactive) {
 			return $default;
 		}
 		$originalOptions = $options;
@@ -522,7 +522,7 @@ 
 				array_map('strtoupper', $options),
 				$options
 			);
-			while ($in === '' || !in_array($in, $options)) {
+			while ($in === '' || ! in_array($in, $options)) {
 				$in = $this->_getInput($prompt, $originalOptions, $default);
 			}
 		}
@@ -538,16 +538,16 @@ 
  * @return Either the default value, or the user-provided input.
  */
 	protected function _getInput($prompt, $options, $default) {
-		if (!is_array($options)) {
+		if ( ! is_array($options)) {
 			$printOptions = '';
 		} else {
-			$printOptions = '(' . implode('/', $options) . ')';
+			$printOptions = '('.implode('/', $options).')';
 		}
 
 		if ($default === null) {
-			$this->stdout->write('<question>' . $prompt . '</question>' . " $printOptions \n" . '> ', 0);
+			$this->stdout->write('<question>'.$prompt.'</question>'." $printOptions \n".'> ', 0);
 		} else {
-			$this->stdout->write('<question>' . $prompt . '</question>' . " $printOptions \n" . "[$default] > ", 0);
+			$this->stdout->write('<question>'.$prompt.'</question>'." $printOptions \n"."[$default] > ", 0);
 		}
 		$result = $this->stdin->read();
 
@@ -601,10 +601,10 @@ 
  */
 	public function out($message = null, $newlines = 1, $level = Shell::NORMAL) {
 		$currentLevel = Shell::NORMAL;
-		if (!empty($this->params['verbose'])) {
+		if ( ! empty($this->params['verbose'])) {
 			$currentLevel = Shell::VERBOSE;
 		}
-		if (!empty($this->params['quiet'])) {
+		if ( ! empty($this->params['quiet'])) {
 			$currentLevel = Shell::QUIET;
 		}
 		if ($level <= $currentLevel) {
@@ -663,7 +663,7 @@ 
 	public function error($title, $message = null) {
 		$this->err(__d('cake_console', '<error>Error:</error> %s', $title));
 
-		if (!empty($message)) {
+		if ( ! empty($message)) {
 			$this->err($message);
 		}
 		return $this->_stop(1);
@@ -694,7 +694,7 @@ 
  * @link http://book.cakephp.org/2.0/en/console-and-shells.html#Shell::createFile
  */
 	public function createFile($path, $contents) {
-		$path = str_replace(DS . DS, DS, $path);
+		$path = str_replace(DS.DS, DS, $path);
 
 		$this->out();
 
@@ -734,10 +734,10 @@ 
 		if (class_exists('PHPUnit_Framework_TestCase')) {
 			return true;
 			//@codingStandardsIgnoreStart
-		} elseif (@include 'PHPUnit' . DS . 'Autoload.php') {
+		} elseif (@include 'PHPUnit'.DS.'Autoload.php') {
 			//@codingStandardsIgnoreEnd
 			return true;
-		} elseif (App::import('Vendor', 'phpunit', array('file' => 'PHPUnit' . DS . 'Autoload.php'))) {
+		} elseif (App::import('Vendor', 'phpunit', array('file' => 'PHPUnit'.DS.'Autoload.php'))) {
 			return true;
 		}
 
@@ -761,8 +761,8 @@ 
  */
 	public function shortPath($file) {
 		$shortPath = str_replace(ROOT, null, $file);
-		$shortPath = str_replace('..' . DS, '', $shortPath);
-		return str_replace(DS . DS, DS, $shortPath);
+		$shortPath = str_replace('..'.DS, '', $shortPath);
+		return str_replace(DS.DS, DS, $shortPath);
 	}
 
 /**
@@ -802,7 +802,7 @@ 
  * @return string Singular model key
  */
 	protected function _modelKey($name) {
-		return Inflector::underscore($name) . '_id';
+		return Inflector::underscore($name).'_id';
 	}
 
 /**
@@ -865,7 +865,7 @@ 
 		if (CakePlugin::loaded($pluginName)) {
 			return CakePlugin::path($pluginName);
 		}
-		return current(App::path('plugins')) . $pluginName . DS;
+		return current(App::path('plugins')).$pluginName.DS;
 	}
 
 /**
@@ -877,7 +877,7 @@ 
  * @return void
  */
 	protected function _useLogger($enable = true) {
-		if (!$enable) {
+		if ( ! $enable) {
 			CakeLog::drop('stdout');
 			CakeLog::drop('stderr');
 			return;

lib/Cake/Controller/Component.php

Doc Comments +1 added lines, -1 removed lines

@@ -114,7 +114,7 @@
  * Called after the Controller::beforeFilter() and before the controller action
  *
  * @param Controller $controller Controller with components to startup
- * @return void
+ * @return boolean
  * @link http://book.cakephp.org/2.0/en/controllers/components.html#Component::startup
  */
 	public function startup(Controller $controller) {

Spacing +3 added lines, -3 removed lines

@@ -79,7 +79,7 @@ 
 		$this->_Collection = $collection;
 		$this->settings = $settings;
 		$this->_set($settings);
-		if (!empty($this->components)) {
+		if ( ! empty($this->components)) {
 			$this->_componentMap = ComponentCollection::normalizeObjectArray($this->components);
 		}
 	}
@@ -91,8 +91,8 @@ 
  * @return mixed A Component object or null.
  */
 	public function __get($name) {
-		if (isset($this->_componentMap[$name]) && !isset($this->{$name})) {
-			$settings = array_merge((array)$this->_componentMap[$name]['settings'], array('enabled' => false));
+		if (isset($this->_componentMap[$name]) && ! isset($this->{$name})) {
+			$settings = array_merge((array) $this->_componentMap[$name]['settings'], array('enabled' => false));
 			$this->{$name} = $this->_Collection->load($this->_componentMap[$name]['class'], $settings);
 		}
 		if (isset($this->{$name})) {

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

Doc Comments +3 added lines, -3 removed lines

@@ -55,7 +55,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 = "*") {
 	}
@@ -66,7 +66,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 = "*") {
 	}
@@ -77,7 +77,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 inherit($aro, $aco, $action = "*") {
 	}

Spacing +3 added lines, -3 removed lines

@@ -93,8 +93,8 @@ 
  * @return boolean Success
  */
 	public function check($aro, $aco, $action = null) {
-		if (!$this->config) {
-			$this->config = $this->readConfigFile(APP . 'Config' . DS . 'acl.ini.php');
+		if ( ! $this->config) {
+			$this->config = $this->readConfigFile(APP.'Config'.DS.'acl.ini.php');
 		}
 		$aclConfig = $this->config;
 
@@ -153,7 +153,7 @@ 
  */
 	public function readConfigFile($filename) {
 		App::uses('IniReader', 'Configure');
-		$iniFile = new IniReader(dirname($filename) . DS);
+		$iniFile = new IniReader(dirname($filename).DS);
 		return $iniFile->read(basename($filename));
 	}
 

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