reginaldojunior / winners

lib/Cake/Test/Case/Utility/CakeTimeTest.php

Doc Comments -1 removed lines

@@ -58,7 +58,6 @@
 /**
  * Restored the original system timezone
  *
- * @param string $timezoneIdentifier Timezone string
  * @return void
  */
 	protected function _restoreSystemTimezone() {

Spacing +20 added lines, -20 removed lines

@@ -162,7 +162,7 @@ 
 			array(
 				'+2 months +2 days',
 				'2 months, 2 days',
-				'on ' . date('j/n/y', strtotime('+2 months +2 days'))
+				'on '.date('j/n/y', strtotime('+2 months +2 days'))
 			),
 			array(
 				'+2 months +12 days',
@@ -202,7 +202,7 @@ 
 			strtotime('+4 months +2 weeks +3 days'),
 			array('absoluteString' => 'exactly on %s', 'accuracy' => array('year' => 'year'), 'end' => '+2 months')
 		);
-		$expected = 'exactly on ' . date('j/n/y', strtotime('+4 months +2 weeks +3 days'));
+		$expected = 'exactly on '.date('j/n/y', strtotime('+4 months +2 weeks +3 days'));
 		$this->assertEquals($expected, $result);
 	}
 
@@ -284,7 +284,7 @@ 
 			strtotime('+2 months +2 days'),
 			array('end' => '1 month', 'format' => 'Y-m-d')
 		);
-		$this->assertEquals('on ' . date('Y-m-d', strtotime('+2 months +2 days')), $result);
+		$this->assertEquals('on '.date('Y-m-d', strtotime('+2 months +2 days')), $result);
 	}
 
 /**
@@ -309,7 +309,7 @@ 
 			strtotime('-2 months -2 days'),
 			array('end' => '1 month', 'format' => 'Y-m-d')
 		);
-		$this->assertEquals('on ' . date('Y-m-d', strtotime('-2 months -2 days')), $result);
+		$this->assertEquals('on '.date('Y-m-d', strtotime('-2 months -2 days')), $result);
 
 		$result = $this->Time->timeAgoInWords(
 			strtotime('-2 years -5 months -2 days'),
@@ -325,7 +325,7 @@ 
 
 		$time = strtotime('-3 years -12 months');
 		$result = $this->Time->timeAgoInWords($time);
-		$expected = 'on ' . date('j/n/y', $time);
+		$expected = 'on '.date('j/n/y', $time);
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->timeAgoInWords(
@@ -339,7 +339,7 @@ 
 			$timestamp,
 			array('accuracy' => array('year' => 'year'))
 		);
-		$expected = 'on ' . date('j/n/y', $timestamp);
+		$expected = 'on '.date('j/n/y', $timestamp);
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->timeAgoInWords(
@@ -409,16 +409,16 @@ 
  */
 	public function testNiceShort() {
 		$time = time();
-		$this->assertEquals('Today, ' . date('H:i', $time), $this->Time->niceShort($time));
+		$this->assertEquals('Today, '.date('H:i', $time), $this->Time->niceShort($time));
 
 		$time = time() - DAY;
-		$this->assertEquals('Yesterday, ' . date('H:i', $time), $this->Time->niceShort($time));
+		$this->assertEquals('Yesterday, '.date('H:i', $time), $this->Time->niceShort($time));
 
 		$time = time() + DAY;
-		$this->assertEquals('Tomorrow, ' . date('H:i', $time), $this->Time->niceShort($time));
+		$this->assertEquals('Tomorrow, '.date('H:i', $time), $this->Time->niceShort($time));
 
 		$time = strtotime('+6 days');
-		$this->assertEquals('On ' . date('l F d, H:i', $time), $this->Time->niceShort($time));
+		$this->assertEquals('On '.date('l F d, H:i', $time), $this->Time->niceShort($time));
 
 		$time = strtotime('-6 days');
 		$this->assertEquals(date('l F d, H:i', $time), $this->Time->niceShort($time));
@@ -444,7 +444,7 @@ 
 		$begin = time();
 		$end = time() + DAY;
 		$field = 'my_field';
-		$expected = '(my_field >= \'' . date('Y-m-d', $begin) . ' 00:00:00\') AND (my_field <= \'' . date('Y-m-d', $end) . ' 23:59:59\')';
+		$expected = '(my_field >= \''.date('Y-m-d', $begin).' 00:00:00\') AND (my_field <= \''.date('Y-m-d', $end).' 23:59:59\')';
 		$this->assertEquals($expected, $this->Time->daysAsSql($begin, $end, $field));
 	}
 
@@ -456,7 +456,7 @@ 
 	public function testDayAsSql() {
 		$time = time();
 		$field = 'my_field';
-		$expected = '(my_field >= \'' . date('Y-m-d', $time) . ' 00:00:00\') AND (my_field <= \'' . date('Y-m-d', $time) . ' 23:59:59\')';
+		$expected = '(my_field >= \''.date('Y-m-d', $time).' 00:00:00\') AND (my_field <= \''.date('Y-m-d', $time).' 23:59:59\')';
 		$this->assertEquals($expected, $this->Time->dayAsSql($time, $field));
 	}
 
@@ -698,10 +698,10 @@ 
 		$days = $map[date('D')];
 
 		for ($day = $days[0] + 1; $day < $days[1]; $day++) {
-			$this->assertTrue($this->Time->isThisWeek(($day > 0 ? '+' : '') . $day . ' days'));
+			$this->assertTrue($this->Time->isThisWeek(($day > 0 ? '+' : '').$day.' days'));
 		}
