dev/core#117 Replace useage of deprecated function each with foreach …

…in Mail/mime Mail/mimePart and Mail/mimeDecode
civicrm · May 17, 2018 · 482441f · 482441f
1 parent c947829
commit 482441f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Mail/mime.php b/Mail/mime.php
@@ -183,7 +183,7 @@ function __construct($params = array())
 
         // Update build parameters
         if (!empty($params) && is_array($params)) {
-            while (list($key, $value) = each($params)) {
+            foreach ($params as $key => $value) {
                 $this->_build_params[$key] = $value;
             }
         }
@@ -842,7 +842,7 @@ function saveMessageBody($filename, $params = null)
     function &get($params = null, $filename = null, $skip_head = false)
     {
         if (isset($params)) {
-            while (list($key, $value) = each($params)) {
+            foreach ($params as $key => $value) {
                 $this->_build_params[$key] = $value;
             }
         }
@@ -1283,7 +1283,7 @@ function encodeRecipients($recipients)
     function _encodeHeaders($input, $params = array())
     {
         $build_params = $this->_build_params;
-        while (list($key, $value) = each($params)) {
+        foreach ($params as $key => $value) {
             $build_params[$key] = $value;
         }
 

diff --git a/Mail/mimeDecode.php b/Mail/mimeDecode.php
@@ -260,7 +260,7 @@ function _decode($headers, $body, $default_ctype = 'text/plain')
         }
 
         reset($headers);
-        while (list($key, $value) = each($headers)) {
+        foreach($headers as $key => $value) {
             $headers[$key]['name'] = strtolower($headers[$key]['name']);
             switch ($headers[$key]['name']) {
 
@@ -273,7 +273,7 @@ function _decode($headers, $body, $default_ctype = 'text/plain')
                     }
 
                     if (isset($content_type['other'])) {
-                        while (list($p_name, $p_value) = each($content_type['other'])) {
+                        foreach ($content_type['other'] as $p_name => $p_value) {
                             $return->ctype_parameters[$p_name] = $p_value;
                         }
                     }
@@ -283,7 +283,7 @@ function _decode($headers, $body, $default_ctype = 'text/plain')
                     $content_disposition = $this->_parseHeaderValue($headers[$key]['value']);
                     $return->disposition   = $content_disposition['value'];
                     if (isset($content_disposition['other'])) {
-                        while (list($p_name, $p_value) = each($content_disposition['other'])) {
+                        foreach ($content_type['other'] as $p_name => $p_value) {
                             $return->d_parameters[$p_name] = $p_value;
                         }
                     }

diff --git a/Mail/mimePart.php b/Mail/mimePart.php
@@ -592,7 +592,7 @@ function _quotedPrintableEncode($input , $line_max = 76)
         $escape = '=';
         $output = '';
 
-        while (list($idx, $line) = each($lines)) {
+        foreach ($lines as $idx => $line) {
             $newline = '';
             $i = 0;