summaryrefslogtreecommitdiffstats
path: root/71.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-02-13 09:10:52 +0100
committerRemi Collet <remi@remirepo.net>2018-02-13 09:10:52 +0100
commite53ff6cd7486288a9d7da0bebf9f5926c8efd238 (patch)
tree7250185de7a8e5c6b5c5ad748b97893dff305a14 /71.patch
parentf698e40c7d5f88a2fefe66687a3f5656b478f4dc (diff)
add patch for 7.2
Diffstat (limited to '71.patch')
-rw-r--r--71.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/71.patch b/71.patch
new file mode 100644
index 0000000..88da655
--- /dev/null
+++ b/71.patch
@@ -0,0 +1,23 @@
+From c5f321f171783c1b088490dcaf39b0aad5eb5c13 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Thu, 12 Oct 2017 09:35:57 +0200
+Subject: [PATCH] fix Warning: count(): Parameter must be an array or an
+ object that implements Countable in PEAR/RunTest.php on line 346
+
+---
+ PEAR/RunTest.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/PEAR/RunTest.php b/PEAR/RunTest.php
+index 8eabac3c3..482beccb3 100644
+--- a/PEAR/RunTest.php
++++ b/PEAR/RunTest.php
+@@ -343,7 +343,7 @@ function run($file, $ini_settings = array(), $test_number = 1)
+
+ // Check if test should be skipped.
+ $res = $this->_runSkipIf($section_text, $temp_skipif, $tested, $ini_settings);
+- if (count($res) != 2) {
++ if ($res == 'SKIPPED' || count($res) != 2) {
+ return $res;
+ }
+ $info = $res['info'];