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 
Fixed files permissions
  • Loading branch information
Grzegorz Drozd committed Feb 28, 2013
157 parents 517ee7c + 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 + 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 + 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 commit 8dd678f
Show file tree
Hide file tree
Showing 89 changed files with 305 additions and 568 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Expand Up @@ -32,8 +32,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.1-dev",
"dev-develop": "2.2-dev"
}
},
"autoload-dev": {
Expand Down
5 changes: 0 additions & 5 deletions src/Address.php
View file
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail;

/**
* @category Zend
* @package Zend_Mail
*/
class Address implements Address\AddressInterface
{
protected $email;
Expand Down
6 changes: 0 additions & 6 deletions src/Address/AddressInterface.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Address;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Address
*/
interface AddressInterface
{
public function getEmail();
Expand Down
5 changes: 0 additions & 5 deletions src/AddressList.php
View file
Expand Up @@ -5,18 +5,13 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail;

use Countable;
use Iterator;

/**
* @category Zend
* @package Zend_Mail
*/
class AddressList implements Countable, Iterator
{
/**
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/BadMethodCallException.php
View file
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
*
* @category Zend
* @package Zend_Mail
*/
class BadMethodCallException extends \BadMethodCallException implements
ExceptionInterface
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/DomainException.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Exception;
Expand All @@ -14,9 +13,6 @@

/**
* Exception for Zend_Mail component.
*
* @category Zend
* @package Zend_Mail
*/
class DomainException extends \DomainException implements ExceptionInterface
{
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/ExceptionInterface.php
View file
Expand Up @@ -5,15 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Exception;

/**
* @category Zend
* @package Zend_Mail
*/
interface ExceptionInterface
{
}
4 changes: 0 additions & 4 deletions src/Exception/InvalidArgumentException.php
View file
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
*
* @category Zend
* @package Zend_Mail
*/
class InvalidArgumentException extends \InvalidArgumentException implements
ExceptionInterface
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/OutOfBoundsException.php
View file
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
*
* @category Zend
* @package Zend_Mail
*/
class OutOfBoundsException extends \OutOfBoundsException implements ExceptionInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Exception/RuntimeException.php
View file
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Exception;

/**
* Exception for Zend_Mail component.
*
* @category Zend
* @package Zend_Mail
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
Expand Down
9 changes: 3 additions & 6 deletions src/Header/AbstractAddressList.php
View file
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header;
Expand All @@ -15,10 +14,6 @@

/**
* Base class for headers composing address lists (to, from, cc, bcc, reply-to)
*
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
abstract class AbstractAddressList implements HeaderInterface
{
Expand Down Expand Up @@ -48,7 +43,9 @@ public static function fromString($headerLine)
{
$decodedLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8');
// split into name/value
list($fieldName, $fieldValue) = explode(': ', $decodedLine, 2);
list($fieldName, $fieldValue) = explode(':', $decodedLine, 2);
$fieldName = trim($fieldName);
$fieldValue = trim($fieldValue);

if (strtolower($fieldName) !== static::$type) {
throw new Exception\InvalidArgumentException(sprintf(
Expand Down
6 changes: 0 additions & 6 deletions src/Header/Bcc.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class Bcc extends AbstractAddressList
{
protected $fieldName = 'Bcc';
Expand Down
6 changes: 0 additions & 6 deletions src/Header/Cc.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class Cc extends AbstractAddressList
{
protected $fieldName = 'Cc';
Expand Down
6 changes: 0 additions & 6 deletions src/Header/ContentType.php
View file
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header;

use Zend\Mail\Headers;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class ContentType implements HeaderInterface
{
/**
Expand Down
4 changes: 0 additions & 4 deletions src/Header/Date.php
View file
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header;

/**
* @todo Add accessors for setting date from DateTime, Zend\Date, or a string
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class Date implements HeaderInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/Header/Exception/BadMethodCallException.php
View file
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header\Exception;

use Zend\Mail\Exception;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class BadMethodCallException extends Exception\BadMethodCallException implements
ExceptionInterface
{
Expand Down
6 changes: 0 additions & 6 deletions src/Header/Exception/ExceptionInterface.php
View file
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header\Exception;

use Zend\Mail\Exception\ExceptionInterface as MailException;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
interface ExceptionInterface extends MailException
{
}
6 changes: 0 additions & 6 deletions src/Header/Exception/InvalidArgumentException.php
View file
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header\Exception;

use Zend\Mail\Exception;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class InvalidArgumentException extends Exception\InvalidArgumentException implements
ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Header/Exception/RuntimeException.php
View file
Expand Up @@ -5,18 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header\Exception;

use Zend\Mail\Exception;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class RuntimeException extends Exception\RuntimeException implements
ExceptionInterface
{}
6 changes: 0 additions & 6 deletions src/Header/From.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class From extends AbstractAddressList
{
protected $fieldName = 'From';
Expand Down
6 changes: 0 additions & 6 deletions src/Header/GenericHeader.php
View file
Expand Up @@ -5,16 +5,10 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header;

/**
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class GenericHeader implements HeaderInterface, UnstructuredInterface
{
/**
Expand Down
5 changes: 0 additions & 5 deletions src/Header/GenericMultiHeader.php
View file
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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_Mail
*/

namespace Zend\Mail\Header;

/**
* Generic class for Headers with multiple occurs in the same message
*
* @category Zend
* @package Zend_Mail
* @subpackage Header
*/
class GenericMultiHeader extends GenericHeader implements MultipleHeadersInterface
{
Expand Down

0 comments on commit 8dd678f

Please sign in to comment.