summaryrefslogtreecommitdiffstats
path: root/50.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-10-24 12:59:00 +0200
committerRemi Collet <remi@remirepo.net>2017-10-24 12:59:00 +0200
commitd757bbe8aca388521312c8ae3cbc27fadab36160 (patch)
tree30a17203c04b8665277fac5050bb446f5ed82cd1 /50.patch
parent0f3c2127967964b5013d9d3dad793a8adefc880b (diff)
fix FTBFS from Koschei, add patch for PHP 7.2 from https://github.com/zendframework/zend-feed/pull/50
Diffstat (limited to '50.patch')
-rw-r--r--50.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/50.patch b/50.patch
new file mode 100644
index 0000000..a1c5100
--- /dev/null
+++ b/50.patch
@@ -0,0 +1,41 @@
+From e50e94da5e23a9d33ef3959c4d1239eec2b1a907 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Tue, 24 Oct 2017 12:40:39 +0200
+Subject: [PATCH] fix warning 'Parameter must be an array or an object that
+ implements Countable' (PHP 7.2)
+
+---
+ src/PubSubHubbub/Model/Subscription.php | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/PubSubHubbub/Model/Subscription.php b/src/PubSubHubbub/Model/Subscription.php
+index 97333ffe..9780b6a8 100644
+--- a/src/PubSubHubbub/Model/Subscription.php
++++ b/src/PubSubHubbub/Model/Subscription.php
+@@ -71,7 +71,7 @@ public function getSubscription($key)
+ .' of "' . $key . '" must be a non-empty string');
+ }
+ $result = $this->db->select(['id' => $key]);
+- if (count($result)) {
++ if ($result && count($result)) {
+ return $result->current()->getArrayCopy();
+ }
+ return false;
+@@ -91,7 +91,7 @@ public function hasSubscription($key)
+ .' of "' . $key . '" must be a non-empty string');
+ }
+ $result = $this->db->select(['id' => $key]);
+- if (count($result)) {
++ if ($result && count($result)) {
+ return true;
+ }
+ return false;
+@@ -106,7 +106,7 @@ public function hasSubscription($key)
+ public function deleteSubscription($key)
+ {
+ $result = $this->db->select(['id' => $key]);
+- if (count($result)) {
++ if ($result && count($result)) {
+ $this->db->delete(
+ ['id' => $key]
+ );