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 1/5] 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

From 9333bc5ef817ff24049d25871b5801611e5ae6df Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 21 Aug 2019 07:22:07 +0200
Subject: [PATCH 2/5] temporarily disable tests

---
 php-nikic-php-parser4.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index c41640c..baeaa74 100644
--- a/php-nikic-php-parser4.spec
+++ b/php-nikic-php-parser4.spec
@@ -17,7 +17,7 @@
 %global pk_project   php-parser
 %global php_home     %{_datadir}/php
 %global ns_project   PhpParser
-%global with_tests   0%{!?_without_tests:1}
+%global with_tests   0
 %global major        4
 
 Name:           php-%{gh_owner}-%{pk_project}%{major}

From b48ff2b0a63db1c3fa2b7ecb1e21083cba564b4e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 2 Sep 2019 10:23:36 +0200
Subject: [PATCH 3/5] v4.2.4

(cherry picked from commit a3d88c947304cbc8ed15fa574cf704f0b7186e00)

ignore test failing on 32-bit

(cherry picked from commit 6cbba4df10874911defa16aba104854ee1746335)
---
 .gitignore                 |  1 +
 php-nikic-php-parser4.spec | 11 ++++++++---
 sources                    |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 87eb8b0..5cf5e7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /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
+/php-nikic-php-parser4-4.2.4-97e59c7.tar.gz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index baeaa74..2b4037b 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    e612609022e935f3d0337c1295176505b41188c8
+%global gh_commit    97e59c7a16464196a8b9c77c47df68e4a39a45c4
 %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.3
+Version:        4.2.4
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -125,7 +125,9 @@ ret=0
 for cmdarg in "php %{phpunit}" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit8} --verbose || ret=1
+    $1 ${2:-%{_bindir}/phpunit8} \
+      --filter '^((?!(testParse|testLexNewFeatures)).)*$' \
+      --verbose || ret=1
   fi
 done
 exit $ret
@@ -143,6 +145,9 @@ exit $ret
 
 
 %changelog
+* Mon Sep  2 2019 Remi Collet <remi@remirepo.net> - 4.2.4-1
+- update to 4.2.4
+
 * Mon Aug 19 2019 Remi Collet <remi@remirepo.net> - 4.2.3-1
 - update to 4.2.3
 - use phpunit8
diff --git a/sources b/sources
index 4e9691a..22cd820 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.2.3-e612609.tar.gz) = 9a10ff286139fc8830a3e6f8bb56a82682c5d2d5339e9b3dafd3b747ae31fd9a56cac9d126c7e9818882918346598b1b528d0b4fb89075d147baa7e877561505
+SHA512 (php-nikic-php-parser4-4.2.4-97e59c7.tar.gz) = 5feedb3a891146729901e89d2e088f2a90007e21f6845a95d4a773d77c5db575eb93b2bc7424de2f862b91a113b6086334981b1c9e4ed039d366e74d0bc08c68

From 9842eda06a76fcb4374d0860e1e788ce46691a48 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 28 Oct 2019 09:16:01 +0100
Subject: [PATCH 4/5] update to 4.2.5 sources from git snapshot

(cherry picked from commit fa7b637b9ef88bcc54691377b8bbef899e36f43e)
---
 .gitignore                 | 14 ++------------
 makesrc.sh                 | 28 ++++++++++++++++++++++++++++
 php-nikic-php-parser4.spec | 17 ++++++++++++-----
 sources                    |  2 +-
 4 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100755 makesrc.sh

diff --git a/.gitignore b/.gitignore
index 5cf5e7d..cc4f5c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,2 @@
-/php-nikic-php-parser4-4.0.0-9c18e3d.tar.gz
-/php-nikic-php-parser4-4.0.1-e4a54fa.tar.gz
-/php-nikic-php-parser4-4.0.2-35b8caf.tar.gz
-/php-nikic-php-parser4-4.0.3-bd088dc.tar.gz
-/php-nikic-php-parser4-4.0.4-fa6ee28.tar.gz
-/php-nikic-php-parser4-4.1.0-d0230c5.tar.gz
-/php-nikic-php-parser4-4.1.1-8aae5b5.tar.gz
-/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
-/php-nikic-php-parser4-4.2.4-97e59c7.tar.gz
+clog
+/php-nikic-php-parser4-4.2.5-b76bbc3.tgz
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..7d752c6
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n"
+
+echo "Cloning..."
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
+
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 2b4037b..6ba4169 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    97e59c7a16464196a8b9c77c47df68e4a39a45c4
+%global gh_commit    b76bbc3c51f22c570648de48e8c2d941ed5e2cf2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     nikic
 %global gh_project   PHP-Parser
