Permalink
Browse files

Fix coding standards errors.

  • Loading branch information...
1 parent c6d6288 commit c718a182188124b47f7652f00744e26363512079 @markstory markstory committed Apr 9, 2012
@@ -54,14 +54,16 @@ protected function _stop($status = 0) {
$this->stopped = $status;
}
- public function do_something() {
+ protected function _secret() {
}
- protected function _secret() {
+ //@codingStandardsIgnoreStart
+ public function do_something() {
}
protected function no_access() {
}
+ //@codingStandardsIgnoreEnd
public function mergeVars($properties, $class, $normalize = true) {
return $this->_mergeVars($properties, $class, $normalize);
@@ -289,6 +289,7 @@ public function returner() {
return 'I am from the controller.';
}
+ //@codingStandardsIgnoreStart
protected function protected_m() {
}
@@ -297,6 +298,7 @@ private function private_m() {
public function _hidden() {
}
+ //@codingStandardsIgnoreEnd
public function admin_add() {
}
@@ -1196,7 +1196,7 @@ public function testMessage() {
$this->assertContains('Content-Type: text/html; charset=UTF-8', $message);
// UTF-8 is 8bit
- $this->assertTrue($this->checkContentTransferEncoding($message, '8bit'));
+ $this->assertTrue($this->_checkContentTransferEncoding($message, '8bit'));
$this->CakeEmail->charset = 'ISO-2022-JP';
$this->CakeEmail->send();
@@ -1205,7 +1205,7 @@ public function testMessage() {
$this->assertContains('Content-Type: text/html; charset=ISO-2022-JP', $message);
// ISO-2022-JP is 7bit
- $this->assertTrue($this->checkContentTransferEncoding($message, '7bit'));
+ $this->assertTrue($this->_checkContentTransferEncoding($message, '7bit'));
}
/**
@@ -1451,7 +1451,7 @@ public function testBodyEncoding() {
$this->assertContains(mb_convert_encoding('ってテーブルを作ってやってたらう','ISO-2022-JP'), $result['message']);
}
- private function checkContentTransferEncoding($message, $charset) {
+ protected function _checkContentTransferEncoding($message, $charset) {
$boundary = '--alt-' . $this->CakeEmail->getBoundary();
$result['text'] = false;
$result['html'] = false;
@@ -1480,6 +1480,7 @@ private function checkContentTransferEncoding($message, $charset) {
/**
* Test CakeEmail::_encode function
*
+ * @return void
*/
public function testEncode() {
$this->skipIf(!function_exists('mb_convert_encoding'));

0 comments on commit c718a18

Please sign in to comment.