Update to 2.9.0

raise dependency on zend-escaper 2.5.2
raise dependency on zend-stdlib 2.7.7
raise dependency on psr/http-message 1.0.1

3 files changed, 67 insertions, 92 deletions

diff --git a/50.patch b/50.patch
deleted file mode 100644
index a1c5100..0000000
--- a/50.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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]
-             );
diff --git a/composer.json b/composer.json
index 7aff1d6..b06ad84 100644
--- a/composer.json
+++ b/composer.json
@@ -3,42 +3,44 @@
     "description": "provides functionality for consuming RSS and Atom feeds",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "feed"
     ],
-    "homepage": "https://github.com/zendframework/zend-feed",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Feed\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-feed/",
+        "issues": "https://github.com/zendframework/zend-feed/issues",
+        "source": "https://github.com/zendframework/zend-feed",
+        "rss": "https://github.com/zendframework/zend-feed/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "zendframework/zend-escaper": "^2.5",
-        "zendframework/zend-stdlib": "^2.7 || ^3.1"
+        "zendframework/zend-escaper": "^2.5.2",
+        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
     },
     "require-dev": {
-        "zendframework/zend-db": "^2.7",
-        "zendframework/zend-cache": "^2.6",
-        "zendframework/zend-http": "^2.5.4",
-        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-        "zendframework/zend-validator": "^2.6",
-        "phpunit/PHPUnit": "^6.0.8 || ^5.7.15",
-        "psr/http-message": "^1.0",
-        "zendframework/zend-coding-standard": "~1.0.0"
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "psr/http-message": "^1.0.1",
+        "zendframework/zend-cache": "^2.7.2",
+        "zendframework/zend-coding-standard": "~1.0.0",
+        "zendframework/zend-db": "^2.8.2",
+        "zendframework/zend-http": "^2.7",
+        "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
+        "zendframework/zend-validator": "^2.10.1"
     },
     "suggest": {
-        "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
+        "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
         "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
         "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
         "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
         "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
-        "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries ehen using the Writer subcomponent"
+        "zendframework/zend-validator": "Zend\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.8-dev",
-            "dev-develop": "2.9-dev"
+    "autoload": {
+        "psr-4": {
+            "Zend\\Feed\\": "src/"
         }
     },
     "autoload-dev": {
@@ -46,6 +48,15 @@
             "ZendTest\\Feed\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.9-dev",
+            "dev-develop": "2.10-dev"
+        }
+    },
     "scripts": {
         "check": [
             "@cs-check",
diff --git a/php-zendframework-zend-feed.spec b/php-zendframework-zend-feed.spec
index a3e9259..83886ee 100644
--- a/php-zendframework-zend-feed.spec
+++ b/php-zendframework-zend-feed.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    94579e805dd108683209fe14b3b5d4276de3de6e
+%global gh_commit    abe88686124d492e0a2a84656f15e5482bfbe030
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-feed
@@ -20,8 +20,8 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.8.0
-Release:        4%{?dist}
+Version:        2.9.0
+Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
 Group:          Development/Libraries
@@ -30,8 +30,6 @@ URL:            https://zendframework.github.io/%{gh_project}/
 Source0:        %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
 Source1:        makesrc.sh
 
-Patch0:         https://patch-diff.githubusercontent.com/raw/zendframework/zend-feed/pull/50.patch
-
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
@@ -44,23 +42,24 @@ BuildRequires:  php-libxml
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-tidy
-BuildRequires:  php-composer(%{gh_owner}/zend-escaper)          >= 2.5
-BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.5
+BuildRequires:  php-composer(%{gh_owner}/zend-escaper)          >= 2.5.2
+BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.7.7
 # From composer, "require-dev": {
-#        "zendframework/zend-db": "^2.7",
-#        "zendframework/zend-cache": "^2.6",
-#        "zendframework/zend-http": "^2.5.4",
-#        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
-#        "zendframework/zend-validator": "^2.6",
-#        "phpunit/PHPUnit": "^6.0.8 || ^5.7.15",
-#        "psr/http-message": "^1.0",
-#        "zendframework/zend-coding-standard": "~1.0.0"
-BuildRequires:  php-composer(%{gh_owner}/zend-db)               >= 2.7
-BuildRequires:  php-composer(%{gh_owner}/zend-cache)            >= 2.6
-BuildRequires:  php-composer(%{gh_owner}/zend-http)             >= 2.5.4
-BuildRequires:  php-composer(%{gh_owner}/zend-servicemanager)   >= 2.7.5
-BuildRequires:  php-composer(%{gh_owner}/zend-validator)        >= 2.6
-BuildRequires:  php-composer(psr/http-message)                  >= 1.0
+#        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+#        "psr/http-message": "^1.0.1",
+#        "zendframework/zend-cache": "^2.7.2",
+#        "zendframework/zend-coding-standard": "~1.0.0",
+#        "zendframework/zend-db": "^2.8.2",
+#        "zendframework/zend-http": "^2.7",
+#        "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
+#        "zendframework/zend-validator": "^2.10.1"
+BuildRequires:  php-composer(psr/http-message)                  <  2
+BuildRequires:  php-composer(psr/http-message)                  >= 1.0.1
+BuildRequires:  php-composer(%{gh_owner}/zend-cache)            >= 2.7.2
+BuildRequires:  php-composer(%{gh_owner}/zend-db)               >= 2.8.2
+BuildRequires:  php-composer(%{gh_owner}/zend-http)             >= 2.7
+BuildRequires:  php-composer(%{gh_owner}/zend-servicemanager)   >= 2.7.8
+BuildRequires:  php-composer(%{gh_owner}/zend-validator)        >= 2.10.1
 %if 0%{?fedora} >= 26
 %global phpunit %{_bindir}/phpunit6
 %else
@@ -68,29 +67,30 @@ BuildRequires:  php-composer(psr/http-message)                  >= 1.0
 %endif
 BuildRequires:  %{phpunit}
 # Because of boostraped Db
-BuildRequires:  php-composer(%{gh_owner}/zend-eventmanager)   >= 2.5
+BuildRequires:  php-composer(%{gh_owner}/zend-eventmanager)     >= 2.5
 # Autoloader
 BuildRequires:  php-composer(%{gh_owner}/zend-loader)           >= 2.5
 %endif
 
 # From composer, "require": {
 #        "php": "^5.6 || ^7.0",
-#        "zendframework/zend-escaper": "^2.5",
-#        "zendframework/zend-stdlib": "^2.7 || ^3.1"
+#        "zendframework/zend-escaper": "^2.5.2",
+#        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
 Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
-Requires:       php-composer(%{gh_owner}/zend-escaper)          >= 2.5
+Requires:       php-composer(%{gh_owner}/zend-escaper)          >= 2.5.2
 Requires:       php-composer(%{gh_owner}/zend-escaper)          <  3
-Requires:       php-composer(%{gh_owner}/zend-stdlib)           >= 2.7
+Requires:       php-composer(%{gh_owner}/zend-stdlib)           >= 2.7.7
 Requires:       php-composer(%{gh_owner}/zend-stdlib)           <  4
 # From composer, "suggest": {
-#        "psr/http-message": "PSR-7 ^1.0, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
+#        "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Zend\\Feed\\Reader\\Http\\Psr7ResponseDecorator",
 #        "zendframework/zend-cache": "Zend\\Cache component, for optionally caching feeds between requests",
 #        "zendframework/zend-db": "Zend\\Db component, for use with PubSubHubbub",
 #        "zendframework/zend-http": "Zend\\Http for PubSubHubbub, and optionally for use with Zend\\Feed\\Reader",
 #        "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for easily extending ExtensionManager implementations",
 #        "zendframework/zend-validator": "Zend\\Validator component, for validating feeds and Atom entries in the Writer subcomponent"
-Requires:       php-composer(psr/http-message)
+Requires:       php-composer(psr/http-message)                  <  2
+Requires:       php-composer(psr/http-message)                  >= 1.0.1
 %if 0%{?fedora} >= 21
 Suggests:       php-composer(%{gh_owner}/zend-cache)
 Suggests:       php-composer(%{gh_owner}/zend-db)
@@ -126,7 +126,6 @@ Documentation: https://zendframework.github.io/%{gh_project}/
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
 
 mv LICENSE.md LICENSE
 
@@ -188,6 +187,12 @@ exit $ret
 
 
 %changelog
+* Tue Dec  5 2017 Remi Collet <remi@remirepo.net> - 2.9.0-1
+- Update to 2.9.0
+- raise dependency on zend-escaper 2.5.2
+- raise dependency on zend-stdlib 2.7.7
+- raise dependency on psr/http-message 1.0.1
+
 * Tue Oct 24 2017 Remi Collet <remi@remirepo.net> - 2.8.0-4
 - fix FTBFS from Koschei, add patch for PHP 7.2 from
   https://github.com/zendframework/zend-feed/pull/50