Merge branch 'master' into feature/http-header-cachecontrol-directives

zendframework · Mar 27, 2012 · 16b512c · 16b512c
commit 16b512c
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 9 deletions.
diff --git a/src/Header/ContentType.php b/src/Header/ContentType.php
@@ -58,7 +58,7 @@ class ContentType implements Header
     public static function fromString($headerLine)
     {
         $headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'content-type') {
@@ -74,7 +74,7 @@ public static function fromString($headerLine)
 
         if (count($values)) {
             foreach ($values as $keyValuePair) {
-                list($key, $value) = preg_split('/=/', $keyValuePair);
+                list($key, $value) = explode('=', $keyValuePair);
                 $value = trim($value, "\"\' \t\n\r\0\x0B");
                 $header->addParameter($key, $value);
             }

diff --git a/src/Header/Date.php b/src/Header/Date.php
@@ -54,7 +54,7 @@ class Date implements Header
      */
     public static function fromString($headerLine)
     {
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'date') {

diff --git a/src/Header/MimeVersion.php b/src/Header/MimeVersion.php
@@ -45,7 +45,7 @@ class MimeVersion implements Header
      */
     public static function fromString($headerLine)
     {
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'mime-version') {

diff --git a/src/Header/Received.php b/src/Header/Received.php
@@ -52,8 +52,7 @@ class Received implements MultipleHeaderDescription
      */
     public static function fromString($headerLine)
     {
-
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'received') {

diff --git a/src/Header/Sender.php b/src/Header/Sender.php
@@ -56,7 +56,7 @@ class Sender implements Header
     public static function fromString($headerLine)
     {
         $headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'sender') {

diff --git a/src/Header/Subject.php b/src/Header/Subject.php
@@ -53,7 +53,7 @@ class Subject implements Header, UnstructuredHeader
     public static function fromString($headerLine)
     {
         $headerLine = iconv_mime_decode($headerLine, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
-        list($name, $value) = preg_split('#: #', $headerLine, 2);
+        list($name, $value) = explode(': ', $headerLine, 2);
 
         // check to ensure proper header type for this factory
         if (strtolower($name) !== 'subject') {

diff --git a/src/Headers.php b/src/Headers.php
@@ -79,7 +79,7 @@ public static function fromString($string)
         $current = array();
 
         // iterate the header lines, some might be continuations
-        foreach (preg_split('#\r\n#', $string) as $line) {
+        foreach (explode("\r\n", $string) as $line) {
 
             // check if a header name is present
             if (preg_match('/^(?P<name>[^()><@,;:\"\\/\[\]?=}{ \t]+):.*$/', $line, $matches)) {