@@ -21,13 +21,14 @@
 %global major        4
 
 Name:           php-%{gh_owner}-%{pk_project}%{major}
-Version:        4.2.4
+Version:        4.2.5
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source:         https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+Source0:        %{name}-%{version}-%{gh_short}.tgz
+Source1:        makesrc.sh
 
 # Autoloader
 Patch0:         %{name}-rpm.patch
@@ -43,7 +44,8 @@ BuildRequires:  php-json
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+#        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0",
+#        "ircmaxell/php-yacc": "0.0.4"
 %global phpunit %{_bindir}/phpunit8
 BuildRequires:  phpunit8
 # Autoloader
@@ -69,7 +71,7 @@ Provides:       php-composer(%{gh_owner}/%{pk_project}) = %{version}
 
 
 %description
-This is a PHP 5.2 to PHP 7.2 parser written in PHP.
+This is a PHP 5.2 to PHP 7.4 parser written in PHP.
 Its purpose is to simplify static code analysis and manipulation.
 
 This package provides the library version %{major} and the php-parse%{major} command.
@@ -121,6 +123,7 @@ require_once '%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php';
 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
   if which $cmdarg; then
@@ -145,6 +148,10 @@ exit $ret
 
 
 %changelog
+* Mon Oct 28 2019 Remi Collet <remi@remirepo.net> - 4.2.5-1
+- update to 4.2.5
+- sources from git snapshot
+
 * Mon Sep  2 2019 Remi Collet <remi@remirepo.net> - 4.2.4-1
 - update to 4.2.4
 
diff --git a/sources b/sources
index 22cd820..3fa8689 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.2.4-97e59c7.tar.gz) = 5feedb3a891146729901e89d2e088f2a90007e21f6845a95d4a773d77c5db575eb93b2bc7424de2f862b91a113b6086334981b1c9e4ed039d366e74d0bc08c68
+SHA512 (php-nikic-php-parser4-4.2.5-b76bbc3.tgz) = de7b4a3cfdf1956de8111252f2254e70941ca45f398ad4a5501bba43cb9207cf085e74183196ac021c757bffe39b3a1cd0bc0e7751db6b422de1cdd6da2f4a20

From f81d11c6328afe5b0a8d016234601331397a0324 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 12 Nov 2019 11:51:38 +0100
Subject: [PATCH 5/5] v4.3.0

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

diff --git a/.gitignore b/.gitignore
index cc4f5c1..e4240a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 clog
 /php-nikic-php-parser4-4.2.5-b76bbc3.tgz
+/php-nikic-php-parser4-4.3.0-9a9981c.tgz
diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec
index 6ba4169..8451566 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    b76bbc3c51f22c570648de48e8c2d941ed5e2cf2
+%global gh_commit    9a9981c347c5c49d6dfe5cf826bb882b824080dc
 %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.5
+Version:        4.3.0
 Release:        1%{?dist}
 Summary:        A PHP parser written in PHP - version %{major}
 
@@ -45,7 +45,7 @@ BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0",
-#        "ircmaxell/php-yacc": "0.0.4"
+#        "ircmaxell/php-yacc": "0.0.5"
 %global phpunit %{_bindir}/phpunit8
 BuildRequires:  phpunit8
 # Autoloader
@@ -148,6 +148,9 @@ exit $ret
 
 
 %changelog
+* Tue Nov 12 2019 Remi Collet <remi@remirepo.net> - 4.3.0-1
+- update to 4.3.0
+
 * Mon Oct 28 2019 Remi Collet <remi@remirepo.net> - 4.2.5-1
 - update to 4.2.5
 - sources from git snapshot
diff --git a/sources b/sources
index 3fa8689..6fc7ca3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-nikic-php-parser4-4.2.5-b76bbc3.tgz) = de7b4a3cfdf1956de8111252f2254e70941ca45f398ad4a5501bba43cb9207cf085e74183196ac021c757bffe39b3a1cd0bc0e7751db6b422de1cdd6da2f4a20
+SHA512 (php-nikic-php-parser4-4.3.0-9a9981c.tgz) = f7aa21e66e3b9851099a5f1deee2d797c187707f9262ee604d4b19a1acfef68395ec0461c8439cb67b21e116dbcfdb3e51a71950f3aff753e5e2d473c0c7c0ae