From bc9eb16e15d93904de37822b514eb702273be8e7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 5 Jan 2018 10:46:22 +0100
Subject: v1.7.0

---
 composer.json                         |  8 ++++----
 php-zendframework-zend-diactoros.spec | 13 ++++++++-----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index feb9aec..9899a71 100644
--- a/composer.json
+++ b/composer.json
@@ -18,8 +18,8 @@
   },
   "extra": {
     "branch-alias": {
-      "dev-master": "1.6-dev",
-      "dev-develop": "1.7-dev"
+      "dev-master": "1.7.x-dev",
+      "dev-develop": "1.8.x-dev"
     }
   },
   "require": {
@@ -54,10 +54,10 @@
       "@cs-check",
       "@test"
     ],
-    "upload-coverage": "coveralls -v",
     "cs-check": "phpcs",
     "cs-fix": "phpcbf",
     "test": "phpunit --colors=always",
-    "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+    "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+    "upload-coverage": "php-coveralls -v"
   }
 }
diff --git a/php-zendframework-zend-diactoros.spec b/php-zendframework-zend-diactoros.spec
index 8b4d2a6..d8461ca 100644
--- a/php-zendframework-zend-diactoros.spec
+++ b/php-zendframework-zend-diactoros.spec
@@ -2,7 +2,7 @@
 #
 # Fedora spec file for php-zendframework-zend-diactoros
 #
-# Copyright (c) 2015-2017 Shawn Iwinski <shawn.iwinski@gmail.com>
+# Copyright (c) 2015-2018 Shawn Iwinski <shawn.iwinski@gmail.com>
 #
 # License: MIT
 # http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
 
 %global github_owner     zendframework
 %global github_name      zend-diactoros
-%global github_version   1.6.1
-%global github_commit    c8664b92a6d5bc229e48b0923486c097e45a7877
+%global github_version   1.7.0
+%global github_commit    ed6ce7e2105c400ca10277643a8327957c0384b7
 
 %global composer_vendor  zendframework
 %global composer_project zend-diactoros
@@ -31,7 +31,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       PSR HTTP Message implementations
 
 Group:         Development/Libraries
@@ -143,7 +143,7 @@ sed 's/function testReasonPhraseDefaultsAgainstIana/function SKIP_testReasonPhra
 
 : Upstream tests
 RETURN_CODE=0
-for CMDARG in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
+for CMDARG in "php %{phpunit}" php70 php71 php72; do
     if which $CMDARG; then
         set $CMDARG
         $1 ${2:-%{_bindir}/phpunit6} --bootstrap bootstrap.php --verbose \
@@ -166,6 +166,9 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri Jan  5 2018 Remi Collet <remi@remirepo.net> - 1.7.0-1
+- Update to 1.7.0
+
 * Tue Dec  5 2017 Remi Collet <remi@remirepo.net> - 1.6.1-2
 - switch to classmap autoloader for consistency
 - provide php-autoloader(zendframework/zend-diactoros)
-- 
cgit