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

Merge branch '2.next' of github.com:cakephp/cakephp into 2.next

Browse source
This commit is contained in:
mark_story 2016-12-13 22:48:57 -05:00
commit 4c3e9356ba
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1081,6 +1081,9 @@ class CakeEmail {
$name = basename($fileInfo['file']); $name = basename($fileInfo['file']);
} }
} }
if (!isset($fileInfo['mimetype']) && function_exists('mime_content_type')) {
$fileInfo['mimetype'] = mime_content_type($fileInfo['file']);
}
if (!isset($fileInfo['mimetype'])) { if (!isset($fileInfo['mimetype'])) {
$fileInfo['mimetype'] = 'application/octet-stream'; $fileInfo['mimetype'] = 'application/octet-stream';
} }

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

@ -821,7 +821,7 @@ class CakeEmailTest extends CakeTestCase {
$expected = array( $expected = array(
'basics.php' => array( 'basics.php' => array(
'file' => CAKE . 'basics.php', 'file' => CAKE . 'basics.php',
'mimetype' => 'application/octet-stream' 'mimetype' => 'text/x-php'
) )
); );
$this->assertSame($expected, $this->CakeEmail->attachments()); $this->assertSame($expected, $this->CakeEmail->attachments());
@ -837,9 +837,9 @@ class CakeEmailTest extends CakeTestCase {
$this->CakeEmail->addAttachments(array('other.txt' => CAKE . 'bootstrap.php', 'license' => CAKE . 'LICENSE.txt')); $this->CakeEmail->addAttachments(array('other.txt' => CAKE . 'bootstrap.php', 'license' => CAKE . 'LICENSE.txt'));
$expected = array( $expected = array(
'basics.php' => array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain'), 'basics.php' => array('file' => CAKE . 'basics.php', 'mimetype' => 'text/plain'),
'bootstrap.php' => array('file' => CAKE . 'bootstrap.php', 'mimetype' => 'application/octet-stream'), 'bootstrap.php' => array('file' => CAKE . 'bootstrap.php', 'mimetype' => 'text/x-php'),
'other.txt' => array('file' => CAKE . 'bootstrap.php', 'mimetype' => 'application/octet-stream'), 'other.txt' => array('file' => CAKE . 'bootstrap.php', 'mimetype' => 'text/x-php'),
'license' => array('file' => CAKE . 'LICENSE.txt', 'mimetype' => 'application/octet-stream') 'license' => array('file' => CAKE . 'LICENSE.txt', 'mimetype' => 'text/plain')
); );
$this->assertSame($expected, $this->CakeEmail->attachments()); $this->assertSame($expected, $this->CakeEmail->attachments());
@ -1075,7 +1075,7 @@ class CakeEmailTest extends CakeTestCase {
"\r\n" . "\r\n" .
"\r\n" . "\r\n" .
"--$boundary\r\n" . "--$boundary\r\n" .
"Content-Type: application/octet-stream\r\n" . "Content-Type: text/x-php\r\n" .
"Content-Transfer-Encoding: base64\r\n" . "Content-Transfer-Encoding: base64\r\n" .
"Content-Disposition: attachment; filename=\"basics.php\"\r\n\r\n"; "Content-Disposition: attachment; filename=\"basics.php\"\r\n\r\n";
$this->assertContains($expected, $result['message']); $this->assertContains($expected, $result['message']);
@ -1156,7 +1156,7 @@ class CakeEmailTest extends CakeTestCase {
"--alt-{$boundary}--\r\n" . "--alt-{$boundary}--\r\n" .
"\r\n" . "\r\n" .
"--$boundary\r\n" . "--$boundary\r\n" .
"Content-Type: application/octet-stream\r\n" . "Content-Type: text/plain\r\n" .
"Content-Transfer-Encoding: base64\r\n" . "Content-Transfer-Encoding: base64\r\n" .
"Content-Disposition: attachment; filename=\"VERSION.txt\"\r\n\r\n"; "Content-Disposition: attachment; filename=\"VERSION.txt\"\r\n\r\n";
$this->assertContains($expected, $result['message']); $this->assertContains($expected, $result['message']);
@ -1208,7 +1208,7 @@ class CakeEmailTest extends CakeTestCase {
"--alt-{$boundary}--\r\n" . "--alt-{$boundary}--\r\n" .
"\r\n" . "\r\n" .
"--rel-$boundary\r\n" . "--rel-$boundary\r\n" .
"Content-Type: application/octet-stream\r\n" . "Content-Type: text/plain\r\n" .
"Content-Transfer-Encoding: base64\r\n" . "Content-Transfer-Encoding: base64\r\n" .
"Content-ID: <abc123>\r\n" . "Content-ID: <abc123>\r\n" .
"Content-Disposition: inline; filename=\"cake.png\"\r\n\r\n"; "Content-Disposition: inline; filename=\"cake.png\"\r\n\r\n";
@ -1250,7 +1250,7 @@ class CakeEmailTest extends CakeTestCase {
"\r\n" . "\r\n" .
"\r\n" . "\r\n" .
"--rel-$boundary\r\n" . "--rel-$boundary\r\n" .
"Content-Type: application/octet-stream\r\n" . "Content-Type: text/plain\r\n" .
"Content-Transfer-Encoding: base64\r\n" . "Content-Transfer-Encoding: base64\r\n" .
"Content-ID: <abc123>\r\n" . "Content-ID: <abc123>\r\n" .
"Content-Disposition: inline; filename=\"cake.png\"\r\n\r\n"; "Content-Disposition: inline; filename=\"cake.png\"\r\n\r\n";
@ -1289,7 +1289,7 @@ class CakeEmailTest extends CakeTestCase {
"\r\n" . "\r\n" .
"\r\n" . "\r\n" .
"--{$boundary}\r\n" . "--{$boundary}\r\n" .
"Content-Type: application/octet-stream\r\n" . "Content-Type: text/plain\r\n" .
"Content-Transfer-Encoding: base64\r\n" . "Content-Transfer-Encoding: base64\r\n" .
"\r\n"; "\r\n";
@ -1707,11 +1707,11 @@ class CakeEmailTest extends CakeTestCase {
$this->CakeEmail->config(array()); $this->CakeEmail->config(array());
$this->CakeEmail->attachments(array(CAKE . 'basics.php')); $this->CakeEmail->attachments(array(CAKE . 'basics.php'));
$result = $this->CakeEmail->send('body'); $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->assertContains("Content-Type: text/x-php\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'); $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->assertContains("Content-Type: text/x-php\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'); $result = $this->CakeEmail->send('body');