- update to 2.8.0

use range dependencies on F27+
switch to phpunit6 or phpunit7

2 files changed, 74 insertions, 28 deletions

diff --git a/composer.json b/composer.json
index 34058fd..dd5d1ad 100644
--- a/composer.json
+++ b/composer.json
@@ -1,26 +1,28 @@
 {
     "name": "zendframework/zend-server",
-    "description": " ",
+    "description": "Create Reflection-based RPC servers",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "server"
     ],
-    "homepage": "https://github.com/zendframework/zend-server",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.7-dev",
-            "dev-develop": "2.8-dev"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-server/",
+        "issues": "https://github.com/zendframework/zend-server/issues",
+        "source": "https://github.com/zendframework/zend-server",
+        "rss": "https://github.com/zendframework/zend-server/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "zendframework/zend-stdlib": "^2.5 || ^3.0",
-        "zendframework/zend-code": "^2.5 || ^3.0"
+        "zendframework/zend-code": "^2.5 || ^3.0",
+        "zendframework/zend-stdlib": "^2.5 || ^3.0"
     },
     "require-dev": {
-        "phpunit/phpUnit": "^4.8",
-        "squizlabs/php_codesniffer": "^2.3.1"
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+        "zendframework/zend-coding-standard": "~1.0.0"
     },
     "autoload": {
         "psr-4": {
@@ -34,5 +36,24 @@
         "files": [
             "test/TestAsset/reflectionTestFunction.php"
         ]
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.8.x-dev",
+            "dev-develop": "2.9.x-dev"
+        }
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors=always",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }
diff --git a/php-zendframework-zend-server.spec b/php-zendframework-zend-server.spec
index f83d5c4..15f3d57 100644
--- a/php-zendframework-zend-server.spec
+++ b/php-zendframework-zend-server.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for php-zendframework-zend-server
 #
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    7cb617ca3e9b24579f544a244ee79ae61f480914
+%global gh_commit    23a2e9a5599c83c05da831cb7c649e8a7809595e
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-server
@@ -20,8 +20,8 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.7.0
-Release:        4%{?dist}
+Version:        2.8.0
+Release:        2%{?dist}
 Summary:        Zend Framework %{library} component
 
 Group:          Development/Libraries
@@ -37,26 +37,45 @@ BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 BuildRequires:  php-reflection
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-code)           >= 2.5
 # From composer, "require-dev": {
-#        "phpunit/phpUnit": "^4.8",
-#        "squizlabs/php_codesniffer": "^2.3.1"
-BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.8
+#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+#        "zendframework/zend-coding-standard": "~1.0.0"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-code)           >= 2.5   with php-autoloader(%{gh_owner}/zend-code)           < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)         >= 3.0   with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+%global phpunit %{_bindir}/phpunit7
+BuildRequires:  phpunit7 >= 7.1.4
+# remirepo:8
+%else
+BuildRequires:  php-autoloader(%{gh_owner}/zend-code)           <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-code)           >= 2.5
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.5
+%global phpunit %{_bindir}/phpunit6
+BuildRequires:  phpunit6 >= 6.5.8
+%endif
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
 #        "php": "^5.6 || ^7.0",
-#        "zendframework/zend-stdlib": "^2.5 || ^3.0",
 #        "zendframework/zend-code": "^2.5 || ^3.0"
+#        "zendframework/zend-stdlib": "^2.5 || ^3.0",
 Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.5
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
-Requires:       php-autoloader(%{gh_owner}/zend-code)           >= 2.5
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/zend-code)           >= 2.5   with php-autoloader(%{gh_owner}/zend-code)           < 4)
+Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.5   with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+# remirepo:6
+%else
 Requires:       php-autoloader(%{gh_owner}/zend-code)           <  4
+Requires:       php-autoloader(%{gh_owner}/zend-code)           >= 2.5
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.5
+%endif
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
@@ -114,9 +133,10 @@ require_once 'test/TestAsset/reflectionTestFunction.php';
 EOF
 
 ret=0
-for cmd in php php56 php70 php71 php72; do
-  if which $cmd; then
-    $cmd %{_bindir}/phpunit --verbose || ret=1
+for cmdarg in "php %{phpunit}" php71 php72; do
+  if which $cmdarg; then
+    set $cmdarg
+    $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
   fi
 done
 exit $ret
@@ -134,6 +154,11 @@ exit $ret
 
 
 %changelog
+* Thu May  3 2018 Remi Collet <remi@remirepo.net> - 2.8.0-2
+- update to 2.8.0
+- use range dependencies on F27+
+- switch to phpunit6 or phpunit7
+
 * Thu Nov 23 2017 Remi Collet <remi@remirepo.net> - 2.7.0-4
 - switch from zend-loader to fedora/autoloader