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

Commit

Permalink
Merge branch 'master' of github.com:zendframework/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Jan 11, 2013
91 parents 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 + ab784fe + 4e7144b + ad4f87d + 2030708 commit cc70e20
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions src/Decode.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 @@ -101,7 +101,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
2 changes: 1 addition & 1 deletion src/Exception/ExceptionInterface.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 src/Exception/RuntimeException.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
6 changes: 3 additions & 3 deletions src/Message.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 @@ -57,7 +57,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 @@ -225,7 +225,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
4 changes: 2 additions & 2 deletions src/Mime.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 @@ -95,7 +95,7 @@ class Mime
* false, encode the string for secure delivery.
*
* @param string $str
* @return boolean
* @return bool
*/
public static function isPrintable($str)
{
Expand Down
10 changes: 5 additions & 5 deletions src/Part.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 @@ -73,7 +73,7 @@ public function isStream()
* @return stream
* @throws Exception\RuntimeException if not a stream or unable to append filter
*/
public function getEncodedStream()
public function getEncodedStream($EOL = Mime::LINEEND)
{
if (!$this->isStream) {
throw new Exception\RuntimeException('Attempt to get a stream from a string part');
Expand All @@ -88,7 +88,7 @@ public function getEncodedStream()
STREAM_FILTER_READ,
array(
'line-length' => 76,
'line-break-chars' => Mime::LINEEND
'line-break-chars' => $EOL
)
);
if (!is_resource($filter)) {
Expand All @@ -102,7 +102,7 @@ public function getEncodedStream()
STREAM_FILTER_READ,
array(
'line-length' => 76,
'line-break-chars' => Mime::LINEEND
'line-break-chars' => $EOL
)
);
if (!is_resource($filter)) {
Expand All @@ -123,7 +123,7 @@ public function getEncodedStream()
public function getContent($EOL = Mime::LINEEND)
{
if ($this->isStream) {
return stream_get_contents($this->getEncodedStream());
return stream_get_contents($this->getEncodedStream($EOL));
}
return Mime::encode($this->content, $this->encoding, $EOL);
}
Expand Down
2 changes: 1 addition & 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
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 cc70e20

Please sign in to comment.