Merge pull request #4621 from Xety/3.0-fix-mail-exception

3.0 Fix mail Exception
cakephp · Sep 16, 2014 · 72a6dfe · 72a6dfe
2 parents 4255491 + 7dbfa90
commit 72a6dfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Network/Email/MailTransport.php b/src/Network/Email/MailTransport.php
@@ -16,7 +16,7 @@
  */
 namespace Cake\Network\Email;
 
-use Cake\Network\Error;
+use Cake\Network\Exception\SocketException;
 
 /**
  * Send mail using mail() function
@@ -29,7 +29,6 @@ class MailTransport extends AbstractTransport {
  *
  * @param \Cake\Network\Email\Email $email Cake Email
  * @return array
- * @throws \Cake\Network\Error\SocketException When mail cannot be sent.
  */
 	public function send(Email $email) {
 		$eol = PHP_EOL;
@@ -61,15 +60,15 @@ public function send(Email $email) {
  * @param string $message email's body
  * @param string $headers email's custom headers
  * @param string $params additional params for sending email
- * @throws \Cake\Network\Error\SocketException if mail could not be sent
+ * @throws \Cake\Network\Exception\SocketException if mail could not be sent
  * @return void
  */
 	protected function _mail($to, $subject, $message, $headers, $params = null) {
 		//@codingStandardsIgnoreStart
 		if (!@mail($to, $subject, $message, $headers, $params)) {
 			$error = error_get_last();
 			$msg = 'Could not send email: ' . (isset($error['message']) ? $error['message'] : 'unknown');
-			throw new Error\SocketException($msg);
+			throw new SocketException($msg);
 		}
 		//@codingStandardsIgnoreEnd
 	}

diff --git a/src/Network/Email/SmtpTransport.php b/src/Network/Email/SmtpTransport.php
@@ -14,7 +14,6 @@
  */
 namespace Cake\Network\Email;
 
-use Cake\Network\Error;
 use Cake\Network\Socket;
 use Cake\Network\Exception\SocketException;