- update to 3.3.2

- use phpunit7
- use range dependencies

2 files changed, 59 insertions, 31 deletions

diff --git a/composer.json b/composer.json
index d6d3b38..bfd067b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,19 @@
 {
     "name": "zendframework/zend-code",
-    "description": "provides facilities to generate arbitrary code using an object oriented interface",
+    "description": "Extensions to the PHP Reflection API, static code scanning, and code generation",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zf",
+        "zendframework",
         "code"
     ],
-    "homepage": "https://github.com/zendframework/zend-code",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Code\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-code/",
+        "issues": "https://github.com/zendframework/zend-code/issues",
+        "source": "https://github.com/zendframework/zend-code",
+        "rss": "https://github.com/zendframework/zend-code/releases.atom",
+        "chat": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
         "php": "^7.1",
@@ -18,21 +21,18 @@
     },
     "require-dev": {
         "ext-phar": "*",
-        "doctrine/annotations": "~1.0",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0",
-        "phpunit/phpunit": "^6.2.3",
-        "zendframework/zend-coding-standard": "^1.0.0"
+        "doctrine/annotations": "^1.0",
+        "phpunit/phpunit": "^7.5.15",
+        "zendframework/zend-coding-standard": "^1.0",
+        "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "suggest": {
         "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
         "zendframework/zend-stdlib": "Zend\\Stdlib component"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.3.x-dev",
-            "dev-develop": "3.4.x-dev"
+    "autoload": {
+        "psr-4": {
+            "Zend\\Code\\": "src/"
         }
     },
     "autoload-dev": {
@@ -40,12 +40,20 @@
             "ZendTest\\Code\\": "test/"
         }
     },
+    "config": {
+        "sort-packages": true
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.3.x-dev",
+            "dev-develop": "3.4.x-dev"
+        }
+    },
     "scripts": {
         "check": [
             "@cs-check",
             "@test"
         ],
-        "upload-coverage": "coveralls -v",
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
diff --git a/php-zendframework-zend-code.spec b/php-zendframework-zend-code.spec
index 519b5fc..3324a3c 100644
--- a/php-zendframework-zend-code.spec
+++ b/php-zendframework-zend-code.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    c21db169075c6ec4b342149f446e7b7b724f95eb
+%global gh_commit    936fa7ad4d53897ea3e3eb41b5b760828246a20b
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     zendframework
 %global gh_project   zend-code
@@ -20,7 +20,7 @@
 %endif
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        3.3.1
+Version:        3.3.2
 Release:        1%{?dist}
 Summary:        Zend Framework %{library} component
 
@@ -37,17 +37,27 @@ BuildRequires:  php-pcre
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
 BuildRequires:  php-tokenizer
-BuildRequires:  php-autoloader(%{gh_owner}/zend-eventmanager)   >= 2.6
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-eventmanager)   >= 2.6    with php-autoloader(%{gh_owner}/zend-eventmanager)   < 4)
 # From composer, "require-dev": {
 #        "ext-phar": "*",
-#        "doctrine/annotations": "~1.0",
-#        "zendframework/zend-stdlib": "^2.7 || ^3.0",
-#        "zendframework/zend-version": "~2.5",
-#        "phpunit/phpunit": "^6.2.3",
-#        "zendframework/zend-coding-standard": "^1.0.0"
+#        "doctrine/annotations": "^1.0",
+#        "phpunit/phpunit": "^7.5.15",
+#        "zendframework/zend-coding-standard": "^1.0",
+#        "zendframework/zend-stdlib": "^2.7 || ^3.0"
+BuildRequires: (php-composer(doctrine/annotations)              >= 1.0    with php-composer(doctrine/annotations)              < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7    with php-autoloader(%{gh_owner}/zend-stdlib)         < 4)
+# remirepo:4
+%else
+BuildRequires:  php-autoloader(%{gh_owner}/zend-eventmanager)   <  4
+BuildRequires:  php-autoloader(%{gh_owner}/zend-eventmanager)   >= 2.6
+BuildRequires:  php-composer(doctrine/annotations)              <  2
 BuildRequires:  php-composer(doctrine/annotations)              >= 1.0
+BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         <  4
 BuildRequires:  php-autoloader(%{gh_owner}/zend-stdlib)         >= 2.7
-BuildRequires:  phpunit6 >= 6.2.3
+%endif
+BuildRequires:  phpunit7 >= 7.5
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
@@ -57,14 +67,18 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "zendframework/zend-eventmanager": "^2.6 || ^3.0""
 Requires:       php(language) >= 7.1
 %if ! %{bootstrap}
-Requires:       php-autoloader(%{gh_owner}/zend-eventmanager)   >= 2.6
-Requires:       php-autoloader(%{gh_owner}/zend-eventmanager)   <  4
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-autoloader(%{gh_owner}/zend-eventmanager)   >= 2.6    with php-autoloader(%{gh_owner}/zend-eventmanager)   < 4)
 # From composer, "suggest": {
 #         "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
 #         "zendframework/zend-stdlib": "Zend\\Stdlib component"
-%if 0%{?fedora} >= 21
 Suggests:       php-composer(doctrine/annotations)
 Suggests:       php-autoloader(%{gh_owner}/zend-stdlib)
+# remirepo:4
+%else
+Requires:       php-autoloader(%{gh_owner}/zend-eventmanager)   <  4
+Requires:       php-autoloader(%{gh_owner}/zend-eventmanager)   >= 2.6
 %endif
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
@@ -127,9 +141,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
 EOF
 
 ret=0
+# TODO 7.4 Trying to access array offset on value of type null
 for cmd in php php71 php72 php73; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit6 --verbose || ret=1
+    $cmd %{_bindir}/phpunit7 --verbose || ret=1
   fi
 done
 exit $ret
@@ -147,6 +162,11 @@ exit $ret
 
 
 %changelog
+* Mon Sep  2 2019 Remi Collet <remi@remirepo.net> - 3.3.2-1
+- update to 3.3.2
+- use phpunit7
+- use range dependencies
+
 * Mon Aug 20 2018 Remi Collet <remi@remirepo.net> - 3.3.1-1
 - update to 3.3.1