reginaldojunior / winners

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

lib/Cake/Test/Case/Routing/DispatcherTest.php

Doc Comments +14 added lines, -14 removed lines

@@ -57,7 +57,7 @@ 
  * @param Controller $controller
  * @param CakeRequest $request
  * @param CakeResponse $response
- * @return void
+ * @return CakeResponse
  */
 	protected function _invoke(Controller $controller, CakeRequest $request, CakeResponse $response) {
 		$this->controller = $controller;
@@ -130,7 +130,7 @@ 
 /**
  * index method
  *
- * @return void
+ * @return boolean
  */
 	public function index() {
 		return true;
@@ -139,7 +139,7 @@ 
 /**
  * add method
  *
- * @return void
+ * @return boolean
  */
 	public function add() {
 		return true;
@@ -175,7 +175,7 @@ 
  * display method
  *
  * @param string $page
- * @return void
+ * @return string|null
  */
 	public function display($page = null) {
 		return $page;
@@ -184,7 +184,7 @@ 
 /**
  * index method
  *
- * @return void
+ * @return boolean
  */
 	public function index() {
 		return true;
@@ -229,7 +229,7 @@ 
  * display method
  *
  * @param string $page
- * @return void
+ * @return string|null
  */
 	public function display($page = null) {
 		return $page;
@@ -238,7 +238,7 @@ 
 /**
  * index method
  *
- * @return void
+ * @return boolean
  */
 	public function index() {
 		return true;
@@ -263,7 +263,7 @@ 
 /**
  * admin_index method
  *
- * @return void
+ * @return boolean
  */
 	public function admin_index() {
 		return true;
@@ -272,7 +272,7 @@ 
 /**
  * camelCased method
  *
- * @return void
+ * @return boolean
  */
 	public function camelCased() {
 		return true;
@@ -305,7 +305,7 @@ 
 /**
  * admin_index method
  *
- * @return void
+ * @return boolean
  */
 	public function admin_index() {
 		return true;
@@ -314,7 +314,7 @@ 
 /**
  * fake index method.
  *
- * @return void
+ * @return boolean
  */
 	public function index() {
 		return true;
@@ -360,7 +360,7 @@ 
 /**
  * index method
  *
- * @return void
+ * @return boolean
  */
 	public function index() {
 		return true;
@@ -369,7 +369,7 @@ 
 /**
  * change method
  *
- * @return void
+ * @return boolean
  */
 	public function change() {
 		return true;
@@ -490,7 +490,7 @@ 
 /**
  * index method
  *
- * @return void
+ * @return boolean
  */
 	public function index() {
 		return true;

Spacing +35 added lines, -35 removed lines

@@ -18,9 +18,9 @@ 
 
 App::uses('Dispatcher', 'Routing');
 
-if (!class_exists('AppController', false)) {
-	require_once CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS . 'AppController.php';
-} elseif (!defined('APP_CONTROLLER_EXISTS')) {
+if ( ! class_exists('AppController', false)) {
+	require_once CAKE.'Test'.DS.'test_app'.DS.'Controller'.DS.'AppController.php';
+} elseif ( ! defined('APP_CONTROLLER_EXISTS')) {
 	define('APP_CONTROLLER_EXISTS', true);
 }
 
@@ -32,7 +32,7 @@ 
 class DispatcherMockCakeResponse extends CakeResponse {
 
 	protected function _sendHeader($name, $value = null) {
-		return $name . ' ' . $value;
+		return $name.' '.$value;
 	}
 
 }
@@ -205,7 +205,7 @@ 
  * @return CakeResponse
  */
 	public function sendfile() {
-		$this->response->file(CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS . 'css' . DS . 'test_asset.css');
+		$this->response->file(CAKE.'Test'.DS.'test_app'.DS.'Vendor'.DS.'css'.DS.'test_asset.css');
 		return $this->response;
 	}
 
@@ -567,7 +567,7 @@ 
 		$this->assertSame($request['pass'][0], 'params1');
 		$this->assertSame($request['pass'][1], 'params2');
 		$this->assertSame($request['pass'][2], 'params3');
-		$this->assertFalse(!empty($request['form']));
+		$this->assertFalse( ! empty($request['form']));
 	}
 
 /**
@@ -755,7 +755,7 @@ 
  */
 	public function testDispatchBasic() {
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 		$Dispatcher = new TestDispatcher();
 		Configure::write('App.baseUrl', '/index.php');
@@ -786,7 +786,7 @@ 
 
 		unset($Dispatcher);
 
-		require CAKE . 'Config' . DS . 'routes.php';
+		require CAKE.'Config'.DS.'routes.php';
 		$Dispatcher = new TestDispatcher();
 		Configure::write('App.baseUrl', '/timesheets/index.php');
 
@@ -918,7 +918,7 @@ 
 			'controller' => 'some_pages', 'action' => 'display'
 		);
 		foreach ($expected as $key => $value) {
-			$this->assertEquals($value, $url[$key], 'Value mismatch ' . $key . ' %');
+			$this->assertEquals($value, $url[$key], 'Value mismatch '.$key.' %');
 		}
 
 		$this->assertSame($Dispatcher->controller->plugin, 'MyPlugin');
@@ -988,7 +988,7 @@ 
 		$this->assertEquals(array('param' => 'value', 'param2' => 'value2'), $Dispatcher->controller->params['named']);
 
 		Router::reload();
-		require CAKE . 'Config' . DS . 'routes.php';
+		require CAKE.'Config'.DS.'routes.php';
 		$Dispatcher = new TestDispatcher();
 		$Dispatcher->base = false;
 
@@ -1010,7 +1010,7 @@ 
 		Configure::write('Routing.prefixes', array('admin'));
 
 		Router::reload();
-		require CAKE . 'Config' . DS . 'routes.php';
+		require CAKE.'Config'.DS.'routes.php';
 		$Dispatcher = new TestDispatcher();
 
 		$url = new CakeRequest('admin/my_plugin/my_plugin/add/5/param:value/param2:value2');
@@ -1033,7 +1033,7 @@ 
 		Configure::write('Routing.prefixes', array('admin'));
 		CakePlugin::load('ArticlesTest', array('path' => '/fake/path'));
 		Router::reload();
-		require CAKE . 'Config' . DS . 'routes.php';
+		require CAKE.'Config'.DS.'routes.php';
 
 		$Dispatcher = new TestDispatcher();
 
@@ -1053,7 +1053,7 @@ 
 			'return' => 1
 		);
 		foreach ($expected as $key => $value) {
-			$this->assertEquals($expected[$key], $Dispatcher->controller->request[$key], 'Value mismatch ' . $key);
+			$this->assertEquals($expected[$key], $Dispatcher->controller->request[$key], 'Value mismatch '.$key);
 		}
 	}
 
@@ -1092,7 +1092,7 @@ 
 
 		Router::reload();
 		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(array('TestPlugin', 'TestPluginTwo'));
 
@@ -1168,7 +1168,7 @@ 
 	public function testTestPluginDispatch() {
 		$Dispatcher = new TestDispatcher();
 		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(array('TestPlugin', 'TestPluginTwo'));
 		Router::reload();
@@ -1195,8 +1195,8 @@ 
  */
 	public function testDispatcherFilterSubscriber() {
 		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)
 		), App::RESET);
 
 		CakePlugin::load('TestPlugin');
@@ -1235,7 +1235,7 @@ 
  */
 	public function testDispatcherFilterSuscriberMissing() {
 		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');
@@ -1255,7 +1255,7 @@ 
  */
 	public function testDispatcherFilterCallable() {
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		), App::RESET);
 
 		$dispatcher = new TestDispatcher();
@@ -1350,9 +1350,9 @@ 
 		Router::reload();
 
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'Vendor' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS),
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS),
+			'Vendor' => array(CAKE.'Test'.DS.'test_app'.DS.'Vendor'.DS),
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 		CakePlugin::load(array('TestPlugin', 'TestPluginTwo'));
 		Configure::write('Dispatcher.filters', array('AssetDispatcher'));
@@ -1469,9 +1469,9 @@ 
 		Router::reload();
 
 		App::build(array(
-			'Plugin' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Plugin' . DS),
-			'Vendor' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'Vendor' . DS),
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS)
+			'Plugin' => array(CAKE.'Test'.DS.'test_app'.DS.'Plugin'.DS),
+			'Vendor' => array(CAKE.'Test'.DS.'test_app'.DS.'Vendor'.DS),
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS)
 		));
 		CakePlugin::load(array('TestPlugin', 'PluginJs'));
 		Configure::write('Dispatcher.filters', array('AssetDispatcher'));
@@ -1482,7 +1482,7 @@ 
 		$Dispatcher->dispatch(new CakeRequest($url), $response);
 		$result = ob_get_clean();
 
-		$path = CAKE . 'Test' . DS . 'test_app' . DS . str_replace('/', DS, $file);
+		$path = CAKE.'Test'.DS.'test_app'.DS.str_replace('/', DS, $file);
 		$file = file_get_contents($path);
 		$this->assertEquals($file, $result);
 
@@ -1551,7 +1551,7 @@ 
 		Router::connect('/:controller/:action/*');
 
 		App::build(array(
-			'View' => array(CAKE . 'Test' . DS . 'test_app' . DS . 'View' . DS),
+			'View' => array(CAKE.'Test'.DS.'test_app'.DS.'View'.DS),
 		), App::RESET);
 
 		$dispatcher = new TestDispatcher();
@@ -1593,7 +1593,7 @@ 
 		$dispatcher->parseParams($event);
 		$expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'add', '[method]' => 'POST');
 		foreach ($expected as $key => $value) {
-			$this->assertEquals($value, $request[$key], 'Value mismatch for ' . $key . ' %s');
+			$this->assertEquals($value, $request[$key], 'Value mismatch for '.$key.' %s');
 		}
 
 		$_SERVER['REQUEST_METHOD'] = 'GET';
@@ -1612,7 +1612,7 @@ 
 			'[method]' => 'PUT'
 		);
 		foreach ($expected as $key => $value) {
-			$this->assertEquals($value, $request[$key], 'Value mismatch for ' . $key . ' %s');
+			$this->assertEquals($value, $request[$key], 'Value mismatch for '.$key.' %s');
 		}
 
 		unset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
@@ -1623,7 +1623,7 @@ 
 		$dispatcher->parseParams($event);
 		$expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'view', '[method]' => 'GET');
 		foreach ($expected as $key => $value) {
-			$this->assertEquals($value, $request[$key], 'Value mismatch for ' . $key . ' %s');
+			$this->assertEquals($value, $request[$key], 'Value mismatch for '.$key.' %s');
 		}
 
 		$_POST['_method'] = 'PUT';
@@ -1633,7 +1633,7 @@ 
 		$dispatcher->parseParams($event);
 		$expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'edit', '[method]' => 'PUT');
 		foreach ($expected as $key => $value) {
-			$this->assertEquals($value, $request[$key], 'Value mismatch for ' . $key . ' %s');
+			$this->assertEquals($value, $request[$key], 'Value mismatch for '.$key.' %s');
 		}
 
 		$_POST['_method'] = 'POST';
@@ -1649,7 +1649,7 @@ 
 			'[method]' => 'POST', 'data' => array('extra' => 'data', 'Post' => array('title' => 'New Post')),
 		);
 		foreach ($expected as $key => $value) {
-			$this->assertEquals($value, $request[$key], 'Value mismatch for ' . $key . ' %s');
+			$this->assertEquals($value, $request[$key], 'Value mismatch for '.$key.' %s');
 		}
 
 		unset($_POST['_method']);
@@ -1668,10 +1668,10 @@ 
 		}
 		$path = strtolower(Inflector::slug($path));
 
