diff options
| -rw-r--r-- | 6018b26b20a78654c113da04ad9e816b1ac0c5e9.patch | 24 | ||||
| -rw-r--r-- | php-horde-Horde-Stream-Wrapper.spec | 17 |
2 files changed, 8 insertions, 33 deletions
diff --git a/6018b26b20a78654c113da04ad9e816b1ac0c5e9.patch b/6018b26b20a78654c113da04ad9e816b1ac0c5e9.patch deleted file mode 100644 index 5a928e1..0000000 --- a/6018b26b20a78654c113da04ad9e816b1ac0c5e9.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 6018b26b20a78654c113da04ad9e816b1ac0c5e9 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/Stream/Wrapper/Combine.php | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/lib/Horde/Stream/Wrapper/Combine.php b/lib/Horde/Stream/Wrapper/Combine.php -index 309d705..167f368 100644 ---- a/lib/Horde/Stream/Wrapper/Combine.php -+++ b/lib/Horde/Stream/Wrapper/Combine.php -@@ -125,8 +125,7 @@ public function stream_open($path, $mode, $options, &$opened_path) - throw new Exception('Use ' . __CLASS__ . '::getStream() to initialize the stream.'); - } - -- reset($data); -- while (list(,$val) = each($data)) { -+ foreach ($data as $val) { - if (is_string($val)) { - $fp = fopen('php://temp', 'r+'); - fwrite($fp, $val); diff --git a/php-horde-Horde-Stream-Wrapper.spec b/php-horde-Horde-Stream-Wrapper.spec index b1d8c77..67945af 100644 --- a/php-horde-Horde-Stream-Wrapper.spec +++ b/php-horde-Horde-Stream-Wrapper.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-horde-Horde-Stream-Wrapper # -# Copyright (c) 2012-2017 Nick Bebout, Remi Collet +# Copyright (c) 2012-2018 Nick Bebout, Remi Collet # # License: MIT # https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense @@ -18,8 +18,8 @@ %endif Name: php-horde-Horde-Stream-Wrapper -Version: 2.1.3 -Release: 4%{?dist} +Version: 2.1.4 +Release: 1%{?dist} Summary: Horde Stream wrappers Group: Development/Libraries @@ -27,8 +27,6 @@ License: BSD URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz -Patch0: https://github.com/horde/Stream_Wrapper/commit/6018b26b20a78654c113da04ad9e816b1ac0c5e9.patch - BuildArch: noarch BuildRequires: php(language) >= 5.3.0 BuildRequires: php-pear(PEAR) >= 1.7.0 @@ -56,9 +54,7 @@ This package provides various stream wrappers. %setup -q -c cd %{pear_name}-%{version} -%patch0 -p1 -b .upstream - -sed -e 's/md5sum="[^"]*"//' ../package.xml >%{name}.xml +mv ../package.xml %{name}.xml %build @@ -85,7 +81,7 @@ cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g) ret=0 for cmd in php php56 php70 php71 php72; do if which $cmd; then - $cmd %{_bindir}/phpunit --verbose . || ret=1 + $cmd %{_bindir}/phpunit --bootstrap bootstrap.php --verbose . || ret=1 fi done exit $ret @@ -113,6 +109,9 @@ fi %changelog +* Fri Jan 26 2018 Remi Collet <remi@remirepo.net> - 2.1.4-1 +- Update to 2.1.4 + * Tue Dec 19 2017 Remi Collet <remi@remirepo.net> - 2.1.3-4 - add upstream patch for PHP 7.2 |