From 7174f3a148b5ea69d6344985dcf1b336827214ef Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 14 Apr 2020 14:28:40 +0200
Subject: [PATCH 01/10] v4.4.0

(cherry picked from commit 30d2e144001c818c7c996f9c4beec330f8c12c35)
---
 .gitignore                 |  1 +
 php-nikic-php-parser4.spec | 11 +++++++----
 sources                    |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e4240a0..469d17a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 clog
 /php-nikic-php-parser4-4.2.5-b76bbc3.tgz
 /php-nikic-php-parser4-4.3.0-9a9981c.tgz
+/php-nikic-php-parser4-4.4.0-bd43ec7.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 36670e4..fede7a7 100644
--- a/php-nikic-php-parser4.spec
+++ b/php-nikic-php-parser4.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-nikic-php-parser4
 #
-# Copyright (c) 2016-2019 Remi Collet
+# Copyright (c) 2016-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    9a9981c347c5c49d6dfe5cf826bb882b824080dc
+%global gh_commit    bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120
 %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.3.0
+Version:        4.4.0
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -125,7 +125,7 @@ AUTOLOAD
 : Upstream test suite
 # ignore test failing on 32-bit (in koji)
 ret=0
-for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
+for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74 php80; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit8} \
@@ -148,6 +148,9 @@ exit $ret
 
 
 %changelog
+* Mon Apr 13 2020 Remi Collet <remi@remirepo.net> - 4.4.0-1
+- update to 4.4.0
+
 * Tue Nov 12 2019 Remi Collet <remi@remirepo.net> - 4.3.0-1
 - update to 4.3.0
 
diff --git a/sources b/sources
index 6fc7ca3..083aab7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.3.0-9a9981c.tgz) = f7aa21e66e3b9851099a5f1deee2d797c187707f9262ee604d4b19a1acfef68395ec0461c8439cb67b21e116dbcfdb3e51a71950f3aff753e5e2d473c0c7c0ae
+SHA512 (php-nikic-php-parser4-4.4.0-bd43ec7.tgz) = 77206fdaae79125ab04267ee0ee9df7a1ebf02538ed6b84b99b6ad6a6cc4a026211c0d40fb95874b303c1718f9e59ecc4243cc64a9d390a22207950a6392e3a2

From 8867d61adc7cd18e6aefd6db8079d31c758f04c3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 3 Jun 2020 10:36:05 +0200
Subject: [PATCH 02/10] v4.5.0

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

diff --git a/.gitignore b/.gitignore
index 469d17a..cb7f6e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ clog
 /php-nikic-php-parser4-4.2.5-b76bbc3.tgz
 /php-nikic-php-parser4-4.3.0-9a9981c.tgz
 /php-nikic-php-parser4-4.4.0-bd43ec7.tgz
+/php-nikic-php-parser4-4.5.0-53c2753.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index fede7a7..15d6c55 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    bd43ec7152eaaab3bd8c6d0aa95ceeb1df8ee120
+%global gh_commit    53c2753d756f5adb586dca79c2ec0e2654dd9463
 %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.4.0
+Version:        4.5.0
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -148,6 +148,9 @@ exit $ret
 
 
 %changelog
+* Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 4.5.0-1
+- update to 4.5.0
+
 * Mon Apr 13 2020 Remi Collet <remi@remirepo.net> - 4.4.0-1
 - update to 4.4.0
 
diff --git a/sources b/sources
index 083aab7..cf3981f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.4.0-bd43ec7.tgz) = 77206fdaae79125ab04267ee0ee9df7a1ebf02538ed6b84b99b6ad6a6cc4a026211c0d40fb95874b303c1718f9e59ecc4243cc64a9d390a22207950a6392e3a2
+SHA512 (php-nikic-php-parser4-4.5.0-53c2753.tgz) = 74491ce0abf5e652cb85e49b8a0a90c9ea1b8c41189e1c51c3a7f1121ed733c7c59cebb064b1a49d652f4d89774e89bd22e55c53eac8068e701e712d69f40e53

From fbbb3e5adcb03f8540f5705aa2aab9b20df5f5b1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 25 Jun 2020 16:46:45 +0200
Subject: [PATCH 03/10] switch to classmap autoloader add missing dependency on
 fedora/autoloader

(cherry picked from commit 0fab98ee1a2fdf337adf740d489ce90436e6b050)
---
 php-nikic-php-parser4.spec | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 15d6c55..f81c838 100644
--- a/php-nikic-php-parser4.spec
+++ b/php-nikic-php-parser4.spec
@@ -22,7 +22,7 @@
 
 Name:           php-%{gh_owner}-%{pk_project}%{major}
 Version:        4.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
 License:        BSD
