reginaldojunior / winners

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

Indentation +20 added lines, -20 removed lines

@@ -1,20 +1,20 @@ 
 <?php
 /**
- * FormHelperTest file
- *
- * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.Case.View.Helper
- * @since         CakePHP(tm) v 1.2.0.4206
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
+	 * FormHelperTest file
+	 *
+	 * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
+	 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 *
+	 * Licensed under The MIT License
+	 * For full copyright and license information, please see the LICENSE.txt
+	 * Redistributions of files must retain the above copyright notice
+	 *
+	 * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
+	 * @package       Cake.Test.Case.View.Helper
+	 * @since         CakePHP(tm) v 1.2.0.4206
+	 * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+	 */
 
 App::uses('ClassRegistry', 'Utility');
 App::uses('Controller', 'Controller');
@@ -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);

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
  * @param string $exclude
  * @param string $insertBefore
  * @param string $insertAfter
- * @return void
+ * @return string
  */
 	public function parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) {
 		return $this->_parseAttributes($options, $exclude, $insertBefore, $insertAfter);

Spacing +43 added lines, -43 removed lines

@@ -24,7 +24,7 @@ 
 App::uses('ClassRegistry', 'Utility');
 App::uses('Folder', 'Utility');
 
-if (!defined('FULL_BASE_URL')) {
+if ( ! defined('FULL_BASE_URL')) {
 	define('FULL_BASE_URL', 'http://cakephp.org');
 }
 
@@ -72,7 +72,7 @@ 
  * @return mixed
  */
 	public function getAttribute($attribute) {
-		if (!isset($this->{$attribute})) {
+		if ( ! isset($this->{$attribute})) {
 			return null;
 		}
 		return $this->{$attribute};
@@ -150,7 +150,7 @@ 
 		$this->Html->request->webroot = '';
 
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)
 		));
 
 		Configure::write('Asset.timestamp', false);
@@ -208,7 +208,7 @@ 
 		Router::reload();
 
 		$result = $this->Html->link('Posts', array('controller' => 'posts', 'action' => 'index', 'full_base' => true));
-		$expected = array('a' => array('href' => Router::fullBaseUrl() . '/posts'), 'Posts', '/a');
+		$expected = array('a' => array('href' => Router::fullBaseUrl().'/posts'), 'Posts', '/a');
 		$this->assertTags($result, $expected);
 
 		$result = $this->Html->link('Home', '/home', array('confirm' => 'Are you sure you want to do this?'));
@@ -464,11 +464,11 @@ 
 	public function testImageWithFullBase() {
 		$result = $this->Html->image('test.gif', array('fullBase' => true));
 		$here = $this->Html->url('/', true);
-		$this->assertTags($result, array('img' => array('src' => $here . 'img/test.gif', 'alt' => '')));
+		$this->assertTags($result, array('img' => array('src' => $here.'img/test.gif', 'alt' => '')));
 
 		$result = $this->Html->image('sub/test.gif', array('fullBase' => true));
 		$here = $this->Html->url('/', true);
-		$this->assertTags($result, array('img' => array('src' => $here . 'img/sub/test.gif', 'alt' => '')));
+		$this->assertTags($result, array('img' => array('src' => $here.'img/sub/test.gif', 'alt' => '')));
 
 		$request = $this->Html->request;
 		$request->webroot = '/myproject/';
@@ -477,7 +477,7 @@ 
 
 		$result = $this->Html->image('sub/test.gif', array('fullBase' => true));
 		$here = $this->Html->url('/', true);
-		$this->assertTags($result, array('img' => array('src' => $here . 'img/sub/test.gif', 'alt' => '')));
+		$this->assertTags($result, array('img' => array('src' => $here.'img/sub/test.gif', 'alt' => '')));
 	}
 
 /**
@@ -512,16 +512,16 @@ 
  * @return void
  */
 	public function testImageTagWithTheme() {
-		$this->skipIf(!is_writable(WWW_ROOT), 'Cannot write to webroot.');
-		$themeExists = is_dir(WWW_ROOT . 'theme');
+		$this->skipIf( ! is_writable(WWW_ROOT), 'Cannot write to webroot.');
+		$themeExists = is_dir(WWW_ROOT.'theme');
 
 		App::uses('File', 'Utility');
 
-		$testfile = WWW_ROOT . 'theme' . DS . 'test_theme' . DS . 'img' . DS . '__cake_test_image.gif';
+		$testfile = WWW_ROOT.'theme'.DS.'test_theme'.DS.'img'.DS.'__cake_test_image.gif';
 		new File($testfile, true);
 
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 		Configure::write('Asset.timestamp', true);
 		Configure::write('debug', 1);
@@ -544,10 +544,10 @@ 
 				'alt' => ''
 		)));
 
