reginaldojunior / winners

lib/Cake/Console/Command/Task/DbConfigTask.php

Doc Comments +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
 /**
  * Interactive interface
  *
- * @return void
+ * @return boolean
  */
 	protected function _interactive() {
 		$this->hr();
@@ -247,7 +247,7 @@ 
  * Assembles and writes database.php
  *
  * @param array $configs Configuration settings to use
- * @return boolean Success
+ * @return null|boolean Success
  */
 	public function bake($configs) {
 		if (!is_dir($this->path)) {

Spacing +22 added lines, -22 removed lines

@@ -64,7 +64,7 @@ 
  * @return void
  */
 	public function initialize() {
-		$this->path = APP . 'Config' . DS;
+		$this->path = APP.'Config'.DS;
 	}
 
 /**
@@ -91,10 +91,10 @@ 
 		$done = false;
 		$dbConfigs = array();
 
-		while (!$done) {
+		while ( ! $done) {
 			$name = '';
 
-			while (!$name) {
+			while ( ! $name) {
 				$name = $this->in(__d('cake_console', "Name:"), null, 'default');
 				if (preg_match('/[^a-z0-9_]/i', $name)) {
 					$name = '';
@@ -115,12 +115,12 @@ 
 			}
 
 			$host = '';
-			while (!$host) {
+			while ( ! $host) {
 				$host = $this->in(__d('cake_console', 'Database Host:'), null, 'localhost');
 			}
 
 			$port = '';
-			while (!$port) {
+			while ( ! $port) {
 				$port = $this->in(__d('cake_console', 'Port?'), null, 'n');
 			}
 
@@ -129,16 +129,16 @@ 
 			}
 
 			$login = '';
-			while (!$login) {
+			while ( ! $login) {
 				$login = $this->in(__d('cake_console', 'User:'), null, 'root');
 			}
 			$password = '';
 			$blankPassword = false;
 
-			while (!$password && !$blankPassword) {
+			while ( ! $password && ! $blankPassword) {
 				$password = $this->in(__d('cake_console', 'Password:'));
 
-				if (!$password) {
+				if ( ! $password) {
 					$blank = $this->in(__d('cake_console', 'The password you supplied was empty. Use an empty password?'), array('y', 'n'), 'n');
 					if ($blank === 'y') {
 						$blankPassword = true;
@@ -147,12 +147,12 @@ 
 			}
 
 			$database = '';
-			while (!$database) {
+			while ( ! $database) {
 				$database = $this->in(__d('cake_console', 'Database Name:'), null, 'cake');
 			}
 
 			$prefix = '';
-			while (!$prefix) {
+			while ( ! $prefix) {
 				$prefix = $this->in(__d('cake_console', 'Table Prefix?'), null, 'n');
 			}
 			if (strtolower($prefix) === 'n') {
@@ -160,7 +160,7 @@ 
 			}
 
 			$encoding = '';
-			while (!$encoding) {
+			while ( ! $encoding) {
 				$encoding = $this->in(__d('cake_console', 'Table encoding?'), null, 'n');
 			}
 			if (strtolower($encoding) === 'n') {
@@ -169,7 +169,7 @@ 
 
 			$schema = '';
 			if ($datasource === 'postgres') {
-				while (!$schema) {
+				while ( ! $schema) {
 					$schema = $this->in(__d('cake_console', 'Table schema?'), null, 'n');
 				}
 			}
@@ -179,7 +179,7 @@ 
 
 			$config = compact('name', 'datasource', 'persistent', 'host', 'login', 'password', 'database', 'prefix', 'encoding', 'port', 'schema');
 
-			while (!$this->_verify($config)) {
+			while ( ! $this->_verify($config)) {
 				$this->_interactive();
 			}
 
@@ -250,12 +250,12 @@ 
  * @return boolean Success
  */
 	public function bake($configs) {
-		if (!is_dir($this->path)) {
+		if ( ! is_dir($this->path)) {
 			$this->err(__d('cake_console', '%s not found', $this->path));
 			return false;
 		}
 
-		$filename = $this->path . 'database.php';
+		$filename = $this->path.'database.php';
 		$oldConfigs = array();
 
 		if (file_exists($filename)) {
@@ -266,17 +266,17 @@ 
 			foreach ($temp as $configName => $info) {
 				$info = array_merge($this->_defaultConfig, $info);
 
-				if (!isset($info['schema'])) {
+				if ( ! isset($info['schema'])) {
 					$info['schema'] = null;
 				}
-				if (!isset($info['encoding'])) {
+				if ( ! isset($info['encoding'])) {
 					$info['encoding'] = null;
 				}
-				if (!isset($info['port'])) {
+				if ( ! isset($info['port'])) {
 					$info['port'] = null;
 				}
 
-				$info['persistent'] = var_export((bool)$info['persistent'], true);
+				$info['persistent'] = var_export((bool) $info['persistent'], true);
 
 				$oldConfigs[] = array(
 					'name' => $configName,
@@ -342,7 +342,7 @@ 
 		}
 
 		$out .= "}\n";
-		$filename = $this->path . 'database.php';
+		$filename = $this->path.'database.php';
 		return $this->createFile($filename, $out);
 	}
 
@@ -356,13 +356,13 @@ 
 		$configs = ConnectionManager::enumConnectionObjects();
 
 		$useDbConfig = key($configs);
-		if (!is_array($configs) || empty($configs)) {
+		if ( ! is_array($configs) || empty($configs)) {
 			return $this->execute();
 		}
 		$connections = array_keys($configs);
 
 		if (count($connections) > 1) {
-			$useDbConfig = $this->in(__d('cake_console', 'Use Database Config') . ':', $connections, $useDbConfig);
+			$useDbConfig = $this->in(__d('cake_console', 'Use Database Config').':', $connections, $useDbConfig);
 		}
 		return $useDbConfig;
 	}

lib/Cake/Console/Command/Task/ExtractTask.php

Doc Comments +1 added lines, -1 removed lines

@@ -378,7 +378,7 @@
  * Parse tokens
  *
  * @param string $functionName Function name that indicates translatable string (e.g: '__')
- * @param array $map Array containing what variables it will find (e.g: category, domain, singular, plural)
+ * @param string[] $map Array containing what variables it will find (e.g: category, domain, singular, plural)
  * @return void
  */
 	protected function _parse($functionName, $map) {

Spacing +55 added lines, -55 removed lines

@@ -150,17 +150,17 @@ 
  * @return void
  */
 	public function execute() {
-		if (!empty($this->params['exclude'])) {
+		if ( ! empty($this->params['exclude'])) {
 			$this->_exclude = explode(',', $this->params['exclude']);
 		}
-		if (isset($this->params['files']) && !is_array($this->params['files'])) {
+		if (isset($this->params['files']) && ! is_array($this->params['files'])) {
 			$this->_files = explode(',', $this->params['files']);
 		}
 		if (isset($this->params['paths'])) {
 			$this->_paths = explode(',', $this->params['paths']);
 		} elseif (isset($this->params['plugin'])) {
 			$plugin = Inflector::camelize($this->params['plugin']);
-			if (!CakePlugin::loaded($plugin)) {
+			if ( ! CakePlugin::loaded($plugin)) {
 				CakePlugin::load($plugin);
 			}
 			$this->_paths = array(CakePlugin::path($plugin));
@@ -170,44 +170,44 @@ 
 		}
 
 		if (isset($this->params['extract-core'])) {
-			$this->_extractCore = !(strtolower($this->params['extract-core']) === 'no');
+			$this->_extractCore = ! (strtolower($this->params['extract-core']) === 'no');
 		} else {
 			$response = $this->in(__d('cake_console', 'Would you like to extract the messages from the CakePHP core?'), array('y', 'n'), 'n');
 			$this->_extractCore = strtolower($response) === 'y';
 		}
 
-		if (!empty($this->params['exclude-plugins']) && $this->_isExtractingApp()) {
+		if ( ! empty($this->params['exclude-plugins']) && $this->_isExtractingApp()) {
 			$this->_exclude = array_merge($this->_exclude, App::path('plugins'));
 		}
 
-		if (!empty($this->params['ignore-model-validation']) || (!$this->_isExtractingApp() && empty($plugin))) {
+		if ( ! empty($this->params['ignore-model-validation']) || ( ! $this->_isExtractingApp() && empty($plugin))) {
 			$this->_extractValidation = false;
 		}
-		if (!empty($this->params['validation-domain'])) {
+		if ( ! empty($this->params['validation-domain'])) {
 			$this->_validationDomain = $this->params['validation-domain'];
 		}
 
 		if ($this->_extractCore) {
 			$this->_paths[] = CAKE;
 			$this->_exclude = array_merge($this->_exclude, array(
-				CAKE . 'Test',
-				CAKE . 'Console' . DS . 'Templates'
+				CAKE.'Test',
+				CAKE.'Console'.DS.'Templates'
 			));
 		}
 
 		if (isset($this->params['output'])) {
 			$this->_output = $this->params['output'];
 		} elseif (isset($this->params['plugin'])) {
-			$this->_output = $this->_paths[0] . DS . 'Locale';
+			$this->_output = $this->_paths[0].DS.'Locale';
 		} else {
-			$message = __d('cake_console', "What is the path you would like to output?\n[Q]uit", $this->_paths[0] . DS . 'Locale');
+			$message = __d('cake_console', "What is the path you would like to output?\n[Q]uit", $this->_paths[0].DS.'Locale');
 			while (true) {
-				$response = $this->in($message, null, rtrim($this->_paths[0], DS) . DS . 'Locale');
+				$response = $this->in($message, null, rtrim($this->_paths[0], DS).DS.'Locale');
 				if (strtoupper($response) === 'Q') {
 					$this->out(__d('cake_console', 'Extract Aborted'));
 					return $this->_stop();
 				} elseif ($this->_isPathUsable($response)) {
-					$this->_output = $response . DS;
+					$this->_output = $response.DS;
 					break;
 				} else {
 					$this->err(__d('cake_console', 'The directory path you supplied was not found. Please try again.'));
@@ -217,7 +217,7 @@ 
 		}
 
 		if (isset($this->params['merge'])) {
-			$this->_merge = !(strtolower($this->params['merge']) === 'no');
+			$this->_merge = ! (strtolower($this->params['merge']) === 'no');
 		} else {
 			$this->out();
 			$response = $this->in(__d('cake_console', 'Would you like to merge all domain and category strings into the default.pot file?'), array('y', 'n'), 'n');
@@ -228,8 +228,8 @@ 
 			$this->_searchFiles();
 		}
 
-		$this->_output = rtrim($this->_output, DS) . DS;
-		if (!$this->_isPathUsable($this->_output)) {
+		$this->_output = rtrim($this->_output, DS).DS;
+		if ( ! $this->_isPathUsable($this->_output)) {
 			$this->err(__d('cake_console', 'The output directory %s was not found or writable.', $this->_output));
 			return $this->_stop();
 		}
@@ -280,9 +280,9 @@ 
 		$this->hr();
 		$this->out(__d('cake_console', 'Paths:'));
 		foreach ($this->_paths as $path) {
-			$this->out('   ' . $path);
+			$this->out('   '.$path);
 		}
-		$this->out(__d('cake_console', 'Output Directory: ') . $this->_output);
+		$this->out(__d('cake_console', 'Output Directory: ').$this->_output);
 		$this->hr();
 		$this->_extractTokens();
 		$this->_extractValidationMessages();
@@ -322,15 +322,15 @@ 
 			->addOption('ignore-model-validation', array(
 				'boolean' => true,
 				'default' => false,
-				'help' => __d('cake_console', 'Ignores validation messages in the $validate property.' .
-					' If this flag is not set and the command is run from the same app directory,' .
+				'help' => __d('cake_console', 'Ignores validation messages in the $validate property.'.
+					' If this flag is not set and the command is run from the same app directory,'.
 					' all messages in model validation rules will be extracted as tokens.')
 			))
 			->addOption('validation-domain', array(
 				'help' => __d('cake_console', 'If set to a value, the localization domain to be used for model validation messages.')
 			))
 			->addOption('exclude', array(
-				'help' => __d('cake_console', 'Comma separated list of directories to exclude.' .
+				'help' => __d('cake_console', 'Comma separated list of directories to exclude.'.
 					' Any path containing a path segment with the provided values will be skipped. E.g. test,vendors')
 			))
 			->addOption('overwrite', array(
@@ -359,7 +359,7 @@ 
 
 			$this->_tokens = array();
 			foreach ($allTokens as $token) {
-				if (!is_array($token) || ($token[0] != T_WHITESPACE && $token[0] != T_INLINE_HTML)) {
+				if ( ! is_array($token) || ($token[0] != T_WHITESPACE && $token[0] != T_INLINE_HTML)) {
 					$this->_tokens[] = $token;
 				}
 			}
@@ -389,7 +389,7 @@ 
 		while (($tokenCount - $count) > 1) {
 			$countToken = $this->_tokens[$count];
 			$firstParenthesis = $this->_tokens[$count + 1];
-			if (!is_array($countToken)) {
+			if ( ! is_array($countToken)) {
 				$count++;
 				continue;
 			}
@@ -399,7 +399,7 @@ 
 				$position = $count;
 				$depth = 0;
 
-				while (!$depth) {
+				while ( ! $depth) {
 					if ($this->_tokens[$position] === '(') {
 						$depth++;
 					} elseif ($this->_tokens[$position] === ')') {
@@ -440,7 +440,7 @@ 
  * @return void
  */
 	protected function _extractValidationMessages() {
-		if (!$this->_extractValidation) {
+		if ( ! $this->_extractValidation) {
 			return;
 		}
 
@@ -461,19 +461,19 @@ 
  */
 	protected function _extractPluginValidationMessages($plugin = null) {
 		App::uses('AppModel', 'Model');
-		if (!empty($plugin)) {
-			if (!CakePlugin::loaded($plugin)) {
+		if ( ! empty($plugin)) {
+			if ( ! CakePlugin::loaded($plugin)) {
 				return;
 			}
-			App::uses($plugin . 'AppModel', $plugin . '.Model');
-			$plugin = $plugin . '.';
+			App::uses($plugin.'AppModel', $plugin.'.Model');
+			$plugin = $plugin.'.';
 		}
-		$models = App::objects($plugin . 'Model', null, false);
+		$models = App::objects($plugin.'Model', null, false);
 
 		foreach ($models as $model) {
-			App::uses($model, $plugin . 'Model');
+			App::uses($model, $plugin.'Model');
 			$reflection = new ReflectionClass($model);
-			if (!$reflection->isSubClassOf('Model')) {
+			if ( ! $reflection->isSubClassOf('Model')) {
 				continue;
 			}
 			$properties = $reflection->getDefaultProperties();
@@ -484,7 +484,7 @@ 
 
 			$file = $reflection->getFileName();
 			$domain = $this->_validationDomain;
-			if (!empty($properties['validationDomain'])) {
+			if ( ! empty($properties['validationDomain'])) {
 				$domain = $properties['validationDomain'];
 			}
 			foreach ($validate as $field => $rules) {
@@ -505,7 +505,7 @@ 
  * @return void
  */
 	protected function _processValidationRules($field, $rules, $file, $domain, $category = 'LC_MESSAGES') {
-		if (!is_array($rules)) {
+		if ( ! is_array($rules)) {
 			return;
 		}
 
@@ -529,7 +529,7 @@ 
 				$msgid = $this->_formatString(sprintf("'%s'", $msgid));
 				$details = array(
 					'file' => $file,
-					'line' => 'validation for field ' . $field
+					'line' => 'validation for field '.$field
 				);
 				$this->_addTranslation($category, $domain, $msgid, $details);
 			}
@@ -543,7 +543,7 @@ 
  */
 	protected function _buildFiles() {
 		$paths = $this->_paths;
-		$paths[] = realpath(APP) . DS;
+		$paths[] = realpath(APP).DS;
 		foreach ($this->_translations as $category => $domains) {
 			foreach ($domains as $domain => $translations) {
 				foreach ($translations as $msgid => $details) {
@@ -552,10 +552,10 @@ 
 					$occurrences = array();
 					foreach ($files as $file => $lines) {
 						$lines = array_unique($lines);
-						$occurrences[] = $file . ':' . implode(';', $lines);
+						$occurrences[] = $file.':'.implode(';', $lines);
 					}
 					$occurrences = implode("\n#: ", $occurrences);
-					$header = '#: ' . str_replace(DS, '/', str_replace($paths, '', $occurrences)) . "\n";
+					$header = '#: '.str_replace(DS, '/', str_replace($paths, '', $occurrences))."\n";
 
 					if ($plural === false) {
 						$sentence = "msgid \"{$msgid}\"\n";
@@ -586,13 +586,13 @@ 
  * @return void
  */
 	protected function _store($category, $domain, $header, $sentence) {
-		if (!isset($this->_storage[$category])) {
+		if ( ! isset($this->_storage[$category])) {
 			$this->_storage[$category] = array();
 		}
-		if (!isset($this->_storage[$category][$domain])) {
+		if ( ! isset($this->_storage[$category][$domain])) {
 			$this->_storage[$category][$domain] = array();
 		}
-		if (!isset($this->_storage[$category][$domain][$sentence])) {
+		if ( ! isset($this->_storage[$category][$domain][$sentence])) {
 			$this->_storage[$category][$domain][$sentence] = $header;
 		} else {
 			$this->_storage[$category][$domain][$sentence] .= $header;
@@ -606,22 +606,22 @@ 
  */
 	protected function _writeFiles() {
 		$overwriteAll = false;
-		if (!empty($this->params['overwrite'])) {
+		if ( ! empty($this->params['overwrite'])) {
 			$overwriteAll = true;
 		}
 		foreach ($this->_storage as $category => $domains) {
 			foreach ($domains as $domain => $sentences) {
 				$output = $this->_writeHeader();
 				foreach ($sentences as $sentence => $header) {
-					$output .= $header . $sentence;
+					$output .= $header.$sentence;
 				}
 
-				$filename = $domain . '.pot';
+				$filename = $domain.'.pot';
 				if ($category === 'LC_MESSAGES') {
-					$File = new File($this->_output . $filename);
+					$File = new File($this->_output.$filename);
 				} else {
-					new Folder($this->_output . $category, true);
-					$File = new File($this->_output . $category . DS . $filename);
+					new Folder($this->_output.$category, true);
+					$File = new File($this->_output.$category.DS.$filename);
 				}
 				$response = '';
 				while ($overwriteAll === false && $File->exists() && strtoupper($response) !== 'Y') {
@@ -633,9 +633,9 @@ 
 					);
 					if (strtoupper($response) === 'N') {
 						$response = '';
-						while (!$response) {
-							$response = $this->in(__d('cake_console', "What would you like to name this file?"), null, 'new_' . $filename);
-							$File = new File($this->_output . $response);
+						while ( ! $response) {
+							$response = $this->in(__d('cake_console', "What would you like to name this file?"), null, 'new_'.$filename);
+							$File = new File($this->_output.$response);
 							$filename = $response;
 						}
 					} elseif (strtoupper($response) === 'A') {
@@ -661,7 +661,7 @@ 
 		$output .= "msgid \"\"\n";
 		$output .= "msgstr \"\"\n";
 		$output .= "\"Project-Id-Version: PROJECT VERSION\\n\"\n";
-		$output .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
+		$output .= "\"POT-Creation-Date: ".date("Y-m-d H:iO")."\\n\"\n";
 		$output .= "\"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\\n\"\n";
 		$output .= "\"Last-Translator: NAME <EMAIL@ADDRESS>\\n\"\n";
 		$output .= "\"Language-Team: LANGUAGE <EMAIL@ADDRESS>\\n\"\n";
@@ -761,20 +761,20 @@ 
  */
 	protected function _searchFiles() {
 		$pattern = false;
-		if (!empty($this->_exclude)) {
+		if ( ! empty($this->_exclude)) {
 			$exclude = array();
 			foreach ($this->_exclude as $e) {
 				if (DS !== '\\' && $e[0] !== DS) {
-					$e = DS . $e;
+					$e = DS.$e;
 				}
 				$exclude[] = preg_quote($e, '/');
 			}
-			$pattern = '/' . implode('|', $exclude) . '/';
+			$pattern = '/'.implode('|', $exclude).'/';
 		}
 		foreach ($this->_paths as $path) {
 			$Folder = new Folder($path);
 			$files = $Folder->findRecursive('.*\.(php|ctp|thtml|inc|tpl)', true);
-			if (!empty($pattern)) {
+			if ( ! empty($pattern)) {
 				foreach ($files as $i => $file) {
 					if (preg_match($pattern, $file)) {
 						unset($files[$i]);

lib/Cake/Console/Command/Task/ModelTask.php

Doc Comments +3 added lines, -3 removed lines

@@ -186,7 +186,7 @@ 
 /**
  * Handles interactive baking
  *
- * @return boolean
+ * @return false|null
  */
 	protected function _interactive() {
 		$this->hr();
@@ -367,7 +367,7 @@ 
 /**
  * Populate the _validations array
  *
- * @return void
+ * @return string[]
  */
 	public function initValidations() {
 		$options = $choices = array();
@@ -670,7 +670,7 @@ 
 /**
  * Interact with the user and confirm associations.
  *
- * @param array $model Temporary Model instance.
+ * @param Model $model Temporary Model instance.
  * @param array $associations Array of associations to be confirmed.
  * @return array Array of confirmed associations
  */

Spacing +43 added lines, -43 removed lines

@@ -91,9 +91,9 @@ 
 			$this->_interactive();
 		}
 
-		if (!empty($this->args[0])) {
+		if ( ! empty($this->args[0])) {
 			$this->interactive = false;
-			if (!isset($this->connection)) {
+			if ( ! isset($this->connection)) {
 				$this->connection = 'default';
 			}
 			if (strtolower($this->args[0]) === 'all') {
@@ -142,7 +142,7 @@ 
  * @return Model Model instance
  */
 	protected function _getModelObject($className, $table = null) {
-		if (!$table) {
+		if ( ! $table) {
 			$table = Inflector::tableize($className);
 		}
 		$object = new Model(array('name' => $className, 'table' => $table, 'ds' => $this->connection));
@@ -167,7 +167,7 @@ 
 	public function inOptions($options, $prompt = null, $default = null) {
 		$valid = false;
 		$max = count($options);
-		while (!$valid) {
+		while ( ! $valid) {
 			$len = strlen(count($options) + 1);
 			foreach ($options as $i => $option) {
 				$this->out(sprintf("%${len}d. %s", $i + 1, $option));
@@ -204,7 +204,7 @@ 
 		$useTable = $this->getTable($currentModelName);
 		$db = ConnectionManager::getDataSource($this->connection);
 		$fullTableName = $db->fullTableName($useTable);
-		if (!in_array($useTable, $this->_tables)) {
+		if ( ! in_array($useTable, $this->_tables)) {
 			$prompt = __d('cake_console', "The table %s doesn't exist or could not be automatically detected\ncontinue anyway?", $useTable);
 			$continue = $this->in($prompt, array('y', 'n'));
 			if (strtolower($continue) === 'n') {
@@ -221,13 +221,13 @@ 
 		} catch (Exception $e) {
 			$fields = array($tempModel->primaryKey);
 		}
-		if (!array_key_exists('id', $fields)) {
+		if ( ! array_key_exists('id', $fields)) {
 			$primaryKey = $this->findPrimaryKey($fields);
 		}
 
 		if ($knownToExist) {
 			$displayField = $tempModel->hasField(array('name', 'title'));
-			if (!$displayField) {
+			if ( ! $displayField) {
 				$displayField = $this->findDisplayField($tempModel->schema());
 			}
 
@@ -259,10 +259,10 @@ 
 		if ($primaryKey !== 'id') {
 			$this->out(__d('cake_console', 'Primary Key: %s', $primaryKey));
 		}
-		if (!empty($validate)) {
+		if ( ! empty($validate)) {
 			$this->out(__d('cake_console', 'Validation: %s', print_r($validate, true)));
 		}
-		if (!empty($associations)) {
+		if ( ! empty($associations)) {
 			$this->out(__d('cake_console', 'Associations:'));
 			$assocKeys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
 			foreach ($assocKeys as $assocKey) {
@@ -296,9 +296,9 @@ 
  * @return void
  */
 	protected function _printAssociation($modelName, $type, $associations) {
-		if (!empty($associations[$type])) {
+		if ( ! empty($associations[$type])) {
 			for ($i = 0, $len = count($associations[$type]); $i < $len; $i++) {
-				$out = "\t" . $modelName . ' ' . $type . ' ' . $associations[$type][$i]['alias'];
+				$out = "\t".$modelName.' '.$type.' '.$associations[$type][$i]['alias'];
 				$this->out($out);
 			}
 		}
@@ -345,7 +345,7 @@ 
  * @return array $validate Array of user selected validations.
  */
 	public function doValidation($model) {
-		if (!$model instanceof Model) {
+		if ( ! $model instanceof Model) {
 			return false;
 		}
 		$fields = $model->schema();
@@ -357,7 +357,7 @@ 
 		$this->initValidations();
 		foreach ($fields as $fieldName => $field) {
 			$validation = $this->fieldValidation($fieldName, $field, $model->primaryKey);
-			if (!empty($validation)) {
+			if ( ! empty($validation)) {
 				$validate[$fieldName] = $validation;
 			}
 		}
@@ -412,7 +412,7 @@ 
 				$optionText = '';
 				for ($i = 1, $m = $defaultChoice / 2; $i <= $m; $i++) {
 					$line = sprintf("%2d. %s", $i, $this->_validations[$i]);
-					$optionText .= $line . str_repeat(" ", 31 - strlen($line));
+					$optionText .= $line.str_repeat(" ", 31 - strlen($line));
 					if ($m + $i !== $defaultChoice) {
 						$optionText .= sprintf("%2d. %s\n", $m + $i, $this->_validations[$m + $i]);
 					}
@@ -425,7 +425,7 @@ 
 			$prompt = __d('cake_console', "... or enter in a valid regex validation string.\n");
 			$methods = array_flip($this->_validations);
 			$guess = $defaultChoice;
-			if ($metaData['null'] != 1 && !in_array($fieldName, array($primaryKey, 'created', 'modified', 'updated'))) {
+			if ($metaData['null'] != 1 && ! in_array($fieldName, array($primaryKey, 'created', 'modified', 'updated'))) {
 				if ($fieldName === 'email') {
 					$guess = $methods['email'];
 				} elseif ($metaData['type'] === 'string' && $metaData['length'] == 36) {
@@ -457,7 +457,7 @@ 
 					$this->out(__d('cake_console', "You have already chosen that validation rule,\nplease choose again"));
 					continue;
 				}
-				if (!isset($this->_validations[$choice]) && is_numeric($choice)) {
+				if ( ! isset($this->_validations[$choice]) && is_numeric($choice)) {
 					$this->out(__d('cake_console', 'Please make a valid selection.'));
 					continue;
 				}
@@ -493,7 +493,7 @@ 
  * @return array Associations
  */
 	public function doAssociations($model) {
-		if (!$model instanceof Model) {
+		if ( ! $model instanceof Model) {
 			return false;
 		}
 		if ($this->interactive === true) {
@@ -506,7 +506,7 @@ 
 		}
 
 		if (empty($this->_tables)) {
-			$this->_tables = (array)$this->getAllTables();
+			$this->_tables = (array) $this->getAllTables();
 		}
 
 		$associations = array(
@@ -545,7 +545,7 @@ 
  * @return array Behaviors
  */
 	public function doActsAs($model) {
-		if (!$model instanceof Model) {
+		if ( ! $model instanceof Model) {
 			return false;
 		}
 		$behaviors = array();
@@ -582,7 +582,7 @@ 
 				);
 			} elseif ($fieldName === 'parent_id') {
 				$associations['belongsTo'][] = array(
-					'alias' => 'Parent' . $model->name,
+					'alias' => 'Parent'.$model->name,
 					'className' => $model->name,
 					'foreignKey' => $fieldName,
 				);
@@ -604,7 +604,7 @@ 
 			$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable);
 			$tempFieldNames = array_keys($tempOtherModel->schema(true));
 
-			$pattern = '/_' . preg_quote($model->table, '/') . '|' . preg_quote($model->table, '/') . '_/';
+			$pattern = '/_'.preg_quote($model->table, '/').'|'.preg_quote($model->table, '/').'_/';
 			$possibleJoinTable = preg_match($pattern, $otherTable);
 			if ($possibleJoinTable) {
 				continue;
@@ -619,7 +619,7 @@ 
 					);
 				} elseif ($otherTable === $model->table && $fieldName === 'parent_id') {
 					$assoc = array(
-						'alias' => 'Child' . $model->name,
+						'alias' => 'Child'.$model->name,
 						'className' => $model->name,
 						'foreignKey' => $fieldName
 					);
@@ -645,11 +645,11 @@ 
 		$foreignKey = $this->_modelKey($model->name);
 		foreach ($this->_tables as $otherTable) {
 			$tableName = null;
-			$offset = strpos($otherTable, $model->table . '_');
-			$otherOffset = strpos($otherTable, '_' . $model->table);
+			$offset = strpos($otherTable, $model->table.'_');
+			$otherOffset = strpos($otherTable, '_'.$model->table);
 
 			if ($offset !== false) {
-				$tableName = substr($otherTable, strlen($model->table . '_'));
+				$tableName = substr($otherTable, strlen($model->table.'_'));
 			} elseif ($otherOffset !== false) {
 				$tableName = substr($otherTable, 0, $otherOffset);
 			}
@@ -676,7 +676,7 @@ 
  */
 	public function confirmAssociations(Model $model, $associations) {
 		foreach ($associations as $type => $settings) {
-			if (!empty($associations[$type])) {
+			if ( ! empty($associations[$type])) {
 				foreach ($associations[$type] as $i => $assoc) {
 					$prompt = "{$model->name} {$type} {$assoc['alias']}?";
 					$response = $this->in($prompt, array('y', 'n'), 'y');
@@ -709,7 +709,7 @@ 
 			$this->out(__d('cake_console', 'What is the association type?'));
 			$assocType = intval($this->inOptions($assocs, __d('cake_console', 'Enter a number')));
 
-			$this->out(__d('cake_console', "For the following options be very careful to match your setup exactly.\n" .
+			$this->out(__d('cake_console', "For the following options be very careful to match your setup exactly.\n".
 				"Any spelling mistakes will cause errors."));
 			$this->hr();
 
@@ -717,7 +717,7 @@ 
 			$className = $this->in(__d('cake_console', 'What className will %s use?', $alias), null, $alias);
 
 			if ($assocType === 0) {
-				if (!empty($possibleKeys[$model->table])) {
+				if ( ! empty($possibleKeys[$model->table])) {
 					$showKeys = $possibleKeys[$model->table];
 				} else {
 					$showKeys = null;
@@ -727,7 +727,7 @@ 
 				$otherTable = Inflector::tableize($className);
 				if (in_array($otherTable, $this->_tables)) {
 					if ($assocType < 3) {
-						if (!empty($possibleKeys[$otherTable])) {
+						if ( ! empty($possibleKeys[$otherTable])) {
 							$showKeys = $possibleKeys[$otherTable];
 						} else {
 							$showKeys = null;
@@ -741,19 +741,19 @@ 
 				}
 				$suggestedForeignKey = $this->_modelKey($model->name);
 			}
-			if (!empty($showKeys)) {
+			if ( ! empty($showKeys)) {
 				$this->out(__d('cake_console', 'A helpful List of possible keys'));
 				$foreignKey = $this->inOptions($showKeys, __d('cake_console', 'What is the foreignKey?'));
 				$foreignKey = $showKeys[intval($foreignKey)];
 			}
-			if (!isset($foreignKey)) {
+			if ( ! isset($foreignKey)) {
 				$foreignKey = $this->in(__d('cake_console', 'What is the foreignKey? Specify your own.'), null, $suggestedForeignKey);
 			}
 			if ($assocType === 3) {
 				$associationForeignKey = $this->in(__d('cake_console', 'What is the associationForeignKey?'), null, $this->_modelKey($model->name));
 				$joinTable = $this->in(__d('cake_console', 'What is the joinTable?'));
 			}
-			$associations[$assocs[$assocType]] = array_values((array)$associations[$assocs[$assocType]]);
+			$associations[$assocs[$assocType]] = array_values((array) $associations[$assocs[$assocType]]);
 			$count = count($associations[$assocs[$assocType]]);
 			$i = ($count > 0) ? $count : 0;
 			$associations[$assocs[$assocType]][$i]['alias'] = $alias;
@@ -796,7 +796,7 @@ 
  */
 	public function bake($name, $data = array()) {
 		if ($name instanceof Model) {
-			if (!$data) {
+			if ( ! $data) {
 				$data = array();
 				$data['associations'] = $this->doAssociations($name);
 				$data['validate'] = $this->doValidation($name);
@@ -823,7 +823,7 @@ 
 
 		$pluginPath = '';
 		if ($this->plugin) {
-			$pluginPath = $this->plugin . '.';
+			$pluginPath = $this->plugin.'.';
 		}
 
 		$this->Template->set($data);
@@ -834,8 +834,8 @@ 
 		$out = $this->Template->generate('classes', 'model');
 
 		$path = $this->getPath();
-		$filename = $path . $name . '.php';
-		$this->out("\n" . __d('cake_console', 'Baking model class for %s...', $name), 1, Shell::QUIET);
+		$filename = $path.$name.'.php';
+		$this->out("\n".__d('cake_console', 'Baking model class for %s...', $name), 1, Shell::QUIET);
 		$this->createFile($filename, $out);
 		ClassRegistry::flush();
 		return $out;
@@ -893,7 +893,7 @@ 
 		}
 
 		if ($this->interactive === true) {
-			if (!isset($useDbConfig)) {
+			if ( ! isset($useDbConfig)) {
 				$useDbConfig = $this->connection;
 			}
 			$db = ConnectionManager::getDataSource($useDbConfig);
@@ -919,7 +919,7 @@ 
  * @return array Array of tables in the database.
  */
 	public function getAllTables($useDbConfig = null) {
-		if (!isset($useDbConfig)) {
+		if ( ! isset($useDbConfig)) {
 			$useDbConfig = $this->connection;
 		}
 
@@ -929,7 +929,7 @@ 
 		$usePrefix = empty($db->config['prefix']) ? '' : $db->config['prefix'];
 		if ($usePrefix) {
 			foreach ($db->listSources() as $table) {
-				if (!strncmp($table, $usePrefix, strlen($usePrefix))) {
+				if ( ! strncmp($table, $usePrefix, strlen($usePrefix))) {
 					$tables[] = substr($table, strlen($usePrefix));
 				}
 			}
@@ -955,8 +955,8 @@ 
 
 		$enteredModel = '';
 
-		while (!$enteredModel) {
-			$enteredModel = $this->in(__d('cake_console', "Enter a number from the list above,\n" .
+		while ( ! $enteredModel) {
+			$enteredModel = $this->in(__d('cake_console', "Enter a number from the list above,\n".
 				"type in the name of another model, or 'q' to exit"), null, 'q');
 
 			if ($enteredModel === 'q') {
@@ -964,8 +964,8 @@ 
 				return $this->_stop();
 			}
 
-			if (!$enteredModel || intval($enteredModel) > count($this->_modelNames)) {
-				$this->err(__d('cake_console', "The model name you supplied was empty,\n" .
+			if ( ! $enteredModel || intval($enteredModel) > count($this->_modelNames)) {
+				$this->err(__d('cake_console', "The model name you supplied was empty,\n".
 					"or the number you selected was not an option. Please try again."));
 				$enteredModel = '';
 			}

lib/Cake/Console/Command/Task/ProjectTask.php

Doc Comments +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
  * Checks that given project path does not already exist, and
  * finds the app directory in it. Then it calls bake() with that information.
  *
- * @return mixed
+ * @return string|null
  */
 	public function execute() {
 		$project = null;
@@ -162,7 +162,7 @@ 
  * @param string $path Project path
  * @param string $skel Path to copy from
  * @param string $skip array of directories to skip when copying
- * @return mixed
+ * @return boolean|null
  */
 	public function bake($path, $skel = null, $skip = array('empty')) {
 		if (!$skel && !empty($this->params['skel'])) {
@@ -311,7 +311,7 @@ 
  *
  * @param string $path Project path
  * @param boolean $hardCode Whether or not define calls should be hardcoded.
- * @return boolean Success
+ * @return boolean|null Success
  */
 	public function corePath($path, $hardCode = true) {
 		if (dirname($path) !== CAKE_CORE_INCLUDE_PATH) {

Spacing +46 added lines, -46 removed lines

@@ -50,21 +50,21 @@ 
 			if (empty($appContents)) {
 				$suggestedPath = rtrim(APP, DS);
 			} else {
-				$suggestedPath = APP . 'myapp';
+				$suggestedPath = APP.'myapp';
 			}
 		}
 
-		while (!$project) {
+		while ( ! $project) {
 			$prompt = __d('cake_console', "What is the path to the project you want to bake?");
 			$project = $this->in($prompt, null, $suggestedPath);
 		}
 
-		if ($project && !Folder::isAbsolute($project) && isset($_SERVER['PWD'])) {
-			$project = $_SERVER['PWD'] . DS . $project;
+		if ($project && ! Folder::isAbsolute($project) && isset($_SERVER['PWD'])) {
+			$project = $_SERVER['PWD'].DS.$project;
 		}
 
 		$response = false;
-		while (!$response && is_dir($project) === true && file_exists($project . 'Config' . 'core.php')) {
+		while ( ! $response && is_dir($project) === true && file_exists($project.'Config'.'core.php')) {
 			$prompt = __d('cake_console', '<warning>A project already exists in this location:</warning> %s Overwrite?', $project);
 			$response = $this->in($prompt, array('y', 'n'), 'n');
 			if (strtolower($response) === 'n') {
@@ -79,14 +79,14 @@ 
 			if ($this->securitySalt($path) === true) {
 				$this->out(__d('cake_console', ' * Random hash key created for \'Security.salt\''));
 			} else {
-				$this->err(__d('cake_console', 'Unable to generate random hash for \'Security.salt\', you should change it in %s', APP . 'Config' . DS . 'core.php'));
+				$this->err(__d('cake_console', 'Unable to generate random hash for \'Security.salt\', you should change it in %s', APP.'Config'.DS.'core.php'));
 				$success = false;
 			}
 
 			if ($this->securityCipherSeed($path) === true) {
 				$this->out(__d('cake_console', ' * Random seed created for \'Security.cipherSeed\''));
 			} else {
-				$this->err(__d('cake_console', 'Unable to generate random seed for \'Security.cipherSeed\', you should change it in %s', APP . 'Config' . DS . 'core.php'));
+				$this->err(__d('cake_console', 'Unable to generate random seed for \'Security.cipherSeed\', you should change it in %s', APP.'Config'.DS.'core.php'));
 				$success = false;
 			}
 
@@ -117,7 +117,7 @@ 
 				$this->out(__d('cake_console', ' * CAKE_CORE_INCLUDE_PATH set to %s in %s', CAKE_CORE_INCLUDE_PATH, 'webroot/index.php'));
 				$this->out(__d('cake_console', ' * CAKE_CORE_INCLUDE_PATH set to %s in %s', CAKE_CORE_INCLUDE_PATH, 'webroot/test.php'));
 			} else {
-				$this->err(__d('cake_console', 'Unable to set CAKE_CORE_INCLUDE_PATH, you should change it in %s', $path . 'webroot' . DS . 'index.php'));
+				$this->err(__d('cake_console', 'Unable to set CAKE_CORE_INCLUDE_PATH, you should change it in %s', $path.'webroot'.DS.'index.php'));
 				$success = false;
 			}
 			if ($success && $hardCode) {
@@ -125,9 +125,9 @@ 
 			}
 
 			$Folder = new Folder($path);
-			if (!$Folder->chmod($path . 'tmp', 0777)) {
-				$this->err(__d('cake_console', 'Could not set permissions on %s', $path . DS . 'tmp'));
-				$this->out('chmod -R 0777 ' . $path . DS . 'tmp');
+			if ( ! $Folder->chmod($path.'tmp', 0777)) {
+				$this->err(__d('cake_console', 'Could not set permissions on %s', $path.DS.'tmp'));
+				$this->out('chmod -R 0777 '.$path.DS.'tmp');
 				$success = false;
 			}
 			if ($success) {
@@ -147,7 +147,7 @@ 
 	public function cakeOnIncludePath() {
 		$paths = explode(PATH_SEPARATOR, ini_get('include_path'));
 		foreach ($paths as $path) {
-			if (file_exists($path . DS . 'Cake' . DS . 'bootstrap.php')) {
+			if (file_exists($path.DS.'Cake'.DS.'bootstrap.php')) {
 				return true;
 			}
 		}
@@ -165,23 +165,23 @@ 
  * @return mixed
  */
 	public function bake($path, $skel = null, $skip = array('empty')) {
-		if (!$skel && !empty($this->params['skel'])) {
+		if ( ! $skel && ! empty($this->params['skel'])) {
 			$skel = $this->params['skel'];
 		}
-		while (!$skel) {
+		while ( ! $skel) {
 			$skel = $this->in(
 				__d('cake_console', "What is the path to the directory layout you wish to copy?"),
 				null,
-				CAKE . 'Console' . DS . 'Templates' . DS . 'skel'
+				CAKE.'Console'.DS.'Templates'.DS.'skel'
 			);
-			if (!$skel) {
+			if ( ! $skel) {
 				$this->err(__d('cake_console', 'The directory path you supplied was empty. Please try again.'));
 			} else {
 				while (is_dir($skel) === false) {
 					$skel = $this->in(
 						__d('cake_console', 'Directory path does not exist please choose another:'),
 						null,
-						CAKE . 'Console' . DS . 'Templates' . DS . 'skel'
+						CAKE.'Console'.DS.'Templates'.DS.'skel'
 					);
 				}
 			}
@@ -189,8 +189,8 @@ 
 
 		$app = basename($path);
 
-		$this->out(__d('cake_console', '<info>Skel Directory</info>: ') . $skel);
-		$this->out(__d('cake_console', '<info>Will be copied to</info>: ') . $path);
+		$this->out(__d('cake_console', '<info>Skel Directory</info>: ').$skel);
+		$this->out(__d('cake_console', '<info>Will be copied to</info>: ').$path);
 		$this->hr();
 
 		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n', 'q'), 'y');
@@ -198,7 +198,7 @@ 
 		switch (strtolower($looksGood)) {
 			case 'y':
 				$Folder = new Folder($skel);
-				if (!empty($this->params['empty'])) {
+				if ( ! empty($this->params['empty'])) {
 					$skip = array();
 				}
 
@@ -212,7 +212,7 @@ 
 				}
 
 				foreach ($Folder->messages() as $message) {
-					$this->out(String::wrap(' * ' . $message), 1, Shell::VERBOSE);
+					$this->out(String::wrap(' * '.$message), 1, Shell::VERBOSE);
 				}
 
 				return true;
@@ -234,11 +234,11 @@ 
  * @return boolean success
  */
 	public function consolePath($path) {
-		$File = new File($path . 'Console' . DS . 'cake.php');
+		$File = new File($path.'Console'.DS.'cake.php');
 		$contents = $File->read();
 		if (preg_match('/(__CAKE_PATH__)/', $contents, $match)) {
 			$root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " \$ds . '" : "'";
-			$replacement = $root . str_replace(DS, "' . \$ds . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "'";
+			$replacement = $root.str_replace(DS, "' . \$ds . '", trim(CAKE_CORE_INCLUDE_PATH, DS))."'";
 			$result = str_replace($match[0], $replacement, $contents);
 			if ($File->write($result)) {
 				return true;
@@ -255,11 +255,11 @@ 
  * @return boolean Success
  */
 	public function securitySalt($path) {
-		$File = new File($path . 'Config' . DS . 'core.php');
+		$File = new File($path.'Config'.DS.'core.php');
 		$contents = $File->read();
 		if (preg_match('/([\s]*Configure::write\(\'Security.salt\',[\s\'A-z0-9]*\);)/', $contents, $match)) {
 			$string = Security::generateAuthKey();
-			$result = str_replace($match[0], "\t" . 'Configure::write(\'Security.salt\', \'' . $string . '\');', $contents);
+			$result = str_replace($match[0], "\t".'Configure::write(\'Security.salt\', \''.$string.'\');', $contents);
 			if ($File->write($result)) {
 				return true;
 			}
@@ -275,12 +275,12 @@ 
  * @return boolean Success
  */
 	public function securityCipherSeed($path) {
-		$File = new File($path . 'Config' . DS . 'core.php');
+		$File = new File($path.'Config'.DS.'core.php');
 		$contents = $File->read();
 		if (preg_match('/([\s]*Configure::write\(\'Security.cipherSeed\',[\s\'A-z0-9]*\);)/', $contents, $match)) {
 			App::uses('Security', 'Utility');
 			$string = substr(bin2hex(Security::generateAuthKey()), 0, 30);
-			$result = str_replace($match[0], "\t" . 'Configure::write(\'Security.cipherSeed\', \'' . $string . '\');', $contents);
+			$result = str_replace($match[0], "\t".'Configure::write(\'Security.cipherSeed\', \''.$string.'\');', $contents);
 			if ($File->write($result)) {
 				return true;
 			}
@@ -297,10 +297,10 @@ 
  */
 	public function cachePrefix($dir) {
 		$app = basename($dir);
-		$File = new File($dir . 'Config' . DS . 'core.php');
+		$File = new File($dir.'Config'.DS.'core.php');
 		$contents = $File->read();
 		if (preg_match('/(\$prefix = \'myapp_\';)/', $contents, $match)) {
-			$result = str_replace($match[0], '$prefix = \'' . $app . '_\';', $contents);
+			$result = str_replace($match[0], '$prefix = \''.$app.'_\';', $contents);
 			return $File->write($result);
 		}
 		return false;
@@ -315,12 +315,12 @@ 
  */
 	public function corePath($path, $hardCode = true) {
 		if (dirname($path) !== CAKE_CORE_INCLUDE_PATH) {
-			$filename = $path . 'webroot' . DS . 'index.php';
-			if (!$this->_replaceCorePath($filename, $hardCode)) {
+			$filename = $path.'webroot'.DS.'index.php';
+			if ( ! $this->_replaceCorePath($filename, $hardCode)) {
 				return false;
 			}
-			$filename = $path . 'webroot' . DS . 'test.php';
-			if (!$this->_replaceCorePath($filename, $hardCode)) {
+			$filename = $path.'webroot'.DS.'test.php';
+			if ( ! $this->_replaceCorePath($filename, $hardCode)) {
 				return false;
 			}
 			return true;
@@ -338,16 +338,16 @@ 
 		$contents = file_get_contents($filename);
 
 		$root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " DS . '" : "'";
-		$corePath = $root . str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "'";
+		$corePath = $root.str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS))."'";
 
 		$result = str_replace('__CAKE_PATH__', $corePath, $contents, $count);
 		if ($hardCode) {
 			$result = str_replace('//define(\'CAKE_CORE', 'define(\'CAKE_CORE', $result);
 		}
-		if (!file_put_contents($filename, $result)) {
+		if ( ! file_put_contents($filename, $result)) {
 			return false;
 		}
-		return (bool)$count;
+		return (bool) $count;
 	}
 
 /**
@@ -357,11 +357,11 @@ 
  * @return boolean Success
  */
 	public function cakeAdmin($name) {
-		$path = (empty($this->configPath)) ? APP . 'Config' . DS : $this->configPath;
-		$File = new File($path . 'core.php');
+		$path = (empty($this->configPath)) ? APP.'Config'.DS : $this->configPath;
+		$File = new File($path.'core.php');
 		$contents = $File->read();
 		if (preg_match('%(\s*[/]*Configure::write\(\'Routing.prefixes\',[\s\'a-z,\)\(]*\);)%', $contents, $match)) {
-			$result = str_replace($match[0], "\n" . 'Configure::write(\'Routing.prefixes\', array(\'' . $name . '\'));', $contents);
+			$result = str_replace($match[0], "\n".'Configure::write(\'Routing.prefixes\', array(\''.$name.'\'));', $contents);
 			if ($File->write($result)) {
 				Configure::write('Routing.prefixes', array($name));
 				return true;
@@ -378,9 +378,9 @@ 
 	public function getPrefix() {
 		$admin = '';
 		$prefixes = Configure::read('Routing.prefixes');
-		if (!empty($prefixes)) {
+		if ( ! empty($prefixes)) {
 			if (count($prefixes) === 1) {
-				return $prefixes[0] . '_';
+				return $prefixes[0].'_';
 			}
 			if ($this->interactive) {
 				$this->out();
@@ -390,11 +390,11 @@ 
 			foreach ($prefixes as $i => $prefix) {
 				$options[] = $i + 1;
 				if ($this->interactive) {
-					$this->out($i + 1 . '. ' . $prefix);
+					$this->out($i + 1.'. '.$prefix);
 				}
 			}
 			$selection = $this->in(__d('cake_console', 'Please choose a prefix to bake with.'), $options, 1);
-			return $prefixes[$selection - 1] . '_';
+			return $prefixes[$selection - 1].'_';
 		}
 		if ($this->interactive) {
 			$this->hr();
@@ -403,7 +403,7 @@ 
 					'/app/Config/core.php'));
 			$this->out(__d('cake_console', 'What would you like the prefix route to be?'));
 			$this->out(__d('cake_console', 'Example: %s', 'www.example.com/admin/controller'));
-			while (!$admin) {
+			while ( ! $admin) {
 				$admin = $this->in(__d('cake_console', 'Enter a routing prefix:'), null, 'admin');
 			}
 			if ($this->cakeAdmin($admin) !== true) {
@@ -413,7 +413,7 @@ 
 					'/app/Config/core.php'));
 				return $this->_stop();
 			}
-			return $admin . '_';
+			return $admin.'_';
 		}
 		return '';
 	}
@@ -436,7 +436,7 @@ 
 				'short' => 't',
 				'help' => __d('cake_console', 'Theme to use when baking code.')
 			))->addOption('skel', array(
-				'default' => current(App::core('Console')) . 'Templates' . DS . 'skel',
+				'default' => current(App::core('Console')).'Templates'.DS.'skel',
 				'help' => __d('cake_console', 'The directory layout to use for the new application skeleton. Defaults to cake/Console/Templates/skel of CakePHP used to create the project.')
 			));
 	}

lib/Cake/Console/Command/Task/TemplateTask.php

Doc Comments +1 added lines, -1 removed lines

@@ -108,7 +108,7 @@
  * @param string|array $one A string or an array of data.
  * @param string|array $two Value in case $one is a string (which then works as the key).
  *   Unused if $one is an associative array, otherwise serves as the values to $one's keys.
- * @return void
+ * @return false|null
  */
 	public function set($one, $two = null) {
 		if (is_array($one)) {

Spacing +12 added lines, -12 removed lines

@@ -63,14 +63,14 @@ 
 
 		$plugins = App::objects('plugin');
 		foreach ($plugins as $plugin) {
-			$paths[] = $this->_pluginPath($plugin) . 'Console' . DS;
+			$paths[] = $this->_pluginPath($plugin).'Console'.DS;
 		}
 
 		$core = current(App::core('Console'));
 		$separator = DS === '/' ? '/' : '\\\\';
-		$core = preg_replace('#shells' . $separator . '$#', '', $core);
+		$core = preg_replace('#shells'.$separator.'$#', '', $core);
 
-		$Folder = new Folder($core . 'Templates' . DS . 'default');
+		$Folder = new Folder($core.'Templates'.DS.'default');
 
 		$contents = $Folder->read();
 		$themeFolders = $contents[0];
@@ -78,23 +78,23 @@ 
 		$paths[] = $core;
 
 		foreach ($paths as $i => $path) {
-			$paths[$i] = rtrim($path, DS) . DS;
+			$paths[$i] = rtrim($path, DS).DS;
 		}
 
 		$themes = array();
 		foreach ($paths as $path) {
-			$Folder = new Folder($path . 'Templates', false);
+			$Folder = new Folder($path.'Templates', false);
 			$contents = $Folder->read();
 			$subDirs = $contents[0];
 			foreach ($subDirs as $dir) {
 				if (empty($dir) || preg_match('@^skel$|_skel$@', $dir)) {
 					continue;
 				}
-				$Folder = new Folder($path . 'Templates' . DS . $dir);
+				$Folder = new Folder($path.'Templates'.DS.$dir);
 				$contents = $Folder->read();
 				$subDirs = $contents[0];
 				if (array_intersect($contents[0], $themeFolders)) {
-					$templateDir = $path . 'Templates' . DS . $dir . DS;
+					$templateDir = $path.'Templates'.DS.$dir.DS;
 					$themes[$dir] = $templateDir;
 				}
 			}
@@ -121,7 +121,7 @@ 
 			$data = array($one => $two);
 		}
 
-		if (!$data) {
+		if ( ! $data) {
 			return false;
 		}
 		$this->templateVars = $data + $this->templateVars;
@@ -168,7 +168,7 @@ 
 			$paths = array_values($this->templatePaths);
 			return $paths[0];
 		}
-		if (!empty($this->params['theme']) && isset($this->templatePaths[$this->params['theme']])) {
+		if ( ! empty($this->params['theme']) && isset($this->templatePaths[$this->params['theme']])) {
 			return $this->templatePaths[$this->params['theme']];
 		}
 
@@ -180,7 +180,7 @@ 
 		$i = 1;
 		$indexedPaths = array();
 		foreach ($this->templatePaths as $key => $path) {
-			$this->out($i . '. ' . $key);
+			$this->out($i.'. '.$key);
 			$indexedPaths[$i] = $path;
 			$i++;
 		}
@@ -200,12 +200,12 @@ 
  * @return string filename will exit program if template is not found.
  */
 	protected function _findTemplate($path, $directory, $filename) {
-		$themeFile = $path . $directory . DS . $filename . '.ctp';
+		$themeFile = $path.$directory.DS.$filename.'.ctp';
 		if (file_exists($themeFile)) {
 			return $themeFile;
 		}
 		foreach ($this->templatePaths as $path) {
-			$templatePath = $path . $directory . DS . $filename . '.ctp';
+			$templatePath = $path.$directory.DS.$filename.'.ctp';
 			if (file_exists($templatePath)) {
 				return $templatePath;
 			}

lib/Cake/Console/Command/Task/ViewTask.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 /**
  * Execution method always used for tasks
  *
- * @return mixed
+ * @return null|boolean
  */
 	public function execute() {
 		parent::execute();
@@ -342,7 +342,7 @@ 
  *
  * @param string $action Action to bake
  * @param string $content Content to write
- * @return boolean Success
+ * @return null|boolean Success
  */
 	public function bake($action, $content = '') {
 		if ($content === true) {

Spacing +24 added lines, -24 removed lines

@@ -91,7 +91,7 @@ 
 		if (empty($this->args[0])) {
 			return;
 		}
-		if (!isset($this->connection)) {
+		if ( ! isset($this->connection)) {
 			$this->connection = 'default';
 		}
 		$action = null;
@@ -108,7 +108,7 @@ 
 		if (isset($this->args[2])) {
 			$action = $this->args[2];
 		}
-		if (!$action) {
+		if ( ! $action) {
 			$action = $this->template;
 		}
 		if ($action) {
@@ -133,7 +133,7 @@ 
  */
 	protected function _methodsToBake() {
 		$methods = array_diff(
-			array_map('strtolower', get_class_methods($this->controllerName . 'Controller')),
+			array_map('strtolower', get_class_methods($this->controllerName.'Controller')),
 			array_map('strtolower', get_class_methods('AppController'))
 		);
 		$scaffoldActions = false;
@@ -143,15 +143,15 @@ 
 		}
 		$adminRoute = $this->Project->getPrefix();
 		foreach ($methods as $i => $method) {
-			if ($adminRoute && !empty($this->params['admin'])) {
+			if ($adminRoute && ! empty($this->params['admin'])) {
 				if ($scaffoldActions) {
-					$methods[$i] = $adminRoute . $method;
+					$methods[$i] = $adminRoute.$method;
 					continue;
 				} elseif (strpos($method, $adminRoute) === false) {
 					unset($methods[$i]);
 				}
 			}
-			if ($method[0] === '_' || $method === strtolower($this->controllerName . 'Controller')) {
+			if ($method[0] === '_' || $method === strtolower($this->controllerName.'Controller')) {
 				unset($methods[$i]);
 			}
 		}
@@ -178,7 +178,7 @@ 
 			App::uses($model, 'Model');
 			if (class_exists($model)) {
 				$vars = $this->_loadController();
-				if (!$actions) {
+				if ( ! $actions) {
 					$actions = $this->_methodsToBake();
 				}
 				$this->bakeActions($actions, $vars);
@@ -229,7 +229,7 @@ 
 				$regularActions = $this->scaffoldActions;
 				$adminActions = array();
 				foreach ($regularActions as $action) {
-					$adminActions[] = $admin . $action;
+					$adminActions[] = $admin.$action;
 				}
 				$this->bakeActions($adminActions, $vars);
 			}
@@ -251,19 +251,19 @@ 
  * @return array Returns an variables to be made available to a view template
  */
 	protected function _loadController() {
-		if (!$this->controllerName) {
+		if ( ! $this->controllerName) {
 			$this->err(__d('cake_console', 'Controller not found'));
 		}
 
 		$plugin = null;
 		if ($this->plugin) {
-			$plugin = $this->plugin . '.';
+			$plugin = $this->plugin.'.';
 		}
 
-		$controllerClassName = $this->controllerName . 'Controller';
-		App::uses($controllerClassName, $plugin . 'Controller');
-		if (!class_exists($controllerClassName)) {
-			$file = $controllerClassName . '.php';
+		$controllerClassName = $this->controllerName.'Controller';
+		App::uses($controllerClassName, $plugin.'Controller');
+		if ( ! class_exists($controllerClassName)) {
+			$file = $controllerClassName.'.php';
 			$this->err(__d('cake_console', "The file '%s' could not be found.\nIn order to bake a view, you'll need to first create the controller.", $file));
 			return $this->_stop();
 		}
@@ -315,9 +315,9 @@ 
  */
 	public function customAction() {
 		$action = '';
-		while (!$action) {
+		while ( ! $action) {
 			$action = $this->in(__d('cake_console', 'Action Name? (use lowercase_underscored function name)'));
-			if (!$action) {
+			if ( ! $action) {
 				$this->out(__d('cake_console', 'The action name you supplied was empty. Please try again.'));
 			}
 		}
@@ -327,7 +327,7 @@ 
 		$this->hr();
 		$this->out(__d('cake_console', 'Controller Name: %s', $this->controllerName));
 		$this->out(__d('cake_console', 'Action Name:     %s', $action));
-		$this->out(__d('cake_console', 'Path:            %s', $this->getPath() . $this->controllerName . DS . Inflector::underscore($action) . ".ctp"));
+		$this->out(__d('cake_console', 'Path:            %s', $this->getPath().$this->controllerName.DS.Inflector::underscore($action).".ctp"));
 		$this->hr();
 		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n'), 'y');
 		if (strtolower($looksGood) === 'y') {
@@ -351,9 +351,9 @@ 
 		if (empty($content)) {
 			return false;
 		}
-		$this->out("\n" . __d('cake_console', 'Baking `%s` view file...', $action), 1, Shell::QUIET);
+		$this->out("\n".__d('cake_console', 'Baking `%s` view file...', $action), 1, Shell::QUIET);
 		$path = $this->getPath();
-		$filename = $path . $this->controllerName . DS . Inflector::underscore($action) . '.ctp';
+		$filename = $path.$this->controllerName.DS.Inflector::underscore($action).'.ctp';
 		return $this->createFile($filename, $content);
 	}
 
@@ -365,7 +365,7 @@ 
  * @return string content from template
  */
 	public function getContent($action, $vars = null) {
-		if (!$vars) {
+		if ( ! $vars) {
 			$vars = $this->_loadController();
 		}
 
@@ -389,18 +389,18 @@ 
 		if ($action != $this->template && in_array($action, $this->noTemplateActions)) {
 			return false;
 		}
-		if (!empty($this->template) && $action != $this->template) {
+		if ( ! empty($this->template) && $action != $this->template) {
 			return $this->template;
 		}
 		$themePath = $this->Template->getThemePath();
-		if (file_exists($themePath . 'views' . DS . $action . '.ctp')) {
+		if (file_exists($themePath.'views'.DS.$action.'.ctp')) {
 			return $action;
 		}
 		$template = $action;
 		$prefixes = Configure::read('Routing.prefixes');
-		foreach ((array)$prefixes as $prefix) {
+		foreach ((array) $prefixes as $prefix) {
 			if (strpos($template, $prefix) !== false) {
-				$template = str_replace($prefix . '_', '', $template);
+				$template = str_replace($prefix.'_', '', $template);
 			}
 		}
 		if (in_array($template, array('add', 'edit'))) {

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;