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 git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
@wdalmut
wdalmut committed Jun 14, 2012
55 parents 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 + 6149722 + 9af4d23 + fbdafd9 commit f236745
Show file tree
Hide file tree
Showing 22 changed files with 362 additions and 401 deletions.
3 changes: 1 addition & 2 deletions src/AddressList.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ public function add($emailOrAddress, $name = null)
{
if (is_string($emailOrAddress)) {
$emailOrAddress = $this->createAddress($emailOrAddress, $name);
}
if (!$emailOrAddress instanceof Address\AddressInterface) {
} elseif (!$emailOrAddress instanceof Address\AddressInterface) {
throw new Exception\InvalidArgumentException(sprintf(
'%s expects an email address or %s\Address object as its first argument; received "%s"',
__METHOD__,
Expand Down
7 changes: 4 additions & 3 deletions src/Header/AbstractAddressList.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
namespace Zend\Mail\Header;

use Zend\Mail\AddressList;
use Zend\Mail\Headers;

/**
* Base class for headers composing address lists (to, from, cc, bcc, reply-to)
Expand Down Expand Up @@ -79,7 +80,7 @@ public static function fromString($headerLine)
$header = new static();

// split value on ","
$fieldValue = str_replace("\r\n ", " ", $fieldValue);
$fieldValue = str_replace(Headers::FOLDING, ' ', $fieldValue);
$values = explode(',', $fieldValue);
array_walk($values, 'trim');

Expand Down Expand Up @@ -150,7 +151,7 @@ public function getFieldValue()
$emails[] = sprintf('%s <%s>', $name, $email);
}
}
$string = implode(",\r\n ", $emails);
$string = implode(',' . Headers::FOLDING, $emails);
return $string;
}

Expand Down Expand Up @@ -208,6 +209,6 @@ public function toString()
{
$name = $this->getFieldName();
$value = $this->getFieldValue();
return sprintf("%s: %s\r\n", $name, $value);
return (empty($value)) ? '' : sprintf('%s: %s', $name, $value);
}
}
8 changes: 5 additions & 3 deletions src/Header/ContentType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

namespace Zend\Mail\Header;

use Zend\Mail\Headers;

/**
* @category Zend
* @package Zend_Mail
Expand Down Expand Up @@ -64,7 +66,7 @@ public static function fromString($headerLine)
throw new Exception\InvalidArgumentException('Invalid header line for Content-Type string');
}

$value = str_replace("\r\n ", " ", $value);
$value = str_replace(Headers::FOLDING, " ", $value);
$values = preg_split('#\s*;\s*#', $value);
$type = array_shift($values);

Expand Down Expand Up @@ -108,7 +110,7 @@ public function getFieldValue()
foreach ($this->parameters as $attribute => $value) {
$values[] = sprintf('%s="%s"', $attribute, $value);
}
$value = implode(";\r\n ", $values);
$value = implode(';' . Headers::FOLDING, $values);
return $value;
}

Expand Down Expand Up @@ -141,7 +143,7 @@ public function getEncoding()
*/
public function toString()
{
return 'Content-Type: ' . $this->getFieldValue() . "\r\n";
return 'Content-Type: ' . $this->getFieldValue();
}

/**
Expand Down
25 changes: 15 additions & 10 deletions src/Header/GenericHeader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ class GenericHeader implements HeaderInterface
public static function fromString($headerLine)
{
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
list($fieldName, $fieldValue) = explode(': ', $headerLine, 2);
$header = new static($fieldName, $fieldValue);
$parts = explode(': ', $headerLine, 2);
if (count($parts) != 2) {
throw new Exception\InvalidArgumentException('Header must match with the format "name: value"');
}
$header = new static($parts[0], $parts[1]);
return $header;
}

Expand All @@ -79,7 +82,7 @@ public function __construct($fieldName = null, $fieldValue = null)
}

/**
* Set header field name
* Set header name
*
* @param string $fieldName
* @throws Exception\InvalidArgumentException
Expand All @@ -96,15 +99,17 @@ public function setFieldName($fieldName)

// Validate what we have
if (!preg_match('/^[a-z][a-z0-9-]*$/i', $fieldName)) {
throw new Exception\InvalidArgumentException('Header name must start with a letter, and consist of only letters, numbers, and dashes');
throw new Exception\InvalidArgumentException(
'Header name must start with a letter, and consist of only letters, numbers and dashes'
);
}

$this->fieldName = $fieldName;
return $this;
}

/**
* Retrieve header field name
* Retrieve header name
*
* @return string
*/
Expand All @@ -114,7 +119,7 @@ public function getFieldName()
}

/**
* Set header field value
* Set header value
*
* @param string $fieldValue
* @return GenericHeader
Expand All @@ -132,7 +137,7 @@ public function setFieldValue($fieldValue)
}

/**
* Retrieve header field value
* Retrieve header value
*
* @return string
*/
Expand Down Expand Up @@ -164,9 +169,9 @@ public function getEncoding()
}

/**
* Cast to string as a well formed HTTP header line
* Cast to string
*
* Returns in form of "NAME: VALUE\r\n"
* Returns in form of "NAME: VALUE"
*
* @return string
*/
Expand All @@ -175,6 +180,6 @@ public function toString()
$name = $this->getFieldName();
$value = $this->getFieldValue();

return $name. ': ' . $value . "\r\n";
return $name. ': ' . $value;
}
}
154 changes: 13 additions & 141 deletions src/Header/GenericMultiHeader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,41 +22,30 @@
namespace Zend\Mail\Header;