-		$dir = new Folder(WWW_ROOT . 'theme' . DS . 'test_theme');
+		$dir = new Folder(WWW_ROOT.'theme'.DS.'test_theme');
 		$dir->delete();
-		if (!$themeExists) {
-			$dir = new Folder(WWW_ROOT . 'theme');
+		if ( ! $themeExists) {
+			$dir = new Folder(WWW_ROOT.'theme');
 			$dir->delete();
 		}
 	}
@@ -559,10 +559,10 @@ 
  */
 	public function testThemeAssetsInMainWebrootPath() {
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 		$webRoot = Configure::read('App.www_root');
-		Configure::write('App.www_root', CAKE . 'Test' . DS . 'test_app' . DS . 'webroot' . DS);
+		Configure::write('App.www_root', CAKE.'Test'.DS.'test_app'.DS.'webroot'.DS);
 
 		$this->Html->theme = 'test_theme';
 		$result = $this->Html->css('webroot_test');
@@ -741,7 +741,7 @@ 
 
 		$result = $this->Html->css('screen', null, array('fullBase' => true));
 		$expected = array(
-			'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => $here . 'css/screen.css')
+			'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => $here.'css/screen.css')
 		);
 		$this->assertTags($result, $expected);
 	}
@@ -879,22 +879,22 @@ 
  * @return void
  */
 	public function testScriptTimestamping() {
-		$this->skipIf(!is_writable(WWW_ROOT . 'js'), 'webroot/js is not Writable, timestamp testing has been skipped.');
+		$this->skipIf( ! is_writable(WWW_ROOT.'js'), 'webroot/js is not Writable, timestamp testing has been skipped.');
 
 		Configure::write('debug', 2);
 		Configure::write('Asset.timestamp', true);
 
-		touch(WWW_ROOT . 'js' . DS . '__cake_js_test.js');
+		touch(WWW_ROOT.'js'.DS.'__cake_js_test.js');
 		$timestamp = substr(strtotime('now'), 0, 8);
 
 		$result = $this->Html->script('__cake_js_test', array('inline' => true, 'once' => false));
-		$this->assertRegExp('/__cake_js_test.js\?' . $timestamp . '[0-9]{2}"/', $result, 'Timestamp value not found %s');
+		$this->assertRegExp('/__cake_js_test.js\?'.$timestamp.'[0-9]{2}"/', $result, 'Timestamp value not found %s');
 
 		Configure::write('debug', 0);
 		Configure::write('Asset.timestamp', 'force');
 		$result = $this->Html->script('__cake_js_test', array('inline' => true, 'once' => false));
-		$this->assertRegExp('/__cake_js_test.js\?' . $timestamp . '[0-9]{2}"/', $result, 'Timestamp value not found %s');
-		unlink(WWW_ROOT . 'js' . DS . '__cake_js_test.js');
+		$this->assertRegExp('/__cake_js_test.js\?'.$timestamp.'[0-9]{2}"/', $result, 'Timestamp value not found %s');
+		unlink(WWW_ROOT.'js'.DS.'__cake_js_test.js');
 		Configure::write('Asset.timestamp', false);
 	}
 
@@ -907,23 +907,23 @@ 
 		CakePlugin::load('TestPlugin');
 
 		$pluginPath = App::pluginPath('TestPlugin');
-		$pluginJsPath = $pluginPath . 'webroot/js';
-		$this->skipIf(!is_writable($pluginJsPath), $pluginJsPath . ' is not Writable, timestamp testing has been skipped.');
+		$pluginJsPath = $pluginPath.'webroot/js';
+		$this->skipIf( ! is_writable($pluginJsPath), $pluginJsPath.' is not Writable, timestamp testing has been skipped.');
 
 		Configure::write('debug', 2);
 		Configure::write('Asset.timestamp', true);
 
-		touch($pluginJsPath . DS . '__cake_js_test.js');
+		touch($pluginJsPath.DS.'__cake_js_test.js');
 		$timestamp = substr(strtotime('now'), 0, 8);
 
 		$result = $this->Html->script('TestPlugin.__cake_js_test', array('inline' => true, 'once' => false));
-		$this->assertRegExp('/test_plugin\/js\/__cake_js_test.js\?' . $timestamp . '[0-9]{2}"/', $result, 'Timestamp value not found %s');
+		$this->assertRegExp('/test_plugin\/js\/__cake_js_test.js\?'.$timestamp.'[0-9]{2}"/', $result, 'Timestamp value not found %s');
 
 		Configure::write('debug', 0);
 		Configure::write('Asset.timestamp', 'force');
 		$result = $this->Html->script('TestPlugin.__cake_js_test', array('inline' => true, 'once' => false));
