reginaldojunior / winners

lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php

Spacing +89 added lines, -89 removed lines

@@ -47,7 +47,7 @@ 
 			array('in', 'err', 'createFile', '_stop'),
 			array($out, $out, $in)
 		);
-		$this->Task->path = TMP . 'tests' . DS;
+		$this->Task->path = TMP.'tests'.DS;
 	}
 
 /**
@@ -58,7 +58,7 @@ 
 	public function tearDown() {
 		parent::tearDown();
 
-		$Folder = new Folder($this->Task->path . 'bake_test_app');
+		$Folder = new Folder($this->Task->path.'bake_test_app');
 		$Folder->delete();
 		unset($this->Task);
 	}
@@ -69,9 +69,9 @@ 
  * @return void
  */
 	protected function _setupTestProject() {
-		$skel = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
+		$skel = CAKE.'Console'.DS.'Templates'.DS.'skel';
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
-		$this->Task->bake($this->Task->path . 'bake_test_app', $skel);
+		$this->Task->bake($this->Task->path.'bake_test_app', $skel);
 	}
 
 /**
@@ -81,50 +81,50 @@ 
  */
 	public function testBake() {
 		$this->_setupTestProject();
-		$path = $this->Task->path . 'bake_test_app';
+		$path = $this->Task->path.'bake_test_app';
 
 		$this->assertTrue(is_dir($path), 'No project dir %s');
 		$dirs = array(
 			'Config',
-			'Config' . DS . 'Schema',
+			'Config'.DS.'Schema',
 			'Console',
-			'Console' . DS . 'Command',
-			'Console' . DS . 'Templates',
-			'Console' . DS . 'Command' . DS . 'Task',
+			'Console'.DS.'Command',
+			'Console'.DS.'Templates',
+			'Console'.DS.'Command'.DS.'Task',
 			'Controller',
-			'Controller' . DS . 'Component',
+			'Controller'.DS.'Component',
 			'Locale',
 			'Model',
-			'Model' . DS . 'Behavior',
-			'Model' . DS . 'Datasource',
+			'Model'.DS.'Behavior',
+			'Model'.DS.'Datasource',
 			'Plugin',
 			'Test',
-			'Test' . DS . 'Case',
-			'Test' . DS . 'Case' . DS . 'Controller',
-			'Test' . DS . 'Case' . DS . 'Controller' . DS . 'Component',
-			'Test' . DS . 'Case' . DS . 'Model',
-			'Test' . DS . 'Case' . DS . 'Model' . DS . 'Behavior',
-			'Test' . DS . 'Fixture',
+			'Test'.DS.'Case',
+			'Test'.DS.'Case'.DS.'Controller',
+			'Test'.DS.'Case'.DS.'Controller'.DS.'Component',
+			'Test'.DS.'Case'.DS.'Model',
+			'Test'.DS.'Case'.DS.'Model'.DS.'Behavior',
+			'Test'.DS.'Fixture',
 			'Vendor',
 			'View',
-			'View' . DS . 'Helper',
+			'View'.DS.'Helper',
 			'tmp',
-			'tmp' . DS . 'cache',
-			'tmp' . DS . 'cache' . DS . 'models',
-			'tmp' . DS . 'cache' . DS . 'persistent',
-			'tmp' . DS . 'cache' . DS . 'views',
-			'tmp' . DS . 'logs',
-			'tmp' . DS . 'sessions',
-			'tmp' . DS . 'tests',
+			'tmp'.DS.'cache',
+			'tmp'.DS.'cache'.DS.'models',
+			'tmp'.DS.'cache'.DS.'persistent',
+			'tmp'.DS.'cache'.DS.'views',
+			'tmp'.DS.'logs',
+			'tmp'.DS.'sessions',
+			'tmp'.DS.'tests',
 			'webroot',
-			'webroot' . DS . 'css',
-			'webroot' . DS . 'files',
-			'webroot' . DS . 'img',
-			'webroot' . DS . 'js',
+			'webroot'.DS.'css',
+			'webroot'.DS.'files',
+			'webroot'.DS.'img',
+			'webroot'.DS.'js',
 
 		);
 		foreach ($dirs as $dir) {
-			$this->assertTrue(is_dir($path . DS . $dir), 'Missing ' . $dir);
+			$this->assertTrue(is_dir($path.DS.$dir), 'Missing '.$dir);
 		}
 	}
 
@@ -134,16 +134,16 @@ 
  * @return void
  */
 	public function testExecuteWithAbsolutePath() {
-		$path = $this->Task->args[0] = TMP . 'tests' . DS . 'bake_test_app';
-		$this->Task->params['skel'] = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
+		$path = $this->Task->args[0] = TMP.'tests'.DS.'bake_test_app';
+		$this->Task->params['skel'] = CAKE.'Console'.DS.'Templates'.DS.'skel';
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
 		$this->Task->execute();
 
 		$this->assertTrue(is_dir($this->Task->args[0]), 'No project dir');
-		$File = new File($path . DS . 'webroot' . DS . 'index.php');
+		$File = new File($path.DS.'webroot'.DS.'index.php');
 		$contents = $File->read();
 		$this->assertRegExp('/define\(\'CAKE_CORE_INCLUDE_PATH\', .*?DS/', $contents);
-		$File = new File($path . DS . 'webroot' . DS . 'test.php');
+		$File = new File($path.DS.'webroot'.DS.'test.php');
 		$contents = $File->read();
 		$this->assertRegExp('/define\(\'CAKE_CORE_INCLUDE_PATH\', .*?DS/', $contents);
 	}
@@ -154,22 +154,22 @@ 
  * @return void
  */
 	public function testExecuteWithCakeOnIncludePath() {
-		if (!function_exists('ini_set')) {
+		if ( ! function_exists('ini_set')) {
 			$this->markTestAsSkipped('Not access to ini_set, cannot proceed.');
 		}
 		$restore = ini_get('include_path');
-		ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . $restore);
+		ini_set('include_path', CAKE_CORE_INCLUDE_PATH.PATH_SEPARATOR.$restore);
 
-		$path = $this->Task->args[0] = TMP . 'tests' . DS . 'bake_test_app';
-		$this->Task->params['skel'] = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
+		$path = $this->Task->args[0] = TMP.'tests'.DS.'bake_test_app';
+		$this->Task->params['skel'] = CAKE.'Console'.DS.'Templates'.DS.'skel';
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue('y'));
 		$this->Task->execute();
 
 		$this->assertTrue(is_dir($this->Task->args[0]), 'No project dir');
