From 1f9ffa9cb672029de22003b717d57f88a66a7208 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 May 2021 07:50:07 +0200 Subject: [PATCH 1/5] v4.10.5 (cherry picked from commit cfd82aa15a6e72e87f776b58d30a7910b94589ff) --- .gitignore | 1 + php-nikic-php-parser4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 01cc9cd..20f1584 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /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 +/php-nikic-php-parser4-4.10.5-4432ba3.tgz diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index 34cb616..fa7a2f2 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-2020 Remi Collet +# Copyright (c) 2016-2021 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 c6d052fc58cb876152f89f532b95a8d7907e7f0e +%global gh_commit 4432ba399e47c66624bc73c8c0f811e5c109576f %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.4 +Version: 4.10.5 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} @@ -150,6 +150,9 @@ exit $ret %changelog +* Tue May 4 2021 Remi Collet - 4.10.5-1 +- update to 4.10.5 + * Mon Dec 21 2020 Remi Collet - 4.10.4-1 - update to 4.10.4 diff --git a/sources b/sources index 7b8aee1..28d8e10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.10.4-c6d052f.tgz) = dcf22d719c5ff3e7e162a751aeaf18fce97d320e79e1c659a7efe30b2de55ebb4efd06a8bb944985400ef00db5c7cb7a611dfd7a4c95fde4c861af51936b426d +SHA512 (php-nikic-php-parser4-4.10.5-4432ba3.tgz) = f7be41418340f05c4f43ea1de2a11edca5833e55d0bb63b4011291a75f22336b864bda0d76478abc1dbea23cda1d64e0709da3b4553b3d2a47a785cb7ab4b203 From 0509b5cd6fd0f165981f132382f0976265ed8f76 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 5 Jul 2021 08:44:19 +0200 Subject: [PATCH 2/5] v4.11.0 (cherry picked from commit 1aa66d69b70a15574aafcd951a2ac5b39a7bee61) --- .gitignore | 1 + php-nikic-php-parser4.spec | 19 ++++++++++++------- sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 20f1584..c3a85ba 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /php-nikic-php-parser4-4.10.3-dbe56d2.tgz /php-nikic-php-parser4-4.10.4-c6d052f.tgz /php-nikic-php-parser4-4.10.5-4432ba3.tgz +/php-nikic-php-parser4-4.11.0-fe14cf3.tgz diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index fa7a2f2..ad5e4a0 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 4432ba399e47c66624bc73c8c0f811e5c109576f +%global gh_commit fe14cf3672a149364fb66dfe11bf6549af899f94 %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.5 +Version: 4.11.0 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} @@ -36,8 +36,8 @@ Patch0: %{name}-rpm.patch BuildArch: noarch %if %{with_tests} # For tests -# as we use phpunit8 -BuildRequires: php(language) >= 7.2 +# as we use phpunit9 +BuildRequires: php(language) >= 7.3 BuildRequires: php-tokenizer BuildRequires: php-reflection BuildRequires: php-ctype @@ -47,8 +47,8 @@ BuildRequires: php-spl # From composer.json, "require-dev": { # "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0", # "ircmaxell/php-yacc": "0.0.7" -%global phpunit %{_bindir}/phpunit8 -BuildRequires: phpunit8 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 # Autoloader BuildRequires: php-fedora-autoloader-devel %endif @@ -128,7 +128,8 @@ else fi ret=0 -for cmdarg in "php %{phpunit}" "php72%{_bindir}/phpunit8" php73 php74 php80; do +# TODO php81 +for cmdarg in "php %{phpunit}" php73 php74 php80; do if which $cmdarg; then set $cmdarg $1 -d auto_prepend_file=%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php \ @@ -150,6 +151,10 @@ exit $ret %changelog +* Mon Jul 5 2021 Remi Collet - 4.11.0-1 +- update to 4.11.0 +- switch to phpunit9 + * Tue May 4 2021 Remi Collet - 4.10.5-1 - update to 4.10.5 diff --git a/sources b/sources index 28d8e10..dd31314 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.10.5-4432ba3.tgz) = f7be41418340f05c4f43ea1de2a11edca5833e55d0bb63b4011291a75f22336b864bda0d76478abc1dbea23cda1d64e0709da3b4553b3d2a47a785cb7ab4b203 +SHA512 (php-nikic-php-parser4-4.11.0-fe14cf3.tgz) = c846eee5f36821459b957937ea1f39adb296322f0fe0da4fc218dcf11711d9ef0fc4c12a4a7af6ec4d2f9b130be32070ead7893afa2386cd9afa4adbf7c754a9 From 04f25821c660e1edbeb5772670d51321f9d72f29 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Jul 2021 07:35:58 +0200 Subject: [PATCH 3/5] v4.12.0 (cherry picked from commit 8549b3bee7e29601f98e7132ff574900ce2f4056) --- .gitignore | 1 + php-nikic-php-parser4.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c3a85ba..6db7ad7 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /php-nikic-php-parser4-4.10.4-c6d052f.tgz /php-nikic-php-parser4-4.10.5-4432ba3.tgz /php-nikic-php-parser4-4.11.0-fe14cf3.tgz +/php-nikic-php-parser4-4.12.0-6608f01.tgz diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index ad5e4a0..6a2246b 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 fe14cf3672a149364fb66dfe11bf6549af899f94 +%global gh_commit 6608f01670c3cc5079e18c1dab1104e002579143 %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.11.0 +Version: 4.12.0 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} @@ -128,11 +128,11 @@ else fi ret=0 -# TODO php81 -for cmdarg in "php %{phpunit}" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg - $1 -d auto_prepend_file=%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php \ + $1 -d include_path=%{php_home} \ + -d auto_prepend_file=%{buildroot}/%{php_home}/%{ns_project}%{major}/autoload.php \ ${2:-%{_bindir}/phpunit9} $FILTER --verbose || ret=1 fi done @@ -151,6 +151,9 @@ exit $ret %changelog +* Wed Jul 21 2021 Remi Collet - 4.12.0-1 +- update to 4.12.0 + * Mon Jul 5 2021 Remi Collet - 4.11.0-1 - update to 4.11.0 - switch to phpunit9 diff --git a/sources b/sources index dd31314..aa08063 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.11.0-fe14cf3.tgz) = c846eee5f36821459b957937ea1f39adb296322f0fe0da4fc218dcf11711d9ef0fc4c12a4a7af6ec4d2f9b130be32070ead7893afa2386cd9afa4adbf7c754a9 +SHA512 (php-nikic-php-parser4-4.12.0-6608f01.tgz) = cd703ad6abe57ab03718cca698a23204665fe90e4b1fd2a5106ea1785ce85dd46c1381494778f653f14a0ee59abb2e0bf20cd40f8b5063cb930233c10dd64a30 From f8cb1f4698d2a37b7def727dd511c8e0a10395da Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Sep 2021 09:43:30 +0200 Subject: [PATCH 4/5] v4.13.0 (cherry picked from commit 2699736df17709db9a12e48d504bebd8786ab375) --- .gitignore | 1 + php-nikic-php-parser4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6db7ad7..374b9a0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /php-nikic-php-parser4-4.10.5-4432ba3.tgz /php-nikic-php-parser4-4.11.0-fe14cf3.tgz /php-nikic-php-parser4-4.12.0-6608f01.tgz +/php-nikic-php-parser4-4.13.0-50953a2.tgz diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index 6a2246b..9a6d81a 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 6608f01670c3cc5079e18c1dab1104e002579143 +%global gh_commit 50953a2691a922aa1769461637869a0a2faa3f53 %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.12.0 +Version: 4.13.0 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} @@ -151,6 +151,9 @@ exit $ret %changelog +* Tue Sep 21 2021 Remi Collet - 4.13.0-1 +- update to 4.13.0 + * Wed Jul 21 2021 Remi Collet - 4.12.0-1 - update to 4.12.0 diff --git a/sources b/sources index aa08063..ba5eea1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.12.0-6608f01.tgz) = cd703ad6abe57ab03718cca698a23204665fe90e4b1fd2a5106ea1785ce85dd46c1381494778f653f14a0ee59abb2e0bf20cd40f8b5063cb930233c10dd64a30 +SHA512 (php-nikic-php-parser4-4.13.0-50953a2.tgz) = b3b64d00263230599990c0e35145a8910702a79f14f26013288e2a5329dd524ead39054834c769b6e297d526667b224dd57b4e9620edb1950af1cb2b48a8aadf From 02b6cc3370bc8807eca1a1b41ee1d844054924b5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Nov 2021 07:31:24 +0100 Subject: [PATCH 5/5] v4.13.1 (cherry picked from commit 13ba1a4645ce885de53daaeb151a50eea0b8ad2e) --- .gitignore | 1 + php-nikic-php-parser4.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 374b9a0..8fba7d3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /php-nikic-php-parser4-4.11.0-fe14cf3.tgz /php-nikic-php-parser4-4.12.0-6608f01.tgz /php-nikic-php-parser4-4.13.0-50953a2.tgz +/php-nikic-php-parser4-4.13.1-63a79e8.tgz diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index 9a6d81a..9af60e1 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 50953a2691a922aa1769461637869a0a2faa3f53 +%global gh_commit 63a79e8daa781cac14e5195e63ed8ae231dd10fd %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.13.0 +Version: 4.13.1 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} @@ -151,6 +151,9 @@ exit $ret %changelog +* Thu Nov 4 2021 Remi Collet - 4.13.1-1 +- update to 4.13.1 + * Tue Sep 21 2021 Remi Collet - 4.13.0-1 - update to 4.13.0 diff --git a/sources b/sources index ba5eea1..bb9cd5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.13.0-50953a2.tgz) = b3b64d00263230599990c0e35145a8910702a79f14f26013288e2a5329dd524ead39054834c769b6e297d526667b224dd57b4e9620edb1950af1cb2b48a8aadf +SHA512 (php-nikic-php-parser4-4.13.1-63a79e8.tgz) = 05e20b26e2e0d9f149ef431e095d06e51d31370ef095f6fcdfb3b6855098e175d4963695774d6858a7d64765f1046718997ce29068c12a18173905d3712cc471