adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the tests.

Browse source
This commit is contained in:
Juan Basso 2011-04-13 00:20:35 -04:00
parent 3200e380d3
commit 9ac5f9c349
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Network/CakeEmail.php
View file

@ -567,6 +567,7 @@ class CakeEmail {
} }
if ($this->_messageId !== false) { if ($this->_messageId !== false) {
if ($this->_messageId === true) { if ($this->_messageId === true) {
App::uses('String', 'Utility');
$headers['Message-ID'] = '<' . String::UUID() . '@' . env('HTTP_HOST') . '>'; $headers['Message-ID'] = '<' . String::UUID() . '@' . env('HTTP_HOST') . '>';
} else { } else {
$headers['Message-ID'] = $this->_messageId; $headers['Message-ID'] = $this->_messageId;
@ -808,7 +809,7 @@ class CakeEmail {
public function send($content = null) { public function send($content = null) {
if (is_string($this->_config)) { if (is_string($this->_config)) {
if (!config('email')) { if (!config('email')) {
throw new SocketException(__d('cake', '%s not found.', APP . DS . 'email.php')); throw new SocketException(__d('cake', '%s not found.', APP . 'config' . DS . 'email.php'));
} }
$configs = new EMAIL_CONFIG(); $configs = new EMAIL_CONFIG();
if (!isset($configs->{$this->_config})) { if (!isset($configs->{$this->_config})) {
@ -1077,6 +1078,7 @@ class CakeEmail {
protected function _render($content) { protected function _render($content) {
$viewClass = $this->_viewRender; $viewClass = $this->_viewRender;
App::uses('View', 'View');
if ($viewClass !== 'View') { if ($viewClass !== 'View') {
list($plugin, $viewClass) = pluginSplit($viewClass, true); list($plugin, $viewClass) = pluginSplit($viewClass, true);
$viewClass .= 'View'; $viewClass .= 'View';

4
lib/Cake/tests/Case/Network/CakeEmailTest.php
View file

@ -110,7 +110,7 @@ class CakeEmailTest extends CakeTestCase {
$this->CakeEmail = new TestCakeEmail(); $this->CakeEmail = new TestCakeEmail();
App::build(array( App::build(array(
'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS) 'views' => array(LIBS . 'tests' . DS . 'test_app' . DS . 'View'. DS)
)); ));
} }
@ -421,6 +421,7 @@ class CakeEmailTest extends CakeTestCase {
$this->CakeEmail->from('cake@cakephp.org'); $this->CakeEmail->from('cake@cakephp.org');
$this->CakeEmail->to(array('you@cakephp.org' => 'You')); $this->CakeEmail->to(array('you@cakephp.org' => 'You'));
$this->CakeEmail->subject('My title'); $this->CakeEmail->subject('My title');
$this->CakeEmail->config(array('empty'));
$result = $this->CakeEmail->send("Here is my body, with multi lines.\nThis is the second line.\r\n\r\nAnd the last."); $result = $this->CakeEmail->send("Here is my body, with multi lines.\nThis is the second line.\r\n\r\nAnd the last.");
$this->assertTrue($result); $this->assertTrue($result);
@ -450,6 +451,7 @@ class CakeEmailTest extends CakeTestCase {
$this->CakeEmail->from('cake@cakephp.org'); $this->CakeEmail->from('cake@cakephp.org');
$this->CakeEmail->to(array('you@cakephp.org' => 'You')); $this->CakeEmail->to(array('you@cakephp.org' => 'You'));
$this->CakeEmail->subject('My title'); $this->CakeEmail->subject('My title');
$this->CakeEmail->config(array('empty'));
$this->CakeEmail->layout('default', 'default'); $this->CakeEmail->layout('default', 'default');
$result = $this->CakeEmail->send(); $result = $this->CakeEmail->send();

1
lib/Cake/tests/Case/Network/Email/SmtpTransportTest.php
View file

@ -17,6 +17,7 @@
* @license MIT License (http://www.opensource.org/licenses/mit-license.php) * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/ */
App::uses('CakeEmail', 'Network'); App::uses('CakeEmail', 'Network');
App::uses('AbstractTransport', 'Network/Email');
App::uses('SmtpTransport', 'Network/Email'); App::uses('SmtpTransport', 'Network/Email');
/** /**