update to 2.6.0

raise dependency on PHP 5.6
use range dependencies on F27+
switch to phpunit6 or phpunit7

2 files changed, 81 insertions, 36 deletions

diff --git a/composer.json b/composer.json
index 97a048f..3862ced 100644
--- a/composer.json
+++ b/composer.json
@@ -1,42 +1,61 @@
 {
     "name": "zendframework/zend-progressbar",
-    "description": "component to create and update progressbars in different environments",
+    "description": "Create and update progress bars in different environments",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "progressbar"
     ],
-    "homepage": "https://github.com/zendframework/zend-progressbar",
-    "autoload": {
-        "psr-4": {
-            "Zend\\ProgressBar\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-progressbar/",
+        "issues": "https://github.com/zendframework/zend-progressbar/issues",
+        "source": "https://github.com/zendframework/zend-progressbar",
+        "rss": "https://github.com/zendframework/zend-progressbar/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
-        "php": "^5.5 || ^7.0",
+        "php": "^5.6 || ^7.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-json": "^2.6.1",
-        "zendframework/zend-session": "^2.6.2",
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/PHPUnit": "~4.0"
+        "zendframework/zend-session": "^2.8.5"
     },
     "suggest": {
         "zendframework/zend-json": "Zend\\Json component",
         "zendframework/zend-session": "To support progressbar persistent"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.5-dev",
-            "dev-develop": "2.6-dev"
+    "autoload": {
+        "psr-4": {
+            "Zend\\ProgressBar\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\ProgressBar\\": "test/"
         }
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.6.x-dev",
+            "dev-develop": "2.7.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-progressbar.spec b/php-zendframework-zend-progressbar.spec
index 96d32a0..0e85391 100644
--- a/php-zendframework-zend-progressbar.spec
+++ b/php-zendframework-zend-progressbar.spec
@@ -1,13 +1,13 @@
 # remirepo/Fedora spec file for php-zendframework-zend-progressbar
 #
-# 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    0723a1f5f7c3f90cdde80ea68cb781e099c770bc
+%global gh_commit    ae5565bbed54f9081d5695bc2f62fe3f27583bdd
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-progressbar
@@ -20,8 +20,8 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        2.5.2
-Release:        4%{?dist}
+Version:        2.6.0
+Release:        2%{?dist}
 Summary:        Zend Framework %{library} component
 
 Group:          Development/Libraries
@@ -33,38 +33,57 @@ Source1:        makesrc.sh
 BuildArch:      noarch
 # Tests
 %if %{with_tests}
-BuildRequires:  php(language) >= 5.5
+BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-date
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
-BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
 # From composer, "require-dev": {
+#        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
+#        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-json": "^2.6.1",
-#        "zendframework/zend-session": "^2.6.2",
-#        "fabpot/php-cs-fixer": "1.7.*",
-#        "phpunit/PHPUnit": "~4.0"
+#        "zendframework/zend-session": "^2.8.5"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+# ignore max version
+BuildRequires: (php-autoloader(%{gh_owner}/zend-json)           >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json)           < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-session)        >= 2.8.5 with php-autoloader(%{gh_owner}/zend-session)        < 3)
+%global phpunit %{_bindir}/phpunit7
+BuildRequires:  phpunit7 >= 7.1.4
+# remirepo:10
+%else
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           <  4
 BuildRequires:  php-autoloader(%{gh_owner}/zend-json)           >= 2.6.1
-BuildRequires:  php-autoloader(%{gh_owner}/zend-session)        >= 2.6.2
-BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.0
+BuildRequires:  php-autoloader(%{gh_owner}/zend-session)        <  3
+BuildRequires:  php-autoloader(%{gh_owner}/zend-session)        >= 2.8.5
+%global phpunit %{_bindir}/phpunit6
+BuildRequires:  phpunit6 >= 6.5.8
+%endif
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 
 # From composer, "require": {
-#        "php": "^5.5 || ^7.0",
+#        "php": "^5.6 || ^7.0",
 #        "zendframework/zend-stdlib": "^2.7 || ^3.0"
-Requires:       php(language) >= 5.5
+Requires:       php(language) >= 5.6
 %if ! %{bootstrap}
-Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7   with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+# remirepo:4
+%else
 Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         <  4
+Requires:       php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
+%endif
 # From composer, "suggest": {
 #        "zendframework/zend-json": "Zend\\Json component",
 #        "zendframework/zend-session": "To support progressbar persistent"
-%if 0%{?fedora} >= 21
 Suggests:       php-autoloader(%{gh_owner}/zend-json)
 Suggests:       php-autoloader(%{gh_owner}/zend-session)
 %endif
-%endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 # From phpcompatinfo report for version 2.5.1
@@ -125,9 +144,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 EOF
 
 ret=0
-for cmd in php php56 php70 php71 php72; do
-  if which $cmd; then
-    $cmd %{_bindir}/phpunit || ret=1
+for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do
+  if which $cmdarg; then
+    set $cmdarg
+    $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
   fi
 done
 exit $ret
@@ -145,6 +165,12 @@ exit $ret
 
 
 %changelog
+* Thu May  3 2018 Remi Collet <remi@remirepo.net> - 2.6.0-2
+- update to 2.6.0
+- raise dependency on PHP 5.6
+- use range dependencies on F27+
+- switch to phpunit6 or phpunit7
+
 * Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.5.2-4
 - switch from zend-loader to fedora/autoloader