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

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@bakura10
bakura10 committed Jul 2, 2012
65 parents 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 + 806e429 commit ab9047d
Show file tree
Hide file tree
Showing 24 changed files with 225 additions and 224 deletions.
6 changes: 3 additions & 3 deletions src/Address.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function __construct($email, $name = null)

/**
* Retrieve email
*
*
* @return string
*/
public function getEmail()
Expand All @@ -64,7 +64,7 @@ public function getEmail()

/**
* Retrieve name
*
*
* @return string
*/
public function getName()
Expand All @@ -74,7 +74,7 @@ public function getName()

/**
* String representation of address
*
*
* @return string
*/
public function toString()
Expand Down
34 changes: 17 additions & 17 deletions src/AddressList.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class AddressList implements Countable, Iterator
{
/**
* List of Address objects we're managing
*
*
* @var array
*/
protected $addresses = array();
Expand Down Expand Up @@ -97,9 +97,9 @@ public function addMany(array $addresses)
}

/**
* Merge another address list into this one
*
* @param AddressList $addressList
* Merge another address list into this one
*
* @param AddressList $addressList
* @return AddressList
*/
public function merge(AddressList $addressList)
Expand All @@ -112,8 +112,8 @@ public function merge(AddressList $addressList)

/**
* Does the email exist in this list?
*
* @param string $email
*
* @param string $email
* @return bool
*/
public function has($email)
Expand All @@ -124,8 +124,8 @@ public function has($email)

/**
* Get an address by email
*
* @param string $email
*
* @param string $email
* @return boolean|Address\AddressInterface
*/
public function get($email)
Expand All @@ -140,7 +140,7 @@ public function get($email)

/**
* Delete an address from the list
*
*
* @param string $email
* @return bool
*/
Expand All @@ -157,7 +157,7 @@ public function delete($email)

/**
* Return count of addresses
*
*
* @return int
*/
public function count()
Expand All @@ -179,7 +179,7 @@ public function rewind()

/**
* Return current item in iteration
*
*
* @return Address
*/
public function current()
Expand All @@ -189,7 +189,7 @@ public function current()

/**
* Return key of current item of iteration
*
*
* @return string
*/
public function key()
Expand All @@ -211,7 +211,7 @@ public function next()

/**
* Is the current item of iteration valid?
*
*
* @return bool
*/
public function valid()
Expand All @@ -221,10 +221,10 @@ public function valid()
}

/**
* Create an address object
*
* @param string $email
* @param string|null $name
* Create an address object
*
* @param string $email
* @param string|null $name
* @return Address
*/
protected function createAddress($email, $name)
Expand Down
4 changes: 2 additions & 2 deletions src/Header/AbstractAddressList.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ abstract class AbstractAddressList implements HeaderInterface
*/
public static function fromString($headerLine)
{
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');

// split into name/value
list($fieldName, $fieldValue) = explode(': ', $headerLine, 2);
Expand Down Expand Up @@ -98,7 +98,7 @@ public static function fromString($headerLine)
if (empty($name)) {
$name = null;
} else {
$name = iconv_mime_decode($name, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
$name = iconv_mime_decode($name, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
}

if (isset($matches['namedEmail'])) {
Expand Down
2 changes: 1 addition & 1 deletion src/Header/ContentType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class ContentType implements HeaderInterface
*/
public static function fromString($headerLine)
{
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
list($name, $value) = explode(': ', $headerLine, 2);

// check to ensure proper header type for this factory
Expand Down
2 changes: 1 addition & 1 deletion src/Header/GenericHeader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class GenericHeader implements HeaderInterface
*/
public static function fromString($headerLine)
{
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
$parts = explode(': ', $headerLine, 2);
if (count($parts) != 2) {
throw new Exception\InvalidArgumentException('Header must match with the format "name: value"');
Expand Down
2 changes: 1 addition & 1 deletion src/Header/GenericMultiHeader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class GenericMultiHeader extends GenericHeader implements MultipleHeadersInterfa
*/
public static function fromString($headerLine)
{
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
$parts = explode(': ', $headerLine, 2);
if (count($parts) != 2) {
throw new Exception\InvalidArgumentException('Header must match with the format "name: value"');
Expand Down
4 changes: 2 additions & 2 deletions src/Header/Sender.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class Sender implements HeaderInterface
*/
public static function fromString($headerLine)
{
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
list($name, $value) = explode(': ', $headerLine, 2);

// check to ensure proper header type for this factory
Expand All @@ -69,7 +69,7 @@ public static function fromString($headerLine)
if (empty($name)) {
$name = null;
} else {
$name = iconv_mime_decode($name, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
$name = iconv_mime_decode($name, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
}
$header->setAddress($matches['email'], $name);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Header/Subject.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class Subject implements UnstructuredInterface
*/
public static function fromString($headerLine)
{
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
$headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
list($name, $value) = explode(': ', $headerLine, 2);

// check to ensure proper header type for this factory
Expand Down
6 changes: 5 additions & 1 deletion src/Headers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,11 @@ public function get($name)
$results = array();

foreach (array_keys($this->headersKeys, $key) as $index) {
$results[] = $this->headers[$index];
if ($this->headers[$index] instanceof Header\GenericHeader) {
$results[] = $this->lazyLoadHeader($index);
} else {
$results[] = $this->headers[$index];
}
}

switch(count($results)) {
Expand Down
Loading

0 comments on commit ab9047d

Please sign in to comment.