-		$this->assertRegExp('/test_plugin\/js\/__cake_js_test.js\?' . $timestamp . '[0-9]{2}"/', $result, 'Timestamp value not found %s');
-		unlink($pluginJsPath . DS . '__cake_js_test.js');
+		$this->assertRegExp('/test_plugin\/js\/__cake_js_test.js\?'.$timestamp.'[0-9]{2}"/', $result, 'Timestamp value not found %s');
+		unlink($pluginJsPath.DS.'__cake_js_test.js');
 		Configure::write('Asset.timestamp', false);
 
 		CakePlugin::unload('TestPlugin');
@@ -1149,15 +1149,15 @@ 
 
 		$result = $this->Html->script('foo', array('fullBase' => true));
 		$expected = array(
-			'script' => array('type' => 'text/javascript', 'src' => $here . 'js/foo.js')
+			'script' => array('type' => 'text/javascript', 'src' => $here.'js/foo.js')
 		);
 		$this->assertTags($result, $expected);
 
 		$result = $this->Html->script(array('foobar', 'bar'), array('fullBase' => true));
 		$expected = array(
-			array('script' => array('type' => 'text/javascript', 'src' => $here . 'js/foobar.js')),
+			array('script' => array('type' => 'text/javascript', 'src' => $here.'js/foobar.js')),
 			'/script',
-			array('script' => array('type' => 'text/javascript', 'src' => $here . 'js/bar.js')),
+			array('script' => array('type' => 'text/javascript', 'src' => $here.'js/bar.js')),
 			'/script',
 		);
 		$this->assertTags($result, $expected);
@@ -1169,16 +1169,16 @@ 
  * @return void
  */
 	public function testScriptInTheme() {
-		$this->skipIf(!is_writable(WWW_ROOT), 'Cannot write to webroot.');
-		$themeExists = is_dir(WWW_ROOT . 'theme');
+		$this->skipIf( ! is_writable(WWW_ROOT), 'Cannot write to webroot.');
+		$themeExists = is_dir(WWW_ROOT.'theme');
 
 		App::uses('File', 'Utility');
 
-		$testfile = WWW_ROOT . 'theme' . DS . 'test_theme' . DS . 'js' . DS . '__test_js.js';
+		$testfile = WWW_ROOT.'theme'.DS.'test_theme'.DS.'js'.DS.'__test_js.js';
 		new File($testfile, true);
 
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 
 		$this->Html->webroot = '/';
@@ -1189,11 +1189,11 @@ 
 		);
 		$this->assertTags($result, $expected);
 
-		$Folder = new Folder(WWW_ROOT . 'theme' . DS . 'test_theme');
+		$Folder = new Folder(WWW_ROOT.'theme'.DS.'test_theme');
 		$Folder->delete();
 
-		if (!$themeExists) {
-			$dir = new Folder(WWW_ROOT . 'theme');
+		if ( ! $themeExists) {
+			$dir = new Folder(WWW_ROOT.'theme');
 			$dir->delete();
 		}
 	}
@@ -1994,7 +1994,7 @@ 
 			array('pathPrefix' => 'videos/', 'poster' => 'poster.jpg', 'text' => 'Your browser does not support the HTML5 Video element.')
 		);
 		$expected = array(
-			'video' => array('poster' => Configure::read('App.imageBaseUrl') . 'poster.jpg'),
+			'video' => array('poster' => Configure::read('App.imageBaseUrl').'poster.jpg'),
 				array('source' => array('src' => 'videos/video.webm', 'type' => 'video/webm')),
 				array('source' => array('src' => 'videos/video.ogv', 'type' => 'video/ogg; codecs='theora, vorbis'')),
 				'Your browser does not support the HTML5 Video element.',
@@ -2181,7 +2181,7 @@ 
  */
 
 	public function testLoadConfig() {
-		$path = CAKE . 'Test' . DS . 'test_app' . DS . 'Config' . DS;
+		$path = CAKE.'Test'.DS.'test_app'.DS.'Config'.DS;
 
 		$result = $this->Html->loadConfig('htmlhelper_tags', $path);
 		$expected = array(
@@ -2222,7 +2222,7 @@ 
  * @expectedException ConfigureException
  */
 	public function testLoadConfigWrongReader() {
-		$path = CAKE . 'Test' . DS . 'test_app' . DS . 'Config' . DS;
+		$path = CAKE.'Test'.DS.'test_app'.DS.'Config'.DS;
 		$this->Html->loadConfig(array('htmlhelper_tags', 'wrong_reader'), $path);
 	}
 
@@ -2239,8 +2239,8 @@ 
 		foreach ($compact as $attribute) {
 			foreach (array('true', true, 1, '1', $attribute) as $value) {
 				$attrs = array($attribute => $value);
-				$expected = ' ' . $attribute . '="' . $attribute . '"';
-				$this->assertEquals($expected, $helper->parseAttributes($attrs), '%s Failed on ' . $value);
+				$expected = ' '.$attribute.'="'.$attribute.'"';
+				$this->assertEquals($expected, $helper->parseAttributes($attrs), '%s Failed on '.$value);
 			}
 		}
 		$this->assertEquals(' compact="compact"', $helper->parseAttributes(array('compact')));

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

Indentation +17 added lines, -17 removed lines

@@ -1,22 +1,22 @@
 <?php
 /**
- * JsHelper Test Case
- *
- * TestCase for the JsHelper
- *
- * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
- * @package       Cake.Test.Case.View.Helper
- * @since         CakePHP(tm) v 1.3
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
+	 * JsHelper Test Case
+	 *
+	 * TestCase for the JsHelper
+	 *
+	 * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
+	 * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 *
+	 * Licensed under The MIT License
+	 * For full copyright and license information, please see the LICENSE.txt
+	 * Redistributions of files must retain the above copyright notice
+	 *
+	 * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+	 * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests
+	 * @package       Cake.Test.Case.View.Helper
+	 * @since         CakePHP(tm) v 1.3
+	 * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+	 */
 
 App::uses('HtmlHelper', 'View/Helper');
 App::uses('JsHelper', 'View/Helper');

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

Doc Comments +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
  * @param string $exclude
  * @param string $insertBefore
  * @param string $insertAfter
- * @return void
+ * @return string
  */
 	public function parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) {
 		return $this->_parseAttributes($options, $exclude, $insertBefore, $insertAfter);

Spacing +22 added lines, -22 removed lines

@@ -216,7 +216,7 @@ 
 		ClassRegistry::addObject('HelperTestTag', new HelperTestTag());
 
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS),
 		));
 	}
 
