adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix coding standards.

Browse source
This commit is contained in:
mark_story 2012-04-20 20:52:10 -04:00
parent 76e724e161
commit 2480ee1beb
5 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Network/Email/CakeEmail.php
View file

@ -139,7 +139,7 @@ class CakeEmail {
* @var mixed True to generate, False to ignore, String with value
*/
protected $_messageId = true;
/**
* Domain for messageId generation.
* Needs to be manually set for CLI mailing as env('HTTP_HOST') is empty
@ -320,7 +320,7 @@ class CakeEmail {
if (empty($this->_domain)) {
$this->_domain = php_uname('n');
}
if ($config) {
$this->config($config);
}
@ -913,7 +913,7 @@ class CakeEmail {
$this->_domain = $domain;
return $this;
}
/**
* Add attachments to the email message
*

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

@ -597,10 +597,10 @@ class ShellTest extends CakeTestCase {
*/
public function testCreateFileNoPermissions() {
$this->skipIf(DIRECTORY_SEPARATOR === '\\', 'Cant perform operations using permissions on windows.');
$path = TMP . 'shell_test';
$file = $path . DS . 'no_perms';
if (!is_dir($path)) {
mkdir($path);
}

1
lib/Cake/Test/Case/Model/ModelWriteTest.php
View file

@ -5258,7 +5258,6 @@ class ModelWriteTest extends BaseModelTest {
$result = $TestModel->saveAssociated(array('Article' => array()), array('validate' => true, 'atomic' => false));
$this->assertEquals(array('Article' => false), $result);
}
/**

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

@ -397,7 +397,7 @@ class CakeEmailTest extends CakeTestCase {
$result = $this->CakeEmail->domain();
$expected = env('HTTP_HOST') ? env('HTTP_HOST') : php_uname('n');
$this->assertSame($expected, $result);
$this->CakeEmail->domain('example.org');
$result = $this->CakeEmail->domain();
$expected = 'example.org';
@ -408,12 +408,12 @@ class CakeEmailTest extends CakeTestCase {
* testMessageIdWithDomain method
*
* @return void
*/
*/
public function testMessageIdWithDomain() {
$result = $this->CakeEmail->getHeaders();
$expected = '@' . (env('HTTP_HOST') ? env('HTTP_HOST') : php_uname('n')) . '>';
$this->assertTextContains($expected, $result['Message-ID']);
$this->CakeEmail->domain('example.org');
$result = $this->CakeEmail->getHeaders();
$expected = '@example.org>';

3
lib/Cake/Test/Case/View/Helper/FormHelperTest.php
View file

@ -3551,7 +3551,6 @@ class FormHelperTest extends CakeTestCase {
$this->assertTags($result, $expected);
}
/**
* test adding an empty option for radio buttons
*
@ -3607,7 +3606,7 @@ class FormHelperTest extends CakeTestCase {
'/div'
);
$this->assertTags($result, $expected);
$result = $this->Form->input('Model.1.field', array(
'type' => 'radio',
'options' => array('option A'),