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

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Quoc Vu committed May 9, 2013
122 parents ad4f87d + 428eb4c + 604814c + fc3d8de + 3a37ce6 + 55daa98 + 4ea5b34 + 92203eb + 757d24d + 02e6999 + edaf480 + 1ede9ce + 8630680 + 37a0c6a + ce1693c + aaa5805 + 7178893 + fc92b9d + d5f6e5e + 4794336 + 1daeb27 + c2a004d + 1b82450 + 3e3dc89 + 861a016 + 86fe89b + af29b04 + b12ad9d + 8eb23ea + 52feefb + 972a9a6 + 212de55 + 2866041 + 7d1f90d + 1f5cb72 + 221c254 + d4f9d25 + 3b0e0d4 + d488887 + 3c450c0 + 964d943 + 679904a + d7eb727 + ea05ef8 + 431fead + fd64604 + 3581ced + c0932a7 + 41e40fd + 3f58aba + e4adfe2 + 5098e2a + 78fb9c8 + 97b778e + e99f479 + b48227e + 935ccef + cb90274 + 58baa5d + e14016b + f4de487 + 4f34d57 + 0dcd117 + 54c204b + 3022d9e + 0227f1f + 56bcb11 + b4afbfa + 736c546 + 6b6568d + 8286d5b + 23843e6 + 8c2b9ff + 506e98d + 4cf9ade + 2876fe6 + 0d2038d + acad728 + 36c4a42 + f137cd9 + 06e2761 + 9f06d58 + d3fd832 + 49269e7 + 06fe394 + 9a0cef5 + fbd3ec7 + 14bf51d + 24906a9 + 6719dba + 622964b + c849349 + 5416b05 + 4e7144b + 2030708 + cc70e20 + ab784fe + 5211392 + 7adf0de + cd44572 + d402762 + faf998a + d914ee1 + bbb5f4a + 4f26772 + ba3fdbf + 8b4ce10 + e5c953a + 3e61a9d + 1c6e914 + 73d4c1d + 1d5a36e + cf94d1e + 408aa85 + 46f6392 + 91ae13f + 22f0b85 + 7d7b227 + 2aa3fc8 + f9e7ca2 + 420f236 + 5d0ecc2 commit 52c4962
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 47 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.2-dev",
"dev-develop": "2.3-dev"
}
},
"autoload-dev": {
Expand Down
9 changes: 2 additions & 7 deletions src/Decode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,15 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Mime
*/

namespace Zend\Mime;

use Zend\Mail\Headers;
use Zend\Stdlib\ErrorHandler;

/**
* @category Zend
* @package Zend_Mime
*/
class Decode
{
/**
Expand Down Expand Up @@ -101,7 +96,7 @@ public static function splitMessageStruct($message, $boundary, $EOL = Mime::LINE
* @param Headers $headers output param, headers container
* @param string $body output param, content of message
* @param string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
* @param boolean $strict enable strict mode for parsing message
* @param bool $strict enable strict mode for parsing message
* @return null
*/
public static function splitMessage($message, &$headers, &$body, $EOL = Mime::LINEEND, $strict = false)
Expand Down
7 changes: 1 addition & 6 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,11 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Mime
*/

namespace Zend\Mime\Exception;

/**
* @category Zend
* @package Zend_Mime
*/
interface ExceptionInterface
{}
6 changes: 1 addition & 5 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Mime
*/

namespace Zend\Mime\Exception;

/**
* Exception for Zend_Mime component.
*
* @category Zend
* @package Zend_Mime
*/
class RuntimeException
extends \RuntimeException
Expand Down
22 changes: 9 additions & 13 deletions src/Message.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,12 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Mime
*/

namespace Zend\Mime;

/**
* @category Zend
* @package Zend_Mime
*/
class Message
{

Expand Down Expand Up @@ -57,7 +52,7 @@ public function addPart(Part $part)
* Check if message needs to be sent as multipart
* MIME message or if it has only one part.
*
* @return boolean
* @return bool
*/
public function isMultiPart()
{
Expand Down Expand Up @@ -111,9 +106,9 @@ public function getMime()
*/
public function generateMessage($EOL = Mime::LINEEND)
{
if (! $this->isMultiPart()) {
$body = array_shift($this->parts);
$body = $body->getContent($EOL);
if (!$this->isMultiPart()) {
$part = current($this->parts);
$body = $part->getContent($EOL);
} else {
$mime = $this->getMime();

Expand Down Expand Up @@ -181,8 +176,8 @@ public function getPartContent($partnum, $EOL = Mime::LINEEND)
*/
protected static function _disassembleMime($body, $boundary)
{
$start = 0;
$res = array();
$start = 0;
$res = array();
// find every mime part limiter and cut out the
// string before it.
// the part before the first boundary string is discarded:
Expand Down Expand Up @@ -225,7 +220,7 @@ public static function createFromMessage($message, $boundary, $EOL = Mime::LINEE
{
$parts = Decode::splitMessageStruct($message, $boundary, $EOL);

$res = new self();
$res = new static();
foreach ($parts as $part) {
// now we build a new MimePart for the current Message Part:
$newPart = new Part($part['body']);
Expand Down Expand Up @@ -265,6 +260,7 @@ public static function createFromMessage($message, $boundary, $EOL = Mime::LINEE
}
$res->addPart($newPart);
}

return $res;
}
}
8 changes: 2 additions & 6 deletions src/Mime.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Mime
*/

namespace Zend\Mime;

/**
* Support class for MultiPart Mime Messages
*
* @category Zend
* @package Zend_Mime
*/
class Mime
{
Expand Down Expand Up @@ -95,7 +91,7 @@ class Mime
* false, encode the string for secure delivery.
*
* @param string $str
* @return boolean
* @return bool
*/
public static function isPrintable($str)
{
Expand Down
7 changes: 2 additions & 5 deletions src/Part.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Mime
*/

namespace Zend\Mime;

/**
* Class representing a MIME part.
*
* @category Zend
* @package Zend_Mime
*/
class Part
{
Expand Down Expand Up @@ -70,6 +66,7 @@ public function isStream()
* if this was created with a stream, return a filtered stream for
* reading the content. very useful for large file attachments.
*
* @param string $EOL
* @return stream
* @throws Exception\RuntimeException if not a stream or unable to append filter
*/
Expand Down
14 changes: 13 additions & 1 deletion test/MessageTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Mime
*/
Expand Down Expand Up @@ -116,4 +116,16 @@ public function testDecodeMimeMessage()
$this->assertEquals('base64', $part2->encoding);
$this->assertEquals('12', $part2->id);
}

public function testNonMultipartMessageShouldNotRemovePartFromMessage()
{
$message = new Mime\Message(); // No Parts
$part = new Mime\Part('This is a test');
$message->addPart($part);
$message->generateMessage();

$parts = $message->getParts();
$test = current($parts);
$this->assertSame($part, $test);
}
}
2 changes: 1 addition & 1 deletion test/MimeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Mime
*/
Expand Down
2 changes: 1 addition & 1 deletion test/PartTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Mime
*/
Expand Down

0 comments on commit 52c4962

Please sign in to comment.