-		$this->assertFalse($this->Time->isThisWeek($days[0] . ' days'));
-		$this->assertFalse($this->Time->isThisWeek('+' . $days[1] . ' days'));
+		$this->assertFalse($this->Time->isThisWeek($days[0].' days'));
+		$this->assertFalse($this->Time->isThisWeek('+'.$days[1].' days'));
 	}
 
 /**
@@ -967,7 +967,7 @@ 
  */
 	public function testConvertSpecifiers() {
 		App::build(array(
-			'Locale' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
+			'Locale' => array(CAKE.'Test'.DS.'test_app'.DS.'Locale'.DS)
 		), App::RESET);
 		Configure::write('Config.language', 'time_test');
 		$time = strtotime('Thu Jan 14 11:43:39 2010');
@@ -1074,7 +1074,7 @@ 
  */
 	public function testI18nFormat() {
 		App::build(array(
-			'Locale' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS)
+			'Locale' => array(CAKE.'Test'.DS.'test_app'.DS.'Locale'.DS)
 		), App::RESET);
 		Configure::write('Config.language', 'time_test');
 
@@ -1085,7 +1085,7 @@ 
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->i18nFormat($time, '%c');
-		$expected = 'jue 14 ene 2010 13:59:28 ' . utf8_encode(strftime('%Z', $time));
+		$expected = 'jue 14 ene 2010 13:59:28 '.utf8_encode(strftime('%Z', $time));
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->i18nFormat($time, 'Time is %r, and date is %x');
@@ -1099,7 +1099,7 @@ 
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->i18nFormat($time, '%c');
-		$expected = 'mié 13 ene 2010 13:59:28 ' . utf8_encode(strftime('%Z', $time));
+		$expected = 'mié 13 ene 2010 13:59:28 '.utf8_encode(strftime('%Z', $time));
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Time->i18nFormat($time, 'Time is %r, and date is %x');
@@ -1145,7 +1145,7 @@ 
 		$this->assertTrue(isset($return['America/Argentina/Buenos_Aires']));
 		$this->assertTrue(isset($return['Pacific/Tahiti']));
 
-		if (!$this->skipIf(version_compare(PHP_VERSION, '5.3.0', '<'))) {
+		if ( ! $this->skipIf(version_compare(PHP_VERSION, '5.3.0', '<'))) {
 			$return = CakeTime::listTimezones(DateTimeZone::ASIA);
 			$this->assertTrue(isset($return['Asia']['Asia/Bangkok']));
 			$this->assertFalse(isset($return['Pacific']));

lib/Cake/Test/Case/Utility/FileTest.php

Doc Comments +5 added lines, -5 removed lines

@@ -391,7 +391,7 @@ 
 /**
  * testWrite method
  *
- * @return void
+ * @return false|null
  */
 	public function testWrite() {
 		if (!$tmpFile = $this->_getTmpFile()) {
@@ -421,7 +421,7 @@ 
 /**
  * testAppend method
  *
- * @return void
+ * @return false|null
  */
 	public function testAppend() {
 		if (!$tmpFile = $this->_getTmpFile()) {
@@ -457,7 +457,7 @@ 
 /**
  * testDelete method
  *
- * @return void
+ * @return false|null
  */
 	public function testDelete() {
 		if (!$tmpFile = $this->_getTmpFile()) {
@@ -482,7 +482,7 @@ 
  * Windows has issues unlinking files if there are
  * active filehandles open.
  *
- * @return void
+ * @return false|null
  */
 	public function testDeleteAfterRead() {
 		if (!$tmpFile = $this->_getTmpFile()) {
@@ -544,7 +544,7 @@ 
  * getTmpFile method
  *
  * @param boolean $paintSkip
- * @return void
+ * @return string|false
  */
 	protected function _getTmpFile($paintSkip = true) {
 		$tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp';

Spacing +29 added lines, -29 removed lines

@@ -55,7 +55,7 @@ 
 		unset($this->File);
 
 		$Folder = new Folder();
-		$Folder->delete(TMP . 'tests' . DS . 'permissions');
+		$Folder->delete(TMP.'tests'.DS.'permissions');
 	}
 
 /**
@@ -64,7 +64,7 @@ 
  * @return void
  */
 	public function testBasic() {
-		$file = CAKE . DS . 'LICENSE.txt';
+		$file = CAKE.DS.'LICENSE.txt';
 
 		$this->File = new File($file, false);
 
@@ -82,8 +82,8 @@ 
 			'mime' => 'text/plain'
 		);
 		if (
-			!function_exists('finfo_open') &&
-			(!function_exists('mime_content_type') ||
+			! function_exists('finfo_open') &&
+			( ! function_exists('mime_content_type') ||
 			function_exists('mime_content_type') &&
 			mime_content_type($this->File->pwd()) === false)
 		) {
@@ -131,11 +131,11 @@ 
 	public function testPermission() {
 		$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'File permissions tests not supported on Windows.');
 
-		$dir = TMP . 'tests' . DS . 'permissions' . DS;
+		$dir = TMP.'tests'.DS.'permissions'.DS;
 		$old = umask();
 
 		umask(0002);
-		$file = $dir . 'permission_' . uniqid();
+		$file = $dir.'permission_'.uniqid();
 		$expecting = decoct(0664 & ~umask());
 		$File = new File($file, true);
 		$result = $File->perms();
@@ -143,7 +143,7 @@ 
 		$File->delete();
 
 		umask(0022);
-		$file = $dir . 'permission_' . uniqid();
+		$file = $dir.'permission_'.uniqid();
 		$expecting = decoct(0644 & ~umask());
 		$File = new File($file, true);
 		$result = $File->perms();
@@ -151,7 +151,7 @@ 
 		$File->delete();
 
 		umask(0422);
-		$file = $dir . 'permission_' . uniqid();
+		$file = $dir.'permission_'.uniqid();
 		$expecting = decoct(0244 & ~umask());
 		$File = new File($file, true);
 		$result = $File->perms();
@@ -159,7 +159,7 @@ 
 		$File->delete();
 
 		umask(0444);
-		$file = $dir . 'permission_' . uniqid();
+		$file = $dir.'permission_'.uniqid();
 		$expecting = decoct(0222 & ~umask());
 		$File = new File($file, true);
 		$result = $File->perms();
@@ -181,7 +181,7 @@ 
 		$result = $this->File->read();
 		$expecting = file_get_contents(__FILE__);
 		$this->assertEquals($expecting, $result);
-		$this->assertTrue(!is_resource($this->File->handle));
+		$this->assertTrue( ! is_resource($this->File->handle));
 
 		$this->File->lock = true;
 		$result = $this->File->read();
@@ -279,7 +279,7 @@ 
  * @return void
  */
 	public function testCreate() {
-		$tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
+		$tmpFile = TMP.'tests'.DS.'cakephp.file.test.tmp';
 		$File = new File($tmpFile, true, 0777);
 		$this->assertTrue($File->exists());
 	}
@@ -290,7 +290,7 @@ 
  * @return void
  */
 	public function testOpeningNonExistentFileCreatesIt() {
-		$someFile = new File(TMP . 'some_file.txt', false);
+		$someFile = new File(TMP.'some_file.txt', false);
 		$this->assertTrue($someFile->open());
 		$this->assertEquals('', $someFile->read());
 		$someFile->close();
@@ -323,7 +323,7 @@ 
  * @return void
  */
 	public function testReadable() {
-		$someFile = new File(TMP . 'some_file.txt', false);
+		$someFile = new File(TMP.'some_file.txt', false);
 		$this->assertTrue($someFile->open());
 		$this->assertTrue($someFile->readable());
 		$someFile->close();
@@ -336,7 +336,7 @@ 
  * @return void
  */
 	public function testWritable() {
-		$someFile = new File(TMP . 'some_file.txt', false);
+		$someFile = new File(TMP.'some_file.txt', false);
 		$this->assertTrue($someFile->open());
 		$this->assertTrue($someFile->writable());
 		$someFile->close();
@@ -349,7 +349,7 @@ 
  * @return void
  */
 	public function testExecutable() {
-		$someFile = new File(TMP . 'some_file.txt', false);
+		$someFile = new File(TMP.'some_file.txt', false);
 		$this->assertTrue($someFile->open());
 		$this->assertFalse($someFile->executable());
 		$someFile->close();
@@ -362,7 +362,7 @@ 
  * @return void
  */
 	public function testLastAccess() {
-		$someFile = new File(TMP . 'some_file.txt', false);
+		$someFile = new File(TMP.'some_file.txt', false);
 		$this->assertFalse($someFile->lastAccess());
 		$this->assertTrue($someFile->open());
 		$this->assertWithinMargin($someFile->lastAccess(), time(), 2);
@@ -376,7 +376,7 @@ 
  * @return void
  */
 	public function testLastChange() {
-		$someFile = new File(TMP . 'some_file.txt', false);
+		$someFile = new File(TMP.'some_file.txt', false);
 		$this->assertFalse($someFile->lastChange());
 		$this->assertTrue($someFile->open('r+'));
 		$this->assertWithinMargin($someFile->lastChange(), time(), 2);
@@ -394,7 +394,7 @@ 
  * @return void
  */
 	public function testWrite() {
-		if (!$tmpFile = $this->_getTmpFile()) {
+		if ( ! $tmpFile = $this->_getTmpFile()) {
 			return false;
 		}
 		if (file_exists($tmpFile)) {
@@ -424,7 +424,7 @@ 
  * @return void
  */
 	public function testAppend() {
-		if (!$tmpFile = $this->_getTmpFile()) {
+		if ( ! $tmpFile = $this->_getTmpFile()) {
 			return false;
 		}
 		if (file_exists($tmpFile)) {
@@ -441,7 +441,7 @@ 
 			$r = $TmpFile->append($fragment);
 			$this->assertTrue($r);
 			$this->assertTrue(file_exists($tmpFile));
-			$data = $data . $fragment;
+			$data = $data.$fragment;
 			$this->assertEquals($data, file_get_contents($tmpFile));
 			$newSize = $TmpFile->size();
 			$this->assertTrue($newSize > $size);
@@ -460,11 +460,11 @@ 
  * @return void
  */
 	public function testDelete() {
-		if (!$tmpFile = $this->_getTmpFile()) {
+		if ( ! $tmpFile = $this->_getTmpFile()) {
 			return false;
 		}
 
-		if (!file_exists($tmpFile)) {
+		if ( ! file_exists($tmpFile)) {
 			touch($tmpFile);
 		}
 		$TmpFile = new File($tmpFile);
@@ -485,10 +485,10 @@ 
  * @return void
  */
 	public function testDeleteAfterRead() {
-		if (!$tmpFile = $this->_getTmpFile()) {
+		if ( ! $tmpFile = $this->_getTmpFile()) {
 			return false;
 		}
-		if (!file_exists($tmpFile)) {
+		if ( ! file_exists($tmpFile)) {
 			touch($tmpFile);
 		}
 		$File = new File($tmpFile);
@@ -502,7 +502,7 @@ 
  * @return void
  */
 	public function testCopy() {
-		$dest = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
+		$dest = TMP.'tests'.DS.'cakephp.file.test.tmp';
 		$file = __FILE__;
 		$this->File = new File($file);
 		$result = $this->File->copy($dest);
@@ -530,8 +530,8 @@ 
  * @return void
  */
 	public function testMime() {
-		$this->skipIf(!function_exists('finfo_open') && !function_exists('mime_content_type'), 'Not able to read mime type');
-		$path = CAKE . 'Test' . DS . 'test_app' . DS . 'webroot' . DS . 'img' . DS . 'cake.power.gif';
+		$this->skipIf( ! function_exists('finfo_open') && ! function_exists('mime_content_type'), 'Not able to read mime type');
+		$path = CAKE.'Test'.DS.'test_app'.DS.'webroot'.DS.'img'.DS.'cake.power.gif';
 		$file = new File($path);
 		$expected = 'image/gif';
 		if (function_exists('mime_content_type') && mime_content_type($file->pwd()) === false) {
@@ -547,8 +547,8 @@ 
  * @return void
  */
 	protected function _getTmpFile($paintSkip = true) {
-		$tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
-		if (is_writable(dirname($tmpFile)) && (!file_exists($tmpFile) || is_writable($tmpFile))) {
+		$tmpFile = TMP.'tests'.DS.'cakephp.file.test.tmp';
+		if (is_writable(dirname($tmpFile)) && ( ! file_exists($tmpFile) || is_writable($tmpFile))) {
 			return $tmpFile;
 		}
 

lib/Cake/Test/Case/Utility/ValidationTest.php

Doc Comments +3 added lines, -4 removed lines

@@ -28,7 +28,6 @@ 
 /**
  * Makes sure that a given $email address is valid and unique
  *
- * @param string $email
  * @return boolean
  */
 	public static function customValidate($check) {
@@ -50,7 +49,7 @@ 
  * postal function, for testing postal pass through.
  *
  * @param string $check
- * @return void
+ * @return boolean
  */
 	public static function postal($check) {
 		return true;
@@ -59,7 +58,7 @@ 
 /**
  * ssn function for testing ssn pass through
  *
- * @return void
+ * @return boolean
  */
 	public static function ssn($check) {
 		return true;
@@ -80,7 +79,7 @@ 
  * phone function, for testing phone pass through.
  *
  * @param string $check
- * @return void
+ * @return boolean
  */
 	public static function phone($check) {
 		return true;

Spacing +18 added lines, -18 removed lines

@@ -32,7 +32,7 @@ 
  * @return boolean
  */
 	public static function customValidate($check) {
-		return (bool)preg_match('/^[0-9]{3}$/', $check);
+		return (bool) preg_match('/^[0-9]{3}$/', $check);
 	}
 
 }
@@ -131,7 +131,7 @@ 
 	public function testNotEmpty() {
 		$this->assertTrue(Validation::notEmpty('abcdefg'));
 		$this->assertTrue(Validation::notEmpty('fasdf '));
-		$this->assertTrue(Validation::notEmpty('fooo' . chr(243) . 'blabla'));
+		$this->assertTrue(Validation::notEmpty('fooo'.chr(243).'blabla'));
 		$this->assertTrue(Validation::notEmpty('abçďĕʑʘπй'));
 		$this->assertTrue(Validation::notEmpty('José'));
 		$this->assertTrue(Validation::notEmpty('é'));
@@ -149,7 +149,7 @@ 
 		Configure::write('App.encoding', 'ISO-8859-1');
 		$this->assertTrue(Validation::notEmpty('abcdefg'));
 		$this->assertTrue(Validation::notEmpty('fasdf '));
-		$this->assertTrue(Validation::notEmpty('fooo' . chr(243) . 'blabla'));
+		$this->assertTrue(Validation::notEmpty('fooo'.chr(243).'blabla'));
 		$this->assertTrue(Validation::notEmpty('abçďĕʑʘπй'));
 		$this->assertTrue(Validation::notEmpty('José'));
 		$this->assertTrue(Validation::notEmpty(utf8_decode('José')));
@@ -1554,9 +1554,9 @@ 
 		$this->assertTrue(Validation::decimal('1234', null));
 		$this->assertTrue(Validation::decimal('-1234', null));
 		$this->assertTrue(Validation::decimal('+1234', null));
-		$this->assertTrue(Validation::decimal((float)1234, null));
-		$this->assertTrue(Validation::decimal((double)1234, null));
-		$this->assertTrue(Validation::decimal((int)1234, null));
+		$this->assertTrue(Validation::decimal((float) 1234, null));
+		$this->assertTrue(Validation::decimal((double) 1234, null));
+		$this->assertTrue(Validation::decimal((int) 1234, null));
 
 		$this->assertFalse(Validation::decimal('', null));
 		$this->assertFalse(Validation::decimal('string', null));
@@ -1584,13 +1584,13 @@ 
 		$this->assertTrue(Validation::decimal('.00', true));
 		$this->assertTrue(Validation::decimal(.01, true));
 		$this->assertTrue(Validation::decimal('.01', true));
-		$this->assertTrue(Validation::decimal((float)1234, true));
-		$this->assertTrue(Validation::decimal((double)1234, true));
+		$this->assertTrue(Validation::decimal((float) 1234, true));
+		$this->assertTrue(Validation::decimal((double) 1234, true));
 
 		$this->assertFalse(Validation::decimal('', true));
 		$this->assertFalse(Validation::decimal('string', true));
 		$this->assertFalse(Validation::decimal('1234.', true));
-		$this->assertFalse(Validation::decimal((int)1234, true));
+		$this->assertFalse(Validation::decimal((int) 1234, true));
 		$this->assertFalse(Validation::decimal('1234', true));
 		$this->assertFalse(Validation::decimal('-1234', true));
 		$this->assertFalse(Validation::decimal('+1234', true));
@@ -1624,9 +1624,9 @@ 
 		$this->assertFalse(Validation::decimal('1234.', 1));
 		$this->assertFalse(Validation::decimal(.0, 1));
 		$this->assertFalse(Validation::decimal(.00, 2));
-		$this->assertFalse(Validation::decimal((float)1234, 1));
-		$this->assertFalse(Validation::decimal((double)1234, 1));
-		$this->assertFalse(Validation::decimal((int)1234, 1));
+		$this->assertFalse(Validation::decimal((float) 1234, 1));
+		$this->assertFalse(Validation::decimal((double) 1234, 1));
+		$this->assertFalse(Validation::decimal((int) 1234, 1));
 		$this->assertFalse(Validation::decimal('1234.5678', '3'));
 		$this->assertFalse(Validation::decimal(1234.5678, 3));
 		$this->assertFalse(Validation::decimal(-1234.5678, 3));
@@ -1640,8 +1640,8 @@ 
  */
 	public function testDecimalWithInvalidPlaces() {
 		$this->assertFalse(Validation::decimal('.27', 'string'));
-		$this->assertFalse(Validation::decimal(1234.5678, (array)true));
-		$this->assertFalse(Validation::decimal(-1234.5678, (object)true));
+		$this->assertFalse(Validation::decimal(1234.5678, (array) true));
+		$this->assertFalse(Validation::decimal(-1234.5678, (object) true));
 	}
 
 /**
@@ -2356,9 +2356,9 @@ 
  * @return void
  */
 	public function testMimeType() {
-		$image = CORE_PATH . 'Cake' . DS . 'Test' . DS . 'test_app' . DS . 'webroot' . DS . 'img' . DS . 'cake.power.gif';
+		$image = CORE_PATH.'Cake'.DS.'Test'.DS.'test_app'.DS.'webroot'.DS.'img'.DS.'cake.power.gif';
 		$File = new File($image, false);
-		$this->skipIf(!$File->mime(), 'Cannot determine mimeType');
+		$this->skipIf( ! $File->mime(), 'Cannot determine mimeType');
 		$this->assertTrue(Validation::mimeType($image, array('image/gif')));
 		$this->assertTrue(Validation::mimeType(array('tmp_name' => $image), array('image/gif')));
 
@@ -2373,7 +2373,7 @@ 
  * @return void
  */
 	public function testMimeTypeFalse() {
-		$image = CORE_PATH . 'Cake' . DS . 'Test' . DS . 'test_app' . DS . 'webroot' . DS . 'img' . DS . 'cake.power.gif';
+		$image = CORE_PATH.'Cake'.DS.'Test'.DS.'test_app'.DS.'webroot'.DS.'img'.DS.'cake.power.gif';
 		$File = new File($image, false);
 		$this->skipIf($File->mime(), 'mimeType can be determined, no Exception will be thrown');
 		Validation::mimeType($image, array('image/gif'));
@@ -2400,7 +2400,7 @@ 
  * @return void
  */
 	public function testFileSize() {
-		$image = CORE_PATH . 'Cake' . DS . 'Test' . DS . 'test_app' . DS . 'webroot' . DS . 'img' . DS . 'cake.power.gif';
+		$image = CORE_PATH.'Cake'.DS.'Test'.DS.'test_app'.DS.'webroot'.DS.'img'.DS.'cake.power.gif';
 		$this->assertTrue(Validation::fileSize($image, '<', 1024));
 		$this->assertTrue(Validation::fileSize(array('tmp_name' => $image), 'isless', 1024));
 		$this->assertTrue(Validation::fileSize($image, '<', '1KB'));

lib/Cake/Test/Case/View/Helper/FormHelperTest.php

Doc Comments +4 added lines, -4 removed lines

@@ -310,7 +310,7 @@ 
 /**
  * beforeValidate method
  *
- * @return void
+ * @return boolean
  */
 	public function beforeValidate($options = array()) {
 		$this->invalidate('openid_not_registered');
@@ -359,7 +359,7 @@ 
 /**
  * beforeValidate method
  *
- * @return void
+ * @return boolean
  */
 	public function beforeValidate($options = array()) {
 		$this->invalidate('email');
@@ -417,7 +417,7 @@ 
 /**
  * beforeValidate method
  *
- * @return void
+ * @return boolean
  */
 	public function beforeValidate($options = array()) {
 		$this->invalidate('full_name');
@@ -467,7 +467,7 @@ 
 /**
  * beforeValidate method
  *
- * @return void
+ * @return boolean
  */
 	public function beforeValidate($options = array()) {
 		$this->invalidate('description');

Spacing +16 added lines, -16 removed lines

@@ -690,8 +690,8 @@ 
 		$this->Form->request['_Token'] = array('key' => $key);
 		$result = $this->Form->secure($fields);
 
-		$hash = Security::hash(serialize($fields) . Configure::read('Security.salt'));
-		$hash .= ':' . 'Model.valid';
+		$hash = Security::hash(serialize($fields).Configure::read('Security.salt'));
+		$hash .= ':'.'Model.valid';
 		$hash = urlencode($hash);
 
 		$expected = array(
@@ -708,7 +708,7 @@ 
 		);
 		$this->assertTags($result, $expected);
 
-		$path = CAKE . 'Test' . DS . 'test_app' . DS . 'Config' . DS;
+		$path = CAKE.'Test'.DS.'test_app'.DS.'Config'.DS;
 		$this->Form->Html->loadConfig('htmlhelper_tags', $path);
 		$result = $this->Form->secure($fields);
 		$expected = array(
@@ -2286,7 +2286,7 @@ 
 
 		$result = $this->Form->input('published', array('type' => 'time'));
 		$now = strtotime('now');
-		$this->assertContains('<option value="' . date('h', $now) . '" selected="selected">' . date('g', $now) . '</option>', $result);
+		$this->assertContains('<option value="'.date('h', $now).'" selected="selected">'.date('g', $now).'</option>', $result);
 
 		$now = strtotime('2013-03-09 00:42:21');
 		$result = $this->Form->input('published', array('type' => 'time', 'selected' => $now));
@@ -3236,7 +3236,7 @@ 
 	public function testInputsPluginModel() {
 		$this->loadFixtures('Post');
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$this->Form->request['models'] = array(
@@ -5387,7 +5387,7 @@ 
 
 		$result = $this->Form->secure($this->Form->fields);
 		$key = 'f7d573650a295b94e0938d32b323fde775e5f32b%3A';
-		$this->assertRegExp('/"' . $key . '"/', $result);
+		$this->assertRegExp('/"'.$key.'"/', $result);
 	}
 
 /**
@@ -6109,7 +6109,7 @@ 
 		$this->assertTags($result, $expected);
 		$this->assertNotRegExp('/<option[^<>]+value=""[^<>]+selected="selected"[^>]*>/', $result);
 
-		$this->Form->request->data['Model']['field'] = date('Y') . '-01-01 00:00:00';
+		$this->Form->request->data['Model']['field'] = date('Y').'-01-01 00:00:00';
 		$now = strtotime($this->Form->data['Model']['field']);
 		$result = $this->Form->dateTime('Model.field', 'DMY', '12', array('empty' => false));
 		$expected = array(
@@ -6929,7 +6929,7 @@ 
 		$result = $this->Form->hour('Model.field', true, array('value' => 'now'));
 		$thisHour = date('H');
 		$optValue = date('G');
-		$this->assertRegExp('/<option value="' . $thisHour . '" selected="selected">' . $optValue . '<\/option>/', $result);
+		$this->assertRegExp('/<option value="'.$thisHour.'" selected="selected">'.$optValue.'<\/option>/', $result);
 
 		$this->Form->request->data['Model']['field'] = '2050-10-10 01:12:32';
 		$result = $this->Form->hour('Model.field', true);
@@ -7227,7 +7227,7 @@ 
 					'maxYear' => 2008
 				)
 		);
-		$this->assertContains('value="' . date('m') . '" selected="selected"', $result);
+		$this->assertContains('value="'.date('m').'" selected="selected"', $result);
 		$this->assertNotContains('value="2008" selected="selected"', $result);
 
 		$result = $this->Form->input('just_year',
@@ -7239,7 +7239,7 @@ 
 				'maxYear' => date('Y', strtotime('+20 years'))
 			)
 		);
-		$this->assertNotContains('value="' . date('Y') . '" selected="selected"', $result);
+		$this->assertNotContains('value="'.date('Y').'" selected="selected"', $result);
 
 		$result = $this->Form->input('just_month',
 			array(
@@ -7249,7 +7249,7 @@ 
 				'empty' => false,
 			)
 		);
-		$this->assertNotContains('value="' . date('m') . '" selected="selected"', $result);
+		$this->assertNotContains('value="'.date('m').'" selected="selected"', $result);
 
 		$result = $this->Form->input('just_day',
 			array(
@@ -7259,7 +7259,7 @@ 
 				'empty' => false,
 			)
 		);
-		$this->assertNotContains('value="' . date('d') . '" selected="selected"', $result);
+		$this->assertNotContains('value="'.date('d').'" selected="selected"', $result);
 	}
 
 /**
@@ -7623,9 +7623,9 @@ 
  */
 	public function testPostLinkSecurityHash() {
 		$hash = Security::hash(
-			'/posts/delete/1' .
-			serialize(array()) .
-			'' .
+			'/posts/delete/1'.
+			serialize(array()).
+			''.
 			Configure::read('Security.salt')
 		);
 		$hash .= '%3A';
@@ -9636,7 +9636,7 @@ 
 	public function testIntrospectModelFromRequest() {
 		$this->loadFixtures('Post');
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)
 		));
 		CakePlugin::load('TestPlugin');
 		$this->Form->request['models'] = array('TestPluginPost' => array('plugin' => 'TestPlugin', 'className' => 'TestPluginPost'));

Indentation +5 added lines, -5 removed lines

@@ -5408,11 +5408,11 @@
 		$this->assertEquals(array('Model.select'), $this->Form->fields);
 	}
 /**
- * When a select box has no options it should not be added to the fields list
- * as it always fail post validation.
- *
- * @return void
- */
+	 * When a select box has no options it should not be added to the fields list
+	 * as it always fail post validation.
+	 *
+	 * @return void
+	 */
 	public function testSelectNoSecureWithNoOptions() {
 		$this->Form->request['_Token'] = array('key' => 'testkey');
 		$this->assertEquals(array(), $this->Form->fields);

lib/Cake/Test/Case/View/Helper/JsHelperTest.php

Doc Comments +2 added lines, -2 removed lines

@@ -69,8 +69,8 @@
  * test method for option parsing
  *
  * @param $options
- * @param array $safe
- * @return void
+ * @param string[] $safe
+ * @return string
  */
 	public function testParseOptions($options, $safe = array()) {
 		return $this->_parseOptions($options, $safe);

Spacing +8 added lines, -8 removed lines

@@ -360,7 +360,7 @@ 
  * @return void
  */
 	public function testWriteScriptsInFile() {
-		$this->skipIf(!is_writable(WWW_ROOT . 'js'), 'webroot/js is not Writable, script caching test has been skipped.');
+		$this->skipIf( ! is_writable(WWW_ROOT.'js'), 'webroot/js is not Writable, script caching test has been skipped.');
 
 		Configure::write('Cache.disable', false);
 		$this->Js->request->webroot = '/';
@@ -373,11 +373,11 @@ 
 		);
 		$this->assertTags($result, $expected);
 		preg_match('/src="(.*\.js)"/', $result, $filename);
-		$this->assertTrue(file_exists(WWW_ROOT . $filename[1]));
-		$contents = file_get_contents(WWW_ROOT . $filename[1]);
+		$this->assertTrue(file_exists(WWW_ROOT.$filename[1]));
+		$contents = file_get_contents(WWW_ROOT.$filename[1]);
 		$this->assertRegExp('/one\s=\s1;\ntwo\s=\s2;/', $contents);
-		if (file_exists(WWW_ROOT . $filename[1])) {
-			unlink(WWW_ROOT . $filename[1]);
+		if (file_exists(WWW_ROOT.$filename[1])) {
+			unlink(WWW_ROOT.$filename[1]);
 		}
 
 		Configure::write('Cache.disable', true);
@@ -385,7 +385,7 @@ 
 		$this->Js->buffer('two = 2;');
 		$result = $this->Js->writeBuffer(array('onDomReady' => false, 'cache' => true));
 		$this->assertRegExp('/one\s=\s1;\ntwo\s=\s2;/', $result);
-		$this->assertFalse(file_exists(WWW_ROOT . $filename[1]));
+		$this->assertFalse(file_exists(WWW_ROOT.$filename[1]));
 	}
 
 /**
@@ -776,11 +776,11 @@ 
 		$expected = '';
 		$this->assertEquals($expected, $result);
 
-		$result = $this->JsEngine->escape('CakePHP' . "\n" . 'Rapid Development Framework');
+		$result = $this->JsEngine->escape('CakePHP'."\n".'Rapid Development Framework');
 		$expected = 'CakePHP\\nRapid Development Framework';
 		$this->assertEquals($expected, $result);
 
-		$result = $this->JsEngine->escape('CakePHP' . "\r\n" . 'Rapid Development Framework' . "\r" . 'For PHP');
+		$result = $this->JsEngine->escape('CakePHP'."\r\n".'Rapid Development Framework'."\r".'For PHP');
 		$expected = 'CakePHP\\r\\nRapid Development Framework\\rFor PHP';
 		$this->assertEquals($expected, $result);
 

lib/Cake/Test/Case/View/ThemeViewTest.php

Doc Comments +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
  *
  * @param string $name
  * @param array $params
- * @return void
+ * @return string
  */
 	public function renderElement($name, $params = array()) {
 		return $name;
@@ -73,7 +73,7 @@ 
  * getViewFileName method
  *
  * @param string $name
- * @return void
+ * @return string
  */
 	public function getViewFileName($name = null) {
 		return $this->_getViewFileName($name);
@@ -83,7 +83,7 @@ 
  * getLayoutFileName method
  *
  * @param string $name
- * @return void
+ * @return string
  */
 	public function getLayoutFileName($name = null) {
 		return $this->_getLayoutFileName($name);

Spacing +11 added lines, -11 removed lines

@@ -112,8 +112,8 @@ 
 		$this->PostsController->index();
 		$this->ThemeView = new ThemeView($this->PostsController);
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS),
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 		App::objects('plugins', null, false);
 		CakePlugin::load(array('TestPlugin'));
@@ -145,15 +145,15 @@ 
 		$this->Controller->theme = 'TestTheme';
 
 		$ThemeView = new TestTheme2View($this->Controller);
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Plugin' . DS . 'TestPlugin' . DS . 'Tests' . DS . 'index.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Themed'.DS.'TestTheme'.DS.'Plugin'.DS.'TestPlugin'.DS.'Tests'.DS.'index.ctp';
 		$result = $ThemeView->getViewFileName('index');
 		$this->assertEquals($expected, $result);
 
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Plugin' . DS . 'TestPlugin' . DS . 'Layouts' . DS . 'plugin_default.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Themed'.DS.'TestTheme'.DS.'Plugin'.DS.'TestPlugin'.DS.'Layouts'.DS.'plugin_default.ctp';
 		$result = $ThemeView->getLayoutFileName('plugin_default');
 		$this->assertEquals($expected, $result);
 
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Layouts' . DS . 'default.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Themed'.DS.'TestTheme'.DS.'Layouts'.DS.'default.ctp';
 		$result = $ThemeView->getLayoutFileName('default');
 		$this->assertEquals($expected, $result);
 	}
@@ -172,25 +172,25 @@ 
 
 		$ThemeView = new TestTheme2View($this->Controller);
 		$ThemeView->theme = 'TestTheme';
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Pages' . DS . 'home.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Pages'.DS.'home.ctp';
 		$result = $ThemeView->getViewFileName('home');
 		$this->assertEquals($expected, $result);
 
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Posts' . DS . 'index.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Themed'.DS.'TestTheme'.DS.'Posts'.DS.'index.ctp';
 		$result = $ThemeView->getViewFileName('/Posts/index');
 		$this->assertEquals($expected, $result);
 
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Themed' . DS . 'TestTheme' . DS . 'Layouts' . DS . 'default.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Themed'.DS.'TestTheme'.DS.'Layouts'.DS.'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEquals($expected, $result);
 
 		$ThemeView->layoutPath = 'rss';
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Layouts' . DS . 'rss' . DS . 'default.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Layouts'.DS.'rss'.DS.'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEquals($expected, $result);
 
-		$ThemeView->layoutPath = 'Emails' . DS . 'html';
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Layouts' . DS . 'Emails' . DS . 'html' . DS . 'default.ctp';
+		$ThemeView->layoutPath = 'Emails'.DS.'html';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Layouts'.DS.'Emails'.DS.'html'.DS.'default.ctp';
 		$result = $ThemeView->getLayoutFileName();
 		$this->assertEquals($expected, $result);
 	}

lib/Cake/TestSuite/CakeTestLoader.php

Doc Comments +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
  *
  * @param string $filePath
  * @param string $params
- * @return void
+ * @return string
  */
 	protected function _resolveTestFile($filePath, $params) {
 		$basePath = $this->_basePath($params) . DS . $filePath;
@@ -55,7 +55,7 @@ 
 /**
  * Generates the base path to a set of tests based on the parameters.
  *
- * @param array $params
+ * @param string $params
  * @return string The base path.
  */
 	protected static function _basePath($params) {

Spacing +10 added lines, -10 removed lines

@@ -47,9 +47,9 @@ 
  * @return void
  */
 	protected function _resolveTestFile($filePath, $params) {
-		$basePath = $this->_basePath($params) . DS . $filePath;
+		$basePath = $this->_basePath($params).DS.$filePath;
 		$ending = 'Test.php';
-		return (strpos($basePath, $ending) === (strlen($basePath) - strlen($ending))) ? $basePath : $basePath . $ending;
+		return (strpos($basePath, $ending) === (strlen($basePath) - strlen($ending))) ? $basePath : $basePath.$ending;
 	}
 
 /**
@@ -60,19 +60,19 @@ 
  */
 	protected static function _basePath($params) {
 		$result = null;
-		if (!empty($params['core'])) {
+		if ( ! empty($params['core'])) {
 			$result = CORE_TEST_CASES;
-		} elseif (!empty($params['plugin'])) {
-			if (!CakePlugin::loaded($params['plugin'])) {
+		} elseif ( ! empty($params['plugin'])) {
+			if ( ! CakePlugin::loaded($params['plugin'])) {
 				try {
 					CakePlugin::load($params['plugin']);
-					$result = CakePlugin::path($params['plugin']) . 'Test' . DS . 'Case';
+					$result = CakePlugin::path($params['plugin']).'Test'.DS.'Case';
 				} catch (MissingPluginException $e) {
 				}
 			} else {
-				$result = CakePlugin::path($params['plugin']) . 'Test' . DS . 'Case';
+				$result = CakePlugin::path($params['plugin']).'Test'.DS.'Case';
 			}
-		} elseif (!empty($params['app'])) {
+		} elseif ( ! empty($params['app'])) {
 			$result = APP_TEST_CASES;
 		}
 		return $result;
@@ -90,7 +90,7 @@ 
 
 		$testCases = array();
 		foreach ($fileList as $testCaseFile) {
-			$case = str_replace($directory . DS, '', $testCaseFile);
+			$case = str_replace($directory.DS, '', $testCaseFile);
 			$case = str_replace('Test.php', '', $case);
 			$testCases[$testCaseFile] = $case;
 		}
@@ -107,7 +107,7 @@ 
  */
 	protected static function _getRecursiveFileList($directory = '.') {
 		$fileList = array();
-		if (!is_dir($directory)) {
+		if ( ! is_dir($directory)) {
 			return $fileList;
 		}
 

lib/Cake/TestSuite/CakeTestRunner.php

Doc Comments +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
  *
  * @param PHPUnit_Framework_Test $suite
  * @param array $arguments
- * @return void
+ * @return PHPUnit_Framework_TestResult
  */
 	public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array()) {
 		if (isset($arguments['printer'])) {

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
  */
 	protected function createTestResult() {
 		$result = new PHPUnit_Framework_TestResult;
-		if (!empty($this->_params['codeCoverage'])) {
+		if ( ! empty($this->_params['codeCoverage'])) {
 			if (method_exists($result, 'collectCodeCoverageInformation')) {
 				$result->collectCodeCoverageInformation(true);
 			}

lib/Cake/TestSuite/CakeTestSuiteCommand.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 /**
  * Construct method
  *
- * @param mixed $loader
+ * @param string $loader
  * @param array $params list of options to be used for this run
  * @throws MissingTestLoaderException When a loader class could not be found.
  */

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
  * @throws MissingTestLoaderException When a loader class could not be found.
  */
 	public function __construct($loader, $params = array()) {
-		if ($loader && !class_exists($loader)) {
+		if ($loader && ! class_exists($loader)) {
 			throw new MissingTestLoaderException(array('class' => $loader));
 		}
 		$this->arguments['loader'] = $loader;
@@ -95,13 +95,13 @@ 
 		try {
 			$result = $runner->doRun($suite, $this->arguments);
 		} catch (PHPUnit_Framework_Exception $e) {
-			print $e->getMessage() . "\n";
+			print $e->getMessage()."\n";
 		}
 
 		if ($exit) {
 			if (isset($result) && $result->wasSuccessful()) {
 				exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
-			} elseif (!isset($result) || $result->errorCount() > 0) {
+			} elseif ( ! isset($result) || $result->errorCount() > 0) {
 				exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
 			}
 			exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT);
@@ -138,13 +138,13 @@ 
 		$object = null;
 
 		$reporter = ucwords($reporter);
-		$coreClass = 'Cake' . $reporter . 'Reporter';
+		$coreClass = 'Cake'.$reporter.'Reporter';
 		App::uses($coreClass, 'TestSuite/Reporter');
 
-		$appClass = $reporter . 'Reporter';
+		$appClass = $reporter.'Reporter';
 		App::uses($appClass, 'TestSuite/Reporter');
 
-		if (!class_exists($appClass)) {
+		if ( ! class_exists($appClass)) {
 			$object = new $coreClass(null, $this->_params);
 		} else {
 			$object = new $appClass(null, $this->_params);