@@ -49,7 +49,7 @@ BuildRequires:  php-spl
 %global phpunit %{_bindir}/phpunit8
 BuildRequires:  phpunit8
 # Autoloader
-BuildRequires:  php-composer(fedora/autoloader)
+BuildRequires:  php-fedora-autoloader-devel
 %endif
 
 # From composer.json, "require": {
@@ -65,7 +65,7 @@ Requires:       php-pcre
 Requires:       php-spl
 Requires:       php-cli
 # Autoloader
-BuildRequires:  php-composer(fedora/autoloader)
+Requires:       php-composer(fedora/autoloader)
 
 Provides:       php-composer(%{gh_owner}/%{pk_project}) = %{version}
 
@@ -89,13 +89,9 @@ Autoloader: %{php_home}/%{ns_project}%{major}/autoload.php
 
 %build
 : Generate an simple PSR-4 autoloader
-cat << 'AUTOLOAD' | tee lib/%{ns_project}/autoload.php
-<?php
-/* Autoloader for %{name} and its dependencies */
-require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
-
-\Fedora\Autoloader\Autoload::addPsr4('%{ns_project}\\', __DIR__);
-AUTOLOAD
+phpab --template fedora \
+      --output lib/%{ns_project}/autoload.php \
+      lib/%{ns_project}
 
 
 %install
@@ -148,6 +144,10 @@ exit $ret
 
 
 %changelog
+* Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 4.5.0-2
+- switch to classmap autoloader
+- add missing dependency on fedora/autoloader
+
 * Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 4.5.0-1
 - update to 4.5.0
 

From 7985a4c863fb9be10ef847fd0733d645a3c9e3ae Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 3 Jul 2020 07:05:50 +0200
Subject: [PATCH 04/10] v4.6.0

(cherry picked from commit 5005fd5b06dbb07b7bbcb997334b97cf6e04de98)
---
 .gitignore                 |  1 +
 php-nikic-php-parser4.spec | 12 ++++++++----
 sources                    |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index cb7f6e6..c75e924 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
 /php-nikic-php-parser4-4.3.0-9a9981c.tgz
 /php-nikic-php-parser4-4.4.0-bd43ec7.tgz
 /php-nikic-php-parser4-4.5.0-53c2753.tgz
+/php-nikic-php-parser4-4.6.0-c346bbf.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index f81c838..d74d7ad 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    53c2753d756f5adb586dca79c2ec0e2654dd9463
+%global gh_commit    c346bbfafe2ff60680258b631afb730d186ed864
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nikic
 %global gh_project   PHP-Parser
@@ -21,8 +21,8 @@
 %global major        4
 
 Name:           php-%{gh_owner}-%{pk_project}%{major}
-Version:        4.5.0
-Release:        2%{?dist}
+Version:        4.6.0
+Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
 License:        BSD
@@ -36,7 +36,8 @@ Patch0:         %{name}-rpm.patch
 BuildArch:      noarch
 %if %{with_tests}
 # For tests
-BuildRequires:  php(language) >= 7.0
+# as we use phpunit8
+BuildRequires:  php(language) >= 7.2
 BuildRequires:  php-tokenizer
 BuildRequires:  php-reflection
 BuildRequires:  php-ctype
@@ -144,6 +145,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul  3 2020 Remi Collet <remi@remirepo.net> - 4.6.0-1
+- update to 4.6.0
+
 * Thu Jun 25 2020 Remi Collet <remi@remirepo.net> - 4.5.0-2
 - switch to classmap autoloader
 - add missing dependency on fedora/autoloader
diff --git a/sources b/sources
index cf3981f..ed33c6e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.5.0-53c2753.tgz) = 74491ce0abf5e652cb85e49b8a0a90c9ea1b8c41189e1c51c3a7f1121ed733c7c59cebb064b1a49d652f4d89774e89bd22e55c53eac8068e701e712d69f40e53
+SHA512 (php-nikic-php-parser4-4.6.0-c346bbf.tgz) = 0d1f38f254907e6cf26fe9cf1ef58497d768d9782395ee663c5f1f295856b47428d7442fb734553e6e1fe814f97eac61bc6c9159d66427df7c2124486ac80ba7

From 17684a78c38c5208a261c943fd3218be53627b29 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 10 Aug 2020 12:13:11 +0200
Subject: [PATCH 05/10] v4.8.0

(cherry picked from commit f2aecc50e3f1502f1728161306d70fcb1829ef90)
(cherry picked from commit 152ed850a3d9248c8f3b4384a69112c47992d010)
---
 .gitignore                 | 1 +
 php-nikic-php-parser4.spec | 9 ++++++---
 sources                    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index c75e924..de35295 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
 /php-nikic-php-parser4-4.4.0-bd43ec7.tgz
 /php-nikic-php-parser4-4.5.0-53c2753.tgz
 /php-nikic-php-parser4-4.6.0-c346bbf.tgz
