reginaldojunior / winners

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

Spacing +21 added lines, -21 removed lines

@@ -56,7 +56,7 @@ 
  */
 	public function __construct($stdout = null, $stderr = null, $stdin = null) {
 		parent::__construct($stdout, $stderr, $stdin);
-		$this->path = APP . 'Test' . DS . 'Fixture' . DS;
+		$this->path = APP.'Test'.DS.'Fixture'.DS;
 	}
 
 /**
@@ -112,7 +112,7 @@ 
 
 		if (isset($this->args[0])) {
 			$this->interactive = false;
-			if (!isset($this->connection)) {
+			if ( ! isset($this->connection)) {
 				$this->connection = 'default';
 			}
 			if (strtolower($this->args[0]) === 'all') {
@@ -136,7 +136,7 @@ 
 		foreach ($tables as $table) {
 			$model = $this->_modelName($table);
 			$importOptions = array();
-			if (!empty($this->params['schema'])) {
+			if ( ! empty($this->params['schema'])) {
 				$importOptions['schema'] = $model;
 			}
 			$this->bake($model, false, $importOptions);
@@ -154,7 +154,7 @@ 
 		$this->out(__d('cake_console', "Bake Fixture\nPath: %s", $this->getPath()));
 		$this->hr();
 
-		if (!isset($this->connection)) {
+		if ( ! isset($this->connection)) {
 			$this->connection = $this->DbConfig->getConfig();
 		}
 		$modelName = $this->Model->getName($this->connection);
@@ -172,7 +172,7 @@ 
 	public function importOptions($modelName) {
 		$options = array();
 
-		if (!empty($this->params['schema'])) {
+		if ( ! empty($this->params['schema'])) {
 			$options['schema'] = $modelName;
 		} else {
 			$doSchema = $this->in(__d('cake_console', 'Would you like to import schema for this fixture?'), array('y', 'n'), 'n');
@@ -180,7 +180,7 @@ 
 				$options['schema'] = $modelName;
 			}
 		}
-		if (!empty($this->params['records'])) {
+		if ( ! empty($this->params['records'])) {
 			$doRecords = 'y';
 		} else {
 			$doRecords = $this->in(__d('cake_console', 'Would you like to use record importing for this fixture?'), array('y', 'n'), 'n');
@@ -211,13 +211,13 @@ 
 		$table = $schema = $records = $import = $modelImport = null;
 		$importBits = array();
 
-		if (!$useTable) {
+		if ( ! $useTable) {
 			$useTable = Inflector::tableize($model);
 		} elseif ($useTable != Inflector::tableize($model)) {
 			$table = $useTable;
 		}
 
-		if (!empty($importOptions)) {
+		if ( ! empty($importOptions)) {
 			if (isset($importOptions['schema'])) {
 				$modelImport = true;
 				$importBits[] = "'model' => '{$importOptions['schema']}'";
@@ -228,15 +228,15 @@ 
 			if ($this->connection !== 'default') {
 				$importBits[] .= "'connection' => '{$this->connection}'";
 			}
-			if (!empty($importBits)) {
+			if ( ! empty($importBits)) {
 				$import = sprintf("array(%s)", implode(', ', $importBits));
 			}
 		}
 
 		$this->_Schema = new CakeSchema();
 		$data = $this->_Schema->read(array('models' => false, 'connection' => $this->connection));
-		if (!isset($data['tables'][$useTable])) {
-			$this->error('Could not find your selected table ' . $useTable);
+		if ( ! isset($data['tables'][$useTable])) {
+			$this->error('Could not find your selected table '.$useTable);
 			return false;
 		}
 
@@ -245,14 +245,14 @@ 
 			$schema = $this->_generateSchema($tableInfo);
 		}
 
-		if (empty($importOptions['records']) && !isset($importOptions['fromTable'])) {
+		if (empty($importOptions['records']) && ! isset($importOptions['fromTable'])) {
 			$recordCount = 1;
 			if (isset($this->params['count'])) {
 				$recordCount = $this->params['count'];
 			}
 			$records = $this->_makeRecordString($this->_generateRecords($tableInfo, $recordCount));
 		}
-		if (!empty($this->params['records']) || isset($importOptions['fromTable'])) {
+		if ( ! empty($this->params['records']) || isset($importOptions['fromTable'])) {
 			$records = $this->_makeRecordString($this->_getRecordsFromTable($model, $useTable));
 		}
 		$out = $this->generateFixtureFile($model, compact('records', 'table', 'schema', 'import'));
@@ -271,14 +271,14 @@ 
 		$vars = array_merge($defaults, $otherVars);
 
 		$path = $this->getPath();
-		$filename = Inflector::camelize($model) . 'Fixture.php';
+		$filename = Inflector::camelize($model).'Fixture.php';
 
 		$this->Template->set('model', $model);
 		$this->Template->set($vars);
 		$content = $this->Template->generate('classes', 'fixture');
 
-		$this->out("\n" . __d('cake_console', 'Baking test fixture for %s...', $model), 1, Shell::QUIET);
-		$this->createFile($path . $filename, $content);
+		$this->out("\n".__d('cake_console', 'Baking test fixture for %s...', $model), 1, Shell::QUIET);
+		$this->createFile($path.$filename, $content);
 		return $content;
 	}
 
@@ -290,7 +290,7 @@ 
 	public function getPath() {
 		$path = $this->path;
 		if (isset($this->plugin)) {
-			$path = $this->_pluginPath($this->plugin) . 'Test' . DS . 'Fixture' . DS;
+			$path = $this->_pluginPath($this->plugin).'Test'.DS.'Fixture'.DS;
 		}
 		return $path;
 	}
@@ -337,8 +337,8 @@ 
 							$insert = String::uuid();
 						} else {
 							$insert = "Lorem ipsum dolor sit amet";
-							if (!empty($fieldInfo['length'])) {
-								$insert = substr($insert, 0, (int)$fieldInfo['length'] - 2);
+							if ( ! empty($fieldInfo['length'])) {
+								$insert = substr($insert, 0, (int) $fieldInfo['length'] - 2);
 							}
 						}
 						break;
@@ -411,7 +411,7 @@ 
 		if ($this->interactive) {
 			$condition = null;
 			$prompt = __d('cake_console', "Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1");
-			while (!$condition) {
+			while ( ! $condition) {
 				$condition = $this->in($prompt, null, 'WHERE 1=1');
 			}
 			$prompt = __d('cake_console', "How many records do you want to import?");
@@ -433,7 +433,7 @@ 
 			$row = array();
 			foreach ($record[$modelObject->alias] as $field => $value) {
 				if ($schema[$field]['type'] === 'boolean') {
-					$value = (int)(bool)$value;
+					$value = (int) (bool) $value;
 				}
 				$row[$field] = $value;
 			}

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

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

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

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

Spacing +19 added lines, -19 removed lines

@@ -83,7 +83,7 @@ 
 	public function execute() {
 		parent::execute();
 		$count = count($this->args);
-		if (!$count) {
+		if ( ! $count) {
 			$this->_interactive();
 		}
 
@@ -114,7 +114,7 @@ 
 
 		if ($type) {
 			$type = Inflector::camelize($type);
-			if (!isset($this->classTypes[$type])) {
+			if ( ! isset($this->classTypes[$type])) {
 				$this->error(__d('cake_console', 'Incorrect type provided. Please choose one of %s', implode(', ', array_keys($this->classTypes))));
 			}
 		} else {
@@ -134,7 +134,7 @@ 
 	public function bake($type, $className) {
 		$plugin = null;
 		if ($this->plugin) {
-			$plugin = $this->plugin . '.';
+			$plugin = $this->plugin.'.';
 		}
 
 		$realType = $this->mapType($type, $plugin);
@@ -159,7 +159,7 @@ 
 		list($preConstruct, $construction, $postConstruct) = $this->generateConstructor($type, $fullClassName, $plugin);
 		$uses = $this->generateUses($type, $realType, $fullClassName);
 
-		$this->out("\n" . __d('cake_console', 'Baking test case for %s %s ...', $className, $type), 1, Shell::QUIET);
+		$this->out("\n".__d('cake_console', 'Baking test case for %s %s ...', $className, $type), 1, Shell::QUIET);
 
 		$this->Template->set('fixtures', $this->_fixtures);
 		$this->Template->set('plugin', $plugin);
@@ -191,7 +191,7 @@ 
 		$keys = array();
 		$i = 0;
 		foreach ($this->classTypes as $option => $package) {
-			$this->out(++$i . '. ' . $option);
+			$this->out(++$i.'. '.$option);
 			$keys[] = $i;
 		}
 		$keys[] = 'q';
@@ -214,15 +214,15 @@ 
 		$typeLength = strlen($type);
 		$type = $this->classTypes[$type];
 		if ($this->plugin) {
-			$plugin = $this->plugin . '.';
-			$options = App::objects($plugin . $type);
+			$plugin = $this->plugin.'.';
+			$options = App::objects($plugin.$type);
 		} else {
 			$options = App::objects($type);
 		}
 		$this->out(__d('cake_console', 'Choose a %s class', $objectType));
 		$keys = array();
 		foreach ($options as $key => $option) {
-			$this->out(++$key . '. ' . $option);
+			$this->out(++$key.'. '.$option);
 			$keys[] = $key;
 		}
 		while (empty($selection)) {
@@ -305,7 +305,7 @@ 
 		if ($position !== false && (strlen($class) - $position) === strlen($type)) {
 			return $class;
 		}
-		return $class . $type;
+		return $class.$type;
 	}
 
 /**
@@ -323,7 +323,7 @@ 
 		}
 		$real = $this->classTypes[$type];
 		if ($plugin) {
-			$real = trim($plugin, '.') . '.' . $real;
+			$real = trim($plugin, '.').'.'.$real;
 		}
 		return $real;
 	}
@@ -392,16 +392,16 @@ 
 		$associated = $subject->getAssociated();
 		foreach ($associated as $alias => $type) {
 			$className = $subject->{$alias}->name;
-			if (!isset($this->_fixtures[$className])) {
+			if ( ! isset($this->_fixtures[$className])) {
 				$this->_processModel($subject->{$alias});
 			}
 			if ($type === 'hasAndBelongsToMany') {
-				if (!empty($subject->hasAndBelongsToMany[$alias]['with'])) {
+				if ( ! empty($subject->hasAndBelongsToMany[$alias]['with'])) {
 					list(, $joinModel) = pluginSplit($subject->hasAndBelongsToMany[$alias]['with']);
 				} else {
 					$joinModel = Inflector::classify($subject->hasAndBelongsToMany[$alias]['joinTable']);
 				}
-				if (!isset($this->_fixtures[$joinModel])) {
+				if ( ! isset($this->_fixtures[$joinModel])) {
 					$this->_processModel($subject->{$joinModel});
 				}
 			}
@@ -418,7 +418,7 @@ 
 	protected function _processController($subject) {
 		$subject->constructClasses();
 		$models = array(Inflector::classify($subject->name));
-		if (!empty($subject->uses)) {
+		if ( ! empty($subject->uses)) {
 			$models = $subject->uses;
 		}
 		foreach ($models as $model) {
@@ -436,11 +436,11 @@ 
  */
 	protected function _addFixture($name) {
 		if ($this->plugin) {
-			$prefix = 'plugin.' . Inflector::underscore($this->plugin) . '.';
+			$prefix = 'plugin.'.Inflector::underscore($this->plugin).'.';
 		} else {
 			$prefix = 'app.';
 		}
-		$fixture = $prefix . Inflector::underscore($name);
+		$fixture = $prefix.Inflector::underscore($name);
 		$this->_fixtures[$name] = $fixture;
 	}
 
