From 5bf37f72736ae4eacccc27ef6189a43582a159b3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 21 Sep 2020 11:24:54 +0200
Subject: [PATCH] v4.10.0

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

diff --git a/.gitignore b/.gitignore
index 2ed2eb5..0b8cff0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ clog
 /php-nikic-php-parser4-4.8.0-8c58eb4.tgz
 /php-nikic-php-parser4-4.9.0-aaee038.tgz
 /php-nikic-php-parser4-4.9.1-88e5197.tgz
+/php-nikic-php-parser4-4.10.0-1c13d05.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 7928629..548ebdc 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    88e519766fc58bd46b8265561fb79b54e2e00b28
+%global gh_commit    1c13d05035deff45f1230ca68bd7d74d621762d9
 %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.9.1
+Version:        4.10.0
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -89,7 +89,7 @@ Autoloader: %{php_home}/%{ns_project}%{major}/autoload.php
 
 
 %build
-: Generate an simple PSR-4 autoloader
+: Generate an simple classmap autoloader
 phpab --template fedora \
       --output lib/%{ns_project}/autoload.php \
       lib/%{ns_project}
@@ -115,19 +115,24 @@ php bin/php-parse-test --help
 mkdir vendor
 cat << 'AUTOLOAD' | tee vendor/autoload.php
 <?php
-require_once '%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('%{ns_project}\\', dirname(__DIR__).'/test/PhpParser/');
 AUTOLOAD
 
 : Upstream test suite
-# ignore test failing on 32-bit (in koji)
+BITS=$(php -r 'echo PHP_INT_SIZE;')
+if [ $BITS -lt 8 ]; then
+   # ignore test failing on 32-bit (in koji)
+   FILTER="--filter '^((?!(testParse|testLexNewFeatures)).)*$'"
+else
+   FILTER=""
+fi
+
 ret=0
 for cmdarg in "php %{phpunit}" "php72%{_bindir}/phpunit8" php73 php74 php80; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit9} \
-      --filter '^((?!(testParse|testLexNewFeatures)).)*$' \
-      --verbose || ret=1
+    $1 -d auto_prepend_file=%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php \
+      ${2:-%{_bindir}/phpunit9} $FILTER --verbose || ret=1
   fi
 done
 exit $ret
@@ -145,6 +150,9 @@ exit $ret
 
 
 %changelog
+* Sun Sep 20 2020 Remi Collet <remi@remirepo.net> - 4.10.0-1
+- update to 4.10.0
+
 * Mon Aug 31 2020 Remi Collet <remi@remirepo.net> - 4.9.1-1
 - update to 4.9.1
 
diff --git a/sources b/sources
index a9c0d32..472fed5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.9.1-88e5197.tgz) = faec582ae5b38709263428ddcb03fa9f67546d811e4af93c64a0ce593c7f6e45526ed23951c0413c9f86be58fb554596be18d003f7fc86c7d03218a5fd35f051
+SHA512 (php-nikic-php-parser4-4.10.0-1c13d05.tgz) = cdbdaa7337ad775b11b1e6cd0be905988f9abf581d6467effabbf5f498bd9fedf61caf8d89f394095cc952bddb02825afafa0d4073c15f413712d406040f558e