adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix coding standards errors.

Browse source
This commit is contained in:
mark_story 2012-04-08 21:01:25 -04:00
parent c6d62884c1
commit c718a18218
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Test/Case/Console/ShellTest.php
View file

@ -54,14 +54,16 @@ class ShellTestShell extends Shell {
$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);

2
lib/Cake/Test/Case/Controller/ControllerTest.php
View file

@ -289,6 +289,7 @@ class TestController extends ControllerTestAppController {
return 'I am from the controller.';
}
//@codingStandardsIgnoreStart
protected function protected_m() {
}
@ -297,6 +298,7 @@ class TestController extends ControllerTestAppController {
public function _hidden() {
}
//@codingStandardsIgnoreEnd
public function admin_add() {
}

7
lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
View file

@ -1196,7 +1196,7 @@ class CakeEmailTest extends CakeTestCase {
$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 @@ class CakeEmailTest extends CakeTestCase {
$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 @@ class CakeEmailTest extends CakeTestCase {
$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 @@ class CakeEmailTest extends CakeTestCase {
/**
* Test CakeEmail::_encode function
*
* @return void
*/
public function testEncode() {
$this->skipIf(!function_exists('mb_convert_encoding'));