diff options
author | Remi Collet <remi@remirepo.net> | 2017-12-19 11:40:00 +0100 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2017-12-19 11:40:00 +0100 |
commit | 04f36f583570ddc9a87a6d8f1d0359ad8b3ca68e (patch) | |
tree | 35891623f518075b1ecb74ee1979fd80fa7a5e6d /d64eb3a776eb017caa7a504ac4b4d9608bfcf1cc.patch | |
parent | 303485a88b5a37926109530feced532939585d53 (diff) |
Fix FTBFS from Koschei, add upstream patch for PHP 7.2
Diffstat (limited to 'd64eb3a776eb017caa7a504ac4b4d9608bfcf1cc.patch')
-rw-r--r-- | d64eb3a776eb017caa7a504ac4b4d9608bfcf1cc.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/d64eb3a776eb017caa7a504ac4b4d9608bfcf1cc.patch b/d64eb3a776eb017caa7a504ac4b4d9608bfcf1cc.patch new file mode 100644 index 0000000..19f3730 --- /dev/null +++ b/d64eb3a776eb017caa7a504ac4b4d9608bfcf1cc.patch @@ -0,0 +1,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; |