Skip to content
This repository has been archived by the owner on Jan 30, 2020. It is now read-only.

Commit

Permalink
Refactor around the deletion of \Zend\Exception:
Browse files Browse the repository at this point in the history
  * extends
  * tag @uses
  * throw
  * replace with a better Exception like \RuntimeException for \Zend\Registry
  • Loading branch information
b-durand committed Apr 12, 2011
13 parents d2a94d1 + 332c539 + cd9b45a + 64c40b6 + 3ecbc20 + 7524f9b + bbf0ef3 + 67b64ab + 7abc3aa + a09c912 + 187e6ab + 31d69ef + ebb8ff3 commit 7960d76
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
1 change: 0 additions & 1 deletion src/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
namespace Zend\Mail;

/**
* @uses \Zend\Exception
* @category Zend
* @package Zend_Mail
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
2 changes: 1 addition & 1 deletion src/Part/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
use Zend\Mail;

/**
* @uses \Zend\Exception
* @uses \Zend\Mail\Exception
* @category Zend
* @package Zend_Mail
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
2 changes: 1 addition & 1 deletion src/Protocol/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
use Zend\Mail;

/**
* @uses \Zend\Exception
* @uses \Zend\Mail\Exception
* @category Zend
* @package Zend_Mail
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
use Zend\Mail;

/**
* @uses \Zend\Exception
* @uses \Zend\Mail\Exception
* @category Zend
* @package Zend_Mail
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
2 changes: 1 addition & 1 deletion src/Transport/Exception.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
use Zend\Mail;

/**
* @uses \Zend\Exception
* @uses \Zend\Mail\Exception
* @category Zend
* @package Zend_Mail
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
16 changes: 8 additions & 8 deletions test/MessageTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public function testSplitInvalidMessage()
{
try {
Mime\Decode::splitMessageStruct("--xxx\n", 'xxx');
} catch (\Zend\Exception $e) {
} catch (\Zend\Mime\Exception $e) {
return; // ok
}

Expand All @@ -173,7 +173,7 @@ public function testInvalidMailHandler()
{
try {
$message = new Message(array('handler' => 1));
} catch (\Zend\Exception $e) {
} catch (\Zend\Mime\Exception $e) {
return; // ok
}

Expand All @@ -187,7 +187,7 @@ public function testMissingId()

try {
$message = new Message(array('handler' => $mail));
} catch (\Zend\Exception $e) {
} catch (\Zend\Mime\Exception $e) {
return; // ok
}

Expand Down Expand Up @@ -230,7 +230,7 @@ public function testSplitInvalidHeader()
$header = '';
try {
Mime\Decode::splitHeaderField($header);
} catch (\Zend\Exception $e) {
} catch (\Zend\Mime\Exception $e) {
return; // ok
}

Expand Down Expand Up @@ -268,7 +268,7 @@ public function testNoContent()

try {
$message->getContent();
} catch (\Zend\Exception $e) {
} catch (\Zend\Mime\Exception $e) {
return; // ok
}

Expand All @@ -284,7 +284,7 @@ public function testEmptyHeader()
$subject = null;
try {
$subject = $message->subject;
} catch (\Zend\Exception $e) {
} catch (\Zend\Mime\Exception $e) {
// ok
}
if ($subject) {
Expand All @@ -298,7 +298,7 @@ public function testEmptyBody()
$part = null;
try {
$part = $message->getPart(1);
} catch (\Zend\Exception $e) {
} catch (\Zend\Mime\Exception $e) {
// ok
}
if ($part) {
Expand Down Expand Up @@ -329,7 +329,7 @@ public function testWrongMultipart()

try {
$message->getPart(1);
} catch (\Zend\Exception $e) {
} catch (\Zend\Mime\Exception $e) {
return; // ok
}
$this->fail('no exception raised while getting part from message without boundary');
Expand Down

0 comments on commit 7960d76

Please sign in to comment.