/**
* Generic class for Headers with multiple occurs in the same message
*
* @category Zend
* @package Zend_Mail
* @subpackage Header
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class GenericMultiHeader implements MultipleHeadersInterface
class GenericMultiHeader extends GenericHeader implements MultipleHeadersInterface
{
/**
* @var string
*/
protected $fieldName = null;

/**
* @var string
*/
protected $fieldValue = null;

/**
* Header encoding
*
* @var string
*/
protected $encoding = 'ASCII';

/**
* Unserialize from a string
*
* @param string $headerLine
* @return GenericMultiHeader
* @return GenericMultiHeader|GenericMultiHeader[]
*/
public static function fromString($headerLine)
{
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
list($fieldName, $fieldValue) = explode(': ', $headerLine, 2);
$parts = explode(': ', $headerLine, 2);
if (count($parts) != 2) {
throw new Exception\InvalidArgumentException('Header must match with the format "name: value"');
}
list($fieldName, $fieldValue) = $parts;

if (strpos($fieldValue, ',')) {
$headers = array();
Expand All @@ -68,125 +57,6 @@ public static function fromString($headerLine)
$header = new static($fieldName, $fieldValue);
return $header;
}


}

/**
* Constructor
*
* @param string $fieldName Optional
* @param string $fieldValue Optional
*/
public function __construct($fieldName = null, $fieldValue = null)
{
if ($fieldName) {
$this->setFieldName($fieldName);
}

if ($fieldValue) {
$this->setFieldValue($fieldValue);
}
}

/**
* Set header name
*
* @param string $fieldName
* @throws Exception\InvalidArgumentException
* @return GenericHeader
*/
public function setFieldName($fieldName)
{
if (!is_string($fieldName) || empty($fieldName)) {
throw new Exception\InvalidArgumentException('Header name must be a string');
}

// Pre-filter to normalize valid characters, change underscore to dash
$fieldName = str_replace(' ', '-', ucwords(str_replace(array('_', '-'), ' ', $fieldName)));

// Validate what we have
if (!preg_match('/^[a-z][a-z0-9-]*$/i', $fieldName)) {
throw new Exception\InvalidArgumentException('Header name must start with a letter, and consist of only letters, numbers, and dashes');
}

$this->fieldName = $fieldName;
return $this;
}

/**
* Retrieve header name
*
* @return string
*/
public function getFieldName()
{
return $this->fieldName;
}

/**
* Set header value
*
* @param string|array $fieldValue
* @return GenericHeader
*/
public function setFieldValue($fieldValue)
{
$fieldValue = (string) $fieldValue;

if (empty($fieldValue) || preg_match('/^\s+$/', $fieldValue)) {
$fieldValue = '';
}

$this->fieldValue = $fieldValue;
return $this;
}

/**
* Retrieve header value
*
* @return string
*/
public function getFieldValue()
{
return $this->fieldValue;
}

/**
* Set header encoding
*
* @param string $encoding
* @return GenericMultiHeader
*/
public function setEncoding($encoding)
{
$this->encoding = $encoding;
return $this;
}

/**
* Get header encoding
*
* @return string
*/
public function getEncoding()
{
return $this->encoding;
}

/**
* Cast to string
*
* Returns in form of "NAME: VALUE\r\n"
*
* @return string
*/
public function toString()
{
$name = $this->getFieldName();
$value = $this->getFieldValue();

return $name. ': ' . $value . "\r\n";
}

/**
Expand All @@ -202,10 +72,12 @@ public function toStringMultipleHeaders(array $headers)
$values = array($this->getFieldValue());
foreach ($headers as $header) {
if (!$header instanceof static) {
throw new Exception\InvalidArgumentException('This method toStringMultipleHeaders was expecting an array of headers of the same type');
throw new Exception\InvalidArgumentException(
'This method toStringMultipleHeaders was expecting an array of headers of the same type'
);
}
$values[] = $header->getFieldValue();
}
return $name. ': ' . implode(',', $values) . "\r\n";
return $name. ': ' . implode(',', $values);
}
}
Loading

0 comments on commit f236745

Please sign in to comment.