From 61c8103668b1ce1b2ae9930a874afcc804920e2d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 20 Aug 2019 10:48:13 +0200
Subject: v2.8.6

---
 composer.json                       | 9 +++------
 php-zendframework-zend-session.spec | 9 ++++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 37f3d21..94e77b8 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "container-interop/container-interop": "^1.1",
         "mongodb/mongodb": "^1.0.1",
         "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-        "phpunit/phpunit": "^5.7.5 || ^6.0.13",
+        "phpunit/phpunit": "^5.7.5 || >=6.0.13 <6.5.0",
         "zendframework/zend-cache": "^2.6.1",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-db": "^2.7",
@@ -32,9 +32,6 @@
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "zendframework/zend-validator": "^2.6"
     },
-    "conflict": {
-        "phpunit/phpunit": ">=6.5.0"
-    },
     "suggest": {
         "mongodb/mongodb": "If you want to use the MongoDB session save handler",
         "zendframework/zend-cache": "Zend\\Cache component",
@@ -61,8 +58,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.8-dev",
-            "dev-develop": "2.9-dev"
+            "dev-master": "2.8.x-dev",
+            "dev-develop": "2.9.x-dev"
         },
         "zf": {
             "component": "Zend\\Session",
diff --git a/php-zendframework-zend-session.spec b/php-zendframework-zend-session.spec
index a0da22f..ac5982b 100644
--- a/php-zendframework-zend-session.spec
+++ b/php-zendframework-zend-session.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    9338f1ae483bcc18cc3b6c0347c8ba4f448b3e2a
+%global gh_commit    8e67629ba7ddc67e3b03157615156317535bffa7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-session
@@ -20,7 +20,7 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.8.4
+Version:        2.8.6
 Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
@@ -149,7 +149,7 @@ require_once __DIR__ . '/../test/autoload.php';
 EOF
 
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php71 php72; do
   if which $cmd; then
     $cmd %{_bindir}/phpunit --verbose || ret=1
   fi
@@ -169,6 +169,9 @@ exit $ret
 
 
 %changelog
+* Tue Aug 20 2019 Remi Collet <remi@remirepo.net> - 2.8.6-1
+- update to 2.8.6
+
 * Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 2.8.4-1
 - Update to 2.8.4
 
-- 
cgit