From f75a2f88e791612969cc0e157f989860ee543157 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 13 Dec 2017 10:35:53 +0100
Subject: v1.4.1

(cherry picked from commit 760e5f02d4a3050c42fd30a31621b89e801962ba)
---
 composer.json                                      | 50 ++++++++++++++--------
 ...framework-zend-expressive-zendviewrenderer.spec |  9 ++--
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/composer.json b/composer.json
index 291a589..b98e415 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "zendframework/zend-expressive-zendviewrenderer",
     "description": "zend-view PhpRenderer integration for Expressive",
-    "type": "library",
     "license": "BSD-3-Clause",
     "keywords": [
         "expressive",
@@ -9,13 +8,16 @@
         "middleware",
         "psr",
         "psr-7",
-        "zf"
+        "zf",
+        "zendframework",
+        "zend-expressive"
     ],
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.4-dev",
-            "dev-develop": "1.5-dev"
-        }
+    "support": {
+        "issues": "https://github.com/zendframework/zend-expressive-zendviewrenderer/issues",
+        "source": "https://github.com/zendframework/zend-expressive-zendviewrenderer",
+        "rss": "https://github.com/zendframework/zend-expressive-zendviewrenderer/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/expressive"
     },
     "require": {
         "php": "^5.6 || ^7.0",
@@ -29,18 +31,28 @@
     },
     "require-dev": {
         "malukenho/docheader": "^0.1.5",
-        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
         "zendframework/zend-coding-standard": "~1.0.0"
     },
     "autoload": {
-      "psr-4": {
-        "Zend\\Expressive\\ZendView\\": "src/"
-      }
+        "psr-4": {
+            "Zend\\Expressive\\ZendView\\": "src/"
+        }
     },
     "autoload-dev": {
-      "psr-4": {
-        "ZendTest\\Expressive\\ZendView\\": "test/"
-      }
+        "psr-4": {
+            "ZendTest\\Expressive\\ZendView\\": "test/"
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.4.x-dev",
+            "dev-develop": "1.5.x-dev",
+            "dev-release-2.0.0": "2.0.x-dev"
+        }
     },
     "scripts": {
         "check": [
@@ -48,11 +60,11 @@
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
-        "cs-check": "phpcs --colors",
-        "cs-fix": "phpcbf --colors",
-        "license-check": "docheader check src/ test/",
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --coverage-clover clover.xml"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "upload-coverage": "coveralls -v",
+        "license-check": "docheader check src/ test/"
     }
 }
diff --git a/php-zendframework-zend-expressive-zendviewrenderer.spec b/php-zendframework-zend-expressive-zendviewrenderer.spec
index 6954f4a..0b93513 100644
--- a/php-zendframework-zend-expressive-zendviewrenderer.spec
+++ b/php-zendframework-zend-expressive-zendviewrenderer.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    0757034f2f97e4b966afcfb2937e9884204a062c
+%global gh_commit    6524aff83227a6cfb3589f2fd0c23ae6116fa3f8
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-expressive-zendviewrenderer
@@ -21,7 +21,7 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?dist}
 Summary:        zend-view PhpRenderer integration for Expressive
 
@@ -51,7 +51,7 @@ BuildRequires:  php-composer(%{gh_owner}/zend-view)                  >= 2.8.1
 BuildRequires:  php-composer(%{gh_owner}/zend-diactoros)
 # From composer, "require-dev": {
 #        "malukenho/docheader": "^0.1.5",
-#        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+#        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
 #        "zendframework/zend-coding-standard": "~1.0.0"
 %if 0%{?fedora} >= 26
 %global phpunit %{_bindir}/phpunit6
@@ -163,6 +163,9 @@ exit $ret
 
 
 %changelog
+* Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 1.4.1-1
+- Update to 1.4.1
+
 * Wed Mar 15 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1
 - Update to 1.4.0
 - use phpunit6 on F26+
-- 
cgit