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

Commit

Permalink
Merge branch 'hotfix/4421' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed May 23, 2013
176 parents c1d4cb7 + 6a14e0a + e84c12e + 94de9c5 + 4b83eb4 + 1483e66 + b428d8b + dc72787 + bca6f24 + 1cda83c + 835b631 + d3605c7 + 7a32de0 + 7a6cebf + 662a059 + 5e1c4bb + de6ba8b + 19c92ef + f5abdbd + a4b3fcc + e0d3e79 + eb7f4fc + f5f296f + c1bc89d + 2cfde08 + 5ed923d + 7bfa121 + 0b38f0b + 1914ec7 + 47650bd + b7f9c80 + d490dab + 0b235a6 + ea8420a + 806e429 + 14b8e16 + 2c9f881 + 1591173 + 3288109 + 6149722 + fb18be8 + 2f56d24 + 256686b + 3cc679d + da18011 + 93ac388 + 57ef4a3 + 2f2851a + 2ec1dbc + 9a48955 + b6b50b9 + a16c105 + a634561 + 779d017 + e998d74 + e0c0b66 + 677bd85 + bd0abb6 + 7e23a9b + 76e9a65 + 9666e65 + 0fb7a6e + b476244 + a566cb1 + 84a7972 + f6501d5 + 74b0454 + ea99bf1 + e2703e7 + 90db7ae + b2f5380 + d6ee2dd + 2dae9df + 15a2e1f + 00d7ef1 + 88e29ab + 04f5596 + d4b9187 + 83cb40e + e80536c + 8344c40 + 314ef07 + f8fe680 + 7d99158 + 5a453b7 + 16b512c + e13bb78 + f8c8e84 + 0e833f2 + 463bd0b + e23f919 + c0f3fe1 + 9af4d23 + fbdafd9 + 46c341e + 1fcdf03 + 9e5c38e + 41f8caa + f236745 + ab9047d + c7b4a3f + 5cbe79f + dc8268a + cbafbe9 + d2c6567 + 0cc6fdf + 09daef8 + df6fc46 + ba228cf + 67d18da + 48a0084 + c78da38 + 76f6205 + 02baf86 + 907dad9 + 56854a7 + 51b08b5 + 86f37cb + 5ecd1ed + a4cca36 + cfc46bf + a576736 + 0650b43 + 6fc76b3 + 2dcfeeb + 80461fa + db66f77 + 66790e4 + ceefa98 + fc0f947 + 6a060b9 + de10d09 + 9ac9f8e + dc02847 + ee05131 + fb9ea71 + cb2e3cf + 08f2b17 + efc498e + 71822ef + 818d7d9 + 5c72f46 + 2b5dcae + 32dbda5 + d550f51 + 3aa0ee9 + 4ea71ee + 730f592 + c6516da + 76770c7 + 167fdbf + 1510cfa + e52ef9a + c1754e3 + 30e7e8b + c208a5e + c258e8b + 95bc2ba + 62058ff + 5129baa + e212b9b + 760714d + 844e2ae + 69ad6c7 + d68e5a1 + 9fededc + 1fe76d7 + 9cfe1eb + de84a61 + ee1b45a + 8dd678f + fd733d8 + a0f84c8 + 155b787 + eb5e6bf + 4885974 commit 722be83
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/Exception/BadMethodCallException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/DomainException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class DomainException extends \DomainException implements ExceptionInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/OutOfBoundsException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
namespace Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/Protocol/AbstractProtocol.php
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ protected function _receive($timeout = null)
* Parse server response for successful codes
*
* Read the response from the stream and check for expected return code.
* Throws a Zend_Mail_Protocol_Exception if an unexpected code is returned.
* Throws a Zend\Mail\Protocol\Exception\ExceptionInterface if an unexpected code is returned.
*
* @param string|array $code One or more codes that indicate a successful response
* @param int $timeout Per-request timeout value if applicable
Expand Down
2 changes: 1 addition & 1 deletion src/Protocol/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Protocol/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
Expand Down
4 changes: 2 additions & 2 deletions src/Protocol/Smtp.php
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public function rset()
/**
* Issues the NOOP command end validates answer
*
* Not used by Zend_Mail, could be used to keep a connection alive or check if it is still open.
* Not used by Zend\Mail, could be used to keep a connection alive or check if it is still open.
*
*/
public function noop()
Expand All @@ -330,7 +330,7 @@ public function noop()
/**
* Issues the VRFY command end validates answer
*
* Not used by Zend_Mail.
* Not used by Zend\Mail.
*
* @param string $user User Name or eMail to verify
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Exception/OutOfBoundsException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class OutOfBoundsException extends Exception\OutOfBoundsException implements
ExceptionInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
Expand Down
4 changes: 2 additions & 2 deletions src/Storage/Message/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ class File extends Part\File implements MessageInterface
/**
* Public constructor
*
* In addition to the parameters of Zend_Mail_Part::__construct() this constructor supports:
* - flags array with flags for message, keys are ignored, use constants defined in Zend_Mail_Storage
* In addition to the parameters of Zend\Mail\Storage\Part::__construct() this constructor supports:
* - flags array with flags for message, keys are ignored, use constants defined in Zend\Mail\Storage
*
* @param array $params
* @throws \Zend\Mail\Storage\Exception\ExceptionInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Part/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Storage\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Storage/Part/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Storage\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Transport/Exception/InvalidArgumentException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Transport/Exception/RuntimeException.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
* Exception for Zend\Mail component.
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
Expand Down

0 comments on commit 722be83

Please sign in to comment.