Merge branch 'feature/zendframework/zendframework#6268-addresslist-fr…

…om-string' into develop Close zendframework/zendframework#6268
zendframework · Jul 27, 2014 · d2a67fc · d2a67fc
7 parents e366253 + 26177b0 + 2beabf9 + de855cb + d26cf74 + 82571c3 + 3d84996
commit d2a67fc
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 23 deletions.
diff --git a/src/AddressList.php b/src/AddressList.php
@@ -79,6 +79,40 @@ public function addMany(array $addresses)
         return $this;
     }
 
+    /**
+     * Add an address to the list from any valid string format, such as
+     *  - "ZF Dev" <[email protected]>
+     *  - [email protected]
+     *
+     * @param string $address
+     * @throws Exception\InvalidArgumentException
+     * @return AddressList
+     */
+    public function addFromString($address)
+    {
+        if (!preg_match('/^((?P<name>.*?)<(?P<namedEmail>[^>]+)>|(?P<email>.+))$/', $address, $matches)) {
+            throw new Exception\InvalidArgumentException('Invalid address format');
+        }
+
+        $name = null;
+        if (isset($matches['name'])) {
+            $name = trim($matches['name']);
+        }
+        if (empty($name)) {
+            $name = null;
+        }
+
+        if (isset($matches['namedEmail'])) {
+            $email = $matches['namedEmail'];
+        }
+        if (isset($matches['email'])) {
+            $email = $matches['email'];
+        }
+        $email = trim($email);
+
+        return $this->add($email, $name);
+    }
+
     /**
      * Merge another address list into this one
      *

diff --git a/src/Header/AbstractAddressList.php b/src/Header/AbstractAddressList.php
@@ -67,29 +67,7 @@ function (&$value) {
 
         $addressList = $header->getAddressList();
         foreach ($values as $address) {
-            // split values into name/email
-            if (!preg_match('/^((?P<name>.*?)<(?P<namedEmail>[^>]+)>|(?P<email>.+))$/', $address, $matches)) {
-                // Should we raise an exception here?
-                continue;
-            }
-            $name = null;
-            if (isset($matches['name'])) {
-                $name  = trim($matches['name']);
-            }
-            if (empty($name)) {
-                $name = null;
-            }
-
-            if (isset($matches['namedEmail'])) {
-                $email = $matches['namedEmail'];
-            }
-            if (isset($matches['email'])) {
-                $email = $matches['email'];
-            }
-            $email = trim($email); // we may have leading whitespace
-
-            // populate address list
-            $addressList->add($email, $name);
+            $addressList->addFromString($address);
         }
         return $header;
     }