@@ -598,8 +598,8 @@ 
 	public function testAssetTimestamp() {
 		Configure::write('Foo.bar', 'test');
 		Configure::write('Asset.timestamp', false);
-		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css');
-		$this->assertEquals(Configure::read('App.cssBaseUrl') . 'cake.generic.css', $result);
+		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl').'cake.generic.css');
+		$this->assertEquals(Configure::read('App.cssBaseUrl').'cake.generic.css', $result);
 
 		Configure::write('Asset.timestamp', true);
 		Configure::write('debug', 0);
@@ -607,25 +607,25 @@ 
 		$result = $this->Helper->assetTimestamp('/%3Cb%3E/cake.generic.css');
 		$this->assertEquals('/%3Cb%3E/cake.generic.css', $result);
 
-		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css');
-		$this->assertEquals(Configure::read('App.cssBaseUrl') . 'cake.generic.css', $result);
+		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl').'cake.generic.css');
+		$this->assertEquals(Configure::read('App.cssBaseUrl').'cake.generic.css', $result);
 
 		Configure::write('Asset.timestamp', true);
 		Configure::write('debug', 2);
-		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css');
-		$this->assertRegExp('/' . preg_quote(Configure::read('App.cssBaseUrl') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
+		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl').'cake.generic.css');
+		$this->assertRegExp('/'.preg_quote(Configure::read('App.cssBaseUrl').'cake.generic.css?', '/').'[0-9]+/', $result);
 
 		Configure::write('Asset.timestamp', 'force');
 		Configure::write('debug', 0);
-		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css');
-		$this->assertRegExp('/' . preg_quote(Configure::read('App.cssBaseUrl') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
+		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl').'cake.generic.css');
+		$this->assertRegExp('/'.preg_quote(Configure::read('App.cssBaseUrl').'cake.generic.css?', '/').'[0-9]+/', $result);
 
-		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl') . 'cake.generic.css?someparam');
-		$this->assertEquals(Configure::read('App.cssBaseUrl') . 'cake.generic.css?someparam', $result);
+		$result = $this->Helper->assetTimestamp(Configure::read('App.cssBaseUrl').'cake.generic.css?someparam');
+		$this->assertEquals(Configure::read('App.cssBaseUrl').'cake.generic.css?someparam', $result);
 
 		$this->Helper->request->webroot = '/some/dir/';
-		$result = $this->Helper->assetTimestamp('/some/dir/' . Configure::read('App.cssBaseUrl') . 'cake.generic.css');
-		$this->assertRegExp('/' . preg_quote(Configure::read('App.cssBaseUrl') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
+		$result = $this->Helper->assetTimestamp('/some/dir/'.Configure::read('App.cssBaseUrl').'cake.generic.css');
+		$this->assertRegExp('/'.preg_quote(Configure::read('App.cssBaseUrl').'cake.generic.css?', '/').'[0-9]+/', $result);
 	}
 
 /**
@@ -642,13 +642,13 @@ 
 			),
 			array('fullBase' => true)
 		);
-		$this->assertEquals(Router::fullBaseUrl() . '/js/post.js', $result);
+		$this->assertEquals(Router::fullBaseUrl().'/js/post.js', $result);
 
 		$result = $this->Helper->assetUrl('foo.jpg', array('pathPrefix' => 'img/'));
 		$this->assertEquals('img/foo.jpg', $result);
 
 		$result = $this->Helper->assetUrl('foo.jpg', array('fullBase' => true));
-		$this->assertEquals(Router::fullBaseUrl() . '/foo.jpg', $result);
+		$this->assertEquals(Router::fullBaseUrl().'/foo.jpg', $result);
 
 		$result = $this->Helper->assetUrl('style', array('ext' => '.css'));
 		$this->assertEquals('style.css', $result);
@@ -675,7 +675,7 @@ 
 			'here' => '/cake_dev/index.php/tasks',
 		));
 		$result = $this->Helper->assetUrl('img/cake.icon.png', array('fullBase' => true));
-		$expected = FULL_BASE_URL . '/cake_dev/app/webroot/img/cake.icon.png';
+		$expected = FULL_BASE_URL.'/cake_dev/app/webroot/img/cake.icon.png';
 		$this->assertEquals($expected, $result);
 	}
 
@@ -707,7 +707,7 @@ 
 		Configure::write('Asset.timestamp', 'force');
 
 		$result = $this->Helper->assetUrl('cake.generic.css', array('pathPrefix' => Configure::read('App.cssBaseUrl')));
-		$this->assertRegExp('/' . preg_quote(Configure::read('App.cssBaseUrl') . 'cake.generic.css?', '/') . '[0-9]+/', $result);
+		$this->assertRegExp('/'.preg_quote(Configure::read('App.cssBaseUrl').'cake.generic.css?', '/').'[0-9]+/', $result);
 	}
 
 /**
@@ -718,7 +718,7 @@ 
 	public function testAssetTimestampPluginsAndThemes() {
 		Configure::write('Asset.timestamp', 'force');
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS),
 		));
 		CakePlugin::load(array('TestPlugin'));
 
@@ -784,7 +784,7 @@ 
 		$this->assertEquals($expected, $this->Helper->entity());
 
 		foreach (array('year', 'month', 'day', 'hour', 'min', 'meridian') as $d) {
-			$this->Helper->setEntity('date.' . $d);
+			$this->Helper->setEntity('date.'.$d);
 			$expected = array('HelperTestPost', 'date', $d);
 			$this->assertEquals($expected, $this->Helper->entity());
 		}
@@ -924,7 +924,7 @@ 
 		$this->Helper->theme = 'test_theme';
 
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 
 		$result = $this->Helper->webroot('/img/cake.power.gif');
@@ -936,7 +936,7 @@ 
 		$this->assertEquals($expected, $result);
 
 		$webRoot = Configure::read('App.www_root');
-		Configure::write('App.www_root', CAKE . 'Test' . DS . 'test_app' . DS . 'webroot' . DS);
+		Configure::write('App.www_root', CAKE.'Test'.DS.'test_app'.DS.'webroot'.DS);
 
 		$result = $this->Helper->webroot('/img/cake.power.gif');
 		$expected = '/theme/test_theme/img/cake.power.gif';
@@ -964,7 +964,7 @@ 
  */
 	public function testLazyLoadingHelpers() {
 		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(array('TestPlugin'));
 		$Helper = new TestHelper($this->View);

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

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
  * testGetFilename method
  *
  * @param string $action
- * @return void
+ * @return string
  */
 	public function testGetFilename($action) {
 		return $this->_getViewFileName($action);

Spacing +20 added lines, -20 removed lines

@@ -21,7 +21,7 @@ 
 App::uses('ScaffoldView', 'View');
 App::uses('AppModel', 'Model');
 
-require_once dirname(dirname(__FILE__)) . DS . 'Model' . DS . 'models.php';
+require_once dirname(dirname(__FILE__)).DS.'Model'.DS.'models.php';
 
 /**
  * TestScaffoldView class
@@ -90,8 +90,8 @@ 
 		$this->Controller->response = $this->getMock('CakeResponse', array('_sendHeader'));
 
 		App::build(array(
-			'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),
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)
 		));
 		CakePlugin::load('TestPlugin');
 	}
@@ -118,39 +118,39 @@ 
 		$this->Controller->request->params['action'] = 'index';
 		$ScaffoldView = new TestScaffoldView($this->Controller);
 		$result = $ScaffoldView->testGetFilename('index');
-		$expected = CAKE . 'View' . DS . 'Scaffolds' . DS . 'index.ctp';
+		$expected = CAKE.'View'.DS.'Scaffolds'.DS.'index.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('edit');
-		$expected = CAKE . 'View' . DS . 'Scaffolds' . DS . 'form.ctp';
+		$expected = CAKE.'View'.DS.'Scaffolds'.DS.'form.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('add');
-		$expected = CAKE . 'View' . DS . 'Scaffolds' . DS . 'form.ctp';
+		$expected = CAKE.'View'.DS.'Scaffolds'.DS.'form.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('view');
-		$expected = CAKE . 'View' . DS . 'Scaffolds' . DS . 'view.ctp';
+		$expected = CAKE.'View'.DS.'Scaffolds'.DS.'view.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('admin_index');
-		$expected = CAKE . 'View' . DS . 'Scaffolds' . DS . 'index.ctp';
+		$expected = CAKE.'View'.DS.'Scaffolds'.DS.'index.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('admin_view');
-		$expected = CAKE . 'View' . DS . 'Scaffolds' . DS . 'view.ctp';
+		$expected = CAKE.'View'.DS.'Scaffolds'.DS.'view.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('admin_edit');
-		$expected = CAKE . 'View' . DS . 'Scaffolds' . DS . 'form.ctp';
+		$expected = CAKE.'View'.DS.'Scaffolds'.DS.'form.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('admin_add');
-		$expected = CAKE . 'View' . DS . 'Scaffolds' . DS . 'form.ctp';
+		$expected = CAKE.'View'.DS.'Scaffolds'.DS.'form.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('error');
-		$expected = CAKE . 'View' . DS . 'Errors' . DS . 'scaffold_error.ctp';
+		$expected = CAKE.'View'.DS.'Errors'.DS.'scaffold_error.ctp';
 		$this->assertEquals($expected, $result);
 
 		$Controller = new ScaffoldViewMockController($this->request);
@@ -160,11 +160,11 @@ 
 
 		$ScaffoldView = new TestScaffoldView($Controller);
 		$result = $ScaffoldView->testGetFilename('admin_edit');
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Posts' . DS . 'scaffold.form.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Posts'.DS.'scaffold.form.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('edit');
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS . 'Posts' . DS . 'scaffold.form.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.'Posts'.DS.'scaffold.form.ctp';
 		$this->assertEquals($expected, $result);
 
 		$Controller = new ScaffoldViewMockController($this->request);
@@ -179,13 +179,13 @@ 
 
 		$ScaffoldView = new TestScaffoldView($Controller);
 		$result = $ScaffoldView->testGetFilename('admin_add');
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' .
-			DS . 'TestPlugin' . DS . 'View' . DS . 'Tests' . DS . 'scaffold.form.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'Plugin'.
+			DS.'TestPlugin'.DS.'View'.DS.'Tests'.DS.'scaffold.form.ctp';
 		$this->assertEquals($expected, $result);
 
 		$result = $ScaffoldView->testGetFilename('add');
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' .
-			DS . 'TestPlugin' . DS . 'View' . DS . 'Tests' . DS . 'scaffold.form.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'Plugin'.
+			DS.'TestPlugin'.DS.'View'.DS.'Tests'.DS.'scaffold.form.ctp';
 		$this->assertEquals($expected, $result);
 
 		Configure::write('Routing.prefixes', $_admin);
@@ -203,8 +203,8 @@ 
 		$ScaffoldView = new TestScaffoldView($this->Controller);
 
 		$result = $ScaffoldView->testGetFilename('index');
-		$expected = CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS .
-			'Themed' . DS . 'TestTheme' . DS . 'Posts' . DS . 'scaffold.index.ctp';
+		$expected = CAKE.'Test'.DS.'test_app'.DS.'View'.DS.
+			'Themed'.DS.'TestTheme'.DS.'Posts'.DS.'scaffold.index.ctp';
 		$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/CakeTestCase.php

Doc Comments +23 added lines, -27 removed lines

@@ -196,8 +196,6 @@ 
 /**
  * Chooses which fixtures to load for a given test
  *
- * @param string $fixture Each parameter is a model name that corresponds to a
- *                        fixture, i.e. 'Post', 'Author', etc.
  * @return void
  * @see CakeTestCase::$autoFixtures
  * @throws Exception when no fixture manager is available.
@@ -219,7 +217,7 @@ 
  * @param string $expected The expected value.
  * @param string $result The actual value.
  * @param message The message to use for failure.
- * @return boolean
+ * @return boolean|null
  */
 	public function assertTextNotEquals($expected, $result, $message = '') {
 		$expected = str_replace(array("\r\n", "\r"), "\n", $expected);
@@ -234,7 +232,7 @@ 
  * @param string $expected The expected value.
  * @param string $result The actual value.
  * @param message The message to use for failure.
- * @return boolean
+ * @return boolean|null
  */
 	public function assertTextEquals($expected, $result, $message = '') {
 		$expected = str_replace(array("\r\n", "\r"), "\n", $expected);
@@ -246,10 +244,10 @@ 
  * Asserts that a string starts with a given prefix, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $prefix
+ * @param string string
  * @param string $string
- * @param string $message
- * @return boolean
+ * @param string string
+ * @return boolean|null
  */
 	public function assertTextStartsWith($prefix, $string, $message = '') {
 		$prefix = str_replace(array("\r\n", "\r"), "\n", $prefix);
@@ -261,10 +259,10 @@ 
  * Asserts that a string starts not with a given prefix, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $prefix
+ * @param string string
  * @param string $string
- * @param string $message
- * @return boolean
+ * @param string string
+ * @return boolean|null
  */
 	public function assertTextStartsNotWith($prefix, $string, $message = '') {
 		$prefix = str_replace(array("\r\n", "\r"), "\n", $prefix);
@@ -276,10 +274,10 @@ 
  * Asserts that a string ends with a given prefix, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $suffix
+ * @param string string
  * @param string $string
- * @param string $message
- * @return boolean
+ * @param string string
+ * @return boolean|null
  */
 	public function assertTextEndsWith($suffix, $string, $message = '') {
 		$suffix = str_replace(array("\r\n", "\r"), "\n", $suffix);
@@ -291,10 +289,10 @@ 
  * Asserts that a string ends not with a given prefix, ignoring differences in newlines.
  * Helpful for doing cross platform tests of blocks of text.
  *
- * @param string $suffix
+ * @param string string
  * @param string $string
- * @param string $message
- * @return boolean
+ * @param string string
+ * @return boolean|null
  */
 	public function assertTextEndsNotWith($suffix, $string, $message = '') {
 		$suffix = str_replace(array("\r\n", "\r"), "\n", $suffix);
@@ -310,7 +308,7 @@ 
  * @param string $haystack
  * @param string $message
  * @param boolean $ignoreCase
- * @return boolean
+ * @return boolean|null
  */
 	public function assertTextContains($needle, $haystack, $message = '', $ignoreCase = false) {
 		$needle = str_replace(array("\r\n", "\r"), "\n", $needle);
@@ -326,7 +324,7 @@ 
  * @param string $haystack
  * @param string $message
  * @param boolean $ignoreCase
- * @return boolean
+ * @return boolean|null
  */
 	public function assertTextNotContains($needle, $haystack, $message = '', $ignoreCase = false) {
 		$needle = str_replace(array("\r\n", "\r"), "\n", $needle);
@@ -373,7 +371,6 @@ 
  *
  * @param string $string An HTML/XHTML/XML string
  * @param array $expected An array, see above
- * @param string $message SimpleTest failure output string
  * @return boolean
  */
 	public function assertTags($string, $expected, $fullDebug = false) {
@@ -511,7 +508,7 @@ 
  *
  * @param array $assertions Assertions to run.
  * @param string $string The HTML string to check.
- * @return void
+ * @return string
  */
 	protected function _assertAttributes($assertions, $string) {
 		$asserts = $assertions['attrs'];
@@ -568,7 +565,7 @@ 
 /**
  * Compatibility wrapper function for assertRegexp
  *
- * @param mixed $pattern a regular expression
+ * @param string $pattern a regular expression
  * @param string $string the text to be matched
  * @param string $message the text to display if the assertion is not correct
  * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
@@ -582,7 +579,7 @@ 
  * Compatibility wrapper function for assertEquals
  *
  * @param mixed $actual
- * @param mixed $expected
+ * @param integer $expected
  * @param string $message the text to display if the assertion is not correct
  * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
@@ -629,7 +626,7 @@ 
 /**
  * Compatibility wrapper function for setExpectedException
  *
- * @param mixed $expected the name of the Exception or error
+ * @param string $expected the name of the Exception or error
  * @param string $message the text to display if the assertion is not correct
  * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
@@ -644,7 +641,6 @@ 
 /**
  * Compatibility wrapper function for setExpectedException
  *
- * @param mixed $expected the name of the Exception
  * @param string $message the text to display if the assertion is not correct
  * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
@@ -656,8 +652,8 @@ 
 /**
  * Compatibility wrapper function for assertSame
  *
- * @param mixed $first
- * @param mixed $second
+ * @param FireCake $first
+ * @param FireCake $second
  * @param string $message the text to display if the assertion is not correct
  * @deprecated This is a compatiblity wrapper for 1.x. It will be removed in 3.0
  * @return void
@@ -684,7 +680,7 @@ 
  *
  * @param mixed $result
  * @param mixed $expected
- * @param mixed $margin the rage of acceptation
+ * @param integer $margin the rage of acceptation
  * @param string $message the text to display if the assertion is not correct
  * @return void
  */

Spacing +18 added lines, -18 removed lines

@@ -76,11 +76,11 @@ 
  * @throws InvalidArgumentException
  */
 	public function run(PHPUnit_Framework_TestResult $result = null) {
-		if (!empty($this->fixtureManager)) {
+		if ( ! empty($this->fixtureManager)) {
 			$this->fixtureManager->load($this);
 		}
 		$result = parent::run($result);
-		if (!empty($this->fixtureManager)) {
+		if ( ! empty($this->fixtureManager)) {
 			$this->fixtureManager->unload($this);
 		}
 		return $result;
@@ -150,7 +150,7 @@ 
 		if (class_exists('ClassRegistry', false)) {
 			ClassRegistry::flush();
 		}
-		if (!empty($this->_configure)) {
+		if ( ! empty($this->_configure)) {
 			Configure::clear();
 			Configure::write($this->_configure);
 		}
@@ -379,8 +379,8 @@ 
 	public function assertTags($string, $expected, $fullDebug = false) {
 		$regex = array();
 		$normalized = array();
-		foreach ((array)$expected as $key => $val) {
-			if (!is_numeric($key)) {
+		foreach ((array) $expected as $key => $val) {
+			if ( ! is_numeric($key)) {
 				$normalized[] = array($key => $val);
 			} else {
 				$normalized[] = $val;
@@ -388,8 +388,8 @@ 
 		}
 		$i = 0;
 		foreach ($normalized as $tags) {
-			if (!is_array($tags)) {
-				$tags = (string)$tags;
+			if ( ! is_array($tags)) {
+				$tags = (string) $tags;
 			}
 			$i++;
 			if (is_string($tags) && $tags{0} === '<') {
@@ -410,7 +410,7 @@ 
 					);
 					continue;
 				}
-				if (!empty($tags) && preg_match('/^preg\:\/(.+)\/$/i', $tags, $matches)) {
+				if ( ! empty($tags) && preg_match('/^preg\:\/(.+)\/$/i', $tags, $matches)) {
 					$tags = $matches[1];
 					$type = 'Regex matches';
 				} else {
@@ -447,7 +447,7 @@ 
 							$attr = $val;
 							$val = '.+?';
 							$explanations[] = sprintf('Attribute "%s" present', $attr);
-						} elseif (!empty($val) && preg_match('/^preg\:\/(.+)\/$/i', $val, $matches)) {
+						} elseif ( ! empty($val) && preg_match('/^preg\:\/(.+)\/$/i', $val, $matches)) {
 							$val = str_replace(
 								array('.*', '.+'),
 								array('.*?', '.+?'),
@@ -460,7 +460,7 @@ 
 							$explanations[] = sprintf('Attribute "%s" == "%s"', $attr, $val);
 							$val = preg_quote($val, '/');
 						}
-						$attrs[] = '[\s]+' . preg_quote($attr, '/') . '=' . $quotes . $val . $quotes;
+						$attrs[] = '[\s]+'.preg_quote($attr, '/').'='.$quotes.$val.$quotes;
 					}
 					$i++;
 				}
@@ -485,14 +485,14 @@ 
 			}
 
 			list($description, $expressions, $itemNum) = $assertion;
-			foreach ((array)$expressions as $expression) {
+			foreach ((array) $expressions as $expression) {
 				if (preg_match(sprintf('/^%s/s', $expression), $string, $match)) {
 					$matches = true;
 					$string = substr($string, strlen($match[0]));
 					break;
 				}
 			}
-			if (!$matches) {
+			if ( ! $matches) {
 				$this->assertTrue(false, sprintf('Item #%d / regex #%d failed: %s', $itemNum, $i, $description));
 				if ($fullDebug) {
 					debug($string, true);
@@ -529,7 +529,7 @@ 
 				}
 			}
 			if ($matches === false) {
-				$this->assertTrue(false, 'Attribute did not match. Was expecting ' . $explains[$j]);
+				$this->assertTrue(false, 'Attribute did not match. Was expecting '.$explains[$j]);
 			}
 			$len = count($asserts);
 		} while ($len > 0);
@@ -635,7 +635,7 @@ 
  * @return void
  */
 	protected function expectError($expected = false, $message = '') {
-		if (!$expected) {
+		if ( ! $expected) {
 			$expected = 'Exception';
 		}
 		$this->setExpectedException($expected, $message);
@@ -702,7 +702,7 @@ 
  * @return boolean
  */
 	protected function skipUnless($condition, $message = '') {
-		if (!$condition) {
+		if ( ! $condition) {
 			$this->markTestSkipped($message);
 		}
 		return $condition;
@@ -722,10 +722,10 @@ 
 		$config += ClassRegistry::config('Model');
 
 		list($plugin, $name) = pluginSplit($model, true);
-		App::uses($name, $plugin . 'Model');
-		$config = array_merge((array)$config, array('name' => $name));
+		App::uses($name, $plugin.'Model');
+		$config = array_merge((array) $config, array('name' => $name));
 
-		if (!class_exists($name)) {
+		if ( ! class_exists($name)) {
 			throw new MissingModelException(array($model));
 		}
 

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