From d757bbe8aca388521312c8ae3cbc27fadab36160 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 24 Oct 2017 12:59:00 +0200 Subject: fix FTBFS from Koschei, add patch for PHP 7.2 from https://github.com/zendframework/zend-feed/pull/50 --- 50.patch | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 50.patch (limited to '50.patch') 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 +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] + ); -- cgit