Update to 2.7.0

raise dependency on PHP 5.6
switch to phpunit6

2 files changed, 66 insertions, 40 deletions

diff --git a/composer.json b/composer.json
index ca7374b..2e66ab4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,34 @@
 {
     "name": "zendframework/zend-console",
-    "description": " ",
+    "description": "Build console applications using getopt syntax or routing, complete with prompts",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "console"
     ],
-    "homepage": "https://github.com/zendframework/zend-console",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.6-dev",
-            "dev-develop": "2.7-dev"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-console/",
+        "issues": "https://github.com/zendframework/zend-console/issues",
+        "source": "https://github.com/zendframework/zend-console",
+        "rss": "https://github.com/zendframework/zend-console/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
+    },
+    "require": {
+        "php": "^5.6 || ^7.0",
+        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "zendframework/zend-coding-standard": "~1.0.0",
+        "zendframework/zend-filter": "^2.7.2",
+        "zendframework/zend-json": "^2.6 || ^3.0",
+        "zendframework/zend-validator": "^2.10.1"
+    },
+    "suggest": {
+        "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
+        "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
     },
     "autoload": {
         "psr-4": {
@@ -23,19 +40,23 @@
             "ZendTest\\Console\\": "test/"
         }
     },
-    "require": {
-        "php": "^5.5 || ^7.0",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+    "config": {
+        "sort-packages": true
     },
-    "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "^4.0",
-        "zendframework/zend-filter": "^2.6",
-        "zendframework/zend-json": "^2.6",
-        "zendframework/zend-validator": "^2.5"
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.7.x-dev",
+            "dev-develop": "2.8.x-dev"
+        }
     },
-    "suggest": {
-        "zendframework/zend-filter": "To support DefaultRouteMatcher usage",
-        "zendframework/zend-validator": "To support DefaultRouteMatcher usage"
+    "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-console.spec b/php-zendframework-zend-console.spec
index ed8ffa1..82e14f8 100644
--- a/php-zendframework-zend-console.spec
+++ b/php-zendframework-zend-console.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    cbbdfdfa0564aa20d1c6c6ef3daeafe6aec02360
+%global gh_commit    e8aa08da83de3d265256c40ba45cd649115f0e18
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-console
@@ -20,8 +20,8 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.6.0
-Release:        5%{?dist}
+Version:        2.7.0
+Release:        2%{?dist}
 Summary:        Zend Framework %{library} component
 
 Group:          Development/Libraries
@@ -33,34 +33,34 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.5
+BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-ctype
 BuildRequires:  php-dom
 BuildRequires:  php-pcre
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
 BuildRequires:  php-xml
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7
 # From composer, "require-dev": {
-#        "fabpot/php-cs-fixer": "1.7.*",
-#        "phpunit/PHPUnit": "~4.0",
-#        "zendframework/zend-filter": "^2.6",
-#        "zendframework/zend-json": "^2.6",
-#        "zendframework/zend-validator": "^2.5"
-BuildRequires:  php-autoloader(%{gh_owner}/zend-filter)         >= 2.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           >= 2.5
-BuildRequires:  php-autoloader(%{gh_owner}/zend-validator)      >= 2.5
-BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.0
+#        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+#        "zendframework/zend-coding-standard": "~1.0.0",
+#        "zendframework/zend-filter": "^2.7.2",
+#        "zendframework/zend-json": "^2.6 || ^3.0",
+#        "zendframework/zend-validator": "^2.10.1"
+BuildRequires:  phpunit6                                        >= 6.4.3
+BuildRequires:  php-autoloader(%{gh_owner}/zend-filter)         >= 2.7.2
+BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           >= 2.6
+BuildRequires:  php-autoloader(%{gh_owner}/zend-validator)      >= 2.10.1
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.5 || ^7.0",
-#        "zendframework/zend-stdlib": "^2.7 || ^3.0"
-Requires:       php(language) >= 5.5
+#        "php": "^5.6 || ^7.0",
+#        "zendframework/zend-stdlib": "^2.7.7 || ^3.1"
+Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7.7
 Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
 # From composer, "suggest": {
 #        "zendframework/zend-validator": "To support DefaultRouteMatcher usage",
@@ -129,9 +129,9 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php70 php71 php72; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit || ret=1
+    $cmd %{_bindir}/phpunit6 || ret=1
   fi
 done
 exit $ret
@@ -149,6 +149,11 @@ exit $ret
 
 
 %changelog
+* Fri Jan 26 2018 Remi Collet <remi@remirepo.net> - 2.7.0-1
+- Update to 2.7.0
+- raise dependency on PHP 5.6
+- switch to phpunit6
+
 * Thu Dec  7 2017 Remi Collet <remi@remirepo.net> - 2.6.0-5
 - switch from zend-loader to fedora/autoloader