@@ -533,13 +533,13 @@ 
  * @return string filename the test should be created on.
  */
 	public function testCaseFileName($type, $className) {
-		$path = $this->getPath() . 'Case' . DS;
+		$path = $this->getPath().'Case'.DS;
 		$type = Inflector::camelize($type);
 		if (isset($this->classTypes[$type])) {
-			$path .= $this->classTypes[$type] . DS;
+			$path .= $this->classTypes[$type].DS;
 		}
 		$className = $this->getRealClassName($type, $className);
-		return str_replace('/', DS, $path) . Inflector::camelize($className) . 'Test.php';
+		return str_replace('/', DS, $path).Inflector::camelize($className).'Test.php';
 	}
 
 /**

lib/Cake/Console/Command/UpgradeShell.php

Spacing +58 added lines, -58 removed lines

@@ -71,7 +71,7 @@ 
 		if ($this->params['dry-run']) {
 			$this->out(__d('cake_console', '<warning>Dry-run mode enabled!</warning>'), 1, Shell::QUIET);
 		}
-		if ($this->params['git'] && !is_dir('.git')) {
+		if ($this->params['git'] && ! is_dir('.git')) {
 			$this->out(__d('cake_console', '<warning>No git repository detected!</warning>'), 1, Shell::QUIET);
 		}
 	}
@@ -100,9 +100,9 @@ 
  * @return void
  */
 	public function tests() {
-		$this->_paths = array(APP . 'tests' . DS);
-		if (!empty($this->params['plugin'])) {
-			$this->_paths = array(App::pluginPath($this->params['plugin']) . 'tests' . DS);
+		$this->_paths = array(APP.'tests'.DS);
+		if ( ! empty($this->params['plugin'])) {
+			$this->_paths = array(App::pluginPath($this->params['plugin']).'tests'.DS);
 		}
 		$patterns = array(
 			array(
@@ -127,7 +127,7 @@ 
 	public function locations() {
 		$cwd = getcwd();
 
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			chdir(App::pluginPath($this->params['plugin']));
 		}
 
@@ -135,7 +135,7 @@ 
 			$Folder = new Folder('plugins');
 			list($plugins) = $Folder->read();
 			foreach ($plugins as $plugin) {
-				chdir($cwd . DS . 'plugins' . DS . $plugin);
+				chdir($cwd.DS.'plugins'.DS.$plugin);
 				$this->out(__d('cake_console', 'Upgrading locations for plugin %s', $plugin));
 				$this->locations();
 			}
@@ -145,24 +145,24 @@ 
 		}
 		$moves = array(
 			'config' => 'Config',
-			'Config' . DS . 'schema' => 'Config' . DS . 'Schema',
+			'Config'.DS.'schema' => 'Config'.DS.'Schema',
 			'libs' => 'Lib',
 			'tests' => 'Test',
 			'views' => 'View',
 			'models' => 'Model',
-			'Model' . DS . 'behaviors' => 'Model' . DS . 'Behavior',
-			'Model' . DS . 'datasources' => 'Model' . DS . 'Datasource',
-			'Test' . DS . 'cases' => 'Test' . DS . 'Case',
-			'Test' . DS . 'fixtures' => 'Test' . DS . 'Fixture',
-			'vendors' . DS . 'shells' . DS . 'templates' => 'Console' . DS . 'Templates',
+			'Model'.DS.'behaviors' => 'Model'.DS.'Behavior',
+			'Model'.DS.'datasources' => 'Model'.DS.'Datasource',
+			'Test'.DS.'cases' => 'Test'.DS.'Case',
+			'Test'.DS.'fixtures' => 'Test'.DS.'Fixture',
+			'vendors'.DS.'shells'.DS.'templates' => 'Console'.DS.'Templates',
 		);
 		foreach ($moves as $old => $new) {
 			if (is_dir($old)) {
 				$this->out(__d('cake_console', 'Moving %s to %s', $old, $new));
-				if (!$this->params['dry-run']) {
+				if ( ! $this->params['dry-run']) {
 					if ($this->params['git']) {
-						exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($old . '__'));
-						exec('git mv -f ' . escapeshellarg($old . '__') . ' ' . escapeshellarg($new));
+						exec('git mv -f '.escapeshellarg($old).' '.escapeshellarg($old.'__'));
+						exec('git mv -f '.escapeshellarg($old.'__').' '.escapeshellarg($new));
 					} else {
 						$Folder = new Folder($old);
 						$Folder->move($new);
@@ -214,8 +214,8 @@ 
 	public function helpers() {
 		$this->_paths = array_diff(App::path('views'), App::core('views'));
 
-		if (!empty($this->params['plugin'])) {
-			$this->_paths = array(App::pluginPath($this->params['plugin']) . 'views' . DS);
+		if ( ! empty($this->params['plugin'])) {
+			$this->_paths = array(App::pluginPath($this->params['plugin']).'views'.DS);
 		}
 
 		$patterns = array();
@@ -229,7 +229,7 @@ 
 			CakePlugin::load($plugin);
 			$pluginHelpers = array_merge(
 				$pluginHelpers,
-				App::objects('helper', App::pluginPath($plugin) . DS . 'views' . DS . 'helpers' . DS, false)
+				App::objects('helper', App::pluginPath($plugin).DS.'views'.DS.'helpers'.DS, false)
 			);
 		}
 		$helpers = array_merge($pluginHelpers, $helpers);
@@ -259,7 +259,7 @@ 
 		$this->_paths = array(
 			APP
 		);
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$this->_paths = array(App::pluginPath($this->params['plugin']));
 		}
 
@@ -298,7 +298,7 @@ 
 		$this->_paths = array(
 			APP
 		);
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$this->_paths = array(App::pluginPath($this->params['plugin']));
 		}
 		$patterns = array(
@@ -353,12 +353,12 @@ 
 
 		$this->_paths = array_merge($views, $controllers, $components);
 
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$pluginPath = App::pluginPath($this->params['plugin']);
 			$this->_paths = array(
-				$pluginPath . 'controllers' . DS,
-				$pluginPath . 'controllers' . DS . 'components' . DS,
-				$pluginPath . 'views' . DS,
+				$pluginPath.'controllers'.DS,
+				$pluginPath.'controllers'.DS.'components'.DS,
+				$pluginPath.'views'.DS,
 			);
 		}
 		$patterns = array(
@@ -405,7 +405,7 @@ 
 		$this->_paths = array(
 			APP
 		);
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$this->_paths = array(App::pluginPath($this->params['plugin']));
 		}
 		$patterns = array(
@@ -427,7 +427,7 @@ 
 		$this->_paths = array(
 			APP
 		);
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$this->_paths = array(App::pluginPath($this->params['plugin']));
 		}
 		$patterns = array(
@@ -509,7 +509,7 @@ 
  */
 	public function components() {
 		$this->_paths = App::Path('Controller/Component');
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$this->_paths = App::Path('Controller/Component', $this->params['plugin']);
 		}
 		$patterns = array(
@@ -534,11 +534,11 @@ 
 
 		$this->_paths = array_merge($controllers, $components);
 
-		if (!empty($this->params['plugin'])) {
+		if ( ! empty($this->params['plugin'])) {
 			$pluginPath = App::pluginPath($this->params['plugin']);
 			$this->_paths = array(
-				$pluginPath . 'controllers' . DS,
-				$pluginPath . 'controllers' . DS . 'components' . DS,
+				$pluginPath.'controllers'.DS,
+				$pluginPath.'controllers'.DS.'components'.DS,
 			);
 		}
 		$patterns = array(
@@ -569,27 +569,27 @@ 
  * @return void
  */
 	protected function _moveViewFiles() {
-		if (!is_dir('View')) {
+		if ( ! is_dir('View')) {
 			return;
 		}
 
 		$dirs = scandir('View');
 		foreach ($dirs as $old) {
-			if (!is_dir('View' . DS . $old) || $old === '.' || $old === '..') {
+			if ( ! is_dir('View'.DS.$old) || $old === '.' || $old === '..') {
 				continue;
 			}
 
-			$new = 'View' . DS . Inflector::camelize($old);
-			$old = 'View' . DS . $old;
+			$new = 'View'.DS.Inflector::camelize($old);
+			$old = 'View'.DS.$old;
 			if ($new === $old) {
 				continue;
 			}
 
 			$this->out(__d('cake_console', 'Moving %s to %s', $old, $new));
-			if (!$this->params['dry-run']) {
+			if ( ! $this->params['dry-run']) {
 				if ($this->params['git']) {
-					exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($old . '__'));
-					exec('git mv -f ' . escapeshellarg($old . '__') . ' ' . escapeshellarg($new));
+					exec('git mv -f '.escapeshellarg($old).' '.escapeshellarg($old.'__'));
+					exec('git mv -f '.escapeshellarg($old.'__').' '.escapeshellarg($new));
 				} else {
 					$Folder = new Folder($old);
 					$Folder->move($new);
@@ -605,10 +605,10 @@ 
  */
 	protected function _moveAppClasses() {
 		$files = array(
-			APP . 'app_controller.php' => APP . 'Controller' . DS . 'AppController.php',
-			APP . 'controllers' . DS . 'app_controller.php' => APP . 'Controller' . DS . 'AppController.php',
-			APP . 'app_model.php' => APP . 'Model' . DS . 'AppModel.php',
-			APP . 'models' . DS . 'app_model.php' => APP . 'Model' . DS . 'AppModel.php',
+			APP.'app_controller.php' => APP.'Controller'.DS.'AppController.php',
+			APP.'controllers'.DS.'app_controller.php' => APP.'Controller'.DS.'AppController.php',
+			APP.'app_model.php' => APP.'Model'.DS.'AppModel.php',
+			APP.'models'.DS.'app_model.php' => APP.'Model'.DS.'AppModel.php',
 		);
 		foreach ($files as $old => $new) {
 			if (file_exists($old)) {
@@ -618,8 +618,8 @@ 
 					continue;
 				}
 				if ($this->params['git']) {
-					exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($old . '__'));
-					exec('git mv -f ' . escapeshellarg($old . '__') . ' ' . escapeshellarg($new));
+					exec('git mv -f '.escapeshellarg($old).' '.escapeshellarg($old.'__'));
+					exec('git mv -f '.escapeshellarg($old.'__').' '.escapeshellarg($new));
 				} else {
 					rename($old, $new);
 				}
@@ -638,7 +638,7 @@ 
  * @return void
  */
 	protected function _movePhpFiles($path, $options) {
-		if (!is_dir($path)) {
+		if ( ! is_dir($path)) {
 			return;
 		}
 
@@ -659,11 +659,11 @@ 
 
 		$cwd = getcwd();
 		foreach ($this->_files as &$file) {
-			$file = $cwd . DS . $file;
+			$file = $cwd.DS.$file;
 
 			$contents = file_get_contents($file);
 			preg_match($options['regex'], $contents, $match);
-			if (!$match) {
+			if ( ! $match) {
 				continue;
 			}
 
@@ -681,18 +681,18 @@ 
 			}
 
 			preg_match('@^.*[\\\/]plugins[\\\/](.*?)[\\\/]@', $file, $match);
-			$base = $cwd . DS;
+			$base = $cwd.DS;
 			$plugin = false;
 			if ($match) {
 				$base = $match[0];
 				$plugin = $match[1];
 			}
 
-			if ($options['checkFolder'] && !empty($this->_map[$type])) {
+			if ($options['checkFolder'] && ! empty($this->_map[$type])) {
 				$folder = str_replace('/', DS, $this->_map[$type]);
-				$new = $base . $folder . DS . $class . '.php';
+				$new = $base.$folder.DS.$class.'.php';
 			} else {
-				$new = dirname($file) . DS . $class . '.php';
+				$new = dirname($file).DS.$class.'.php';
 			}
 
 			if ($file === $new) {
@@ -700,15 +700,15 @@ 
 			}
 
 			$dir = dirname($new);
-			if (!is_dir($dir)) {
+			if ( ! is_dir($dir)) {
 				new Folder($dir, true);
 			}
 
 			$this->out(__d('cake_console', 'Moving %s to %s', $file, $new), 1, Shell::VERBOSE);
-			if (!$this->params['dry-run']) {
+			if ( ! $this->params['dry-run']) {
 				if ($this->params['git']) {
-					exec('git mv -f ' . escapeshellarg($file) . ' ' . escapeshellarg($file . '__'));
-					exec('git mv -f ' . escapeshellarg($file . '__') . ' ' . escapeshellarg($new));
+					exec('git mv -f '.escapeshellarg($file).' '.escapeshellarg($file.'__'));
+					exec('git mv -f '.escapeshellarg($file.'__').' '.escapeshellarg($new));
 				} else {
 					rename($file, $new);
 				}
@@ -741,12 +741,12 @@ 
 	protected function _findFiles($extensions = '') {
 		$this->_files = array();
 		foreach ($this->_paths as $path) {
-			if (!is_dir($path)) {
+			if ( ! is_dir($path)) {
 				continue;
 			}
 			$Iterator = new RegexIterator(
 				new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)),
-				'/^.+\.(' . $extensions . ')$/i',
+				'/^.+\.('.$extensions.')$/i',
 				RegexIterator::MATCH
 			);
 			foreach ($Iterator as $file) {
@@ -773,7 +773,7 @@ 
 		}
 
 		$this->out(__d('cake_console', 'Done updating %s', $file), 1);
-		if (!$this->params['dry-run']) {
+		if ( ! $this->params['dry-run']) {
 			file_put_contents($file, $contents);
 		}
 	}
@@ -809,7 +809,7 @@ 
 		);
 
 		return parent::getOptionParser()
-			->description(__d('cake_console', "A shell to help automate upgrading from CakePHP 1.3 to 2.0. \n" .
+			->description(__d('cake_console', "A shell to help automate upgrading from CakePHP 1.3 to 2.0. \n".
 				"Be sure to have a backup of your application before running these commands."))
 			->addSubcommand('all', array(
 				'help' => __d('cake_console', 'Run all upgrade commands.'),

lib/Cake/Console/ConsoleErrorHandler.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 		$message = __d('cake_console', '%s in [%s, line %s]', $description, $file, $line);
 		$stderr->write(__d('cake_console', "<error>%s Error:</error> %s\n", $name, $message));
 
-		if (!Configure::read('debug')) {
+		if ( ! Configure::read('debug')) {
 			CakeLog::write($log, $message);
 		}
 

lib/Cake/Console/ConsoleInput.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	public function read() {
 		if ($this->_canReadline) {
 			$line = readline('');
-			if (!empty($line)) {
+			if ( ! empty($line)) {
 				readline_add_history($line);
 			}
 			return $line;

lib/Cake/Console/ConsoleInputArgument.php

Spacing +9 added lines, -9 removed lines

@@ -63,7 +63,7 @@ 
 	public function __construct($name, $help = '', $required = false, $choices = array()) {
 		if (is_array($name) && isset($name['name'])) {
 			foreach ($name as $key => $value) {
-				$this->{'_' . $key} = $value;
+				$this->{'_'.$key} = $value;
 			}
 		} else {
 			$this->_name = $name;
@@ -94,10 +94,10 @@ 
 			$name = str_pad($name, $width, ' ');
 		}
 		$optional = '';
-		if (!$this->isRequired()) {
+		if ( ! $this->isRequired()) {
 			$optional = __d('cake_console', ' <comment>(optional)</comment>');
 		}
-		if (!empty($this->_choices)) {
+		if ( ! empty($this->_choices)) {
 			$optional .= __d('cake_console', ' <comment>(choices: %s)</comment>', implode('|', $this->_choices));
 		}
 		return sprintf('%s%s%s', $name, $this->_help, $optional);
@@ -110,12 +110,12 @@ 
  */
 	public function usage() {
 		$name = $this->_name;
-		if (!empty($this->_choices)) {
+		if ( ! empty($this->_choices)) {
 			$name = implode('|', $this->_choices);
 		}
-		$name = '<' . $name . '>';
-		if (!$this->isRequired()) {
-			$name = '[' . $name . ']';
+		$name = '<'.$name.'>';
+		if ( ! $this->isRequired()) {
+			$name = '['.$name.']';
 		}
 		return $name;
 	}
@@ -126,7 +126,7 @@ 
  * @return boolean
  */
 	public function isRequired() {
-		return (bool)$this->_required;
+		return (bool) $this->_required;
 	}
 
 /**
@@ -140,7 +140,7 @@ 
 		if (empty($this->_choices)) {
 			return true;
 		}
-		if (!in_array($value, $this->_choices)) {
+		if ( ! in_array($value, $this->_choices)) {
 			throw new ConsoleException(
 				__d('cake_console', '"%s" is not a valid value for %s. Please use one of "%s"',
 				$value, $this->_name, implode(', ', $this->_choices)

lib/Cake/Console/ConsoleInputOption.php

Spacing +14 added lines, -14 removed lines

@@ -80,7 +80,7 @@ 
 	public function __construct($name, $short = null, $help = '', $boolean = false, $default = '', $choices = array()) {
 		if (is_array($name) && isset($name['name'])) {
 			foreach ($name as $key => $value) {
-				$this->{'_' . $key} = $value;
+				$this->{'_'.$key} = $value;
 			}
 		} else {
 			$this->_name = $name;
@@ -123,14 +123,14 @@ 
  */
 	public function help($width = 0) {
 		$default = $short = '';
-		if (!empty($this->_default) && $this->_default !== true) {
+		if ( ! empty($this->_default) && $this->_default !== true) {
 			$default = __d('cake_console', ' <comment>(default: %s)</comment>', $this->_default);
 		}
-		if (!empty($this->_choices)) {
+		if ( ! empty($this->_choices)) {
 			$default .= __d('cake_console', ' <comment>(choices: %s)</comment>', implode('|', $this->_choices));
 		}
-		if (!empty($this->_short)) {
-			$short = ', -' . $this->_short;
+		if ( ! empty($this->_short)) {
+			$short = ', -'.$this->_short;
 		}
 		$name = sprintf('--%s%s', $this->_name, $short);
 		if (strlen($name) < $width) {
@@ -145,13 +145,13 @@ 
  * @return string
  */
 	public function usage() {
-		$name = empty($this->_short) ? '--' . $this->_name : '-' . $this->_short;
+		$name = empty($this->_short) ? '--'.$this->_name : '-'.$this->_short;
 		$default = '';
-		if (!empty($this->_default) && $this->_default !== true) {
-			$default = ' ' . $this->_default;
+		if ( ! empty($this->_default) && $this->_default !== true) {
+			$default = ' '.$this->_default;
 		}
-		if (!empty($this->_choices)) {
-			$default = ' ' . implode('|', $this->_choices);
+		if ( ! empty($this->_choices)) {
+			$default = ' '.implode('|', $this->_choices);
 		}
 		return sprintf('[%s%s]', $name, $default);
 	}
@@ -171,7 +171,7 @@ 
  * @return boolean
  */
 	public function isBoolean() {
-		return (bool)$this->_boolean;
+		return (bool) $this->_boolean;
 	}
 
 /**
@@ -185,7 +185,7 @@ 
 		if (empty($this->_choices)) {
 			return true;
 		}
-		if (!in_array($value, $this->_choices)) {
+		if ( ! in_array($value, $this->_choices)) {
 			throw new ConsoleException(
 				__d('cake_console', '"%s" is not a valid value for --%s. Please use one of "%s"',
 				$value, $this->_name, implode(', ', $this->_choices)
@@ -202,12 +202,12 @@ 
  */
 	public function xml(SimpleXmlElement $parent) {
 		$option = $parent->addChild('option');
-		$option->addAttribute('name', '--' . $this->_name);
+		$option->addAttribute('name', '--'.$this->_name);
 		$short = '';
 		if (strlen($this->_short)) {
 			$short = $this->_short;
 		}
-		$option->addAttribute('short', '-' . $short);
+		$option->addAttribute('short', '-'.$short);
 		$option->addAttribute('boolean', $this->_boolean);
 		$option->addChild('default', $this->_default);
 		$choices = $option->addChild('choices');

lib/Cake/Console/ConsoleInputSubcommand.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	public function __construct($name, $help = '', $parser = null) {
 		if (is_array($name) && isset($name['name'])) {
 			foreach ($name as $key => $value) {
-				$this->{'_' . $key} = $value;
+				$this->{'_'.$key} = $value;
 			}
 		} else {
 			$this->_name = $name;
@@ -89,7 +89,7 @@ 
 		if (strlen($name) < $width) {
 			$name = str_pad($name, $width, ' ');
 		}
-		return $name . $this->_help;
+		return $name.$this->_help;
 	}
 
 /**