-		$filename = CACHE . 'views' . DS . $path . '.php';
+		$filename = CACHE.'views'.DS.$path.'.php';
 
-		if (!file_exists($filename)) {
-			$filename = CACHE . 'views' . DS . $path . '_index.php';
+		if ( ! file_exists($filename)) {
+			$filename = CACHE.'views'.DS.$path.'_index.php';
 		}
 		return $filename;
 	}

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

Doc Comments -1 removed lines

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

Spacing +20 added lines, -20 removed lines

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -275,7 +275,7 @@
 /**
  * Test method for testing addFormat with callbacks.
  *
- * @return void
+ * @return string
  */
 	public function customFormat($error, $strings) {
 		return $error['error'] . ': I eated an error ' . $error['file'];

Indentation +12 added lines, -12 removed lines

@@ -1,17 +1,17 @@
 <?php
 /**
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * 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://cakephp.org CakePHP Project
- * @since         CakePHP(tm) v 1.2.0.5432
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
+	 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+	 * 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://cakephp.org CakePHP Project
+	 * @since         CakePHP(tm) v 1.2.0.5432
+	 * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+	 */
 
 App::uses('Debugger', 'Utility');
 

Spacing +19 added lines, -19 removed lines

@@ -142,8 +142,8 @@ 
 			'pre' => array('class' => 'cake-error'),
 			'a' => array(
 				'href' => "javascript:void(0);",
-				'onclick' => "preg:/document\.getElementById\('cakeErr[a-z0-9]+\-trace'\)\.style\.display = " .
-					"\(document\.getElementById\('cakeErr[a-z0-9]+\-trace'\)\.style\.display == 'none'" .
+				'onclick' => "preg:/document\.getElementById\('cakeErr[a-z0-9]+\-trace'\)\.style\.display = ".
+					"\(document\.getElementById\('cakeErr[a-z0-9]+\-trace'\)\.style\.display == 'none'".
 					" \? '' \: 'none'\);/"
 			),
 			'b' => array(), 'Notice', '/b', ' (8)',
@@ -165,14 +165,14 @@ 
 		$this->_restoreError = true;
 
 		Debugger::output('js', array(
-			'traceLine' => '{:reference} - <a href="txmt://open?url=file://{:file}' .
+			'traceLine' => '{:reference} - <a href="txmt://open?url=file://{:file}'.
 				'&line={:line}">{:path}</a>, line {:line}'
 		));
 		$result = Debugger::trace();
-		$this->assertRegExp('/' . preg_quote('txmt://open?url=file://', '/') . '(\/|[A-Z]:\\\\)' . '/', $result);
+		$this->assertRegExp('/'.preg_quote('txmt://open?url=file://', '/').'(\/|[A-Z]:\\\\)'.'/', $result);
 
 		Debugger::output('xml', array(
-			'error' => '<error><code>{:code}</code><file>{:file}</file><line>{:line}</line>' .
+			'error' => '<error><code>{:code}</code><file>{:file}</file><line>{:line}</line>'.
 				'{:description}</error>',
 			'context' => "<context>{:context}</context>",
 			'trace' => "<stack>{:trace}</stack>",
@@ -187,7 +187,7 @@ 
 			'error' => array(),
 			'code' => array(), '8', '/code',
 			'file' => array(), 'preg:/[^<]+/', '/file',
-			'line' => array(), '' . (intval(__LINE__) - 7), '/line',
+			'line' => array(), ''.(intval(__LINE__) - 7), '/line',
 			'preg:/Undefined variable:\s+foo/',
 			'/error'
 		);
@@ -224,16 +224,16 @@ 
 		$this->_restoreError = true;
 
 		Debugger::addFormat('js', array(
-			'traceLine' => '{:reference} - <a href="txmt://open?url=file://{:file}' .
+			'traceLine' => '{:reference} - <a href="txmt://open?url=file://{:file}'.
 				'&line={:line}">{:path}</a>, line {:line}'
 		));
 		Debugger::outputAs('js');
 
 		$result = Debugger::trace();
-		$this->assertRegExp('/' . preg_quote('txmt://open?url=file://', '/') . '(\/|[A-Z]:\\\\)' . '/', $result);
+		$this->assertRegExp('/'.preg_quote('txmt://open?url=file://', '/').'(\/|[A-Z]:\\\\)'.'/', $result);
 
 		Debugger::addFormat('xml', array(
-			'error' => '<error><code>{:code}</code><file>{:file}</file><line>{:line}</line>' .
+			'error' => '<error><code>{:code}</code><file>{:file}</file><line>{:line}</line>'.
 				'{:description}</error>',
 		));
 		Debugger::outputAs('xml');
@@ -246,7 +246,7 @@ 
 			'<error',
 			'<code', '8', '/code',
 			'<file', 'preg:/[^<]+/', '/file',
-			'<line', '' . (intval(__LINE__) - 7), '/line',
+			'<line', ''.(intval(__LINE__) - 7), '/line',
 			'preg:/Undefined variable:\s+foo/',
 			'/error'
 		);
@@ -278,7 +278,7 @@ 
  * @return void
  */
 	public function customFormat($error, $strings) {
-		return $error['error'] . ': I eated an error ' . $error['file'];
+		return $error['error'].': I eated an error '.$error['file'];
 	}
 
 /**
@@ -287,10 +287,10 @@ 
  * @return void
  */
 	public function testTrimPath() {
-		$this->assertEquals('APP' . DS, Debugger::trimPath(APP));
+		$this->assertEquals('APP'.DS, Debugger::trimPath(APP));
 		$this->assertEquals('CORE', Debugger::trimPath(CAKE_CORE_INCLUDE_PATH));
 		$this->assertEquals('ROOT', Debugger::trimPath(ROOT));
-		$this->assertEquals('CORE' . DS . 'Cake' . DS, Debugger::trimPath(CAKE));
+		$this->assertEquals('CORE'.DS.'Cake'.DS, Debugger::trimPath(CAKE));
 		$this->assertEquals('Some/Other/Path', Debugger::trimPath('Some/Other/Path'));
 	}
 
@@ -450,20 +450,20 @@ 
  * @return void
  */
 	public function testLog() {
-		if (file_exists(LOGS . 'debug.log')) {
-			unlink(LOGS . 'debug.log');
+		if (file_exists(LOGS.'debug.log')) {
+			unlink(LOGS.'debug.log');
 		}
-		CakeLog::config('file', array('engine' => 'File', 'path' => TMP . 'logs' . DS));
+		CakeLog::config('file', array('engine' => 'File', 'path' => TMP.'logs'.DS));
 
 		Debugger::log('cool');
-		$result = file_get_contents(LOGS . 'debug.log');
+		$result = file_get_contents(LOGS.'debug.log');
 		$this->assertRegExp('/DebuggerTest\:\:testLog/i', $result);
 		$this->assertRegExp("/'cool'/", $result);
 
-		unlink(LOGS . 'debug.log');
+		unlink(LOGS.'debug.log');
 
 		Debugger::log(array('whatever', 'here'));
-		$result = file_get_contents(LOGS . 'debug.log');
+		$result = file_get_contents(LOGS.'debug.log');
 		$this->assertRegExp('/DebuggerTest\:\:testLog/i', $result);
 		$this->assertRegExp('/\[main\]/', $result);
 		$this->assertRegExp('/array/', $result);