summaryrefslogtreecommitdiffstats
path: root/d64eb3a776eb017caa7a504ac4b4d9608bfcf1cc.patch
blob: 19f37309533c4fce4d7ba0e4cdb81cfa3718cb0b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
From d64eb3a776eb017caa7a504ac4b4d9608bfcf1cc Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 13 Feb 2017 14:57:35 +0100
Subject: [PATCH] Don't use each().

For modern PHP versions there is no improved performance or memory usage compared to foreach() anymore. Beside that it's deprecated in PHP 7.2.
---
 lib/Horde/Text/Flowed.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/Horde/Text/Flowed.php b/lib/Horde/Text/Flowed.php
index fb5befd..b5a6cfe 100644
--- a/lib/Horde/Text/Flowed.php
+++ b/lib/Horde/Text/Flowed.php
@@ -127,9 +127,8 @@ public function toFixed($quote = false)
         $txt = '';
 
         $this->_reformat(false, $quote);
-        reset($this->_output);
         $lines = count($this->_output) - 1;
-        while (list($no, $line) = each($this->_output)) {
+        foreach ($this->_output as $no => $line) {
             $txt .= $line['text'] . (($lines == $no) ? '' : "\n");
         }
 
@@ -172,8 +171,7 @@ public function toFlowed($quote = false, array $opts = array())
         $txt = '';
 
         $this->_reformat(true, $quote, empty($opts['nowrap']));
-        reset($this->_output);
-        while (list(,$line) = each($this->_output)) {
+        foreach ($this->_output as $line) {
             $txt .= $line['text'] . "\n";
         }
 
@@ -206,9 +204,8 @@ protected function _reformat($toflowed, $quote, $wrap = true)
         $text = preg_split("/\r?\n/", $this->_text);
         $text_count = count($text) - 1;
         $skip = 0;
-        reset($text);
 
-        while (list($no, $line) = each($text)) {
+        foreach ($text as $no => $line) {
             if ($skip) {
                 --$skip;
                 continue;