v3.1.0

3 files changed, 71 insertions, 33 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1ab5c4f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+package-*.xml
+*.tgz
+*.tar.gz
+*.tar.xz
+*.tar.xz.asc
+*.src.rpm
+*/*rpm
diff --git a/composer.json b/composer.json
index b118d69..29c6780 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,14 @@
         "test"
     ],
     "homepage": "https://github.com/zendframework/zend-test",
+    "config": {
+        "sort-packages": true
+    },
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-test/",
+        "forum": "https://discourse.zendframework.com/c/questions/components",
+        "issues": "https://github.com/zendframework/zend-test/issues"
+    },
     "autoload": {
         "psr-4": {
             "Zend\\Test\\": "src/"
@@ -14,7 +22,8 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "phpunit/phpunit": "^4.0 || ^5.0",
+        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0",
+        "sebastian/version": "^1.0.4 || ^2.0",
         "zendframework/zend-console": "^2.6",
         "zendframework/zend-dom": "^2.6",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
@@ -23,20 +32,19 @@
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "zendframework/zend-stdlib": "^2.7 || ^3.0",
         "zendframework/zend-uri": "^2.5",
-        "zendframework/zend-view": "^2.6.3",
-        "sebastian/version": "^1.0.4 || ^2.0"
+        "zendframework/zend-view": "^2.6.3"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "symfony/finder": "^2.2",
         "mikey179/vfsStream": "~1.2",
+        "symfony/finder": "^2.2",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-i18n": "^2.6",
         "zendframework/zend-log": "^2.7.1",
         "zendframework/zend-modulemanager": "^2.7.1",
+        "zendframework/zend-mvc-console": "^1.1.8",
+        "zendframework/zend-mvc-plugin-flashmessenger": "^0.1.0",
         "zendframework/zend-serializer": "^2.6.1",
         "zendframework/zend-session": "^2.6.2",
-        "zendframework/zend-mvc-plugin-flashmessenger": "^0.1.0",
-        "zendframework/zend-mvc-console": "^1.1.8",
         "zendframework/zend-validator": "^2.8"
     },
     "suggest": {
@@ -44,13 +52,27 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev",
-            "dev-develop": "3.1-dev"
+            "dev-master": "3.1-dev",
+            "dev-develop": "3.2-dev"
         }
     },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Test\\": "test/"
-        }
+        },
+        "files": [
+            "autoload/phpunit-class-aliases.php"
+        ]
+    },
+    "scripts": {
+        "check": [
+            "@cs-check",
+            "@test"
+        ],
+        "cs-check": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit --colors",
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
+        "upload-coverage": "coveralls -v"
     }
 }
diff --git a/php-zendframework-zend-test.spec b/php-zendframework-zend-test.spec
index bf89a33..e7a9afb 100644
--- a/php-zendframework-zend-test.spec
+++ b/php-zendframework-zend-test.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    f1ee9ae3f69446f19f4015826b7a70d5ff2f5644
+%global gh_commit    9665205827ed6ee69f1ef82990362057c789250c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-test
@@ -20,7 +20,7 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        3.0.2
+Version:        3.1.0
 Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
@@ -36,6 +36,7 @@ BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 5.6
 BuildRequires:  php-composer(phpunit/phpunit)                   >= 4.0
+BuildRequires:  phpunit6
 BuildRequires:  php-pcre
 BuildRequires:  php-composer(%{gh_owner}/zend-console)          >= 2.6
 BuildRequires:  php-composer(%{gh_owner}/zend-dom)              >= 2.6
@@ -47,15 +48,16 @@ BuildRequires:  php-composer(%{gh_owner}/zend-stdlib)           >= 2.7
 BuildRequires:  php-composer(%{gh_owner}/zend-uri)              >= 2.5
 BuildRequires:  php-composer(%{gh_owner}/zend-view)             >= 2.6.3
 # From composer, "require-dev": {
-#        "fabpot/php-cs-fixer": "1.7.*",
 #        "mikey179/vfsStream": "~1.2",
+#        "symfony/finder": "^2.2",
+#        "zendframework/zend-coding-standard": "~1.0.0",
 #        "zendframework/zend-i18n": "^2.6",
 #        "zendframework/zend-log": "^2.7.1",
 #        "zendframework/zend-modulemanager": "^2.7.1",
+#        "zendframework/zend-mvc-console": "^1.1.8",
+#        "zendframework/zend-mvc-plugin-flashmessenger": "^0.1.0",
 #        "zendframework/zend-serializer": "^2.6.1",
 #        "zendframework/zend-session": "^2.6.2",
-#        "zendframework/zend-mvc-plugin-flashmessenger": "^0.1.0",
-#        "zendframework/zend-mvc-console": "^1.1.8",
 #        "zendframework/zend-validator": "^2.8"
 BuildRequires:  php-composer(mikey179/vfsStream)                >= 1.2
 BuildRequires:  php-composer(%{gh_owner}/zend-i18n)             >= 2.6
@@ -72,7 +74,8 @@ BuildRequires:  php-composer(%{gh_owner}/zend-loader)           >= 2.5
 
 # From composer, "require": {
 #        "php": "^5.6 || ^7.0",
-#        "phpunit/phpunit": "^4.0 || ^5.0",
+#        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0",
+#        "sebastian/version": "^1.0.4 || ^2.0",
 #        "zendframework/zend-console": "^2.6",
 #        "zendframework/zend-dom": "^2.6",
 #        "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
@@ -81,11 +84,14 @@ BuildRequires:  php-composer(%{gh_owner}/zend-loader)           >= 2.5
 #        "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
 #        "zendframework/zend-stdlib": "^2.7 || ^3.0",
 #        "zendframework/zend-uri": "^2.5",
-#        "zendframework/zend-view": "^2.6.3",
-#        "sebastian/version": "^1.0.4 || ^2.0"
+#        "zendframework/zend-view": "^2.6.3"
 Requires:       php(language) >= 5.6
+%if 0%{?fedora} >= 25
+Recommends:     phpunit6
+Recommends:     php-composer(phpunit/phpunit)                   >= 4.0
+%else
 Requires:       php-composer(phpunit/phpunit)                   >= 4.0
-Requires:       php-composer(phpunit/phpunit)                   <  6
+%endif
 Requires:       php-composer(sebastian/version)                 >= 1.0.4
 Requires:       php-composer(sebastian/version)                 <  3
 %if ! %{bootstrap}
@@ -156,23 +162,21 @@ Zend\Loader\AutoloaderFactory::factory(array(
            'Zend\\%{library}'     => '%{buildroot}%{php_home}/Zend/%{library}'
 ))));
 require_once '%{php_home}/Zend/autoload.php';
+require_once 'autoload/phpunit-class-aliases.php';
 EOF
 
-# remirepo:11
-run=0
+# 7.2: https://github.com/zendframework/zend-session/issues/74
 ret=0
-if which php56; then
-   php56 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1
-   run=1
-fi
-if which php71; then
-   php71 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1
-   run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} --verbose
-# remirepo:2
-fi
+for cmd in php php56 php70 php71; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit --verbose || ret=1
+  fi
+done
+for cmd in php php70 php71; do
+  if which $cmd; then
+    $cmd %{_bindir}/phpunit6 --verbose || ret=1
+  fi
+done
 exit $ret
 %else
 : Test suite disabled
@@ -193,6 +197,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue May  2 2017 Remi Collet <remi@remirepo.net> - 3.1.0-1
+- Update to 3.1.0
+- run test suite against phpunit v5 and v6
+- make dependency in phpunit optional (v5 or v6)
+
 * Wed Sep  7 2016 Remi Collet <remi@fedoraproject.org> - 3.0.2-1
 - update to 3.0.2