From 152ed850a3d9248c8f3b4384a69112c47992d010 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Aug 2020 12:13:11 +0200 Subject: [PATCH 1/8] v4.8.0 (cherry picked from commit f2aecc50e3f1502f1728161306d70fcb1829ef90) --- .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 57a6a51..fde2af4 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 - 4.8.0-1 +- update to 4.8.0 + * Fri Jul 3 2020 Remi Collet - 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 1759d7ab0ab67adeff3e3db45b8dc1d01d741efd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 19 Aug 2020 08:42:23 +0200 Subject: [PATCH 2/8] 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 fde2af4..8dc705c 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 - 4.9.0-1 +- update to 4.9.0 + * Mon Aug 10 2020 Remi Collet - 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 319dd3dd6c622889568eeb6be63b893c4965ee59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 31 Aug 2020 07:12:52 +0200 Subject: [PATCH 3/8] 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 8dc705c..7928629 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 - 4.9.1-1 +- update to 4.9.1 + * Wed Aug 19 2020 Remi Collet - 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 5bf37f72736ae4eacccc27ef6189a43582a159b3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Sep 2020 11:24:54 +0200 Subject: [PATCH 4/8] 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 - 4.10.0-1 +- update to 4.10.0 + * Mon Aug 31 2020 Remi Collet - 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 bf24b186faeaae18b779a15699a4000556ff1e39 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 24 Sep 2020 07:21:04 +0200 Subject: [PATCH 5/8] 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 548ebdc..eb78cb5 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 - 4.10.1-1 +- update to 4.10.1 + * Sun Sep 20 2020 Remi Collet - 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 fad6402ad7cd62e2ba8d1cf74407cfc1e6fe90bb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Sep 2020 08:36:26 +0200 Subject: [PATCH 6/8] 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 eb78cb5..59963f6 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 - 4.10.2-1 +- update to 4.10.2 + * Thu Sep 24 2020 Remi Collet - 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 From 4021c8e614820d682d6823fbca8836dacc6621fd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Dec 2020 11:45:21 +0100 Subject: [PATCH 7/8] v4.10.3 (cherry picked from commit 5b9b58ac1d7be1c3602f5aac9fbb5085fb0c6432) --- .gitignore | 1 + php-nikic-php-parser4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0a25e82..3ef365a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /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 +/php-nikic-php-parser4-4.10.3-dbe56d2.tgz diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index 59963f6..4acd676 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 658f1be311a230e0907f5dfe0213742aff0596de +%global gh_commit dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984 %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.2 +Version: 4.10.3 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} @@ -150,6 +150,9 @@ exit $ret %changelog +* Fri Dec 4 2020 Remi Collet - 4.10.3-1 +- update to 4.10.3 + * Mon Sep 28 2020 Remi Collet - 4.10.2-1 - update to 4.10.2 diff --git a/sources b/sources index 5407fe6..96b3519 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.10.2-658f1be.tgz) = 7565a6314056e56e0b207e83ab91c9b76dd714aa9c86bf7eac6ed5416e5f04b750522164a5944eaadd8e047d75b3f46f16a6b91604c5e998c8a0b43e61de3125 +SHA512 (php-nikic-php-parser4-4.10.3-dbe56d2.tgz) = cd05fc57babb3d1358802f2b99d5131a68cb2cb2ded971c45c0618115d06fe376e8ae865d0d8316befd487eeed49ab40b3a148dcdc06352ddd6161b82a5a8d32 From 9a88e3858f0b413efa6e617ff48be041d4dea343 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 21 Dec 2020 08:19:11 +0100 Subject: [PATCH 8/8] v4.10.4 (cherry picked from commit dd499f2700ed927e4d805387eb86d4fae0e945d6) --- .gitignore | 1 + php-nikic-php-parser4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3ef365a..01cc9cd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /php-nikic-php-parser4-4.10.1-1b479e7.tgz /php-nikic-php-parser4-4.10.2-658f1be.tgz /php-nikic-php-parser4-4.10.3-dbe56d2.tgz +/php-nikic-php-parser4-4.10.4-c6d052f.tgz diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index 4acd676..4ff296d 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 dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984 +%global gh_commit c6d052fc58cb876152f89f532b95a8d7907e7f0e %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.3 +Version: 4.10.4 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} @@ -150,6 +150,9 @@ exit $ret %changelog +* Mon Dec 21 2020 Remi Collet - 4.10.4-1 +- update to 4.10.4 + * Fri Dec 4 2020 Remi Collet - 4.10.3-1 - update to 4.10.3 diff --git a/sources b/sources index 96b3519..7b8aee1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.10.3-dbe56d2.tgz) = cd05fc57babb3d1358802f2b99d5131a68cb2cb2ded971c45c0618115d06fe376e8ae865d0d8316befd487eeed49ab40b3a148dcdc06352ddd6161b82a5a8d32 +SHA512 (php-nikic-php-parser4-4.10.4-c6d052f.tgz) = dcf22d719c5ff3e7e162a751aeaf18fce97d320e79e1c659a7efe30b2de55ebb4efd06a8bb944985400ef00db5c7cb7a611dfd7a4c95fde4c861af51936b426d