+/php-nikic-php-parser4-4.8.0-8c58eb4.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index d74d7ad..2180e40 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    c346bbfafe2ff60680258b631afb730d186ed864
+%global gh_commit    8c58eb4cd4f3883f82611abeac2efbc3dbed787e
 %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.6.0
+Version:        4.8.0
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -122,7 +122,7 @@ AUTOLOAD
 : Upstream test suite
 # ignore test failing on 32-bit (in koji)
 ret=0
-for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php72 php73 "php74 %{_bindir}/phpunit9" "php80 %{_bindir}/phpunit9"; do
   if which $cmdarg; then
     set $cmdarg
     $1 ${2:-%{_bindir}/phpunit8} \
@@ -145,6 +145,9 @@ exit $ret
 
 
 %changelog
+* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 4.8.0-1
+- update to 4.8.0
+
 * Fri Jul  3 2020 Remi Collet <remi@remirepo.net> - 4.6.0-1
 - update to 4.6.0
 
diff --git a/sources b/sources
index ed33c6e..fd801c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.6.0-c346bbf.tgz) = 0d1f38f254907e6cf26fe9cf1ef58497d768d9782395ee663c5f1f295856b47428d7442fb734553e6e1fe814f97eac61bc6c9159d66427df7c2124486ac80ba7
+SHA512 (php-nikic-php-parser4-4.8.0-8c58eb4.tgz) = a7ee517482c17defeadb788a9ed4870362a935ddbe456a1f00a49c54cec0b46120d75d0c255c5ea6ddf5bf73fb915b70942c62450845094d2cbfac250e415fa8

From 0b30273dd8cd21ec3bf8ceedc4e712368100fa6f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 19 Aug 2020 08:42:23 +0200
Subject: [PATCH 06/10] v4.9.0

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

diff --git a/.gitignore b/.gitignore
index de35295..ab03b39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ clog
 /php-nikic-php-parser4-4.5.0-53c2753.tgz
 /php-nikic-php-parser4-4.6.0-c346bbf.tgz
 /php-nikic-php-parser4-4.8.0-8c58eb4.tgz
+/php-nikic-php-parser4-4.9.0-aaee038.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 2180e40..88893c8 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    8c58eb4cd4f3883f82611abeac2efbc3dbed787e
+%global gh_commit    aaee038b912e567780949787d5fe1977be11a778
 %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.8.0
+Version:        4.9.0
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -45,8 +45,8 @@ BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0",
-#        "ircmaxell/php-yacc": "0.0.5"
+#        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0",
+#        "ircmaxell/php-yacc": "0.0.7"
 %global phpunit %{_bindir}/phpunit8
 BuildRequires:  phpunit8
 # Autoloader
@@ -145,6 +145,9 @@ exit $ret
 
 
 %changelog
+* Wed Aug 19 2020 Remi Collet <remi@remirepo.net> - 4.9.0-1
+- update to 4.9.0
+
 * Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 4.8.0-1
 - update to 4.8.0
 
diff --git a/sources b/sources
index fd801c8..5fa30b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.8.0-8c58eb4.tgz) = a7ee517482c17defeadb788a9ed4870362a935ddbe456a1f00a49c54cec0b46120d75d0c255c5ea6ddf5bf73fb915b70942c62450845094d2cbfac250e415fa8
+SHA512 (php-nikic-php-parser4-4.9.0-aaee038.tgz) = 31aecb36576da330831e478f5f9dec86c04d1f8e092c6d710dc3be38315fcff658b919c00090522ddc71186bb1594ef2bd30981680715eec32972fe7ccbfb7a6

From 657083fa67571503b6f002dbab8e7ae0cd458956 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 31 Aug 2020 07:12:52 +0200
Subject: [PATCH 07/10] v4.9.1

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

diff --git a/.gitignore b/.gitignore
index ab03b39..2ed2eb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ clog
 /php-nikic-php-parser4-4.6.0-c346bbf.tgz
 /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
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 88893c8..981b2ad 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    aaee038b912e567780949787d5fe1977be11a778
+%global gh_commit    88e519766fc58bd46b8265561fb79b54e2e00b28
 %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.0
+Version:        4.9.1
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -122,10 +122,10 @@ AUTOLOAD
 : Upstream test suite
 # ignore test failing on 32-bit (in koji)
 ret=0
