update to 4.0.0

2 files changed, 43 insertions, 28 deletions

diff --git a/composer.json b/composer.json
index b49f953..b1515f3 100644
--- a/composer.json
+++ b/composer.json
@@ -27,16 +27,19 @@
         }
     ],
     "config": {
+        "platform": {
+            "php": "7.3.0"
+        },
         "optimize-autoloader": true,
         "sort-packages": true
     },
     "prefer-stable": true,
     "require": {
-        "php": "^7.0",
-        "sebastian/recursion-context": "^3.0"
+        "php": "^7.3",
+        "sebastian/recursion-context": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^9.0",
         "ext-mbstring": "*"
     },
     "autoload": {
@@ -46,7 +49,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev"
+            "dev-master": "4.0-dev"
         }
     }
 }
diff --git a/php-sebastian-exporter4.spec b/php-sebastian-exporter4.spec
index c1bdbb5..c27dec5 100644
--- a/php-sebastian-exporter4.spec
+++ b/php-sebastian-exporter4.spec
@@ -1,19 +1,23 @@
-# remirepo/fedora spec file for php-sebastian-exporter3
+# remirepo/fedora spec file for php-sebastian-exporter4
 #
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2020 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    68609e1261d215ea5b21b7987539cbfbe156ec3e
+%global gh_commit    80c26562e964016538f832f305b2286e1ec29566
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   exporter
+# Packagist
 %global pk_vendor    sebastian
 %global pk_project   %{gh_project}
-%global major        3
+# Namespace
+%global ns_vendor    SebastianBergmann
+%global ns_project   Exporter
+%global major        4
 %global php_home     %{_datadir}/php
 %global pear_name    Exporter
 %global pear_channel pear.phpunit.de
@@ -24,7 +28,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.1.2
+Version:        4.0.0
 Release:        1%{?dist}
 Summary:        Export PHP variables for visualization
 
@@ -33,31 +37,36 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 7.0
+BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 %if %{with_tests}
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.0",
+#        "phpunit/phpunit": "^9.0",
 #        "ext-mbstring": "*"
-BuildRequires:  phpunit6
+# TODO test suite passes with v8, switch to v9 when available
+BuildRequires:  phpunit8
 BuildRequires:  php-mbstring
+# remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires:  (php-composer(%{pk_vendor}/recursion-context) >= 3.0 with php-composer(%{pk_vendor}/recursion-context) < 4)
+BuildRequires:  (php-composer(%{pk_vendor}/recursion-context) >= 4.0 with php-composer(%{pk_vendor}/recursion-context) < 5)
+# remirepo:3
 %else
-BuildRequires:  php-sebastian-recursion-context3
+BuildRequires:  php-sebastian-recursion-context4
 %endif
 %endif
 
 # from composer.json
-#        "php": "^7.0",
-#        "sebastian/recursion-context": "^3.0"
-Requires:       php(language) >= 7.0
+#        "php": "^7.3",
+#        "sebastian/recursion-context": "^4.0"
+Requires:       php(language) >= 7.3
+# remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires:       (php-composer(%{pk_vendor}/recursion-context) >= 3.0 with php-composer(%{pk_vendor}/recursion-context) < 4)
+Requires:       (php-composer(%{pk_vendor}/recursion-context) >= 4.0 with php-composer(%{pk_vendor}/recursion-context) < 5)
+# remirepo:3
 %else
-Requires:       php-sebastian-recursion-context3
+Requires:       php-sebastian-recursion-context4
 %endif
-# from phpcompatinfo report for version 3.0.0
+# from phpcompatinfo report for version 4.0.0
 Requires:       php-mbstring
 Requires:       php-pcre
 Requires:       php-spl
@@ -79,16 +88,15 @@ Provides the functionality to export PHP variables for visualization.
 # generate the Autoloader
 phpab --template fedora --output src/autoload.php src
 
-# Rely on include_path as in PHPUnit dependencies
 cat <<EOF | tee -a src/autoload.php
 // Dependency' autoloader
-require_once 'SebastianBergmann/RecursionContext3/autoload.php';
+require_once '%{php_home}/%{ns_vendor}/RecursionContext4/autoload.php';
 EOF
 
 
 %install
-mkdir -p   %{buildroot}%{php_home}/SebastianBergmann
-cp -pr src %{buildroot}%{php_home}/SebastianBergmann/Exporter%{major}
+mkdir -p   %{buildroot}%{php_home}/%{ns_vendor}
+cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}
 
 
 %if %{with_tests}
@@ -98,10 +106,10 @@ touch vendor/autoload.php
 
 : Run upstream test suite
 ret=0
-for cmd in php php70 php71 php72 php73 php74; do
+for cmd in php php73 php74; do
   if which $cmd; then
-    %{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \
-    %{_bindir}/phpunit6  --verbose || ret=1
+    $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
+      %{_bindir}/phpunit8  --verbose || ret=1
   fi
 done
 exit $ret
@@ -109,14 +117,18 @@ exit $ret
 
 
 %files
+# remirepo:1
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
 %doc README.md
 %doc composer.json
-%{php_home}/SebastianBergmann/Exporter%{major}
+%{php_home}/%{ns_vendor}/%{ns_project}%{major}
 
 
 %changelog
+* Fri Feb  7 2020 Remi Collet <remi@remirepo.net> - 4.0.0-1
+- update to 4.0.0
+
 * Sun Sep 15 2019 Remi Collet <remi@remirepo.net> - 3.1.2-1
 - update to 3.1.2