reginaldojunior / winners

lib/Cake/Console/Command/AclShell.php

Doc Comments +2 added lines, -2 removed lines

@@ -356,7 +356,7 @@ 
 /**
  * Initialize ACL database.
  *
- * @return mixed
+ * @return boolean
  */
 	public function initdb() {
 		return $this->dispatchShell('schema create DbAcl');
@@ -365,7 +365,7 @@ 
 /**
  * Get the option parser.
  *
- * @return void
+ * @return ConsoleOptionParser
  */
 	public function getOptionParser() {
 		$parser = parent::getOptionParser();

Spacing +29 added lines, -29 removed lines

@@ -71,27 +71,27 @@ 
 
 		$class = Configure::read('Acl.classname');
 		list($plugin, $class) = pluginSplit($class, true);
-		App::uses($class, $plugin . 'Controller/Component/Acl');
-		if (!in_array($class, array('DbAcl', 'DB_ACL')) && !is_subclass_of($class, 'DbAcl')) {
+		App::uses($class, $plugin.'Controller/Component/Acl');
+		if ( ! in_array($class, array('DbAcl', 'DB_ACL')) && ! is_subclass_of($class, 'DbAcl')) {
 			$out = "--------------------------------------------------\n";
-			$out .= __d('cake_console', 'Error: Your current CakePHP configuration is set to an ACL implementation other than DB.') . "\n";
-			$out .= __d('cake_console', 'Please change your core config to reflect your decision to use DbAcl before attempting to use this script') . "\n";
+			$out .= __d('cake_console', 'Error: Your current CakePHP configuration is set to an ACL implementation other than DB.')."\n";
+			$out .= __d('cake_console', 'Please change your core config to reflect your decision to use DbAcl before attempting to use this script')."\n";
 			$out .= "--------------------------------------------------\n";
-			$out .= __d('cake_console', 'Current ACL Classname: %s', $class) . "\n";
+			$out .= __d('cake_console', 'Current ACL Classname: %s', $class)."\n";
 			$out .= "--------------------------------------------------\n";
 			$this->err($out);
 			return $this->_stop();
 		}
 
 		if ($this->command) {
-			if (!config('database')) {
+			if ( ! config('database')) {
 				$this->out(__d('cake_console', 'Your database configuration was not found. Take a moment to create one.'));
 				$this->args = null;
 				return $this->DbConfig->execute();
 			}
-			require_once APP . 'Config' . DS . 'database.php';
+			require_once APP.'Config'.DS.'database.php';
 
-			if (!in_array($this->command, array('initdb'))) {
+			if ( ! in_array($this->command, array('initdb'))) {
 				$collection = new ComponentCollection();
 				$this->Acl = new AclComponent($collection);
 				$controller = new Controller();
@@ -120,7 +120,7 @@ 
 		$class = ucfirst($this->args[0]);
 		$parent = $this->parseIdentifier($this->args[1]);
 
-		if (!empty($parent) && $parent !== '/' && $parent !== 'root') {
+		if ( ! empty($parent) && $parent !== '/' && $parent !== 'root') {
 			$parent = $this->_getNodeId($class, $parent);
 		} else {
 			$parent = null;
@@ -130,7 +130,7 @@ 
 		if (is_string($data) && $data !== '/') {
 			$data = array('alias' => $data);
 		} elseif (is_string($data)) {
-			$this->error(__d('cake_console', '/ can not be used as an alias!') . __d('cake_console', "	/ is the root, please supply a sub alias"));
+			$this->error(__d('cake_console', '/ can not be used as an alias!').__d('cake_console', "	/ is the root, please supply a sub alias"));
 		}
 
 		$data['parent_id'] = $parent;
@@ -157,12 +157,12 @@ 
 		}
 
 		if ($this->Acl->{$class}->find('all', array('conditions' => $identifier))) {
-			if (!$this->Acl->{$class}->deleteAll($identifier)) {
-				$this->error(__d('cake_console', 'Node Not Deleted. ') . __d('cake_console', 'There was an error deleting the %s.', $class) . "\n");
+			if ( ! $this->Acl->{$class}->deleteAll($identifier)) {
+				$this->error(__d('cake_console', 'Node Not Deleted. ').__d('cake_console', 'There was an error deleting the %s.', $class)."\n");
 			}
 			$this->out(__d('cake_console', '<success>%s deleted.</success>', $class), 2);
 		} else {
-			$this->error(__d('cake_console', 'Node Not Deleted. ') . __d('cake_console', 'There was an error deleting the %s. Node does not exist.', $class) . "\n");
+			$this->error(__d('cake_console', 'Node Not Deleted. ').__d('cake_console', 'There was an error deleting the %s. Node does not exist.', $class)."\n");
 		}
 	}
 
@@ -183,10 +183,10 @@ 
 			)
 		);
 		$this->Acl->{$class}->create();
-		if (!$this->Acl->{$class}->save($data)) {
+		if ( ! $this->Acl->{$class}->save($data)) {
 			$this->out(__d('cake_console', 'Error in setting new parent. Please make sure the parent node exists, and is not a descendant of the node specified.'));
 		} else {
-			$this->out(__d('cake_console', 'Node parent set to %s', $this->args[2]) . "\n");
+			$this->out(__d('cake_console', 'Node parent set to %s', $this->args[2])."\n");
 		}
 	}
 
@@ -227,9 +227,9 @@ 
 		$indent = str_repeat('  ', $indent);
 		$data = $node[$class];
 		if ($data['alias']) {
-			$this->out($indent . "[" . $data['id'] . "] " . $data['alias']);
+			$this->out($indent."[".$data['id']."] ".$data['alias']);
 		} else {
-			$this->out($indent . "[" . $data['id'] . "] " . $data['model'] . '.' . $data['foreign_key']);
+			$this->out($indent."[".$data['id']."] ".$data['model'].'.'.$data['foreign_key']);
 		}
 	}
 
@@ -305,18 +305,18 @@ 
 			$identity = $this->parseIdentifier($this->args[1]);
 
 			$topNode = $this->Acl->{$class}->find('first', array(
-				'conditions' => array($class . '.id' => $this->_getNodeId($class, $identity))
+				'conditions' => array($class.'.id' => $this->_getNodeId($class, $identity))
 			));
 
 			$nodes = $this->Acl->{$class}->find('all', array(
 				'conditions' => array(
-					$class . '.lft >=' => $topNode[$class]['lft'],
-					$class . '.lft <=' => $topNode[$class]['rght']
+					$class.'.lft >=' => $topNode[$class]['lft'],
+					$class.'.lft <=' => $topNode[$class]['rght']
 				),
-				'order' => $class . '.lft ASC'
+				'order' => $class.'.lft ASC'
 			));
 		} else {
-			$nodes = $this->Acl->{$class}->find('all', array('order' => $class . '.lft ASC'));
+			$nodes = $this->Acl->{$class}->find('all', array('order' => $class.'.lft ASC'));
 		}
 
 		if (empty($nodes)) {
@@ -326,7 +326,7 @@ 
 				$this->error(__d('cake_console', '%s not found', $this->args[0]), __d('cake_console', 'No tree returned.'));
 			}
 		}
-		$this->out($class . ' tree:');
+		$this->out($class.' tree:');
 		$this->hr();
 
 		$stack = array();
@@ -334,7 +334,7 @@ 
 
 		foreach ($nodes as $n) {
 			$stack[] = $n;
-			if (!empty($last)) {
+			if ( ! empty($last)) {
 				$end = end($stack);
 				if ($end[$class]['rght'] > $last) {
 					foreach ($stack as $k => $v) {
@@ -523,13 +523,13 @@ 
  * @return boolean Success
  */
 	public function nodeExists() {
-		if (!isset($this->args[0]) || !isset($this->args[1])) {
+		if ( ! isset($this->args[0]) || ! isset($this->args[1])) {
 			return false;
 		}
 		$dataVars = $this->_dataVars($this->args[0]);
 		extract($dataVars);
 		$key = is_numeric($this->args[1]) ? $dataVars['secondary_id'] : 'alias';
-		$conditions = array($class . '.' . $key => $this->args[1]);
+		$conditions = array($class.'.'.$key => $this->args[1]);
 		$possibility = $this->Acl->{$class}->find('all', compact('conditions'));
 		if (empty($possibility)) {
 			$this->error(__d('cake_console', '%s not found', $this->args[1]), __d('cake_console', 'No tree returned.'));
@@ -592,7 +592,7 @@ 
 			$aco = $this->parseIdentifier($aco);
 		}
 		$action = '*';
-		if (isset($this->args[2]) && !in_array($this->args[2], array('', 'all'))) {
+		if (isset($this->args[2]) && ! in_array($this->args[2], array('', 'all'))) {
 			$action = $this->args[2];
 		}
 		return compact('aro', 'aco', 'action', 'aroName', 'acoName');
@@ -605,14 +605,14 @@ 
  * @return array Variables
  */
 	protected function _dataVars($type = null) {
-		if (!$type) {
+		if ( ! $type) {
 			$type = $this->args[0];
 		}
 		$vars = array();
 		$class = ucwords($type);
 		$vars['secondary_id'] = (strtolower($class) === 'aro') ? 'foreign_key' : 'object_id';
 		$vars['data_name'] = $type;
-		$vars['table_name'] = $type . 's';
+		$vars['table_name'] = $type.'s';
 		$vars['class'] = $class;
 		return $vars;
 	}

lib/Cake/Console/Command/SchemaShell.php

Doc Comments +2 added lines, -2 removed lines

@@ -411,7 +411,7 @@ 
  * @param array $contents
  * @param string $event
  * @param CakeSchema $Schema
- * @return void
+ * @return null|false
  */
 	protected function _run($contents, $event, CakeSchema $Schema) {
 		if (empty($contents)) {
@@ -454,7 +454,7 @@ 
 /**
  * get the option parser
  *
- * @return void
+ * @return ConsoleOptionParser
  */
 	public function getOptionParser() {
 		$plugin = array(

Spacing +32 added lines, -32 removed lines

@@ -56,9 +56,9 @@ 
 		Configure::write('Cache.disable', 1);
 
 		$name = $path = $connection = $plugin = null;
-		if (!empty($this->params['name'])) {
+		if ( ! empty($this->params['name'])) {
 			$name = $this->params['name'];
-		} elseif (!empty($this->args[0]) && $this->args[0] !== 'snapshot') {
+		} elseif ( ! empty($this->args[0]) && $this->args[0] !== 'snapshot') {
 			$name = $this->params['name'] = $this->args[0];
 		}
 
@@ -79,14 +79,14 @@ 
 		}
 		$file = $this->params['file'];
 
-		if (!empty($this->params['path'])) {
+		if ( ! empty($this->params['path'])) {
 			$path = $this->params['path'];
 		}
 
-		if (!empty($this->params['connection'])) {
+		if ( ! empty($this->params['connection'])) {
 			$connection = $this->params['connection'];
 		}
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$plugin = $this->params['plugin'];
 			if (empty($name)) {
 				$name = $plugin;
@@ -103,12 +103,12 @@ 
  * @return void
  */
 	public function view() {
-		$File = new File($this->Schema->path . DS . $this->params['file']);
+		$File = new File($this->Schema->path.DS.$this->params['file']);
 		if ($File->exists()) {
 			$this->out($File->read());
 			return $this->_stop();
 		}
-		$file = $this->Schema->path . DS . $this->params['file'];
+		$file = $this->Schema->path.DS.$this->params['file'];
 		$this->err(__d('cake_console', 'Schema file (%s) could not be found.', $file));
 		return $this->_stop();
 	}
@@ -124,7 +124,7 @@ 
 		$options = array();
 		if ($this->params['force']) {
 			$options['models'] = false;
-		} elseif (!empty($this->params['models'])) {
+		} elseif ( ! empty($this->params['models'])) {
 			$options['models'] = String::tokenize($this->params['models']);
 		}
 
@@ -133,7 +133,7 @@ 
 			$snapshot = true;
 		}
 
-		if (!$snapshot && file_exists($this->Schema->path . DS . $this->params['file'])) {
+		if ( ! $snapshot && file_exists($this->Schema->path.DS.$this->params['file'])) {
 			$snapshot = true;
 			$prompt = __d('cake_console', "Schema file exists.\n [O]verwrite\n [S]napshot\n [Q]uit\nWould you like to do?");
 			$result = strtolower($this->in($prompt, array('o', 's', 'q'), 's'));
@@ -153,7 +153,7 @@ 
 
 		Configure::write('Cache.disable', $cacheDisable);
 
-		if (!empty($this->params['exclude']) && !empty($content)) {
+		if ( ! empty($this->params['exclude']) && ! empty($content)) {
 			$excluded = String::tokenize($this->params['exclude']);
 			foreach ($excluded as $table) {
 				unset($content['tables'][$table]);
@@ -171,9 +171,9 @@ 
 			}
 
 			$count = 0;
-			if (!empty($result[1])) {
+			if ( ! empty($result[1])) {
 				foreach ($result[1] as $file) {
-					if (preg_match('/' . preg_quote($fileName) . '(?:[_\d]*)?\.php$/', $file)) {
+					if (preg_match('/'.preg_quote($fileName).'(?:[_\d]*)?\.php$/', $file)) {
 						$count++;
 					}
 				}
@@ -185,7 +185,7 @@ 
 				}
 			}
 
-			$content['file'] = $fileName . '_' . $count . '.php';
+			$content['file'] = $fileName.'_'.$count.'.php';
 		}
 
 		if ($this->Schema->write($content)) {
@@ -208,11 +208,11 @@ 
 	public function dump() {
 		$write = false;
 		$Schema = $this->Schema->load();
-		if (!$Schema) {
+		if ( ! $Schema) {
 			$this->err(__d('cake_console', 'Schema could not be loaded'));
 			return $this->_stop();
 		}
-		if (!empty($this->params['write'])) {
+		if ( ! empty($this->params['write'])) {
 			if ($this->params['write'] == 1) {
 				$write = Inflector::underscore($this->Schema->name);
 			} else {
@@ -220,7 +220,7 @@ 
 			}
 		}
 		$db = ConnectionManager::getDataSource($this->Schema->connection);
-		$contents = "\n\n" . $db->dropSchema($Schema) . "\n\n" . $db->createSchema($Schema);
+		$contents = "\n\n".$db->dropSchema($Schema)."\n\n".$db->createSchema($Schema);
 
 		if ($write) {
 			if (strpos($write, '.sql') === false) {
@@ -229,7 +229,7 @@ 
 			if (strpos($write, DS) !== false) {
 				$File = new File($write, true);
 			} else {
-				$File = new File($this->Schema->path . DS . $write, true);
+				$File = new File($this->Schema->path.DS.$write, true);
 			}
 
 			if ($File->write($contents)) {
@@ -270,14 +270,14 @@ 
  */
 	protected function _loadSchema() {
 		$name = $plugin = null;
-		if (!empty($this->params['name'])) {
+		if ( ! empty($this->params['name'])) {
 			$name = $this->params['name'];
 		}
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$plugin = $this->params['plugin'];
 		}
 
-		if (!empty($this->params['dry'])) {
+		if ( ! empty($this->params['dry'])) {
 			$this->_dry = true;
 			$this->out(__d('cake_console', 'Performing a dry run.'));
 		}
@@ -287,16 +287,16 @@ 
 			'plugin' => $plugin,
 			'connection' => $this->params['connection'],
 		);
-		if (!empty($this->params['snapshot'])) {
+		if ( ! empty($this->params['snapshot'])) {
 			$fileName = rtrim($this->Schema->file, '.php');
-			$options['file'] = $fileName . '_' . $this->params['snapshot'] . '.php';
+			$options['file'] = $fileName.'_'.$this->params['snapshot'].'.php';
 		}
 
 		$Schema = $this->Schema->load($options);
 
-		if (!$Schema) {
+		if ( ! $Schema) {
 			$this->err(__d('cake_console', 'The chosen schema could not be loaded. Attempted to load:'));
-			$this->err(__d('cake_console', 'File: %s', $this->Schema->path . DS . $this->Schema->file));
+			$this->err(__d('cake_console', 'File: %s', $this->Schema->path.DS.$this->Schema->file));
 			$this->err(__d('cake_console', 'Name: %s', $this->Schema->name));
 			return $this->_stop();
 		}
@@ -320,7 +320,7 @@ 
 
 		$drop = $create = array();
 
-		if (!$table) {
+		if ( ! $table) {
 			foreach ($Schema->tables as $table => $fields) {
 				$drop[$table] = $db->dropSchema($Schema, $table);
 				$create[$table] = $db->createSchema($Schema, $table);
@@ -334,7 +334,7 @@ 
 			return $this->_stop();
 		}
 
-		$this->out("\n" . __d('cake_console', 'The following table(s) will be dropped.'));
+		$this->out("\n".__d('cake_console', 'The following table(s) will be dropped.'));
 		$this->out(array_keys($drop));
 
 		if ($this->in(__d('cake_console', 'Are you sure you want to drop the table(s)?'), array('y', 'n'), 'n') === 'y') {
@@ -342,7 +342,7 @@ 
 			$this->_run($drop, 'drop', $Schema);
 		}
 
-		$this->out("\n" . __d('cake_console', 'The following table(s) will be created.'));
+		$this->out("\n".__d('cake_console', 'The following table(s) will be created.'));
 		$this->out(array_keys($create));
 
 		if ($this->in(__d('cake_console', 'Are you sure you want to create the table(s)?'), array('y', 'n'), 'y') === 'y') {
@@ -394,7 +394,7 @@ 
 			return $this->_stop();
 		}
 
-		$this->out("\n" . __d('cake_console', 'The following statements will run.'));
+		$this->out("\n".__d('cake_console', 'The following statements will run.'));
 		$this->out(array_map('trim', $contents));
 		if ($this->in(__d('cake_console', 'Are you sure you want to alter the tables?'), array('y', 'n'), 'n') === 'y') {
 			$this->out();
@@ -429,19 +429,19 @@ 
 					$this->out(__d('cake_console', 'Dry run for %s :', $table));
 					$this->out($sql);
 				} else {
-					if (!$Schema->before(array($event => $table))) {
+					if ( ! $Schema->before(array($event => $table))) {
 						return false;
 					}
 					$error = null;
 					try {
 						$db->execute($sql);
 					} catch (PDOException $e) {
-						$error = $table . ': ' . $e->getMessage();
+						$error = $table.': '.$e->getMessage();
 					}
 
 					$Schema->after(array($event => $table, 'errors' => $error));
 
-					if (!empty($error)) {
+					if ( ! empty($error)) {
 						$this->err($error);
 					} else {
 						$this->out(__d('cake_console', '%s updated.', $table));
@@ -468,7 +468,7 @@ 
 		);
 		$path = array(
 			'help' => __d('cake_console', 'Path to read and write schema.php'),
-			'default' => APP . 'Config' . DS . 'Schema'
+			'default' => APP.'Config'.DS.'Schema'
 		);
 		$file = array(
 			'help' => __d('cake_console', 'File name to read and write.'),

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

Doc Comments +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
 /**
  * Interactive
  *
- * @return void
+ * @return false|string
  */
 	protected function _interactive() {
 		$this->interactive = true;

Spacing +19 added lines, -19 removed lines

@@ -61,7 +61,7 @@ 
 		}
 
 		if (isset($this->args[0])) {
-			if (!isset($this->connection)) {
+			if ( ! isset($this->connection)) {
 				$this->connection = 'default';
 			}
 			if (strtolower($this->args[0]) === 'all') {
@@ -71,15 +71,15 @@ 
 			$controller = $this->_controllerName($this->args[0]);
 			$actions = '';
 
-			if (!empty($this->params['public'])) {
-				$this->out(__d('cake_console', 'Baking basic crud methods for ') . $controller);
+			if ( ! empty($this->params['public'])) {
+				$this->out(__d('cake_console', 'Baking basic crud methods for ').$controller);
 				$actions .= $this->bakeActions($controller);
 			}
-			if (!empty($this->params['admin'])) {
+			if ( ! empty($this->params['admin'])) {
 				$admin = $this->Project->getPrefix();
 				if ($admin) {
 					$this->out(__d('cake_console', 'Adding %s methods', $admin));
-					$actions .= "\n" . $this->bakeActions($controller, $admin);
+					$actions .= "\n".$this->bakeActions($controller, $admin);
 				}
 			}
 			if (empty($actions)) {
@@ -106,7 +106,7 @@ 
 		$unitTestExists = $this->_checkUnitTest();
 
 		$admin = false;
-		if (!empty($this->params['admin'])) {
+		if ( ! empty($this->params['admin'])) {
 			$admin = $this->Project->getPrefix();
 		}
 
@@ -119,7 +119,7 @@ 
 				$actions = $this->bakeActions($controller);
 				if ($admin) {
 					$this->out(__d('cake_console', 'Adding %s methods', $admin));
-					$actions .= "\n" . $this->bakeActions($controller, $admin);
+					$actions .= "\n".$this->bakeActions($controller, $admin);
 				}
 				if ($this->bake($controller, $actions) && $unitTestExists) {
 					$this->bakeTest($controller);
@@ -128,7 +128,7 @@ 
 			}
 		}
 
-		if (!$controllersCreated) {
+		if ( ! $controllersCreated) {
 			$this->out(__d('cake_console', 'No Controllers were baked, Models need to exist before Controllers can be baked.'));
 		}
 	}
@@ -161,7 +161,7 @@ 
 		$wannaBakeCrud = 'y';
 
 		$question[] = __d('cake_console', "Would you like to build your controller interactively?");
-		if (file_exists($this->path . $controllerName . 'Controller.php')) {
+		if (file_exists($this->path.$controllerName.'Controller.php')) {
 			$question[] = __d('cake_console', "Warning: Choosing no will overwrite the %sController.", $controllerName);
 		}
 		$doItInteractive = $this->in(implode("\n", $question), array('y', 'n'), 'y');
@@ -252,12 +252,12 @@ 
 				$length = count($$var);
 				foreach ($$var as $i => $propElement) {
 					if ($i != $length - 1) {
-						$output .= ucfirst($propElement) . ', ';
+						$output .= ucfirst($propElement).', ';
 					} else {
 						$output .= ucfirst($propElement);
 					}
 				}
-				$this->out($title . "\n\t" . $output);
+				$this->out($title."\n\t".$output);
 			}
 		}
 		$this->hr();
@@ -294,8 +294,8 @@ 
 		if ($plugin) {
 			$plugin .= '.';
 		}
-		App::uses($modelImport, $plugin . 'Model');
-		if (!class_exists($modelImport)) {
+		App::uses($modelImport, $plugin.'Model');
+		if ( ! class_exists($modelImport)) {
 			$this->err(__d('cake_console', 'You must have a model for this class to build basic methods. Please try again.'));
 			return $this->_stop();
 		}
@@ -328,16 +328,16 @@ 
  * @return string Baked controller
  */
 	public function bake($controllerName, $actions = '', $helpers = null, $components = null) {
-		$this->out("\n" . __d('cake_console', 'Baking controller class for %s...', $controllerName), 1, Shell::QUIET);
+		$this->out("\n".__d('cake_console', 'Baking controller class for %s...', $controllerName), 1, Shell::QUIET);
 
 		$isScaffold = ($actions === 'scaffold') ? true : false;
 
 		$this->Template->set(array(
 			'plugin' => $this->plugin,
-			'pluginPath' => empty($this->plugin) ? '' : $this->plugin . '.'
+			'pluginPath' => empty($this->plugin) ? '' : $this->plugin.'.'
 		));
 
-		if (!in_array('Paginator', (array)$components)) {
+		if ( ! in_array('Paginator', (array) $components)) {
 			$components[] = 'Paginator';
 		}
 
@@ -345,7 +345,7 @@ 
 		$contents = $this->Template->generate('classes', 'controller');
 
 		$path = $this->getPath();
-		$filename = $path . $controllerName . 'Controller.php';
+		$filename = $path.$controllerName.'Controller.php';
 		if ($this->createFile($filename, $contents)) {
 			return $contents;
 		}
@@ -444,14 +444,14 @@ 
 		$controllers = $this->listAll($useDbConfig);
 		$enteredController = '';
 
-		while (!$enteredController) {
+		while ( ! $enteredController) {
 			$enteredController = $this->in(__d('cake_console', "Enter a number from the list above,\ntype in the name of another controller, or 'q' to exit"), null, 'q');
 			if ($enteredController === 'q') {
 				$this->out(__d('cake_console', 'Exit'));
 				return $this->_stop();
 			}
 
-			if (!$enteredController || intval($enteredController) > count($controllers)) {
+			if ( ! $enteredController || intval($enteredController) > count($controllers)) {
 				$this->err(__d('cake_console', "The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again."));
 				$enteredController = '';
 			}

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/PluginTask.php

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 /**
  * Execution method always used for tasks
  *
- * @return void
+ * @return false|null
  */
 	public function execute() {
 		if (isset($this->args[0])) {

Spacing +28 added lines, -28 removed lines

@@ -47,7 +47,7 @@ 
  */
 	public function initialize() {
 		$this->path = current(App::path('plugins'));
-		$this->bootstrap = APP . 'Config' . DS . 'bootstrap.php';
+		$this->bootstrap = APP.'Config'.DS.'bootstrap.php';
 	}
 
 /**
@@ -81,8 +81,8 @@ 
 			$plugin = $this->in(__d('cake_console', 'Enter the name of the plugin in CamelCase format'));
 		}
 
-		if (!$this->bake($plugin)) {
-			$this->error(__d('cake_console', "An error occurred trying to bake: %s in %s", $plugin, $this->path . $plugin));
+		if ( ! $this->bake($plugin)) {
+			$this->error(__d('cake_console', "An error occurred trying to bake: %s in %s", $plugin, $this->path.$plugin));
 		}
 	}
 
@@ -99,33 +99,33 @@ 
 		}
 		$this->hr();
 		$this->out(__d('cake_console', "<info>Plugin Name:</info> %s", $plugin));
-		$this->out(__d('cake_console', "<info>Plugin Directory:</info> %s", $this->path . $plugin));
+		$this->out(__d('cake_console', "<info>Plugin Directory:</info> %s", $this->path.$plugin));
 		$this->hr();
 
 		$looksGood = $this->in(__d('cake_console', 'Look okay?'), array('y', 'n', 'q'), 'y');
 
 		if (strtolower($looksGood) === 'y') {
-			$Folder = new Folder($this->path . $plugin);
+			$Folder = new Folder($this->path.$plugin);
 			$directories = array(
-				'Config' . DS . 'Schema',
-				'Model' . DS . 'Behavior',
-				'Model' . DS . 'Datasource',
-				'Console' . DS . 'Command' . DS . 'Task',
-				'Controller' . DS . 'Component',
+				'Config'.DS.'Schema',
+				'Model'.DS.'Behavior',
+				'Model'.DS.'Datasource',
+				'Console'.DS.'Command'.DS.'Task',
+				'Controller'.DS.'Component',
 				'Lib',
-				'View' . DS . 'Helper',
-				'Test' . DS . 'Case' . DS . 'Controller' . DS . 'Component',
-				'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper',
-				'Test' . DS . 'Case' . DS . 'Model' . DS . 'Behavior',
-				'Test' . DS . 'Fixture',
+				'View'.DS.'Helper',
+				'Test'.DS.'Case'.DS.'Controller'.DS.'Component',
+				'Test'.DS.'Case'.DS.'View'.DS.'Helper',
+				'Test'.DS.'Case'.DS.'Model'.DS.'Behavior',
+				'Test'.DS.'Fixture',
 				'Vendor',
 				'webroot'
 			);
 
 			foreach ($directories as $directory) {
-				$dirPath = $this->path . $plugin . DS . $directory;
+				$dirPath = $this->path.$plugin.DS.$directory;
 				$Folder->create($dirPath);
-				new File($dirPath . DS . 'empty', true);
+				new File($dirPath.DS.'empty', true);
 			}
 
 			foreach ($Folder->messages() as $message) {
@@ -133,33 +133,33 @@ 
 			}
 
 			$errors = $Folder->errors();
-			if (!empty($errors)) {
+			if ( ! empty($errors)) {
 				foreach ($errors as $message) {
 					$this->error($message);
 				}
 				return false;
 			}
 
-			$controllerFileName = $plugin . 'AppController.php';
+			$controllerFileName = $plugin.'AppController.php';
 
 			$out = "<?php\n\n";
 			$out .= "App::uses('AppController', 'Controller');\n\n";
 			$out .= "class {$plugin}AppController extends AppController {\n\n";
 			$out .= "}\n";
-			$this->createFile($this->path . $plugin . DS . 'Controller' . DS . $controllerFileName, $out);
+			$this->createFile($this->path.$plugin.DS.'Controller'.DS.$controllerFileName, $out);
 
-			$modelFileName = $plugin . 'AppModel.php';
+			$modelFileName = $plugin.'AppModel.php';
 
 			$out = "<?php\n\n";
 			$out .= "App::uses('AppModel', 'Model');\n\n";
 			$out .= "class {$plugin}AppModel extends AppModel {\n\n";
 			$out .= "}\n";
-			$this->createFile($this->path . $plugin . DS . 'Model' . DS . $modelFileName, $out);
+			$this->createFile($this->path.$plugin.DS.'Model'.DS.$modelFileName, $out);
 
 			$this->_modifyBootstrap($plugin);
 
 			$this->hr();
-			$this->out(__d('cake_console', '<success>Created:</success> %s in %s', $plugin, $this->path . $plugin), 2);
+			$this->out(__d('cake_console', '<success>Created:</success> %s in %s', $plugin, $this->path.$plugin), 2);
 		}
 
 		return true;
@@ -174,7 +174,7 @@ 
 	protected function _modifyBootstrap($plugin) {
 		$bootstrap = new File($this->bootstrap, false);
 		$contents = $bootstrap->read();
-		if (!preg_match("@\n\s*CakePlugin::loadAll@", $contents)) {
+		if ( ! preg_match("@\n\s*CakePlugin::loadAll@", $contents)) {
 			$bootstrap->append("\nCakePlugin::load('$plugin', array('bootstrap' => false, 'routes' => false));\n");
 			$this->out('');
 			$this->out(__d('cake_dev', '%s modified', $this->bootstrap));
@@ -190,16 +190,16 @@ 
 	public function findPath($pathOptions) {
 		$valid = false;
 		foreach ($pathOptions as $i => $path) {
-			if (!is_dir($path)) {
+			if ( ! is_dir($path)) {
 				unset($pathOptions[$i]);
 			}
 		}
 		$pathOptions = array_values($pathOptions);
 
 		$max = count($pathOptions);
-		while (!$valid) {
+		while ( ! $valid) {
 			foreach ($pathOptions as $i => $option) {
-				$this->out($i + 1 . '. ' . $option);
+				$this->out($i + 1.'. '.$option);
 			}
 			$prompt = __d('cake_console', 'Choose a plugin path from the paths above.');
 			$choice = $this->in($prompt, null, 1);
@@ -218,7 +218,7 @@ 
 	public function getOptionParser() {
 		$parser = parent::getOptionParser();
 		return $parser->description(__d('cake_console',
-			'Create the directory structure, AppModel and AppController classes for a new plugin. ' .
+			'Create the directory structure, AppModel and AppController classes for a new plugin. '.
 			'Can create plugins in any of your bootstrapped plugin paths.'
 		))->addArgument('name', array(
 			'help' => __d('cake_console', 'CamelCased name of the plugin to create.')

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