From 1be8e98e04a995ac666baed4ec397bd3e1e8feee Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 20 Aug 2019 15:35:02 +0200
Subject: [PATCH] update to 4.2.3 use phpunit8

(cherry picked from commit ee331dcfe2b19eaf5eaefc0605ada7ad2f48ef2c)
---
 .gitignore                 |  1 +
 php-nikic-php-parser4.spec | 18 +++++++++++-------
 sources                    |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index fbe5034..87eb8b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /php-nikic-php-parser4-4.2.0-594bcae.tar.gz
 /php-nikic-php-parser4-4.2.1-5221f49.tar.gz
 /php-nikic-php-parser4-4.2.2-1bd73cc.tar.gz
+/php-nikic-php-parser4-4.2.3-e612609.tar.gz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index a77d03c..c41640c 100644
--- a/php-nikic-php-parser4.spec
+++ b/php-nikic-php-parser4.spec
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    1bd73cc04c3843ad8d6b0bfc0956026a151fc420
+%global gh_commit    e612609022e935f3d0337c1295176505b41188c8
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nikic
 %global gh_project   PHP-Parser
@@ -21,7 +21,7 @@
 %global major        4
 
 Name:           php-%{gh_owner}-%{pk_project}%{major}
-Version:        4.2.2
+Version:        4.2.3
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -43,9 +43,9 @@ BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.5 || ^7.0"
-%global phpunit %{_bindir}/phpunit7
-BuildRequires:  phpunit7
+#        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+%global phpunit %{_bindir}/phpunit8
+BuildRequires:  phpunit8
 # Autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 %endif
@@ -122,10 +122,10 @@ AUTOLOAD
 
 : Upstream test suite
 ret=0
-for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
+    $1 ${2:-%{_bindir}/phpunit8} --verbose || ret=1
   fi
 done
 exit $ret
@@ -143,6 +143,10 @@ exit $ret
 
 
 %changelog
+* Mon Aug 19 2019 Remi Collet <remi@remirepo.net> - 4.2.3-1
+- update to 4.2.3
+- use phpunit8
+
 * Mon May 27 2019 Remi Collet <remi@remirepo.net> - 4.2.2-1
 - update to 4.2.2
 
diff --git a/sources b/sources
index 37f98b2..4e9691a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.2.2-1bd73cc.tar.gz) = f28591a6daa44d19c367cde731be8b59d2d7116945c857d76bf95bbe9e5ba7b300261efb1e57170657f775371f866a695f4aa72e9ad99e3055f7069a778d15fd
+SHA512 (php-nikic-php-parser4-4.2.3-e612609.tar.gz) = 9a10ff286139fc8830a3e6f8bb56a82682c5d2d5339e9b3dafd3b747ae31fd9a56cac9d126c7e9818882918346598b1b528d0b4fb89075d147baa7e877561505