reginaldojunior / winners

lib/Cake/Test/Case/I18n/I18nTest.php

Doc Comments +5 added lines, -5 removed lines

@@ -1877,7 +1877,7 @@ 
 /**
  * Singular method
  *
- * @return void
+ * @return null|string
  */
 	protected function _domainCategorySingular($domain = 'test_plugin', $category = 3) {
 		$singular = __dc($domain, 'Plural Rule 1', $category);
@@ -1900,7 +1900,7 @@ 
 /**
  * Singular method
  *
- * @return void
+ * @return null|string
  */
 	protected function _domainSingular($domain = 'test_plugin') {
 		$singular = __d($domain, 'Plural Rule 1');
@@ -1923,7 +1923,7 @@ 
 /**
  * category method
  *
- * @return void
+ * @return null|string
  */
 	protected function _category($category = 3) {
 		$singular = __c('Plural Rule 1', $category);
@@ -1933,7 +1933,7 @@ 
 /**
  * Singular method
  *
- * @return void
+ * @return null|string
  */
 	protected function _singular() {
 		$singular = __('Plural Rule 1');
@@ -1956,7 +1956,7 @@ 
 /**
  * singularFromCore method
  *
- * @return void
+ * @return null|string
  */
 	protected function _singularFromCore() {
 		$singular = __('Plural Rule 1 (from core)');

Spacing +23 added lines, -23 removed lines

@@ -35,8 +35,8 @@ 
 
 		Cache::delete('object_map', '_cake_core_');
 		App::build(array(
-			'Locale' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Locale' . DS),
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			'Locale' => array(CAKE.'Test'.DS.'test_app'.DS.'Locale'.DS),
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)
 		), App::RESET);
 		CakePlugin::load(array('TestPlugin'));
 	}
@@ -80,23 +80,23 @@ 
 		I18n::clear();
 
 		// now only dom1 should be in cache
-		$cachedDom1 = Cache::read('dom1_' . $lang, '_cake_core_');
+		$cachedDom1 = Cache::read('dom1_'.$lang, '_cake_core_');
 		$this->assertEquals('Dom 1 Foo', $cachedDom1['LC_MESSAGES']['dom1.foo']);
 		$this->assertEquals('Dom 1 Bar', $cachedDom1['LC_MESSAGES']['dom1.bar']);
 		// dom2 not in cache
-		$this->assertFalse(Cache::read('dom2_' . $lang, '_cake_core_'));
+		$this->assertFalse(Cache::read('dom2_'.$lang, '_cake_core_'));
 
 		// translate a item of dom2 (adds dom2 to cache)
 		$this->assertEquals('Dom 2 Foo', I18n::translate('dom2.foo', false, 'dom2'));
 
 		// verify dom2 was cached through manual read from cache
-		$cachedDom2 = Cache::read('dom2_' . $lang, '_cake_core_');
+		$cachedDom2 = Cache::read('dom2_'.$lang, '_cake_core_');
 		$this->assertEquals('Dom 2 Foo', $cachedDom2['LC_MESSAGES']['dom2.foo']);
 		$this->assertEquals('Dom 2 Bar', $cachedDom2['LC_MESSAGES']['dom2.bar']);
 
 		// modify cache entry manually to verify that dom1 entries now will be read from cache
 		$cachedDom1['LC_MESSAGES']['dom1.foo'] = 'FOO';
-		Cache::write('dom1_' . $lang, $cachedDom1, '_cake_core_');
+		Cache::write('dom1_'.$lang, $cachedDom1, '_cake_core_');
 		$this->assertEquals('FOO', I18n::translate('dom1.foo', false, 'dom1'));
 	}
 
@@ -1600,7 +1600,7 @@ 
  */
 	public function testPluginTranslation() {
 		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('Config.language', 'po');
@@ -1680,15 +1680,15 @@ 
 		$string .= "This is the third line.\n";
 		$string .= "This is the forth line.";
 
-		$singular = "%d = 1\n" . $string;
-		$plural = "%d = 0 or > 1\n" . $string;
+		$singular = "%d = 1\n".$string;
+		$plural = "%d = 0 or > 1\n".$string;
 
 		$result = __n($singular, $plural, 1);
-		$expected = "%d is 1\n" . $string;
+		$expected = "%d is 1\n".$string;
 		$this->assertEquals($expected, $result);
 
 		$result = __n($singular, $plural, 2);
-		$expected = "%d is 2-4\n" . $string;
+		$expected = "%d is 2-4\n".$string;
 		$this->assertEquals($expected, $result);
 
 		// Windows Newline is \r\n
@@ -1697,15 +1697,15 @@ 
 		$string .= "This is the third line.\r\n";
 		$string .= "This is the forth line.";
 
-		$singular = "%d = 1\r\n" . $string;
-		$plural = "%d = 0 or > 1\r\n" . $string;
+		$singular = "%d = 1\r\n".$string;
+		$plural = "%d = 0 or > 1\r\n".$string;
 
 		$result = __n($singular, $plural, 1);
-		$expected = "%d is 1\n" . str_replace("\r\n", "\n", $string);
+		$expected = "%d is 1\n".str_replace("\r\n", "\n", $string);
 		$this->assertEquals($expected, $result);
 
 		$result = __n($singular, $plural, 2);
-		$expected = "%d is 2-4\n" . str_replace("\r\n", "\n", $string);
+		$expected = "%d is 2-4\n".str_replace("\r\n", "\n", $string);
 		$this->assertEquals($expected, $result);
 	}
 
@@ -1739,15 +1739,15 @@ 
 	public function testFloatValue() {
 		Configure::write('Config.language', 'rule_9_po');
 
-		$result = __n('%d = 1', '%d = 0 or > 1', (float)1);
+		$result = __n('%d = 1', '%d = 0 or > 1', (float) 1);
 		$expected = '%d is 1 (translated)';
 		$this->assertEquals($expected, $result);
 
-		$result = __n('%d = 1', '%d = 0 or > 1', (float)2);
+		$result = __n('%d = 1', '%d = 0 or > 1', (float) 2);
 		$expected = "%d ends in 2-4, not 12-14 (translated)";
 		$this->assertEquals($expected, $result);
 
-		$result = __n('%d = 1', '%d = 0 or > 1', (float)5);
+		$result = __n('%d = 1', '%d = 0 or > 1', (float) 5);
 		$expected = "%d everything else (translated)";
 		$this->assertEquals($expected, $result);
 	}
@@ -1869,7 +1869,7 @@ 
  */
 	public function testLoadLocaleDefinition() {
 		$path = current(App::path('locales'));
-		$result = I18n::loadLocaleDefinition($path . 'nld' . DS . 'LC_TIME');
+		$result = I18n::loadLocaleDefinition($path.'nld'.DS.'LC_TIME');
 		$expected = array('zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag');
 		$this->assertSame($expected, $result['day']);
 	}
@@ -1892,7 +1892,7 @@ 
 	protected function _domainCategoryPlural($domain = 'test_plugin', $category = 3) {
 		$plurals = array();
 		for ($number = 0; $number <= 25; $number++) {
-			$plurals[] = sprintf(__dcn($domain, '%d = 1', '%d = 0 or > 1', (float)$number, $category), (float)$number);
+			$plurals[] = sprintf(__dcn($domain, '%d = 1', '%d = 0 or > 1', (float) $number, $category), (float) $number);
 		}
 		return $plurals;
 	}
@@ -1915,7 +1915,7 @@ 
 	protected function _domainPlural($domain = 'test_plugin') {
 		$plurals = array();
 		for ($number = 0; $number <= 25; $number++) {
-			$plurals[] = sprintf(__dn($domain, '%d = 1', '%d = 0 or > 1', (float)$number), (float)$number);
+			$plurals[] = sprintf(__dn($domain, '%d = 1', '%d = 0 or > 1', (float) $number), (float) $number);
 		}
 		return $plurals;
 	}
@@ -1948,7 +1948,7 @@ 
 	protected function _plural() {
 		$plurals = array();
 		for ($number = 0; $number <= 25; $number++) {
-			$plurals[] = sprintf(__n('%d = 1', '%d = 0 or > 1', (float)$number), (float)$number);
+			$plurals[] = sprintf(__n('%d = 1', '%d = 0 or > 1', (float) $number), (float) $number);
 		}
 		return $plurals;
 	}
@@ -1971,7 +1971,7 @@ 
 	protected function _pluralFromCore() {
 		$plurals = array();
 		for ($number = 0; $number <= 25; $number++) {
-			$plurals[] = sprintf(__n('%d = 1 (from core)', '%d = 0 or > 1 (from core)', (float)$number), (float)$number);
+			$plurals[] = sprintf(__n('%d = 1 (from core)', '%d = 0 or > 1 (from core)', (float) $number), (float) $number);
 		}
 		return $plurals;
 	}

lib/Cake/Test/Case/Model/BehaviorCollectionTest.php

Doc Comments +11 added lines, -12 removed lines

@@ -105,7 +105,7 @@ 
  *
  * @param Model $model Model using this behavior
  * @param array $options Options passed from Model::save().
- * @return mixed False if the operation should abort. Any other result will continue.
+ * @return boolean|null False if the operation should abort. Any other result will continue.
  * @see Model::save()
  */
 	public function beforeSave(Model $model, $options = array()) {
@@ -130,7 +130,7 @@ 
  * @param Model $model
  * @param boolean $created
  * @param array $options Options passed from Model::save().
- * @return void
+ * @return boolean|null
  */
 	public function afterSave(Model $model, $created, $options = array()) {
 		$settings = $this->settings[$model->alias];
@@ -159,9 +159,9 @@ 
 /**
  * beforeValidate Callback
  *
- * @param Model $Model Model invalidFields was called on.
+ * @param Model $model Model invalidFields was called on.
  * @param array $options Options passed from Model::save().
- * @return boolean
+ * @return boolean|null
  * @see Model::save()
  */
 	public function beforeValidate(Model $model, $options = array()) {
@@ -188,8 +188,7 @@ 
  * afterValidate method
  *
  * @param Model $model
- * @param boolean $cascade
- * @return void
+ * @return boolean|null
  */
 	public function afterValidate(Model $model) {
 		$settings = $this->settings[$model->alias];
@@ -210,7 +209,7 @@ 
  *
  * @param Model $model
  * @param boolean $cascade
- * @return void
+ * @return boolean|null
  */
 	public function beforeDelete(Model $model, $cascade = true) {
 		$settings = $this->settings[$model->alias];
@@ -267,7 +266,7 @@ 
  * beforeTest method
  *
  * @param Model $model
- * @return void
+ * @return string
  */
 	public function beforeTest(Model $model) {
 		if (!isset($model->beforeTestResult)) {
@@ -282,7 +281,7 @@ 
  *
  * @param Model $model
  * @param boolean $param
- * @return void
+ * @return string|null
  */
 	public function testMethod(Model $model, $param = true) {
 		if ($param === true) {
@@ -294,7 +293,7 @@ 
  * testData method
  *
  * @param Model $model
- * @return void
+ * @return boolean
  */
 	public function testData(Model $model) {
 		if (!isset($model->data['Apple']['field'])) {
@@ -309,7 +308,7 @@ 
  *
  * @param Model $model
  * @param string|array $field
- * @return void
+ * @return boolean
  */
 	public function validateField(Model $model, $field) {
 		return current($field) === 'Orange';
@@ -321,7 +320,7 @@ 
  * @param Model $model
  * @param string $method
  * @param string $query
- * @return void
+ * @return string
  */
 	public function speakEnglish(Model $model, $method, $query) {
 		$method = preg_replace('/look for\s+/', 'Item.name = \'', $method);

Spacing +16 added lines, -16 removed lines

@@ -20,7 +20,7 @@ 
 
 App::uses('AppModel', 'Model');
 
-require_once dirname(__FILE__) . DS . 'models.php';
+require_once dirname(__FILE__).DS.'models.php';
 
 /**
  * TestBehavior class
@@ -60,7 +60,7 @@ 
  */
 	public function beforeFind(Model $model, $query) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['beforeFind']) || $settings['beforeFind'] === 'off') {
+		if ( ! isset($settings['beforeFind']) || $settings['beforeFind'] === 'off') {
 			return parent::beforeFind($model, $query);
 		}
 		switch ($settings['beforeFind']) {
@@ -69,7 +69,7 @@ 
 			case 'test':
 				return null;
 			case 'modify':
-				$query['fields'] = array($model->alias . '.id', $model->alias . '.name', $model->alias . '.mytime');
+				$query['fields'] = array($model->alias.'.id', $model->alias.'.name', $model->alias.'.mytime');
 				$query['recursive'] = -1;
 				return $query;
 		}
@@ -85,7 +85,7 @@ 
  */
 	public function afterFind(Model $model, $results, $primary = false) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['afterFind']) || $settings['afterFind'] === 'off') {
+		if ( ! isset($settings['afterFind']) || $settings['afterFind'] === 'off') {
 			return parent::afterFind($model, $results, $primary);
 		}
 		switch ($settings['afterFind']) {
@@ -110,7 +110,7 @@ 
  */
 	public function beforeSave(Model $model, $options = array()) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['beforeSave']) || $settings['beforeSave'] === 'off') {
+		if ( ! isset($settings['beforeSave']) || $settings['beforeSave'] === 'off') {
 			return parent::beforeSave($model, $options);
 		}
 		switch ($settings['beforeSave']) {
@@ -134,7 +134,7 @@ 
  */
 	public function afterSave(Model $model, $created, $options = array()) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['afterSave']) || $settings['afterSave'] === 'off') {
+		if ( ! isset($settings['afterSave']) || $settings['afterSave'] === 'off') {
 			return parent::afterSave($model, $created, $options);
 		}
 		$string = 'modified after';
@@ -151,7 +151,7 @@ 
 			case 'test2':
 				return false;
 			case 'modify':
-				$model->data[$model->alias]['name'] .= ' ' . $string;
+				$model->data[$model->alias]['name'] .= ' '.$string;
 				break;
 		}
 	}
@@ -166,7 +166,7 @@ 
  */
 	public function beforeValidate(Model $model, $options = array()) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['validate']) || $settings['validate'] === 'off') {
+		if ( ! isset($settings['validate']) || $settings['validate'] === 'off') {
 			return parent::beforeValidate($model, $options);
 		}
 		switch ($settings['validate']) {
@@ -193,7 +193,7 @@ 
  */
 	public function afterValidate(Model $model) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['afterValidate']) || $settings['afterValidate'] === 'off') {
+		if ( ! isset($settings['afterValidate']) || $settings['afterValidate'] === 'off') {
 			return parent::afterValidate($model);
 		}
 		switch ($settings['afterValidate']) {
@@ -214,7 +214,7 @@ 
  */
 	public function beforeDelete(Model $model, $cascade = true) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['beforeDelete']) || $settings['beforeDelete'] === 'off') {
+		if ( ! isset($settings['beforeDelete']) || $settings['beforeDelete'] === 'off') {
 			return parent::beforeDelete($model, $cascade);
 		}
 		switch ($settings['beforeDelete']) {
@@ -239,7 +239,7 @@ 
  */
 	public function afterDelete(Model $model) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['afterDelete']) || $settings['afterDelete'] === 'off') {
+		if ( ! isset($settings['afterDelete']) || $settings['afterDelete'] === 'off') {
 			return parent::afterDelete($model);
 		}
 		switch ($settings['afterDelete']) {
@@ -257,7 +257,7 @@ 
  */
 	public function onError(Model $model, $error) {
 		$settings = $this->settings[$model->alias];
-		if (!isset($settings['onError']) || $settings['onError'] === 'off') {
+		if ( ! isset($settings['onError']) || $settings['onError'] === 'off') {
 			return parent::onError($model, $error);
 		}
 		echo "onError trigger success";
@@ -270,7 +270,7 @@ 
  * @return void
  */
 	public function beforeTest(Model $model) {
-		if (!isset($model->beforeTestResult)) {
+		if ( ! isset($model->beforeTestResult)) {
 			$model->beforeTestResult = array();
 		}
 		$model->beforeTestResult[] = strtolower(get_class($this));
@@ -297,7 +297,7 @@ 
  * @return void
  */
 	public function testData(Model $model) {
-		if (!isset($model->data['Apple']['field'])) {
+		if ( ! isset($model->data['Apple']['field'])) {
 			return false;
 		}
 		$model->data['Apple']['field_2'] = true;
@@ -326,7 +326,7 @@ 
 	public function speakEnglish(Model $model, $method, $query) {
 		$method = preg_replace('/look for\s+/', 'Item.name = \'', $method);
 		$query = preg_replace('/^in\s+/', 'Location.name = \'', $query);
-		return $method . '\' AND ' . $query . '\'';
+		return $method.'\' AND '.$query.'\'';
 	}
 
 }
@@ -505,7 +505,7 @@ 
 		$this->assertEquals('working', $Apple->testMethod(true));
 		$this->assertEquals('working', $Apple->Behaviors->dispatchMethod($Apple, 'testMethod'));
 
-		App::build(array('Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)));
+		App::build(array('Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)));
 		CakePlugin::load('TestPlugin');
 		$this->assertTrue($Apple->Behaviors->load('SomeOther', array('className' => 'TestPlugin.TestPluginPersisterOne')));
 		$this->assertInstanceOf('TestPluginPersisterOneBehavior', $Apple->Behaviors->SomeOther);

lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php

Doc Comments +6 added lines

@@ -27,10 +27,16 @@
  */
 class TestCakeSession extends CakeSession {
 
+	/**
+	 * @param string $value
+	 */
 	public static function setUserAgent($value) {
 		self::$_userAgent = $value;
 	}
 
+	/**
+	 * @param string $host
+	 */
 	public static function setHost($host) {
 		self::_setHost($host);
 	}

Spacing +5 added lines, -5 removed lines

@@ -474,7 +474,7 @@ 
  */
 	public function testCheckUserAgentFalse() {
 		Configure::write('Session.checkAgent', false);
-		TestCakeSession::setUserAgent(md5('http://randomdomainname.com' . Configure::read('Security.salt')));
+		TestCakeSession::setUserAgent(md5('http://randomdomainname.com'.Configure::read('Security.salt')));
 		$this->assertTrue(TestCakeSession::valid());
 	}
 
@@ -486,7 +486,7 @@ 
 	public function testCheckUserAgentTrue() {
 		Configure::write('Session.checkAgent', true);
 		TestCakeSession::$error = false;
-		$agent = md5('http://randomdomainname.com' . Configure::read('Security.salt'));
+		$agent = md5('http://randomdomainname.com'.Configure::read('Security.salt'));
 
 		TestCakeSession::write('Config.userAgent', md5('Hacking you!'));
 		TestCakeSession::setUserAgent($agent);
@@ -536,9 +536,9 @@ 
 	public function testUsingAppLibsHandler() {
 		App::build(array(
 			'Model/Datasource/Session' => array(
-				CAKE . 'Test' . DS . 'test_app' . DS . 'Model' . DS . 'Datasource' . DS . 'Session' . DS
+				CAKE.'Test'.DS.'test_app'.DS.'Model'.DS.'Datasource'.DS.'Session'.DS
 			),
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)
 		), App::RESET);
 		Configure::write('Session', array(
 			'defaults' => 'cake',
@@ -563,7 +563,7 @@ 
  */
 	public function testUsingPluginHandler() {
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS)
 		), App::RESET);
 		CakePlugin::load('TestPlugin');
 

lib/Cake/Test/Case/Model/Datasource/Database/SqlserverTest.php

Doc Comments +1 added lines, -2 removed lines

@@ -59,8 +59,7 @@
 /**
  * fetchAll method
  *
- * @param mixed $sql
- * @return void
+ * @return string
  */
 	protected function _matchRecords(Model $model, $conditions = null) {
 		return $this->conditions(array('id' => array(1, 2)));

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 App::uses('AppModel', 'Model');
 App::uses('Sqlserver', 'Model/Datasource/Database');
 
-require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
+require_once dirname(dirname(dirname(__FILE__))).DS.'models.php';
 
 /**
  * SqlserverTestDb class
@@ -221,7 +221,7 @@ 
  * @return void
  */
 	public function fetch() {
-		if (!$this->valid()) {
+		if ( ! $this->valid()) {
 			return null;
 		}
 		$current = $this->current();
@@ -267,7 +267,7 @@ 
 	public function setUp() {
 		parent::setUp();
 		$this->Dbo = ConnectionManager::getDataSource('test');
-		if (!($this->Dbo instanceof Sqlserver)) {
+		if ( ! ($this->Dbo instanceof Sqlserver)) {
 			$this->markTestSkipped('Please configure the test datasource to use SQL Server.');
 		}
 		$this->db = new SqlserverTestDb($this->Dbo->config);
@@ -406,7 +406,7 @@ 
  */
 	public function testDescribe() {
 		$SqlserverTableDescription = new SqlserverTestResultIterator(array(
-			(object)array(
+			(object) array(
 				'Default' => '((0))',
 				'Field' => 'count',
 				'Key' => 0,
@@ -414,7 +414,7 @@ 
 				'Null' => 'NO',
 				'Type' => 'integer'
 			),
-			(object)array(
+			(object) array(
 				'Default' => '',
 				'Field' => 'body',
 				'Key' => 0,
@@ -422,7 +422,7 @@ 
 				'Null' => 'YES',
 				'Type' => 'nvarchar'
 			),
-			(object)array(
+			(object) array(
 				'Default' => '',
 				'Field' => 'published',
 				'Key' => 0,
@@ -431,7 +431,7 @@ 
 				'Null' => 'YES',
 				'Size' => ''
 			),
-			(object)array(
+			(object) array(
 				'Default' => '',
 				'Field' => 'id',
 				'Key' => 1,
@@ -440,7 +440,7 @@ 
 				'Null' => 'NO',
 				'Size' => ''
 			),
-			(object)array(
+			(object) array(
 				'Default' => null,
 				'Field' => 'parent_id',
 				'Key' => '0',

lib/Cake/Test/Case/Model/Datasource/DataSourceTest.php

Doc Comments +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 /**
  * listSources
  *
- * @return boolean
+ * @return string[]
  */
 	public function listSources() {
 		return null;
@@ -66,7 +66,7 @@ 
 /**
  * Returns the schema for the datasource to enable create/update
  *
- * @param object $Model
+ * @param Model $Model
  * @return array
  */
 	public function describe(Model $Model) {

Spacing +1 added lines, -1 removed lines

@@ -241,7 +241,7 @@
 			->method('delete')
 			->with(
 				$this->equalTo($this->Model),
-				$this->equalTo(array($this->Model->alias . '.id' => 1))
+				$this->equalTo(array($this->Model->alias.'.id' => 1))
 			);
 		$this->Model->delete(1);
 	}

lib/Cake/Test/Case/Model/models.php

Doc Comments +11 added lines, -11 removed lines

@@ -169,7 +169,7 @@ 
  *
  * @param mixed $value
  * @param mixed $options
- * @return void
+ * @return boolean
  */
 	public function validateNumber($value, $options) {
 		$options = array_merge(array('min' => 0, 'max' => 100), $options);
@@ -181,7 +181,7 @@ 
  * validateTitle method
  *
  * @param mixed $value
- * @return void
+ * @return boolean
  */
 	public function validateTitle($value) {
 		return (!empty($value) && strpos(strtolower($value['title']), 'title-') === 0);
@@ -283,7 +283,7 @@ 
 /**
  * beforeSave method
  *
- * @return void
+ * @return boolean
  */
 	public function beforeSave($options = array()) {
 		return $this->beforeSaveReturn;
@@ -293,7 +293,7 @@ 
  * titleDuplicate method
  *
  * @param string $title
- * @return void
+ * @return boolean
  */
 	public static function titleDuplicate($title) {
 		if ($title === 'My Article Title') {
@@ -2164,7 +2164,7 @@ 
  * customValidationMethod method
  *
  * @param mixed $data
- * @return void
+ * @return boolean
  */
 	public function customValidationMethod($data) {
 		return $data === 1;
@@ -2173,7 +2173,7 @@ 
 /**
  * Custom validator with parameters + default values
  *
- * @return array
+ * @return boolean
  */
 	public function customValidatorWithParams($data, $validator, $or = true, $ignoreOnSame = 'id') {
 		$this->validatorParams = get_defined_vars();
@@ -2184,7 +2184,7 @@ 
 /**
  * Custom validator with message
  *
- * @return array
+ * @return string
  */
 	public function customValidatorWithMessage($data) {
 		return 'This field will *never* validate! Muhahaha!';
@@ -2193,7 +2193,7 @@ 
 /**
  * Test validation with many parameters
  *
- * @return void
+ * @return boolean
  */
 	public function customValidatorWithSixParams($data, $one = 1, $two = 2, $three = 3, $four = 4, $five = 5, $six = 6) {
 		$this->validatorParams = get_defined_vars();
@@ -2243,7 +2243,7 @@ 
  * customValidationMethod method
  *
  * @param mixed $data
- * @return void
+ * @return boolean
  */
 	public function customValidationMethod($data) {
 		return $data === 1;
@@ -2553,7 +2553,7 @@ 
  * @param integer $levelLimit
  * @param integer $childLimit
  * @param mixed $currentLevel
- * @param mixed $parent_id
+ * @param mixed $parentId
  * @param string $prefix
  * @param boolean $hierarchal
  * @return void
@@ -4995,7 +4995,7 @@ 
  * Alters title data
  *
  * @param array $options Options passed from Model::save().
- * @return boolean True if validate operation should continue, false to abort
+ * @return boolean|null True if validate operation should continue, false to abort
  * @see Model::save()
  */
 	public function beforeValidate($options = array()) {

Spacing +23 added lines, -23 removed lines

@@ -184,7 +184,7 @@ 
  * @return void
  */
 	public function validateTitle($value) {
-		return (!empty($value) && strpos(strtolower($value['title']), 'title-') === 0);
+		return ( ! empty($value) && strpos(strtolower($value['title']), 'title-') === 0);
 	}
 
 }
@@ -217,8 +217,8 @@ 
  * @throws Exception
  */
 	public function beforeFind($queryData) {
-		if (!empty($queryData['lazyLoad'])) {
-			if (!isset($this->Article, $this->Comment, $this->ArticleFeatured)) {
+		if ( ! empty($queryData['lazyLoad'])) {
+			if ( ! isset($this->Article, $this->Comment, $this->ArticleFeatured)) {
 				throw new Exception('Unavailable associations');
 			}
 		}
@@ -318,7 +318,7 @@ 
 
 	public function beforeDelete($cascade = true) {
 		$db = $this->getDataSource();
-		$db->delete($this, array($this->alias . '.' . $this->primaryKey => array(1, 3)));
+		$db->delete($this, array($this->alias.'.'.$this->primaryKey => array(1, 3)));
 		return true;
 	}
 
@@ -2559,7 +2559,7 @@ 
  * @return void
  */
 	public function initialize($levelLimit = 3, $childLimit = 3, $currentLevel = null, $parentId = null, $prefix = '1', $hierarchal = true) {
-		if (!$parentId) {
+		if ( ! $parentId) {
 			$db = ConnectionManager::getDataSource($this->useDbConfig);
 			$db->truncate($this->table);
 			$this->save(array($this->name => array('name' => '1. Root')));
@@ -2567,12 +2567,12 @@ 
 			$this->create(array());
 		}
 
-		if (!$currentLevel || $currentLevel > $levelLimit) {
+		if ( ! $currentLevel || $currentLevel > $levelLimit) {
 			return;
 		}
 
 		for ($i = 1; $i <= $childLimit; $i++) {
-			$name = $prefix . '.' . $i;
+			$name = $prefix.'.'.$i;
 			$data = array($this->name => array('name' => $name));
 			$this->create($data);
 
@@ -3721,7 +3721,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 				'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
@@ -3768,7 +3768,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'test_model4_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 				'test_model7_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8')
@@ -3833,7 +3833,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 				'test_model4_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
@@ -3893,7 +3893,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 				'test_model5_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
@@ -3941,7 +3941,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 				'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
@@ -4001,7 +4001,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 				'test_model9_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
@@ -4062,7 +4062,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
 				'test_model8_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '11'),
@@ -4124,7 +4124,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
 				'name' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => '20'),
@@ -4183,7 +4183,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
 				'level_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
@@ -4254,7 +4254,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
 				'group_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
@@ -4334,7 +4334,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
 				'group_id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
@@ -4394,7 +4394,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
 				'category_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
@@ -4456,7 +4456,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
 				'parent_id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
@@ -4515,7 +4515,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
 				'article_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
@@ -4569,7 +4569,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
 				'article_featured_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
@@ -4644,7 +4644,7 @@ 
  * @return void
  */
 	public function schema($field = false) {
-		if (!isset($this->_schema)) {
+		if ( ! isset($this->_schema)) {
 			$this->_schema = array(
 				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
 				'category_featured_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),

lib/Cake/Test/Case/Network/Email/CakeEmailTest.php

Doc Comments +8 added lines, -5 removed lines

@@ -51,7 +51,7 @@ 
 /**
  * Wrap to protected method
  *
- * @return array
+ * @return string[]
  */
 	public function wrap($text, $length = CakeEmail::LINE_LENGTH_MUST) {
 		return parent::_wrap($text, $length);
@@ -1981,6 +1981,9 @@ 
 		$this->assertContains(mb_convert_encoding('①㈱', 'ISO-2022-JP-MS'), $result['message']);
 	}
 
+	/**
+	 * @param string $charset
+	 */
 	protected function _checkContentTransferEncoding($message, $charset) {
 		$boundary = '--alt-' . $this->CakeEmail->getBoundary();
 		$result['text'] = false;
@@ -2119,8 +2122,8 @@ 
 	}
 
 /**
- * @param mixed $charset
- * @param mixed $headerCharset
+ * @param string $charset
+ * @param null|string $headerCharset
  * @return CakeEmail
  */
 	protected function _getEmailByOldStyleCharset($charset, $headerCharset) {
@@ -2143,8 +2146,8 @@ 
 	}
 
 /**
- * @param mixed $charset
- * @param mixed $headerCharset
+ * @param string $charset
+ * @param null|string $headerCharset
  * @return CakeEmail
  */
 	protected function _getEmailByNewStyleCharset($charset, $headerCharset) {

Indentation +4 added lines, -4 removed lines

@@ -1202,10 +1202,10 @@
 		$this->assertContains('--' . $boundary . '--', $result['message']);
 	}
 /**
- * testSendWithLog method
- *
- * @return void
- */
+	 * testSendWithLog method
+	 *
+	 * @return void
+	 */
 	public function testSendWithLog() {
 		CakeLog::config('email', array(
 			'engine' => 'File',

Spacing +176 added lines, -176 removed lines

@@ -148,7 +148,7 @@ 
 		$this->CakeEmail = new TestCakeEmail();
 
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 	}
 
@@ -426,7 +426,7 @@ 
  * @return void
  */
 	public function testFormatAddressJapanese() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 
 		$this->CakeEmail->headerCharset = 'ISO-2022-JP';
 		$result = $this->CakeEmail->formatAddress(array('cake@cakephp.org' => '日本語Test'));
@@ -434,11 +434,11 @@ 
 		$this->assertSame($expected, $result);
 
 		$result = $this->CakeEmail->formatAddress(array('cake@cakephp.org' => '寿限無寿限無五劫の擦り切れ海砂利水魚の水行末雲来末風来末食う寝る処に住む処やぶら小路の藪柑子パイポパイポパイポのシューリンガンシューリンガンのグーリンダイグーリンダイのポンポコピーのポンポコナーの長久命の長助'));
-		$expected = array("=?ISO-2022-JP?B?GyRCPHc4Qkw1PHc4Qkw1OF45ZSROOyQkakBaJGwzJDo9TXg/ZTV7GyhC?=\r\n" .
-			" =?ISO-2022-JP?B?GyRCJE4/ZTlUS3YxQE1oS3ZJd01oS3Y/KSQmPzIkaz1oJEs9OyRgGyhC?=\r\n" .
-			" =?ISO-2022-JP?B?GyRCPWgkZCRWJGk+Lk8pJE5pLjQ7O1IlUSUkJV0lUSUkJV0lUSUkGyhC?=\r\n" .
-			" =?ISO-2022-JP?B?GyRCJV0kTiU3JWUhPCVqJXMlLCVzJTclZSE8JWolcyUsJXMkTiUwGyhC?=\r\n" .
-			" =?ISO-2022-JP?B?GyRCITwlaiVzJUAlJCUwITwlaiVzJUAlJCROJV0lcyVdJTMlVCE8GyhC?=\r\n" .
+		$expected = array("=?ISO-2022-JP?B?GyRCPHc4Qkw1PHc4Qkw1OF45ZSROOyQkakBaJGwzJDo9TXg/ZTV7GyhC?=\r\n".
+			" =?ISO-2022-JP?B?GyRCJE4/ZTlUS3YxQE1oS3ZJd01oS3Y/KSQmPzIkaz1oJEs9OyRgGyhC?=\r\n".
+			" =?ISO-2022-JP?B?GyRCPWgkZCRWJGk+Lk8pJE5pLjQ7O1IlUSUkJV0lUSUkJV0lUSUkGyhC?=\r\n".
+			" =?ISO-2022-JP?B?GyRCJV0kTiU3JWUhPCVqJXMlLCVzJTclZSE8JWolcyUsJXMkTiUwGyhC?=\r\n".
+			" =?ISO-2022-JP?B?GyRCITwlaiVzJUAlJCUwITwlaiVzJUAlJCROJV0lcyVdJTMlVCE8GyhC?=\r\n".
 			" =?ISO-2022-JP?B?GyRCJE4lXSVzJV0lMyVKITwkTkQ5NVdMPyRORDk9dRsoQg==?= <cake@cakephp.org>");
 		$this->assertSame($expected, $result);
 	}
@@ -563,7 +563,7 @@ 
 		$this->assertSame($this->CakeEmail->subject(), '1');
 
 		$this->CakeEmail->subject('هذه رسالة بعنوان طويل مرسل للمستلم');
-		$expected = '=?UTF-8?B?2YfYsNmHINix2LPYp9mE2Kkg2KjYudmG2YjYp9mGINi32YjZitmEINmF2LE=?=' . "\r\n" . ' =?UTF-8?B?2LPZhCDZhNmE2YXYs9iq2YTZhQ==?=';
+		$expected = '=?UTF-8?B?2YfYsNmHINix2LPYp9mE2Kkg2KjYudmG2YjYp9mGINi32YjZitmEINmF2LE=?='."\r\n".' =?UTF-8?B?2LPZhCDZhNmE2YXYs9iq2YTZhQ==?=';
 		$this->assertSame($this->CakeEmail->subject(), $expected);
 	}
 
@@ -573,7 +573,7 @@ 
  * @return void
  */
 	public function testSubjectJapanese() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 		mb_internal_encoding('UTF-8');
 
 		$this->CakeEmail->headerCharset = 'ISO-2022-JP';
@@ -582,8 +582,8 @@ 
 		$this->assertSame($this->CakeEmail->subject(), $expected);
 
 		$this->CakeEmail->subject('長い長い長いSubjectの場合はfoldingするのが正しいんだけどいったいどうなるんだろう？');
-		$expected = "=?ISO-2022-JP?B?GyRCRDkkJEQ5JCREOSQkGyhCU3ViamVjdBskQiROPmw5ZyRPGyhCZm9s?=\r\n" .
-			" =?ISO-2022-JP?B?ZGluZxskQiQ5JGskTiQsQDUkNyQkJHMkQCQxJEkkJCRDJD8kJCRJGyhC?=\r\n" .
+		$expected = "=?ISO-2022-JP?B?GyRCRDkkJEQ5JCREOSQkGyhCU3ViamVjdBskQiROPmw5ZyRPGyhCZm9s?=\r\n".
+			" =?ISO-2022-JP?B?ZGluZxskQiQ5JGskTiQsQDUkNyQkJHMkQCQxJEkkJCRDJD8kJCRJGyhC?=\r\n".
 			" =?ISO-2022-JP?B?GyRCJCYkSiRrJHMkQCRtJCYhKRsoQg==?=";
 		$this->assertSame($this->CakeEmail->subject(), $expected);
 	}
@@ -766,10 +766,10 @@ 
  * @return void
  */
 	public function testAttachments() {
-		$this->CakeEmail->attachments(CAKE . 'basics.php');
+		$this->CakeEmail->attachments(CAKE.'basics.php');
 		$expected = array(
 			'basics.php' => array(
-				'file' => CAKE . 'basics.php',
+				'file' => CAKE.'basics.php',
 				'mimetype' => 'application/octet-stream'
 			)
 		);
@@ -779,21 +779,21 @@ 
 		$this->assertSame($this->CakeEmail->attachments(), array());
 
 		$this->CakeEmail->attachments(array(
-			array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain')
+			array('file' => CAKE.'basics.php', 'mimetype' => 'text/plain')
 		));
-		$this->CakeEmail->addAttachments(CAKE . 'bootstrap.php');
-		$this->CakeEmail->addAttachments(array(CAKE . 'bootstrap.php'));
-		$this->CakeEmail->addAttachments(array('other.txt' => CAKE . 'bootstrap.php', 'license' => CAKE . 'LICENSE.txt'));
+		$this->CakeEmail->addAttachments(CAKE.'bootstrap.php');
+		$this->CakeEmail->addAttachments(array(CAKE.'bootstrap.php'));
+		$this->CakeEmail->addAttachments(array('other.txt' => CAKE.'bootstrap.php', 'license' => CAKE.'LICENSE.txt'));
 		$expected = array(
-			'basics.php' => array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain'),
-			'bootstrap.php' => array('file' => CAKE . 'bootstrap.php', 'mimetype' => 'application/octet-stream'),
-			'other.txt' => array('file' => CAKE . 'bootstrap.php', 'mimetype' => 'application/octet-stream'),
-			'license' => array('file' => CAKE . 'LICENSE.txt', 'mimetype' => 'application/octet-stream')
+			'basics.php' => array('file' => CAKE.'basics.php', 'mimetype' => 'text/plain'),
+			'bootstrap.php' => array('file' => CAKE.'bootstrap.php', 'mimetype' => 'application/octet-stream'),
+			'other.txt' => array('file' => CAKE.'bootstrap.php', 'mimetype' => 'application/octet-stream'),
+			'license' => array('file' => CAKE.'LICENSE.txt', 'mimetype' => 'application/octet-stream')
 		);
 		$this->assertSame($this->CakeEmail->attachments(), $expected);
 
 		$this->setExpectedException('SocketException');
-		$this->CakeEmail->attachments(array(array('nofile' => CAKE . 'basics.php', 'mimetype' => 'text/plain')));
+		$this->CakeEmail->attachments(array(array('nofile' => CAKE.'basics.php', 'mimetype' => 'text/plain')));
 	}
 
 /**
@@ -948,15 +948,15 @@ 
 		$expected = "Here is my body, with multi lines.\r\nThis is the second line.\r\n\r\nAnd the last.\r\n\r\n";
 
 		$this->assertEquals($expected, $result['message']);
-		$this->assertTrue((bool)strpos($result['headers'], 'Date: '));
-		$this->assertTrue((bool)strpos($result['headers'], 'Message-ID: '));
-		$this->assertTrue((bool)strpos($result['headers'], 'To: '));
+		$this->assertTrue((bool) strpos($result['headers'], 'Date: '));
+		$this->assertTrue((bool) strpos($result['headers'], 'Message-ID: '));
+		$this->assertTrue((bool) strpos($result['headers'], 'To: '));
 
 		$result = $this->CakeEmail->send("Other body");
 		$expected = "Other body\r\n\r\n";
 		$this->assertSame($result['message'], $expected);
-		$this->assertTrue((bool)strpos($result['headers'], 'Message-ID: '));
-		$this->assertTrue((bool)strpos($result['headers'], 'To: '));
+		$this->assertTrue((bool) strpos($result['headers'], 'Message-ID: '));
+		$this->assertTrue((bool) strpos($result['headers'], 'To: '));
 
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('Debug');
@@ -1008,22 +1008,22 @@ 
 		$this->CakeEmail->to('cake@cakephp.org');
 		$this->CakeEmail->subject('My title');
 		$this->CakeEmail->emailFormat('text');
-		$this->CakeEmail->attachments(array(CAKE . 'basics.php'));
+		$this->CakeEmail->attachments(array(CAKE.'basics.php'));
 		$result = $this->CakeEmail->send('Hello');
 
 		$boundary = $this->CakeEmail->getBoundary();
-		$this->assertContains('Content-Type: multipart/mixed; boundary="' . $boundary . '"', $result['headers']);
-		$expected = "--$boundary\r\n" .
-			"Content-Type: text/plain; charset=UTF-8\r\n" .
-			"Content-Transfer-Encoding: 8bit\r\n" .
-			"\r\n" .
-			"Hello" .
-			"\r\n" .
-			"\r\n" .
-			"\r\n" .
-			"--$boundary\r\n" .
-			"Content-Type: application/octet-stream\r\n" .
-			"Content-Transfer-Encoding: base64\r\n" .
+		$this->assertContains('Content-Type: multipart/mixed; boundary="'.$boundary.'"', $result['headers']);
+		$expected = "--$boundary\r\n".
+			"Content-Type: text/plain; charset=UTF-8\r\n".
+			"Content-Transfer-Encoding: 8bit\r\n".
+			"\r\n".
+			"Hello".
+			"\r\n".
+			"\r\n".
+			"\r\n".
+			"--$boundary\r\n".
+			"Content-Type: application/octet-stream\r\n".
+			"Content-Transfer-Encoding: base64\r\n".
 			"Content-Disposition: attachment; filename=\"basics.php\"\r\n\r\n";
 		$this->assertContains($expected, $result['message']);
 	}
@@ -1040,7 +1040,7 @@ 
 		$this->CakeEmail->to('cake@cakephp.org');
 		$this->CakeEmail->subject('My title');
 		$this->CakeEmail->emailFormat('text');
-		$data = file_get_contents(CAKE . 'Console/Templates/skel/webroot/img/cake.icon.png');
+		$data = file_get_contents(CAKE.'Console/Templates/skel/webroot/img/cake.icon.png');
 		$this->CakeEmail->attachments(array('cake.icon.png' => array(
 				'data' => $data,
 				'mimetype' => 'image/png'
@@ -1048,18 +1048,18 @@ 
 		$result = $this->CakeEmail->send('Hello');
 
 		$boundary = $this->CakeEmail->getBoundary();
-		$this->assertContains('Content-Type: multipart/mixed; boundary="' . $boundary . '"', $result['headers']);
-		$expected = "--$boundary\r\n" .
-				"Content-Type: text/plain; charset=UTF-8\r\n" .
-				"Content-Transfer-Encoding: 8bit\r\n" .
-				"\r\n" .
-				"Hello" .
-				"\r\n" .
-				"\r\n" .
-				"\r\n" .
-				"--$boundary\r\n" .
-				"Content-Type: image/png\r\n" .
-				"Content-Transfer-Encoding: base64\r\n" .
+		$this->assertContains('Content-Type: multipart/mixed; boundary="'.$boundary.'"', $result['headers']);
+		$expected = "--$boundary\r\n".
+				"Content-Type: text/plain; charset=UTF-8\r\n".
+				"Content-Transfer-Encoding: 8bit\r\n".
+				"\r\n".
+				"Hello".
+				"\r\n".
+				"\r\n".
+				"\r\n".
+				"--$boundary\r\n".
+				"Content-Type: image/png\r\n".
+				"Content-Transfer-Encoding: base64\r\n".
 				"Content-Disposition: attachment; filename=\"cake.icon.png\"\r\n\r\n";
 		$expected .= chunk_split(base64_encode($data), 76, "\r\n");
 		$this->assertContains($expected, $result['message']);
@@ -1076,35 +1076,35 @@ 
 		$this->CakeEmail->to('cake@cakephp.org');
 		$this->CakeEmail->subject('My title');
 		$this->CakeEmail->emailFormat('both');
-		$this->CakeEmail->attachments(array(CAKE . 'VERSION.txt'));
+		$this->CakeEmail->attachments(array(CAKE.'VERSION.txt'));
 		$result = $this->CakeEmail->send('Hello');
 
 		$boundary = $this->CakeEmail->getBoundary();
-		$this->assertContains('Content-Type: multipart/mixed; boundary="' . $boundary . '"', $result['headers']);
-		$expected = "--$boundary\r\n" .
-			"Content-Type: multipart/alternative; boundary=\"alt-$boundary\"\r\n" .
-			"\r\n" .
-			"--alt-$boundary\r\n" .
-			"Content-Type: text/plain; charset=UTF-8\r\n" .
-			"Content-Transfer-Encoding: 8bit\r\n" .
-			"\r\n" .
-			"Hello" .
-			"\r\n" .
-			"\r\n" .
-			"\r\n" .
-			"--alt-$boundary\r\n" .
-			"Content-Type: text/html; charset=UTF-8\r\n" .
-			"Content-Transfer-Encoding: 8bit\r\n" .
-			"\r\n" .
-			"Hello" .
-			"\r\n" .
-			"\r\n" .
-			"\r\n" .
-			"--alt-{$boundary}--\r\n" .
-			"\r\n" .
-			"--$boundary\r\n" .
-			"Content-Type: application/octet-stream\r\n" .
-			"Content-Transfer-Encoding: base64\r\n" .
+		$this->assertContains('Content-Type: multipart/mixed; boundary="'.$boundary.'"', $result['headers']);
+		$expected = "--$boundary\r\n".
+			"Content-Type: multipart/alternative; boundary=\"alt-$boundary\"\r\n".
+			"\r\n".
+			"--alt-$boundary\r\n".
+			"Content-Type: text/plain; charset=UTF-8\r\n".
+			"Content-Transfer-Encoding: 8bit\r\n".
+			"\r\n".
+			"Hello".
+			"\r\n".
+			"\r\n".
+			"\r\n".
+			"--alt-$boundary\r\n".
+			"Content-Type: text/html; charset=UTF-8\r\n".
+			"Content-Transfer-Encoding: 8bit\r\n".
+			"\r\n".
+			"Hello".
+			"\r\n".
+			"\r\n".
+			"\r\n".
+			"--alt-{$boundary}--\r\n".
+			"\r\n".
+			"--$boundary\r\n".
+			"Content-Type: application/octet-stream\r\n".
+			"Content-Transfer-Encoding: base64\r\n".
 			"Content-Disposition: attachment; filename=\"VERSION.txt\"\r\n\r\n";
 		$this->assertContains($expected, $result['message']);
 	}
@@ -1122,46 +1122,46 @@ 
 		$this->CakeEmail->emailFormat('both');
 		$this->CakeEmail->attachments(array(
 			'cake.png' => array(
-				'file' => CAKE . 'VERSION.txt',
+				'file' => CAKE.'VERSION.txt',
 				'contentId' => 'abc123'
 			)
 		));
 		$result = $this->CakeEmail->send('Hello');
 
 		$boundary = $this->CakeEmail->getBoundary();
-		$this->assertContains('Content-Type: multipart/mixed; boundary="' . $boundary . '"', $result['headers']);
-		$expected = "--$boundary\r\n" .
-			"Content-Type: multipart/related; boundary=\"rel-$boundary\"\r\n" .
-			"\r\n" .
-			"--rel-$boundary\r\n" .
-			"Content-Type: multipart/alternative; boundary=\"alt-$boundary\"\r\n" .
-			"\r\n" .
-			"--alt-$boundary\r\n" .
-			"Content-Type: text/plain; charset=UTF-8\r\n" .
-			"Content-Transfer-Encoding: 8bit\r\n" .
-			"\r\n" .
-			"Hello" .
-			"\r\n" .
-			"\r\n" .
-			"\r\n" .
-			"--alt-$boundary\r\n" .
-			"Content-Type: text/html; charset=UTF-8\r\n" .
-			"Content-Transfer-Encoding: 8bit\r\n" .
-			"\r\n" .
-			"Hello" .
-			"\r\n" .
-			"\r\n" .
-			"\r\n" .
-			"--alt-{$boundary}--\r\n" .
-			"\r\n" .
-			"--rel-$boundary\r\n" .
-			"Content-Type: application/octet-stream\r\n" .
-			"Content-Transfer-Encoding: base64\r\n" .
-			"Content-ID: <abc123>\r\n" .
+		$this->assertContains('Content-Type: multipart/mixed; boundary="'.$boundary.'"', $result['headers']);
+		$expected = "--$boundary\r\n".
+			"Content-Type: multipart/related; boundary=\"rel-$boundary\"\r\n".
+			"\r\n".
+			"--rel-$boundary\r\n".
+			"Content-Type: multipart/alternative; boundary=\"alt-$boundary\"\r\n".
+			"\r\n".
+			"--alt-$boundary\r\n".
+			"Content-Type: text/plain; charset=UTF-8\r\n".
+			"Content-Transfer-Encoding: 8bit\r\n".
+			"\r\n".
+			"Hello".
+			"\r\n".
+			"\r\n".
+			"\r\n".
+			"--alt-$boundary\r\n".
+			"Content-Type: text/html; charset=UTF-8\r\n".
+			"Content-Transfer-Encoding: 8bit\r\n".
+			"\r\n".
+			"Hello".
+			"\r\n".
+			"\r\n".
+			"\r\n".
+			"--alt-{$boundary}--\r\n".
+			"\r\n".
+			"--rel-$boundary\r\n".
+			"Content-Type: application/octet-stream\r\n".
+			"Content-Transfer-Encoding: base64\r\n".
+			"Content-ID: <abc123>\r\n".
 			"Content-Disposition: inline; filename=\"cake.png\"\r\n\r\n";
 		$this->assertContains($expected, $result['message']);
-		$this->assertContains('--rel-' . $boundary . '--', $result['message']);
-		$this->assertContains('--' . $boundary . '--', $result['message']);
+		$this->assertContains('--rel-'.$boundary.'--', $result['message']);
+		$this->assertContains('--'.$boundary.'--', $result['message']);
 	}
 
 /**
@@ -1177,29 +1177,29 @@ 
 		$this->CakeEmail->emailFormat('text');
 		$this->CakeEmail->attachments(array(
 			'cake.png' => array(
-				'file' => CAKE . 'VERSION.txt',
+				'file' => CAKE.'VERSION.txt',
 				'contentDisposition' => false
 			)
 		));
 		$result = $this->CakeEmail->send('Hello');
 
 		$boundary = $this->CakeEmail->getBoundary();
-		$this->assertContains('Content-Type: multipart/mixed; boundary="' . $boundary . '"', $result['headers']);
-		$expected = "--$boundary\r\n" .
-			"Content-Type: text/plain; charset=UTF-8\r\n" .
-			"Content-Transfer-Encoding: 8bit\r\n" .
-			"\r\n" .
-			"Hello" .
-			"\r\n" .
-			"\r\n" .
-			"\r\n" .
-			"--{$boundary}\r\n" .
-			"Content-Type: application/octet-stream\r\n" .
-			"Content-Transfer-Encoding: base64\r\n" .
+		$this->assertContains('Content-Type: multipart/mixed; boundary="'.$boundary.'"', $result['headers']);
+		$expected = "--$boundary\r\n".
+			"Content-Type: text/plain; charset=UTF-8\r\n".
+			"Content-Transfer-Encoding: 8bit\r\n".
+			"\r\n".
+			"Hello".
+			"\r\n".
+			"\r\n".
+			"\r\n".
+			"--{$boundary}\r\n".
+			"Content-Type: application/octet-stream\r\n".
+			"Content-Transfer-Encoding: base64\r\n".
 			"\r\n";
 
 		$this->assertContains($expected, $result['message']);
-		$this->assertContains('--' . $boundary . '--', $result['message']);
+		$this->assertContains('--'.$boundary.'--', $result['message']);
 	}
 /**
  * testSendWithLog method
@@ -1220,7 +1220,7 @@ 
 		$result = $this->CakeEmail->send("Logging This");
 
 		App::uses('File', 'Utility');
-		$File = new File(TMP . 'cake_test_emails.log');
+		$File = new File(TMP.'cake_test_emails.log');
 		$log = $File->read();
 		$this->assertTrue(strpos($log, $result['headers']) !== false);
 		$this->assertTrue(strpos($log, $result['message']) !== false);
@@ -1249,7 +1249,7 @@ 
 		$result = $this->CakeEmail->send("Logging This");
 
 		App::uses('File', 'Utility');
-		$File = new File(TMP . 'cake_test_emails.log');
+		$File = new File(TMP.'cake_test_emails.log');
 		$log = $File->read();
 		$this->assertTrue(strpos($log, $result['headers']) !== false);
 		$this->assertTrue(strpos($log, $result['message']) !== false);
@@ -1304,7 +1304,7 @@ 
  * @return void
  */
 	public function testSendRenderJapanese() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('debug');
@@ -1393,7 +1393,7 @@ 
  * @return void
  */
 	public function testSendRenderWithVarsJapanese() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('debug');
 
@@ -1407,7 +1407,7 @@ 
 		$result = $this->CakeEmail->send();
 
 		$expected = mb_convert_encoding('ここにあなたの設定した値が入ります: 日本語の差し込み123', 'ISO-2022-JP');
-		$this->assertTrue((bool)strpos($result['message'], $expected));
+		$this->assertTrue((bool) strpos($result['message'], $expected));
 	}
 
 /**
@@ -1431,7 +1431,7 @@ 
 		$this->assertInstanceOf('CakeEmail', $result);
 
 		$result = $this->CakeEmail->send();
-		$this->assertTrue((bool)strpos($result['message'], 'Right now: ' . date('Y-m-d\TH:i:s\Z', $timestamp)));
+		$this->assertTrue((bool) strpos($result['message'], 'Right now: '.date('Y-m-d\TH:i:s\Z', $timestamp)));
 
 		$result = $this->CakeEmail->helpers();
 		$this->assertEquals(array('Time'), $result);
@@ -1455,10 +1455,10 @@ 
 		$server = env('SERVER_NAME') ? env('SERVER_NAME') : 'localhost';
 
 		if (env('SERVER_PORT') && env('SERVER_PORT') != 80) {
-			$server .= ':' . env('SERVER_PORT');
+			$server .= ':'.env('SERVER_PORT');
 		}
 
-		$expected = '<img src="http://' . $server . '/img/image.gif" alt="cool image" width="100" height="100" />';
+		$expected = '<img src="http://'.$server.'/img/image.gif" alt="cool image" width="100" height="100" />';
 		$result = $this->CakeEmail->send();
 		$this->assertContains($expected, $result['message']);
 	}
@@ -1470,7 +1470,7 @@ 
  */
 	public function testSendRenderPlugin() {
 		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', 'TestPluginTwo'));
 
@@ -1537,10 +1537,10 @@ 
 		$message = $this->CakeEmail->message();
 		$boundary = $this->CakeEmail->getBoundary();
 		$this->assertFalse(empty($boundary));
-		$this->assertContains('--' . $boundary, $message);
-		$this->assertContains('--' . $boundary . '--', $message);
-		$this->assertContains('--alt-' . $boundary, $message);
-		$this->assertContains('--alt-' . $boundary . '--', $message);
+		$this->assertContains('--'.$boundary, $message);
+		$this->assertContains('--'.$boundary.'--', $message);
+		$this->assertContains('--alt-'.$boundary, $message);
+		$this->assertContains('--alt-'.$boundary.'--', $message);
 
 		$this->CakeEmail->attachments(array('fake.php' => __FILE__));
 		$this->CakeEmail->send();
@@ -1548,10 +1548,10 @@ 
 		$message = $this->CakeEmail->message();
 		$boundary = $this->CakeEmail->getBoundary();
 		$this->assertFalse(empty($boundary));
-		$this->assertContains('--' . $boundary, $message);
-		$this->assertContains('--' . $boundary . '--', $message);
-		$this->assertContains('--alt-' . $boundary, $message);
-		$this->assertContains('--alt-' . $boundary . '--', $message);
+		$this->assertContains('--'.$boundary, $message);
+		$this->assertContains('--'.$boundary.'--', $message);
+		$this->assertContains('--alt-'.$boundary, $message);
+		$this->assertContains('--alt-'.$boundary.'--', $message);
 	}
 
 /**
@@ -1566,19 +1566,19 @@ 
 		$this->CakeEmail->to(array('you@cakephp.org' => 'You'));
 		$this->CakeEmail->subject('My title');
 		$this->CakeEmail->config(array());
-		$this->CakeEmail->attachments(array(CAKE . 'basics.php'));
+		$this->CakeEmail->attachments(array(CAKE.'basics.php'));
 		$result = $this->CakeEmail->send('body');
 		$this->assertContains("Content-Type: application/octet-stream\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"basics.php\"", $result['message']);
 
-		$this->CakeEmail->attachments(array('my.file.txt' => CAKE . 'basics.php'));
+		$this->CakeEmail->attachments(array('my.file.txt' => CAKE.'basics.php'));
 		$result = $this->CakeEmail->send('body');
 		$this->assertContains("Content-Type: application/octet-stream\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"my.file.txt\"", $result['message']);
 
-		$this->CakeEmail->attachments(array('file.txt' => array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain')));
+		$this->CakeEmail->attachments(array('file.txt' => array('file' => CAKE.'basics.php', 'mimetype' => 'text/plain')));
 		$result = $this->CakeEmail->send('body');
 		$this->assertContains("Content-Type: text/plain\r\nContent-Transfer-Encoding: base64\r\nContent-Disposition: attachment; filename=\"file.txt\"", $result['message']);
 
-		$this->CakeEmail->attachments(array('file2.txt' => array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain', 'contentId' => 'a1b1c1')));
+		$this->CakeEmail->attachments(array('file2.txt' => array('file' => CAKE.'basics.php', 'mimetype' => 'text/plain', 'contentId' => 'a1b1c1')));
 		$result = $this->CakeEmail->send('body');
 		$this->assertContains("Content-Type: text/plain\r\nContent-Transfer-Encoding: base64\r\nContent-ID: <a1b1c1>\r\nContent-Disposition: inline; filename=\"file2.txt\"", $result['message']);
 	}
@@ -1761,7 +1761,7 @@ 
 	public function testRenderWithLayoutAndAttachment() {
 		$this->CakeEmail->emailFormat('html');
 		$this->CakeEmail->template('html', 'default');
-		$this->CakeEmail->attachments(array(CAKE . 'basics.php'));
+		$this->CakeEmail->attachments(array(CAKE.'basics.php'));
 		$result = $this->CakeEmail->render(array());
 		$this->assertNotEmpty($result);
 
@@ -1800,8 +1800,8 @@ 
 
 		$result = $this->CakeEmail->send('This is the message');
 
-		$this->assertTrue((bool)strpos($result['headers'], 'Message-ID: '));
-		$this->assertTrue((bool)strpos($result['headers'], 'To: '));
+		$this->assertTrue((bool) strpos($result['headers'], 'Message-ID: '));
+		$this->assertTrue((bool) strpos($result['headers'], 'To: '));
 	}
 
 /**
@@ -1830,8 +1830,8 @@ 
 
 		$result = $this->CakeEmail->send('This is the message');
 
-		$this->assertTrue((bool)strpos($result['headers'], 'Message-ID: '));
-		$this->assertTrue((bool)strpos($result['headers'], 'To: '));
+		$this->assertTrue((bool) strpos($result['headers'], 'Message-ID: '));
+		$this->assertTrue((bool) strpos($result['headers'], 'To: '));
 	}
 
 /**
@@ -1898,7 +1898,7 @@ 
  * @return void
  */
 	public function testHeaderEncoding() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 		$email = new CakeEmail(array('headerCharset' => 'iso-2022-jp-ms', 'transport' => 'Debug'));
 		$email->subject('あれ？もしかしての前と');
 		$headers = $email->getHeaders(array('subject'));
@@ -1916,7 +1916,7 @@ 
  * @return void
  */
 	public function testBodyEncoding() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 		$email = new CakeEmail(array(
 			'charset' => 'iso-2022-jp',
 			'headerCharset' => 'iso-2022-jp-ms',
@@ -1939,7 +1939,7 @@ 
  * @return void
  */
 	public function testBodyEncodingIso2022Jp() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 		$email = new CakeEmail(array(
 			'charset' => 'iso-2022-jp',
 			'headerCharset' => 'iso-2022-jp',
@@ -1963,7 +1963,7 @@ 
  * @return void
  */
 	public function testBodyEncodingIso2022JpMs() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 		$email = new CakeEmail(array(
 			'charset' => 'iso-2022-jp-ms',
 			'headerCharset' => 'iso-2022-jp-ms',
@@ -1982,7 +1982,7 @@ 
 	}
 
 	protected function _checkContentTransferEncoding($message, $charset) {
-		$boundary = '--alt-' . $this->CakeEmail->getBoundary();
+		$boundary = '--alt-'.$this->CakeEmail->getBoundary();
 		$result['text'] = false;
 		$result['html'] = false;
 		$length = count($message);
@@ -1990,14 +1990,14 @@ 
 			if ($message[$i] == $boundary) {
 				$flag = false;
 				$type = '';
-				while (!preg_match('/^$/', $message[$i])) {
+				while ( ! preg_match('/^$/', $message[$i])) {
 					if (preg_match('/^Content-Type: text\/plain/', $message[$i])) {
 						$type = 'text';
 					}
 					if (preg_match('/^Content-Type: text\/html/', $message[$i])) {
 						$type = 'html';
 					}
-					if ($message[$i] === 'Content-Transfer-Encoding: ' . $charset) {
+					if ($message[$i] === 'Content-Transfer-Encoding: '.$charset) {
 						$flag = true;
 					}
 					++$i;
@@ -2014,7 +2014,7 @@ 
  * @return void
  */
 	public function testEncode() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 
 		$this->CakeEmail->headerCharset = 'ISO-2022-JP';
 		$result = $this->CakeEmail->encode('日本語');
@@ -2023,8 +2023,8 @@ 
 
 		$this->CakeEmail->headerCharset = 'ISO-2022-JP';
 		$result = $this->CakeEmail->encode('長い長い長いSubjectの場合はfoldingするのが正しいんだけどいったいどうなるんだろう？');
-		$expected = "=?ISO-2022-JP?B?GyRCRDkkJEQ5JCREOSQkGyhCU3ViamVjdBskQiROPmw5ZyRPGyhCZm9s?=\r\n" .
-			" =?ISO-2022-JP?B?ZGluZxskQiQ5JGskTiQsQDUkNyQkJHMkQCQxJEkkJCRDJD8kJCRJGyhC?=\r\n" .
+		$expected = "=?ISO-2022-JP?B?GyRCRDkkJEQ5JCREOSQkGyhCU3ViamVjdBskQiROPmw5ZyRPGyhCZm9s?=\r\n".
+			" =?ISO-2022-JP?B?ZGluZxskQiQ5JGskTiQsQDUkNyQkJHMkQCQxJEkkJCRDJD8kJCRJGyhC?=\r\n".
 			" =?ISO-2022-JP?B?GyRCJCYkSiRrJHMkQCRtJCYhKRsoQg==?=";
 		$this->assertSame($expected, $result);
 	}
@@ -2069,7 +2069,7 @@ 
  * @return void
  */
 	public function testCharsetsCompatible() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 
 		$checkHeaders = array(
 			'from' => true,
@@ -2126,10 +2126,10 @@ 
 	protected function _getEmailByOldStyleCharset($charset, $headerCharset) {
 		$email = new CakeEmail(array('transport' => 'Debug'));
 
-		if (! empty($charset)) {
+		if ( ! empty($charset)) {
 			$email->charset = $charset;
 		}
-		if (! empty($headerCharset)) {
+		if ( ! empty($headerCharset)) {
 			$email->headerCharset = $headerCharset;
 		}
 
@@ -2150,10 +2150,10 @@ 
 	protected function _getEmailByNewStyleCharset($charset, $headerCharset) {
 		$email = new CakeEmail(array('transport' => 'Debug'));
 
-		if (! empty($charset)) {
+		if ( ! empty($charset)) {
 			$email->charset($charset);
 		}
-		if (! empty($headerCharset)) {
+		if ( ! empty($headerCharset)) {
 			$email->headerCharset($headerCharset);
 		}
 
@@ -2172,7 +2172,7 @@ 
  * @return void
  */
 	public function testWrapLongLine() {
-		$message = '<a href="http://cakephp.org">' . str_repeat('x', CakeEmail::LINE_LENGTH_MUST) . "</a>";
+		$message = '<a href="http://cakephp.org">'.str_repeat('x', CakeEmail::LINE_LENGTH_MUST)."</a>";
 
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('Debug');
@@ -2181,32 +2181,32 @@ 
 		$this->CakeEmail->subject('Wordwrap Test');
 		$this->CakeEmail->config(array('empty'));
 		$result = $this->CakeEmail->send($message);
-		$expected = "<a\r\n" . 'href="http://cakephp.org">' . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - 26) . "\r\n" .
-			str_repeat('x', 26) . "\r\n</a>\r\n\r\n";
+		$expected = "<a\r\n".'href="http://cakephp.org">'.str_repeat('x', CakeEmail::LINE_LENGTH_MUST - 26)."\r\n".
+			str_repeat('x', 26)."\r\n</a>\r\n\r\n";
 		$this->assertEquals($expected, $result['message']);
 		$this->assertLineLengths($result['message']);
 
 		$str1 = "a ";
 		$str2 = " b";
 		$length = strlen($str1) + strlen($str2);
-		$message = $str1 . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length - 1) . $str2;
+		$message = $str1.str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length - 1).$str2;
 
 		$result = $this->CakeEmail->send($message);
 		$expected = "{$message}\r\n\r\n";
 		$this->assertEquals($expected, $result['message']);
 		$this->assertLineLengths($result['message']);
 
-		$message = $str1 . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length) . $str2;
+		$message = $str1.str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length).$str2;
 
 		$result = $this->CakeEmail->send($message);
 		$expected = "{$message}\r\n\r\n";
 		$this->assertEquals($expected, $result['message']);
 		$this->assertLineLengths($result['message']);
 
-		$message = $str1 . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length + 1) . $str2;
+		$message = $str1.str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length + 1).$str2;
 
 		$result = $this->CakeEmail->send($message);
-		$expected = $str1 . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length + 1) . sprintf("\r\n%s\r\n\r\n", trim($str2));
+		$expected = $str1.str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length + 1).sprintf("\r\n%s\r\n\r\n", trim($str2));
 		$this->assertEquals($expected, $result['message']);
 		$this->assertLineLengths($result['message']);
 	}
@@ -2224,7 +2224,7 @@ 
 </table>
 HTML;
 		$length = strlen($str);
-		$message = $str . str_repeat('x', CakeEmail::LINE_LENGTH_MUST + 1);
+		$message = $str.str_repeat('x', CakeEmail::LINE_LENGTH_MUST + 1);
 
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('Debug');
@@ -2248,7 +2248,7 @@ 
 	public function testWrapIncludeLessThanSign() {
 		$str = 'foo<bar';
 		$length = strlen($str);
-		$message = $str . str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length + 1);
+		$message = $str.str_repeat('x', CakeEmail::LINE_LENGTH_MUST - $length + 1);
 
 		$this->CakeEmail->reset();
 		$this->CakeEmail->transport('Debug');
@@ -2269,7 +2269,7 @@ 
  * @return void
  */
 	public function testWrapForJapaneseEncoding() {
-		$this->skipIf(!function_exists('mb_convert_encoding'));
+		$this->skipIf( ! function_exists('mb_convert_encoding'));
 
 		$message = mb_convert_encoding('受け付けました', 'iso-2022-jp', 'UTF-8');
 

lib/Cake/Test/Case/Network/Email/SmtpTransportTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 /**
  * Helper to change the socket
  *
- * @param object $socket
+ * @param CakeSocket $socket
  * @return void
  */
 	public function setSocket(CakeSocket $socket) {

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
  * @return mixed
  */
 	public function __call($method, $args) {
-		$method = '_' . $method;
+		$method = '_'.$method;
 		return $this->$method();
 	}
 
@@ -311,7 +311,7 @@ 
 		$data .= "To: CakePHP <cake@cakephp.org>\r\n";
 		$data .= "Cc: Mark Story <mark@cakephp.org>, Juan Basso <juan@cakephp.org>\r\n";
 		$data .= "X-Mailer: CakePHP Email\r\n";
-		$data .= "Date: " . $date . "\r\n";
+		$data .= "Date: ".$date."\r\n";
 		$data .= "Message-ID: <4d9946cf-0a44-4907-88fe-1d0ccbdd56cb@localhost>\r\n";
 		$data .= "Subject: Testing SMTP\r\n";
 		$data .= "MIME-Version: 1.0\r\n";

lib/Cake/Test/Case/Network/Http/HttpSocketTest.php

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
  * Convenience method for testing protected method
  *
  * @param string|array $uri URI (see {@link _parseUri()})
- * @return array Current configuration settings
+ * @return boolean Current configuration settings
  */
 	public function configUri($uri = null) {
 		return parent::_configUri($uri);

Spacing +19 added lines, -19 removed lines

@@ -34,7 +34,7 @@ 
  * @return void
  */
 	public static function authentication(HttpSocket $http, &$authInfo) {
-		$http->request['header']['Authorization'] = 'Test ' . $authInfo['user'] . '.' . $authInfo['pass'];
+		$http->request['header']['Authorization'] = 'Test '.$authInfo['user'].'.'.$authInfo['pass'];
 	}
 
 /**
@@ -45,7 +45,7 @@ 
  * @return void
  */
 	public static function proxyAuthentication(HttpSocket $http, &$proxyInfo) {
-		$http->request['header']['Proxy-Authorization'] = 'Test ' . $proxyInfo['user'] . '.' . $proxyInfo['pass'];
+		$http->request['header']['Proxy-Authorization'] = 'Test '.$proxyInfo['user'].'.'.$proxyInfo['pass'];
 	}
 
 }
@@ -320,7 +320,7 @@ 
 				'allow_self_signed' => false,
 				'verify_depth' => 5,
 				'CN_match' => 'www.cakephp.org',
-				'cafile' => CAKE . 'Config' . DS . 'cacert.pem'
+				'cafile' => CAKE.'Config'.DS.'cacert.pem'
 			)
 		);
 
@@ -556,10 +556,10 @@ 
 			$this->Socket->request($test['request']);
 
 			$raw = $expectation['request']['raw'];
-			$expectation['request']['raw'] = $expectation['request']['line'] . $expectation['request']['header'] . "\r\n" . $raw;
+			$expectation['request']['raw'] = $expectation['request']['line'].$expectation['request']['header']."\r\n".$raw;
 
 			$r = array('config' => $this->Socket->config, 'request' => $this->Socket->request);
-			$this->assertEquals($r, $expectation, 'Failed test #' . $i . ' ');
+			$this->assertEquals($r, $expectation, 'Failed test #'.$i.' ');
 			$expectation['request']['raw'] = $raw;
 		}
 
@@ -631,13 +631,13 @@ 
 		$request = array('uri' => 'htpp://www.cakephp.org/');
 		$number = mt_rand(0, 9999999);
 		$this->Socket->expects($this->any())->method('connect')->will($this->returnValue(true));
-		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>Hello, your lucky number is " . $number . "</h1>";
+		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>Hello, your lucky number is ".$number."</h1>";
 		$this->Socket->expects($this->at(0))->method('write')
 			->with("GET / HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n\r\n");
 		$this->Socket->expects($this->at(0))->method('read')->will($this->returnValue(false));
 		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse));
-		$response = (string)$this->Socket->request($request);
-		$this->assertEquals($response, "<h1>Hello, your lucky number is " . $number . "</h1>");
+		$response = (string) $this->Socket->request($request);
+		$this->assertEquals($response, "<h1>Hello, your lucky number is ".$number."</h1>");
 	}
 
 /**
@@ -702,21 +702,21 @@ 
 		$this->Socket->expects($this->at(4))->method('read')->will($this->returnValue($serverResponse));
 		$this->Socket->connected = true;
 
-		$f = fopen(TMP . 'download.txt', 'w');
-		if (!$f) {
+		$f = fopen(TMP.'download.txt', 'w');
+		if ( ! $f) {
 			$this->markTestSkipped('Can not write in TMP directory.');
 		}
 
 		$this->Socket->setContentResource($f);
-		$result = (string)$this->Socket->request('http://www.cakephp.org/');
+		$result = (string) $this->Socket->request('http://www.cakephp.org/');
 		$this->assertEquals('', $result);
 		$this->assertEquals('CakeHttp Server', $this->Socket->response['header']['Server']);
 		fclose($f);
-		$this->assertEquals(file_get_contents(TMP . 'download.txt'), '<h1>This is a test!</h1>');
-		unlink(TMP . 'download.txt');
+		$this->assertEquals(file_get_contents(TMP.'download.txt'), '<h1>This is a test!</h1>');
+		unlink(TMP.'download.txt');
 
 		$this->Socket->setContentResource(false);
-		$result = (string)$this->Socket->request('http://www.cakephp.org/');
+		$result = (string) $this->Socket->request('http://www.cakephp.org/');
 		$this->assertEquals('<h1>This is a test!</h1>', $result);
 	}
 
@@ -1654,11 +1654,11 @@ 
 
 		$escape = $this->Socket->tokenEscapeChars(false);
 		foreach ($escape as $char) {
-			$token = 'My-special-' . $char . '-Token';
+			$token = 'My-special-'.$char.'-Token';
 			$escapedToken = $this->Socket->escapeToken($token);
-			$expectedToken = 'My-special-"' . $char . '"-Token';
+			$expectedToken = 'My-special-"'.$char.'"-Token';
 
-			$this->assertEquals($expectedToken, $escapedToken, 'Test token escaping for ASCII ' . ord($char));
+			$this->assertEquals($expectedToken, $escapedToken, 'Test token escaping for ASCII '.ord($char));
 		}
 
 		$token = 'Extreme-:Token-	-"@-test';
@@ -1742,7 +1742,7 @@ 
  * @return void
  */
 	public function testVerifyPeer() {
-		$this->skipIf(!extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
+		$this->skipIf( ! extension_loaded('openssl'), 'OpenSSL is not enabled cannot test SSL.');
 		$socket = new HttpSocket();
 		try {
 			$socket->get('https://typography.com');
@@ -1777,7 +1777,7 @@ 
  */
 	public function testResponseStatusParsing($status, $msg = '') {
 		$this->Socket->connected = true;
-		$serverResponse = $status . "\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\n\r\n<h1>This is a test!</h1>";
+		$serverResponse = $status."\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\n\r\n<h1>This is a test!</h1>";
 		$this->Socket->expects($this->at(1))->method('read')->will($this->returnValue($serverResponse));
 		$this->Socket->expects($this->at(2))->method('read')->will($this->returnValue(false));