-		$contents = file_get_contents($path . DS . 'webroot' . DS . 'index.php');
+		$contents = file_get_contents($path.DS.'webroot'.DS.'index.php');
 		$this->assertRegExp('#//define\(\'CAKE_CORE_INCLUDE_PATH#', $contents);
 
-		$contents = file_get_contents($path . DS . 'webroot' . DS . 'test.php');
+		$contents = file_get_contents($path.DS.'webroot'.DS.'test.php');
 		$this->assertRegExp('#//define\(\'CAKE_CORE_INCLUDE_PATH#', $contents);
 
 		ini_set('include_path', $restore);
@@ -183,34 +183,34 @@ 
 	public function testBakeEmptyFlag() {
 		$this->Task->params['empty'] = true;
 		$this->_setupTestProject();
-		$path = $this->Task->path . 'bake_test_app';
+		$path = $this->Task->path.'bake_test_app';
 
 		$empty = array(
-			'Console' . DS . 'Command' . DS . 'Task' => 'empty',
-			'Controller' . DS . 'Component' => 'empty',
+			'Console'.DS.'Command'.DS.'Task' => 'empty',
+			'Controller'.DS.'Component' => 'empty',
 			'Lib' => 'empty',
-			'Model' . DS . 'Behavior' => 'empty',
-			'Model' . DS . 'Datasource' => 'empty',
+			'Model'.DS.'Behavior' => 'empty',
+			'Model'.DS.'Datasource' => 'empty',
 			'Plugin' => 'empty',
-			'Test' . DS . 'Case' . DS . 'Model' . DS . 'Behavior' => 'empty',
-			'Test' . DS . 'Case' . DS . 'Controller' . DS . 'Component' => 'empty',
-			'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' => 'empty',
-			'Test' . DS . 'Fixture' => 'empty',
+			'Test'.DS.'Case'.DS.'Model'.DS.'Behavior' => 'empty',
+			'Test'.DS.'Case'.DS.'Controller'.DS.'Component' => 'empty',
+			'Test'.DS.'Case'.DS.'View'.DS.'Helper' => 'empty',
+			'Test'.DS.'Fixture' => 'empty',
 			'Vendor' => 'empty',
-			'View' . DS . 'Elements' => 'empty',
-			'View' . DS . 'Scaffolds' => 'empty',
-			'tmp' . DS . 'cache' . DS . 'models' => 'empty',
-			'tmp' . DS . 'cache' . DS . 'persistent' => 'empty',
-			'tmp' . DS . 'cache' . DS . 'views' => 'empty',
-			'tmp' . DS . 'logs' => 'empty',
-			'tmp' . DS . 'sessions' => 'empty',
-			'tmp' . DS . 'tests' => 'empty',
-			'webroot' . DS . 'js' => 'empty',
-			'webroot' . DS . 'files' => 'empty'
+			'View'.DS.'Elements' => 'empty',
+			'View'.DS.'Scaffolds' => 'empty',
+			'tmp'.DS.'cache'.DS.'models' => 'empty',
+			'tmp'.DS.'cache'.DS.'persistent' => 'empty',
+			'tmp'.DS.'cache'.DS.'views' => 'empty',
+			'tmp'.DS.'logs' => 'empty',
+			'tmp'.DS.'sessions' => 'empty',
+			'tmp'.DS.'tests' => 'empty',
+			'webroot'.DS.'js' => 'empty',
+			'webroot'.DS.'files' => 'empty'
 		);
 
 		foreach ($empty as $dir => $file) {
-			$this->assertTrue(is_file($path . DS . $dir . DS . $file), sprintf('Missing %s file in %s', $file, $dir));
+			$this->assertTrue(is_file($path.DS.$dir.DS.$file), sprintf('Missing %s file in %s', $file, $dir));
 		}
 	}
 
@@ -222,11 +222,11 @@ 
 	public function testSecuritySaltGeneration() {
 		$this->_setupTestProject();
 
-		$path = $this->Task->path . 'bake_test_app' . DS;
+		$path = $this->Task->path.'bake_test_app'.DS;
 		$result = $this->Task->securitySalt($path);
 		$this->assertTrue($result);
 
-		$File = new File($path . 'Config' . DS . 'core.php');
+		$File = new File($path.'Config'.DS.'core.php');
 		$contents = $File->read();
 		$this->assertNotRegExp('/DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi/', $contents, 'Default Salt left behind. %s');
 	}
@@ -239,11 +239,11 @@ 
 	public function testSecurityCipherSeedGeneration() {
 		$this->_setupTestProject();
 
-		$path = $this->Task->path . 'bake_test_app' . DS;
+		$path = $this->Task->path.'bake_test_app'.DS;
 		$result = $this->Task->securityCipherSeed($path);
 		$this->assertTrue($result);
 
-		$File = new File($path . 'Config' . DS . 'core.php');
+		$File = new File($path.'Config'.DS.'core.php');
 		$contents = $File->read();
 		$this->assertNotRegExp('/76859309657453542496749683645/', $contents, 'Default CipherSeed left behind. %s');
 	}
@@ -256,11 +256,11 @@ 
 	public function testCachePrefixGeneration() {
 		$this->_setupTestProject();
 
-		$path = $this->Task->path . 'bake_test_app' . DS;
+		$path = $this->Task->path.'bake_test_app'.DS;
 		$result = $this->Task->cachePrefix($path);
 		$this->assertTrue($result);
 
-		$File = new File($path . 'Config' . DS . 'core.php');
+		$File = new File($path.'Config'.DS.'core.php');
 		$contents = $File->read();
 		$this->assertRegExp('/\$prefix = \'.+\';/', $contents, '$prefix is not defined');
 		$this->assertNotRegExp('/\$prefix = \'myapp_\';/', $contents, 'Default cache prefix left behind. %s');
@@ -274,13 +274,13 @@ 
 	public function testIndexPhpGeneration() {
 		$this->_setupTestProject();
 
-		$path = $this->Task->path . 'bake_test_app' . DS;
+		$path = $this->Task->path.'bake_test_app'.DS;
 		$this->Task->corePath($path);
 
-		$File = new File($path . 'webroot' . DS . 'index.php');
+		$File = new File($path.'webroot'.DS.'index.php');
 		$contents = $File->read();
 		$this->assertNotRegExp('/define\(\'CAKE_CORE_INCLUDE_PATH\', ROOT/', $contents);
-		$File = new File($path . 'webroot' . DS . 'test.php');
+		$File = new File($path.'webroot'.DS.'test.php');
 		$contents = $File->read();
 		$this->assertNotRegExp('/define\(\'CAKE_CORE_INCLUDE_PATH\', ROOT/', $contents);
 	}
@@ -297,13 +297,13 @@ 
 
 		Configure::write('Routing.prefixes', null);
 		$this->_setupTestProject();
-		$this->Task->configPath = $this->Task->path . 'bake_test_app' . DS . 'Config' . DS;
+		$this->Task->configPath = $this->Task->path.'bake_test_app'.DS.'Config'.DS;
 		$this->Task->expects($this->once())->method('in')->will($this->returnValue('super_duper_admin'));
 
 		$result = $this->Task->getPrefix();
 		$this->assertEquals('super_duper_admin_', $result);
 
-		$File = new File($this->Task->configPath . 'core.php');
+		$File = new File($this->Task->configPath.'core.php');
 		$File->delete();
 	}
 
