optmizing CakeEmail, and improving tests, transport class config() no…

…w returns configs array if no array is passed
cakephp · Aug 29, 2011 · 2efa3b0 · 2efa3b0
1 parent 9300f09
commit 2efa3b0
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 142 deletions.
diff --git a/app/Config/email.php.default b/app/Config/email.php.default
@@ -85,11 +85,5 @@ class EmailConfig {
 		'client' => null
 	);
 
-	public $test = array(
-		'from' => array('some@example.com' => 'My website'),
-		'to' => array('test@example.com' => 'Testname'),
-		'subject' => 'Test mail subject',
-		'transport' => 'Debug',
-	);
 
 }
diff --git a/lib/Cake/Console/Templates/skel/Config/email.php.default b/lib/Cake/Console/Templates/skel/Config/email.php.default
@@ -85,11 +85,5 @@ class EmailConfig {
 		'client' => null
 	);
 
-	public $test = array(
-		'from' => array('some@example.com' => 'My website'),
-		'to' => array('test@example.com' => 'Testname'),
-		'subject' => 'Test mail subject',
-		'transport' => 'Debug',
-	);
 
 }
diff --git a/lib/Cake/Network/Email/AbstractTransport.php b/lib/Cake/Network/Email/AbstractTransport.php
@@ -42,13 +42,14 @@ abstract public function send(CakeEmail $email);
 /**
  * Set the config
  *
- * @param array $config
- * @return object $this
+ * @param mixed $config
+ * @return array Returns configs
  */
-	public function config($config = array()) {
-		if (!empty($config)) {
+	public function config($config = null) {
+		if (is_array($config)) {
 			$this->_config = $config;
 		}
+		return $this->_config;
 	}
 
 /**

diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php
@@ -942,7 +942,7 @@ public function send($content = null) {
 			$this->_message[] = '';
 		}
 		$contents = $this->transportClass()->send($this);
-		if (isset($this->_config['log']) && $this->_config['log']) {
+		if (!empty($this->_config['log'])) {
 			$level = LOG_DEBUG;
 			if ($this->_config['log'] !== true) {
 				$level = $this->_config['log'];
@@ -995,7 +995,7 @@ public static function deliver($to = null, $subject = null, $message = null, $tr
  */
 	protected function _applyConfig($config) {
 		if (is_string($config)) {
-			if (!config('email')) {
+			if (!class_exists('EmailConfig') && !config('email')) {
 				throw new SocketException(__d('cake', '%s not found.', APP . 'Config' . DS . 'email.php'));
 			}
 			$configs = new EmailConfig();

diff --git a/lib/Cake/Network/Email/DebugTransport.php b/lib/Cake/Network/Email/DebugTransport.php
@@ -34,7 +34,7 @@ class DebugTransport extends AbstractTransport {
 	public function send(CakeEmail $email) {
 		$headers = $email->getHeaders(array('from', 'sender', 'replyTo', 'readReceipt', 'returnPath', 'to', 'cc', 'bcc', 'subject'));
 		$headers = $this->_headersToString($headers);
-		$message = implode((array)$email->message(), "\n");
+		$message = implode("\n", (array)$email->message());
 		return array('headers' => $headers, 'message' => $message);
 	}