-for cmdarg in "php %{phpunit}" php72 php73 "php74 %{_bindir}/phpunit9" "php80 %{_bindir}/phpunit9"; do
+for cmdarg in "php %{phpunit}" "php72%{_bindir}/phpunit8" php73 php74 php80; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit8} \
+    $1 ${2:-%{_bindir}/phpunit9} \
       --filter '^((?!(testParse|testLexNewFeatures)).)*$' \
       --verbose || ret=1
   fi
@@ -145,6 +145,9 @@ exit $ret
 
 
 %changelog
+* Mon Aug 31 2020 Remi Collet <remi@remirepo.net> - 4.9.1-1
+- update to 4.9.1
+
 * Wed Aug 19 2020 Remi Collet <remi@remirepo.net> - 4.9.0-1
 - update to 4.9.0
 
diff --git a/sources b/sources
index 5fa30b6..a9c0d32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.9.0-aaee038.tgz) = 31aecb36576da330831e478f5f9dec86c04d1f8e092c6d710dc3be38315fcff658b919c00090522ddc71186bb1594ef2bd30981680715eec32972fe7ccbfb7a6
+SHA512 (php-nikic-php-parser4-4.9.1-88e5197.tgz) = faec582ae5b38709263428ddcb03fa9f67546d811e4af93c64a0ce593c7f6e45526ed23951c0413c9f86be58fb554596be18d003f7fc86c7d03218a5fd35f051

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

(cherry picked from commit a167bdccf2f1f0e381b96821979733b5136453e5)
(cherry picked from commit 5bf37f72736ae4eacccc27ef6189a43582a159b3)
---
 .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 981b2ad..192e653 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

From b842679c4eb730053cf17b16f812a29eee00a269 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 24 Sep 2020 07:21:04 +0200
Subject: [PATCH 09/10] v4.10.1

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

diff --git a/.gitignore b/.gitignore
index 0b8cff0..5865ab6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ clog
 /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
+/php-nikic-php-parser4-4.10.1-1b479e7.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 192e653..c866ee2 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    1c13d05035deff45f1230ca68bd7d74d621762d9
+%global gh_commit    1b479e7592812411c20c34d9ed33db3957bde66e
 %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.10.0
+Version:        4.10.1
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -150,6 +150,9 @@ exit $ret
 
 
 %changelog
+* Thu Sep 24 2020 Remi Collet <remi@remirepo.net> - 4.10.1-1
+- update to 4.10.1
+
 * Sun Sep 20 2020 Remi Collet <remi@remirepo.net> - 4.10.0-1
 - update to 4.10.0
 
diff --git a/sources b/sources
index 472fed5..cbbae18 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.10.0-1c13d05.tgz) = cdbdaa7337ad775b11b1e6cd0be905988f9abf581d6467effabbf5f498bd9fedf61caf8d89f394095cc952bddb02825afafa0d4073c15f413712d406040f558e
+SHA512 (php-nikic-php-parser4-4.10.1-1b479e7.tgz) = e0bd0f282d402052919586d62255572715904098f6a320c309b46167e1fdb4daa041060802056451e08e7baf23ed216b1b6638f19db0d6c56b6870a6aeb21533

From 1ed990e489bbca59a8f6e161721100fa48da13fd Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 28 Sep 2020 08:36:26 +0200
Subject: [PATCH 10/10] v4.10.2

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

diff --git a/.gitignore b/.gitignore
index 5865ab6..0a25e82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ clog
 /php-nikic-php-parser4-4.9.1-88e5197.tgz
 /php-nikic-php-parser4-4.10.0-1c13d05.tgz
 /php-nikic-php-parser4-4.10.1-1b479e7.tgz
+/php-nikic-php-parser4-4.10.2-658f1be.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index c866ee2..dcb114d 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    1b479e7592812411c20c34d9ed33db3957bde66e
+%global gh_commit    658f1be311a230e0907f5dfe0213742aff0596de
 %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.10.1
+Version:        4.10.2
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -150,6 +150,9 @@ exit $ret
 
 
 %changelog
+* Mon Sep 28 2020 Remi Collet <remi@remirepo.net> - 4.10.2-1
+- update to 4.10.2
+
 * Thu Sep 24 2020 Remi Collet <remi@remirepo.net> - 4.10.1-1
 - update to 4.10.1
 
diff --git a/sources b/sources
index cbbae18..5407fe6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.10.1-1b479e7.tgz) = e0bd0f282d402052919586d62255572715904098f6a320c309b46167e1fdb4daa041060802056451e08e7baf23ed216b1b6638f19db0d6c56b6870a6aeb21533
+SHA512 (php-nikic-php-parser4-4.10.2-658f1be.tgz) = 7565a6314056e56e0b207e83ab91c9b76dd714aa9c86bf7eac6ed5416e5f04b750522164a5944eaadd8e047d75b3f46f16a6b91604c5e998c8a0b43e61de3125