@@ -313,13 +313,13 @@ 
  * @return void
  */
 	public function testCakeAdmin() {
-		$File = new File(APP . 'Config' . DS . 'core.php');
+		$File = new File(APP.'Config'.DS.'core.php');
 		$contents = $File->read();
-		$File = new File(TMP . 'tests' . DS . 'core.php');
+		$File = new File(TMP.'tests'.DS.'core.php');
 		$File->write($contents);
 
 		Configure::write('Routing.prefixes', null);
-		$this->Task->configPath = TMP . 'tests' . DS;
+		$this->Task->configPath = TMP.'tests'.DS;
 		$result = $this->Task->cakeAdmin('my_prefix');
 		$this->assertTrue($result);
 
@@ -335,7 +335,7 @@ 
 	public function testGetPrefixWithMultiplePrefixes() {
 		Configure::write('Routing.prefixes', array('admin', 'ninja', 'shinobi'));
 		$this->_setupTestProject();
-		$this->Task->configPath = $this->Task->path . 'bake_test_app' . DS . 'Config' . DS;
+		$this->Task->configPath = $this->Task->path.'bake_test_app'.DS.'Config'.DS;
 		$this->Task->expects($this->once())->method('in')->will($this->returnValue(2));
 
 		$result = $this->Task->getPrefix();
@@ -348,23 +348,23 @@ 
  * @return void
  */
 	public function testExecute() {
-		$this->Task->params['skel'] = CAKE . 'Console' . DS . 'Templates' . DS . 'skel';
-		$this->Task->params['working'] = TMP . 'tests' . DS;
+		$this->Task->params['skel'] = CAKE.'Console'.DS.'Templates'.DS.'skel';
+		$this->Task->params['working'] = TMP.'tests'.DS;
 
-		$path = $this->Task->path . 'bake_test_app';
+		$path = $this->Task->path.'bake_test_app';
 		$this->Task->expects($this->at(0))->method('in')->will($this->returnValue($path));
 		$this->Task->expects($this->at(1))->method('in')->will($this->returnValue('y'));
 
 		$this->Task->execute();
 		$this->assertTrue(is_dir($path), 'No project dir');
-		$this->assertTrue(is_dir($path . DS . 'Controller'), 'No controllers dir ');
-		$this->assertTrue(is_dir($path . DS . 'Controller' . DS . 'Component'), 'No components dir ');
-		$this->assertTrue(is_dir($path . DS . 'Model'), 'No models dir');
-		$this->assertTrue(is_dir($path . DS . 'View'), 'No views dir');
-		$this->assertTrue(is_dir($path . DS . 'View' . DS . 'Helper'), 'No helpers dir');
-		$this->assertTrue(is_dir($path . DS . 'Test'), 'No tests dir');
-		$this->assertTrue(is_dir($path . DS . 'Test' . DS . 'Case'), 'No cases dir');
-		$this->assertTrue(is_dir($path . DS . 'Test' . DS . 'Fixture'), 'No fixtures dir');
+		$this->assertTrue(is_dir($path.DS.'Controller'), 'No controllers dir ');
+		$this->assertTrue(is_dir($path.DS.'Controller'.DS.'Component'), 'No components dir ');
+		$this->assertTrue(is_dir($path.DS.'Model'), 'No models dir');
+		$this->assertTrue(is_dir($path.DS.'View'), 'No views dir');
+		$this->assertTrue(is_dir($path.DS.'View'.DS.'Helper'), 'No helpers dir');
+		$this->assertTrue(is_dir($path.DS.'Test'), 'No tests dir');
+		$this->assertTrue(is_dir($path.DS.'Test'.DS.'Case'), 'No cases dir');
+		$this->assertTrue(is_dir($path.DS.'Test'.DS.'Fixture'), 'No fixtures dir');
 	}
 
 /**
@@ -375,11 +375,11 @@ 
 	public function testConsolePath() {
 		$this->_setupTestProject();
 
-		$path = $this->Task->path . 'bake_test_app' . DS;
+		$path = $this->Task->path.'bake_test_app'.DS;
 		$result = $this->Task->consolePath($path);
 		$this->assertTrue($result);
 
-		$File = new File($path . 'Console' . DS . 'cake.php');
+		$File = new File($path.'Console'.DS.'cake.php');
 		$contents = $File->read();
 		$this->assertNotRegExp('/__CAKE_PATH__/', $contents, 'Console path placeholder left behind.');
 	}

lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php

Spacing +6 added lines, -6 removed lines

@@ -86,9 +86,9 @@ 
  * @return void
  */
 	public function testFindingInstalledThemesForBake() {
-		$consoleLibs = CAKE . 'Console' . DS;
+		$consoleLibs = CAKE.'Console'.DS;
 		$this->Task->initialize();
-		$this->assertEquals($this->Task->templatePaths['default'], $consoleLibs . 'Templates' . DS . 'default' . DS);
+		$this->assertEquals($this->Task->templatePaths['default'], $consoleLibs.'Templates'.DS.'default'.DS);
 	}
 
 /**
@@ -98,7 +98,7 @@ 
  * @return void
  */
 	public function testGetThemePath() {
-		$defaultTheme = CAKE . 'Console' . DS . 'Templates' . DS . 'default' . DS;
+		$defaultTheme = CAKE.'Console'.DS.'Templates'.DS.'default'.DS;
 		$this->Task->templatePaths = array('default' => $defaultTheme);
 
 		$this->Task->expects($this->exactly(1))->method('in')->will($this->returnValue('1'));
@@ -125,7 +125,7 @@ 
 	public function testGenerate() {
 		App::build(array(
 			'Console' => array(
-				CAKE . 'Test' . DS . 'test_app' . DS . 'Console' . DS
+				CAKE.'Test'.DS.'test_app'.DS.'Console'.DS
 			)
 		));
 		$this->Task->initialize();
@@ -145,8 +145,8 @@ 
 	public function testGenerateWithTemplateFallbacks() {
 		App::build(array(
 			'Console' => array(
-				CAKE . 'Test' . DS . 'test_app' . DS . 'Console' . DS,
-				CAKE_CORE_INCLUDE_PATH . DS . 'console' . DS
+				CAKE.'Test'.DS.'test_app'.DS.'Console'.DS,
+				CAKE_CORE_INCLUDE_PATH.DS.'console'.DS
 			)
 		));
 		$this->Task->initialize();

lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php

Spacing +21 added lines, -21 removed lines

@@ -224,7 +224,7 @@ 
 		$this->Task->expects($this->never())->method('err');
 		$this->Task->expects($this->never())->method('_stop');
 
-		$file = TESTS . 'Case' . DS . 'Model' . DS . 'MyClassTest.php';
+		$file = TESTS.'Case'.DS.'Model'.DS.'MyClassTest.php';
 
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with($file, $this->anything());
@@ -232,7 +232,7 @@ 
 		$this->Task->expects($this->at(3))->method('createFile')
 			->with($file, $this->anything());
 
-		$file = TESTS . 'Case' . DS . 'Controller' . DS . 'CommentsControllerTest.php';
+		$file = TESTS.'Case'.DS.'Controller'.DS.'CommentsControllerTest.php';
 		$this->Task->expects($this->at(5))->method('createFile')
 			->with($file, $this->anything());
 
@@ -584,8 +584,8 @@ 
 		$this->Task->plugin = 'TestTest';
 
 		//fake plugin path
-		CakePlugin::load('TestTest', array('path' => APP . 'Plugin' . DS . 'TestTest' . DS));
-		$path = APP . 'Plugin' . DS . 'TestTest' . DS . 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'FormHelperTest.php';
+		CakePlugin::load('TestTest', array('path' => APP.'Plugin'.DS.'TestTest'.DS));
+		$path = APP.'Plugin'.DS.'TestTest'.DS.'Test'.DS.'Case'.DS.'View'.DS.'Helper'.DS.'FormHelperTest.php';
 		$this->Task->expects($this->once())->method('createFile')
 			->with($path, $this->anything());
 
@@ -599,14 +599,14 @@ 
  * @return void
  */
 	public function testInteractiveWithPlugin() {
-		$testApp = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS;
+		$testApp = CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS;
 		App::build(array(
 			'Plugin' => array($testApp)
 		), App::RESET);
 		CakePlugin::load('TestPlugin');
 
 		$this->Task->plugin = 'TestPlugin';
-		$path = $testApp . 'TestPlugin' . DS . 'Test' . DS . 'Case' . DS . 'View' . DS . 'Helper' . DS . 'OtherHelperTest.php';
+		$path = $testApp.'TestPlugin'.DS.'Test'.DS.'Case'.DS.'View'.DS.'Helper'.DS.'OtherHelperTest.php';
 		$this->Task->expects($this->any())
 			->method('in')
 			->will($this->onConsecutiveCalls(
@@ -627,16 +627,16 @@ 
 
 	public static function caseFileNameProvider() {
 		return array(
-			array('Model', 'Post', 'Case' . DS . 'Model' . DS . 'PostTest.php'),
-			array('Helper', 'Form', 'Case' . DS . 'View' . DS . 'Helper' . DS . 'FormHelperTest.php'),
-			array('Controller', 'Posts', 'Case' . DS . 'Controller' . DS . 'PostsControllerTest.php'),
-			array('Behavior', 'Containable', 'Case' . DS . 'Model' . DS . 'Behavior' . DS . 'ContainableBehaviorTest.php'),
-			array('Component', 'Auth', 'Case' . DS . 'Controller' . DS . 'Component' . DS . 'AuthComponentTest.php'),
-			array('model', 'Post', 'Case' . DS . 'Model' . DS . 'PostTest.php'),
-			array('helper', 'Form', 'Case' . DS . 'View' . DS . 'Helper' . DS . 'FormHelperTest.php'),
-			array('controller', 'Posts', 'Case' . DS . 'Controller' . DS . 'PostsControllerTest.php'),
-			array('behavior', 'Containable', 'Case' . DS . 'Model' . DS . 'Behavior' . DS . 'ContainableBehaviorTest.php'),
-			array('component', 'Auth', 'Case' . DS . 'Controller' . DS . 'Component' . DS . 'AuthComponentTest.php'),
+			array('Model', 'Post', 'Case'.DS.'Model'.DS.'PostTest.php'),
+			array('Helper', 'Form', 'Case'.DS.'View'.DS.'Helper'.DS.'FormHelperTest.php'),
+			array('Controller', 'Posts', 'Case'.DS.'Controller'.DS.'PostsControllerTest.php'),
+			array('Behavior', 'Containable', 'Case'.DS.'Model'.DS.'Behavior'.DS.'ContainableBehaviorTest.php'),
+			array('Component', 'Auth', 'Case'.DS.'Controller'.DS.'Component'.DS.'AuthComponentTest.php'),
+			array('model', 'Post', 'Case'.DS.'Model'.DS.'PostTest.php'),
+			array('helper', 'Form', 'Case'.DS.'View'.DS.'Helper'.DS.'FormHelperTest.php'),
+			array('controller', 'Posts', 'Case'.DS.'Controller'.DS.'PostsControllerTest.php'),
+			array('behavior', 'Containable', 'Case'.DS.'Model'.DS.'Behavior'.DS.'ContainableBehaviorTest.php'),
+			array('component', 'Auth', 'Case'.DS.'Controller'.DS.'Component'.DS.'AuthComponentTest.php'),
 		);
 	}
 
@@ -647,10 +647,10 @@ 
  * @return void
  */
 	public function testTestCaseFileName($type, $class, $expected) {
-		$this->Task->path = DS . 'my' . DS . 'path' . DS . 'tests' . DS;
+		$this->Task->path = DS.'my'.DS.'path'.DS.'tests'.DS;
 
 		$result = $this->Task->testCaseFileName($type, $class);
-		$expected = $this->Task->path . $expected;
+		$expected = $this->Task->path.$expected;
 		$this->assertEquals($expected, $result);
 	}
 
@@ -660,12 +660,12 @@ 
  * @return void
  */
 	public function testTestCaseFileNamePlugin() {
-		$this->Task->path = DS . 'my' . DS . 'path' . DS . 'tests' . DS;
+		$this->Task->path = DS.'my'.DS.'path'.DS.'tests'.DS;
 
-		CakePlugin::load('TestTest', array('path' => APP . 'Plugin' . DS . 'TestTest' . DS));
+		CakePlugin::load('TestTest', array('path' => APP.'Plugin'.DS.'TestTest'.DS));
 		$this->Task->plugin = 'TestTest';
 		$result = $this->Task->testCaseFileName('Model', 'Post');
-		$expected = APP . 'Plugin' . DS . 'TestTest' . DS . 'Test' . DS . 'Case' . DS . 'Model' . DS . 'PostTest.php';
+		$expected = APP.'Plugin'.DS.'TestTest'.DS.'Test'.DS.'Case'.DS.'Model'.DS.'PostTest.php';
 		$this->assertEquals($expected, $result);
 	}
 

lib/Cake/Test/Case/Console/Command/Task/ViewTaskTest.php

Spacing +29 added lines, -29 removed lines

@@ -200,7 +200,7 @@ 
 
 		$this->Task->path = TMP;
 		$this->Task->Template->params['theme'] = 'default';
-		$this->Task->Template->templatePaths = array('default' => CAKE . 'Console' . DS . 'Templates' . DS . 'default' . DS);
+		$this->Task->Template->templatePaths = array('default' => CAKE.'Console'.DS.'Templates'.DS.'default'.DS);
 	}
 
 /**
@@ -292,7 +292,7 @@ 
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'view.ctp',
+				TMP.'ViewTaskComments'.DS.'view.ctp',
 				$this->stringContains('View Task Articles')
 			);
 
@@ -309,7 +309,7 @@ 
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'edit.ctp',
+				TMP.'ViewTaskComments'.DS.'edit.ctp',
 				new PHPUnit_Framework_Constraint_IsAnything()
 			);
 		$this->Task->bake('edit', true);
@@ -325,7 +325,7 @@ 
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'index.ctp',
+				TMP.'ViewTaskComments'.DS.'index.ctp',
 				$this->stringContains("\$viewTaskComment['Article']['title']")
 			);
 		$this->Task->bake('index', true);
@@ -354,8 +354,8 @@ 
 		$this->Task->name = 'View';
 
 		//fake plugin path
-		CakePlugin::load('TestTest', array('path' => APP . 'Plugin' . DS . 'TestTest' . DS));
-		$path = APP . 'Plugin' . DS . 'TestTest' . DS . 'View' . DS . 'ViewTaskComments' . DS . 'view.ctp';
+		CakePlugin::load('TestTest', array('path' => APP.'Plugin'.DS.'TestTest'.DS));
+		$path = APP.'Plugin'.DS.'TestTest'.DS.'View'.DS.'ViewTaskComments'.DS.'view.ctp';
 
 		$result = $this->Task->getContent('index');
 		$this->assertNotContains('List Test Test.view Task Articles', $result);
@@ -378,17 +378,17 @@ 
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'view.ctp',
+				TMP.'ViewTaskComments'.DS.'view.ctp',
 				$this->stringContains('View Task Comments')
 			);
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'edit.ctp',
+				TMP.'ViewTaskComments'.DS.'edit.ctp',
 				$this->stringContains('Edit View Task Comment')
 			);
 		$this->Task->expects($this->at(2))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'index.ctp',
+				TMP.'ViewTaskComments'.DS.'index.ctp',
 				$this->stringContains('ViewTaskComment')
 			);
 
@@ -408,7 +408,7 @@ 
 
 		$this->Task->expects($this->once())->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'my_action.ctp',
+				TMP.'ViewTaskComments'.DS.'my_action.ctp',
 				$this->anything()
 			);
 
@@ -428,12 +428,12 @@ 
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'index.ctp',
+				TMP.'ViewTaskComments'.DS.'index.ctp',
 				$this->anything()
 			);
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'add.ctp',
+				TMP.'ViewTaskComments'.DS.'add.ctp',
 				$this->anything()
 			);
 		$this->Task->expects($this->exactly(2))->method('createFile');
@@ -454,7 +454,7 @@ 
 
 		$this->Task->expects($this->once())->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'index.ctp',
+				TMP.'ViewTaskComments'.DS.'index.ctp',
 				$this->anything()
 			);
 
@@ -472,7 +472,7 @@ 
 
 		$this->Task->expects($this->once())->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'view.ctp',
+				TMP.'ViewTaskComments'.DS.'view.ctp',
 				$this->anything()
 			);
 		$this->Task->execute();
@@ -489,12 +489,12 @@ 
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'index.ctp',
+				TMP.'ViewTaskComments'.DS.'index.ctp',
 				$this->anything()
 			);
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'add.ctp',
+				TMP.'ViewTaskComments'.DS.'add.ctp',
 				$this->anything()
 			);
 		$this->Task->expects($this->exactly(2))->method('createFile');
@@ -522,12 +522,12 @@ 
 
 		$this->Task->expects($this->at(0))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'index.ctp',
+				TMP.'ViewTaskComments'.DS.'index.ctp',
 				$this->anything()
 			);
 		$this->Task->expects($this->at(1))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'add.ctp',
+				TMP.'ViewTaskComments'.DS.'add.ctp',
 				$this->anything()
 			);
 		$this->Task->execute();
@@ -553,7 +553,7 @@ 
 		foreach ($views as $i => $view) {
 			$this->Task->expects($this->at($i))->method('createFile')
 				->with(
-					TMP . 'ViewTaskArticles' . DS . $view,
+					TMP.'ViewTaskArticles'.DS.$view,
 					$this->anything()
 				);
 		}
@@ -579,25 +579,25 @@ 
 
 		$this->Task->expects($this->at(3))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'index.ctp',
+				TMP.'ViewTaskComments'.DS.'index.ctp',
 				$this->stringContains('ViewTaskComment')
 			);
 
 		$this->Task->expects($this->at(4))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'view.ctp',
+				TMP.'ViewTaskComments'.DS.'view.ctp',
 				$this->stringContains('ViewTaskComment')
 			);
 
 		$this->Task->expects($this->at(5))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'add.ctp',
+				TMP.'ViewTaskComments'.DS.'add.ctp',
 				$this->stringContains('Add View Task Comment')
 			);
 
 		$this->Task->expects($this->at(6))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'edit.ctp',
+				TMP.'ViewTaskComments'.DS.'edit.ctp',
 				$this->stringContains('Edit View Task Comment')
 			);
 
@@ -617,7 +617,7 @@ 
 
 		$this->Task->expects($this->once())->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'list.ctp',
+				TMP.'ViewTaskComments'.DS.'list.ctp',
 				$this->stringContains('ViewTaskComment')
 			);
 		$this->Task->execute();
@@ -644,25 +644,25 @@ 
 
 		$this->Task->expects($this->at(3))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'admin_index.ctp',
+				TMP.'ViewTaskComments'.DS.'admin_index.ctp',
 				$this->stringContains('ViewTaskComment')
 			);
 
 		$this->Task->expects($this->at(4))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'admin_view.ctp',
+				TMP.'ViewTaskComments'.DS.'admin_view.ctp',
 				$this->stringContains('ViewTaskComment')
 			);
 
 		$this->Task->expects($this->at(5))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'admin_add.ctp',
+				TMP.'ViewTaskComments'.DS.'admin_add.ctp',
 				$this->stringContains('Add View Task Comment')
 			);
 
 		$this->Task->expects($this->at(6))->method('createFile')
 			->with(
-				TMP . 'ViewTaskComments' . DS . 'admin_edit.ctp',
+				TMP.'ViewTaskComments'.DS.'admin_edit.ctp',
 				$this->stringContains('Edit View Task Comment')
 			);
 
@@ -688,7 +688,7 @@ 
 		$this->assertEquals('form', $result);
 
 		$this->Task->Template->templatePaths = array(
-			'test' => CAKE . 'Test' . DS . 'test_app' . DS . 'Console' . DS . 'Templates' . DS . 'test' . DS
+			'test' => CAKE.'Test'.DS.'test_app'.DS.'Console'.DS.'Templates'.DS.'test'.DS
 		);
 		$this->Task->Template->params['theme'] = 'test';
 

lib/Cake/Test/Case/Console/Command/TestShellTest.php

Spacing +20 added lines, -20 removed lines

@@ -117,10 +117,10 @@ 
 	public function testMapAppFileToCategory() {
 		$this->Shell->startup();
 
-		$return = $this->Shell->mapFileToCategory(APP . 'Controller/ExampleController.php');
+		$return = $this->Shell->mapFileToCategory(APP.'Controller/ExampleController.php');
 		$this->assertSame('app', $return);
 
-		$return = $this->Shell->mapFileToCategory(APP . 'My/File/Is/Here.php');
+		$return = $this->Shell->mapFileToCategory(APP.'My/File/Is/Here.php');
 		$this->assertSame('app', $return);
 	}
 
@@ -132,10 +132,10 @@ 
 	public function testMapAppFileToCase() {
 		$this->Shell->startup();
 
-		$return = $this->Shell->mapFileToCase(APP . 'Controller/ExampleController.php', 'app', false);
+		$return = $this->Shell->mapFileToCase(APP.'Controller/ExampleController.php', 'app', false);
 		$this->assertSame('Controller/ExampleController', $return);
 
-		$return = $this->Shell->mapFileToCase(APP . 'My/File/Is/Here.php', 'app', false);
+		$return = $this->Shell->mapFileToCase(APP.'My/File/Is/Here.php', 'app', false);
 		$this->assertSame('My/File/Is/Here', $return);
 	}
 
@@ -147,10 +147,10 @@ 
 	public function testMapPluginFileToCategory() {
 		$this->Shell->startup();
 
-		$return = $this->Shell->mapFileToCategory(APP . 'Plugin/awesome/Controller/ExampleController.php');
+		$return = $this->Shell->mapFileToCategory(APP.'Plugin/awesome/Controller/ExampleController.php');
 		$this->assertSame('awesome', $return);
 
-		$return = $this->Shell->mapFileToCategory(dirname(CAKE) . 'plugins/awesome/Controller/ExampleController.php');
+		$return = $this->Shell->mapFileToCategory(dirname(CAKE).'plugins/awesome/Controller/ExampleController.php');
 		$this->assertSame('awesome', $return);
 	}
 
@@ -162,10 +162,10 @@ 
 	public function testMapPluginFileToCase() {
 		$this->Shell->startup();
 
-		$return = $this->Shell->mapFileToCase(APP . 'Plugin/awesome/Controller/ExampleController.php', 'awesome', false);
+		$return = $this->Shell->mapFileToCase(APP.'Plugin/awesome/Controller/ExampleController.php', 'awesome', false);
 		$this->assertSame('Controller/ExampleController', $return);
 
-		$return = $this->Shell->mapFileToCase(dirname(CAKE) . 'plugins/awesome/Controller/ExampleController.php', 'awesome', false);
+		$return = $this->Shell->mapFileToCase(dirname(CAKE).'plugins/awesome/Controller/ExampleController.php', 'awesome', false);
 		$this->assertSame('Controller/ExampleController', $return);
 	}
 
@@ -215,10 +215,10 @@ 
 	public function testMapAppTestToCategory() {
 		$this->Shell->startup();
 
-		$return = $this->Shell->mapFileToCategory(APP . 'Test/Case/Controller/ExampleControllerTest.php');
+		$return = $this->Shell->mapFileToCategory(APP.'Test/Case/Controller/ExampleControllerTest.php');
 		$this->assertSame('app', $return);
 
-		$return = $this->Shell->mapFileToCategory(APP . 'Test/Case/My/File/Is/HereTest.php');
+		$return = $this->Shell->mapFileToCategory(APP.'Test/Case/My/File/Is/HereTest.php');
 		$this->assertSame('app', $return);
 	}
 
@@ -230,10 +230,10 @@ 
 	public function testMapAppTestToCase() {
 		$this->Shell->startup();
 
-		$return = $this->Shell->mapFileToCase(APP . 'Test/Case/Controller/ExampleControllerTest.php', 'app', false);
+		$return = $this->Shell->mapFileToCase(APP.'Test/Case/Controller/ExampleControllerTest.php', 'app', false);
 		$this->assertSame('Controller/ExampleController', $return);
 
-		$return = $this->Shell->mapFileToCase(APP . 'Test/Case/My/File/Is/HereTest.php', 'app', false);
+		$return = $this->Shell->mapFileToCase(APP.'Test/Case/My/File/Is/HereTest.php', 'app', false);
 		$this->assertSame('My/File/Is/Here', $return);
 	}
 
@@ -245,10 +245,10 @@ 
 	public function testMapPluginTestToCategory() {
 		$this->Shell->startup();
 
-		$return = $this->Shell->mapFileToCategory(APP . 'Plugin/awesome/Test/Case/Controller/ExampleControllerTest.php');
+		$return = $this->Shell->mapFileToCategory(APP.'Plugin/awesome/Test/Case/Controller/ExampleControllerTest.php');
 		$this->assertSame('awesome', $return);
 
-		$return = $this->Shell->mapFileToCategory(dirname(CAKE) . 'plugins/awesome/Test/Case/Controller/ExampleControllerTest.php');
+		$return = $this->Shell->mapFileToCategory(dirname(CAKE).'plugins/awesome/Test/Case/Controller/ExampleControllerTest.php');
 		$this->assertSame('awesome', $return);
 	}
 
@@ -260,10 +260,10 @@ 
 	public function testMapPluginTestToCase() {
 		$this->Shell->startup();
 
-		$return = $this->Shell->mapFileToCase(APP . 'Plugin/awesome/Test/Case/Controller/ExampleControllerTest.php', 'awesome', false);
+		$return = $this->Shell->mapFileToCase(APP.'Plugin/awesome/Test/Case/Controller/ExampleControllerTest.php', 'awesome', false);
 		$this->assertSame('Controller/ExampleController', $return);
 
-		$return = $this->Shell->mapFileToCase(dirname(CAKE) . 'plugins/awesome/Test/Case/Controller/ExampleControllerTest.php', 'awesome', false);
+		$return = $this->Shell->mapFileToCase(dirname(CAKE).'plugins/awesome/Test/Case/Controller/ExampleControllerTest.php', 'awesome', false);
 		$this->assertSame('Controller/ExampleController', $return);
 	}
 
@@ -275,16 +275,16 @@ 
 	public function testMapNotTestToNothing() {
 		$this->Shell->startup();
 
-		$return = $this->Shell->mapFileToCategory(APP . 'Test/Case/NotATestFile.php');
+		$return = $this->Shell->mapFileToCategory(APP.'Test/Case/NotATestFile.php');
 		$this->assertSame('app', $return);
 
-		$return = $this->Shell->mapFileToCase(APP . 'Test/Case/NotATestFile.php', false, false);
+		$return = $this->Shell->mapFileToCase(APP.'Test/Case/NotATestFile.php', false, false);
 		$this->assertFalse($return);
 
-		$return = $this->Shell->mapFileToCategory(APP . 'Test/Fixture/SomeTest.php');
+		$return = $this->Shell->mapFileToCategory(APP.'Test/Fixture/SomeTest.php');
 		$this->assertSame('app', $return);
 
-		$return = $this->Shell->mapFileToCase(APP . 'Test/Fixture/SomeTest.php', false, false);
+		$return = $this->Shell->mapFileToCase(APP.'Test/Fixture/SomeTest.php', false, false);
 		$this->assertFalse($return);
 	}
 

lib/Cake/Test/Case/Console/ConsoleOutputTest.php

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
  */
 	public function testWriteNewLine() {
 		$this->output->expects($this->once())->method('_write')
-			->with('Some output' . PHP_EOL);
+			->with('Some output'.PHP_EOL);
 
 		$this->output->write('Some output');
 	}
@@ -77,7 +77,7 @@ 
  */
 	public function testWriteMultipleNewLines() {
 		$this->output->expects($this->once())->method('_write')
-			->with('Some output' . PHP_EOL . PHP_EOL . PHP_EOL . PHP_EOL);
+			->with('Some output'.PHP_EOL.PHP_EOL.PHP_EOL.PHP_EOL);
 
 		$this->output->write('Some output', 4);
 	}
@@ -89,7 +89,7 @@ 
  */
 	public function testWriteArray() {
 		$this->output->expects($this->once())->method('_write')
-			->with('Line' . PHP_EOL . 'Line' . PHP_EOL . 'Line' . PHP_EOL);
+			->with('Line'.PHP_EOL.'Line'.PHP_EOL.'Line'.PHP_EOL);
 
 		$this->output->write(array('Line', 'Line', 'Line'));
 	}

lib/Cake/Test/Case/Console/ShellTest.php

Spacing +32 added lines, -32 removed lines

@@ -144,8 +144,8 @@ 
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
 		$this->Shell = new ShellTestShell($output, $error, $in);
 
-		if (is_dir(TMP . 'shell_test')) {
-			$Folder = new Folder(TMP . 'shell_test');
+		if (is_dir(TMP.'shell_test')) {
+			$Folder = new Folder(TMP.'shell_test');
 			$Folder->delete();
 		}
 	}
@@ -188,8 +188,8 @@ 
  */
 	public function testInitialize() {
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS),
+			'Model' => array(CAKE.'Test'.DS.'test_app'.DS.'Model'.DS)
 		), App::RESET);
 
 		CakePlugin::load('TestPlugin');
@@ -219,8 +219,8 @@ 
  */
 	public function testLoadModel() {
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'Model' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS),
+			'Model' => array(CAKE.'Test'.DS.'test_app'.DS.'Model'.DS)
 		), App::RESET);
 
 		$Shell = new TestMergeShell();
@@ -412,7 +412,7 @@ 
 		$this->assertEquals($this->Shell->nl(), $newLine);
 		$this->assertEquals($this->Shell->nl(true), $newLine);
 		$this->assertEquals("", $this->Shell->nl(false));
-		$this->assertEquals($this->Shell->nl(2), $newLine . $newLine);
+		$this->assertEquals($this->Shell->nl(2), $newLine.$newLine);
 		$this->assertEquals($this->Shell->nl(1), $newLine);
 	}
 
@@ -531,33 +531,33 @@ 
  * @return void
  */
 	public function testShortPath() {
-		$path = $expected = DS . 'tmp' . DS . 'ab' . DS . 'cd';
+		$path = $expected = DS.'tmp'.DS.'ab'.DS.'cd';
 		$this->assertEquals($expected, $this->Shell->shortPath($path));
 
-		$path = $expected = DS . 'tmp' . DS . 'ab' . DS . 'cd' . DS;
+		$path = $expected = DS.'tmp'.DS.'ab'.DS.'cd'.DS;
 		$this->assertEquals($expected, $this->Shell->shortPath($path));
 
-		$path = $expected = DS . 'tmp' . DS . 'ab' . DS . 'index.php';
+		$path = $expected = DS.'tmp'.DS.'ab'.DS.'index.php';
 		$this->assertEquals($expected, $this->Shell->shortPath($path));
 
-		$path = DS . 'tmp' . DS . 'ab' . DS . DS . 'cd';
-		$expected = DS . 'tmp' . DS . 'ab' . DS . 'cd';
+		$path = DS.'tmp'.DS.'ab'.DS.DS.'cd';
+		$expected = DS.'tmp'.DS.'ab'.DS.'cd';
 		$this->assertEquals($expected, $this->Shell->shortPath($path));
 
-		$path = 'tmp' . DS . 'ab';
-		$expected = 'tmp' . DS . 'ab';
+		$path = 'tmp'.DS.'ab';
+		$expected = 'tmp'.DS.'ab';
 		$this->assertEquals($expected, $this->Shell->shortPath($path));
 
-		$path = 'tmp' . DS . 'ab';
-		$expected = 'tmp' . DS . 'ab';
+		$path = 'tmp'.DS.'ab';
+		$expected = 'tmp'.DS.'ab';
 		$this->assertEquals($expected, $this->Shell->shortPath($path));
 
 		$path = APP;
-		$expected = DS . basename(APP) . DS;
+		$expected = DS.basename(APP).DS;
 		$this->assertEquals($expected, $this->Shell->shortPath($path));
 
-		$path = APP . 'index.php';
-		$expected = DS . basename(APP) . DS . 'index.php';
+		$path = APP.'index.php';
+		$expected = DS.basename(APP).DS.'index.php';
 		$this->assertEquals($expected, $this->Shell->shortPath($path));
 	}
 
@@ -569,8 +569,8 @@ 
 	public function testCreateFileNonInteractive() {
 		$eol = PHP_EOL;
 
-		$path = TMP . 'shell_test';
-		$file = $path . DS . 'file1.php';
+		$path = TMP.'shell_test';
+		$file = $path.DS.'file1.php';
 
 		new Folder($path, true);
 
@@ -597,8 +597,8 @@ 
 	public function testCreateFileInteractive() {
 		$eol = PHP_EOL;
 
-		$path = TMP . 'shell_test';
-		$file = $path . DS . 'file1.php';
+		$path = TMP.'shell_test';
+		$file = $path.DS.'file1.php';
 		new Folder($path, true);
 
 		$this->Shell->interactive = true;
@@ -640,10 +640,10 @@ 
 	public function testCreateFileNoPermissions() {
 		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on windows.');
 
-		$path = TMP . 'shell_test';
-		$file = $path . DS . 'no_perms';
+		$path = TMP.'shell_test';
+		$file = $path.DS.'no_perms';
 
-		if (!is_dir($path)) {
+		if ( ! is_dir($path)) {
 			mkdir($path);
 		}
 		chmod($path, 0444);
@@ -846,13 +846,13 @@ 
 	public function testFileAndConsoleLogging() {
 		// file logging
 		$this->Shell->log_something();
-		$this->assertTrue(file_exists(LOGS . 'error.log'));
+		$this->assertTrue(file_exists(LOGS.'error.log'));
 
-		unlink(LOGS . 'error.log');
-		$this->assertFalse(file_exists(LOGS . 'error.log'));
+		unlink(LOGS.'error.log');
+		$this->assertFalse(file_exists(LOGS.'error.log'));
 
 		// both file and console logging
-		require_once CORE_TEST_CASES . DS . 'Log' . DS . 'Engine' . DS . 'ConsoleLogTest.php';
+		require_once CORE_TEST_CASES.DS.'Log'.DS.'Engine'.DS.'ConsoleLogTest.php';
 		$mock = $this->getMock('ConsoleLog', array('write'), array(
 			array('types' => 'error'),
 		));
@@ -865,8 +865,8 @@ 
 			->method('write')
 			->with('error', $this->Shell->testMessage);
 		$this->Shell->log_something();
-		$this->assertTrue(file_exists(LOGS . 'error.log'));
-		$contents = file_get_contents(LOGS . 'error.log');
+		$this->assertTrue(file_exists(LOGS.'error.log'));
+		$contents = file_get_contents(LOGS.'error.log');
 		$this->assertContains($this->Shell->testMessage, $contents);
 	}
 

lib/Cake/Test/Case/Controller/Component/Acl/IniAclTest.php

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
  * @return void
  */
 	public function testCheck() {
-		$iniFile = CAKE . 'Test' . DS . 'test_app' . DS . 'Config' . DS . 'acl.ini.php';
+		$iniFile = CAKE.'Test'.DS.'test_app'.DS.'Config'.DS.'acl.ini.php';
 
 		$Ini = new IniAcl();
 		$Ini->config = $Ini->readConfigFile($iniFile);
@@ -54,7 +54,7 @@ 
  * @return void
  */
 	public function testCheckArray() {
-		$iniFile = CAKE . 'Test' . DS . 'test_app' . DS . 'Config' . DS . 'acl.ini.php';
+		$iniFile = CAKE.'Test'.DS.'test_app'.DS.'Config'.DS.'acl.ini.php';
 
 		$Ini = new IniAcl();
 		$Ini->config = $Ini->readConfigFile($iniFile);

lib/Cake/Test/Case/Controller/Component/Acl/PhpAclTest.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 		$this->PhpAcl = new PhpAcl();
 		$this->Acl = new AclComponent($Collection, array(
 			'adapter' => array(
-				'config' => CAKE . 'Test' . DS . 'test_app' . DS . 'Config' . DS . 'acl.php',
+				'config' => CAKE.'Test'.DS.'test_app'.DS.'Config'.DS.'acl.php',
 			),
 		));
 	}