Merge remote-tracking branch 'zf2/master'

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-mail",
-    "description": "Zend\\Mail component",
+    "description": "provides generalized functionality to compose and send both text and MIME-compliant multipart e-mail messages",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf2",
@@ -9,11 +9,11 @@
     "homepage": "https://github.com/zendframework/zend-mail",
     "autoload": {
         "psr-4": {
-            "Zend\\Mail\\": "src/"
+            "Zend\\Mail": "src/"
         }
     },
     "require": {
-        "php": ">=5.3.23",
+        "php": ">=5.3.3",
         "zendframework/zend-crypt": "self.version",
         "zendframework/zend-loader": "self.version",
         "zendframework/zend-mime": "self.version",
@@ -27,7 +27,8 @@
         "phpunit/PHPUnit": "~4.0"
     },
     "suggest": {
-        "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
+        "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
+        "zendframework/zend-validator": "Zend\\Validator component"
     },
     "extra": {
         "branch-alias": {

src/Address.php

@@ -1,30 +1,18 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to [email protected] so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 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
- * @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 Address implements Address\AddressInterface
 {
@@ -54,7 +42,7 @@ public function __construct($email, $name = null)
 
     /**
      * Retrieve email
-     * 
+     *
      * @return string
      */
     public function getEmail()
@@ -64,7 +52,7 @@ public function getEmail()
 
     /**
      * Retrieve name
-     * 
+     *
      * @return string
      */
     public function getName()
@@ -74,7 +62,7 @@ public function getName()
 
     /**
      * String representation of address
-     * 
+     *
      * @return string
      */
     public function toString()

src/Address/AddressInterface.php

@@ -1,22 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to [email protected] so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @subpackage Address
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 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;
@@ -25,8 +14,6 @@
  * @category   Zend
  * @package    Zend_Mail
  * @subpackage Address
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 interface AddressInterface
 {

src/AddressList.php

@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to [email protected] so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 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;
@@ -26,14 +16,12 @@
 /**
  * @category   Zend
  * @package    Zend_Mail
- * @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 AddressList implements Countable, Iterator
 {
     /**
      * List of Address objects we're managing
-     * 
+     *
      * @var array
      */
     protected $addresses = array();
@@ -97,9 +85,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)
@@ -112,8 +100,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)
@@ -124,8 +112,8 @@ public function has($email)
 
     /**
      * Get an address by email
-     * 
-     * @param  string $email 
+     *
+     * @param  string $email
      * @return boolean|Address\AddressInterface
      */
     public function get($email)
@@ -140,7 +128,7 @@ public function get($email)
 
     /**
      * Delete an address from the list
-     * 
+     *
      * @param  string $email
      * @return bool
      */
@@ -157,7 +145,7 @@ public function delete($email)
 
     /**
      * Return count of addresses
-     * 
+     *
      * @return int
      */
     public function count()
@@ -179,7 +167,7 @@ public function rewind()
 
     /**
      * Return current item in iteration
-     * 
+     *
      * @return Address
      */
     public function current()
@@ -189,7 +177,7 @@ public function current()
 
     /**
      * Return key of current item of iteration
-     * 
+     *
      * @return string
      */
     public function key()
@@ -211,7 +199,7 @@ public function next()
 
     /**
      * Is the current item of iteration valid?
-     * 
+     *
      * @return bool
      */
     public function valid()
@@ -221,10 +209,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)

src/Exception/BadMethodCallException.php

@@ -1,21 +1,11 @@
 <?php
 /**
- * Zend Framework
+ * Zend Framework (http://framework.zend.com/)
  *
- * LICENSE
- *
- * This source file is subject to the new BSD license that is bundled
- * with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://framework.zend.com/license/new-bsd
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to [email protected] so we can send you a copy immediately.
- *
- * @category   Zend
- * @package    Zend_Mail
- * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
- * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 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;
@@ -25,10 +15,8 @@
  *
  * @category   Zend
  * @package    Zend_Mail
- * @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 BadMethodCallException extends \BadMethodCallException implements 
+class BadMethodCallException extends \BadMethodCallException implements
     ExceptionInterface
 {
 }