From 083020b64eb14b967c4f85b3effcce288755f39d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Feb 2019 11:28:49 +0100 Subject: [PATCH 1/4] v4.2.1 (cherry picked from commit 4a8e477f26f91da30fe2ba371f634a4a0fd56e6f) --- .gitignore | 1 + php-nikic-php-parser4-rpm.patch | 13 +------------ php-nikic-php-parser4.spec | 14 +++++++++++--- sources | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 7c39b07..068c3ff 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /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 diff --git a/php-nikic-php-parser4-rpm.patch b/php-nikic-php-parser4-rpm.patch index bbdfc8f..66edc42 100644 --- a/php-nikic-php-parser4-rpm.patch +++ b/php-nikic-php-parser4-rpm.patch @@ -15,15 +15,4 @@ diff -up ./bin/php-parse.rpm ./bin/php-parse ini_set('xdebug.max_nesting_level', 3000); -diff -up ./test/bootstrap.php.rpm ./test/bootstrap.php ---- ./test/bootstrap.php.rpm 2016-04-20 06:33:22.713063604 +0200 -+++ ./test/bootstrap.php 2016-04-20 06:34:38.963385593 +0200 -@@ -2,7 +2,7 @@ - - namespace PhpParser; - --require __DIR__ . '/../vendor/autoload.php'; -+require '@BUILDROOT@/usr/share/php/PhpParser4/autoload.php'; - - function canonicalize($str) { - // normalize EOL style + diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index 4ca79c8..033e21d 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 594bcae1fc0bccd3993d2f0d61a018e26ac2865a +%global gh_commit 5221f49a608808c1e4d436df32884cbc1b821ac0 %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.0 +Version: 4.2.1 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} @@ -113,7 +113,12 @@ sed -e 's:%{php_home}:%{buildroot}%{php_home}:' \ php bin/php-parse-test --help : Test suite autoloader -sed -e 's:@BUILDROOT@:%{buildroot}:' -i test/bootstrap.php +mkdir vendor +cat << 'AUTOLOAD' | tee vendor/autoload.php + - 4.2.1-1 +- update to 4.2.1 + * Sun Jan 13 2019 Remi Collet - 4.2.0-1 - update to 4.2.0 diff --git a/sources b/sources index 0892e90..63af6a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.2.0-594bcae.tar.gz) = 093a5dc47d71e248f33c93363cd0a5e45fdd28c11c234f8bb54045beb666a2bb916b6c7cef27937258948158d517ee84971f26821957cfcfbc94a183266405b7 +SHA512 (php-nikic-php-parser4-4.2.1-5221f49.tar.gz) = ab2a1b7f656fb524437ac911a2a5da7a04f24d7b30ae429d4ed6a0713ec1347bfde7d6a1fb2e1f7a350dddd3adb449d62ec160cc457ed481e65d99ca304eaf55 From c89d1d39cca196c77ee84dad6881b6b2aaca669b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 May 2019 13:53:50 +0200 Subject: [PATCH 2/4] v4.2.2 (cherry picked from commit de17fd67f9f11ae31fcbe29142e3c24ec2eec49f) --- .gitignore | 1 + php-nikic-php-parser4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 068c3ff..fbe5034 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /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 diff --git a/php-nikic-php-parser4.spec b/php-nikic-php-parser4.spec index 033e21d..fa6a737 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 5221f49a608808c1e4d436df32884cbc1b821ac0 +%global gh_commit 1bd73cc04c3843ad8d6b0bfc0956026a151fc420 %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.1 +Version: 4.2.2 Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} @@ -122,7 +122,7 @@ AUTOLOAD : Upstream test suite ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do +for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1 @@ -143,6 +143,9 @@ exit $ret %changelog +* Mon May 27 2019 Remi Collet - 4.2.2-1 +- update to 4.2.2 + * Mon Feb 18 2019 Remi Collet - 4.2.1-1 - update to 4.2.1 diff --git a/sources b/sources index 63af6a5..37f98b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-nikic-php-parser4-4.2.1-5221f49.tar.gz) = ab2a1b7f656fb524437ac911a2a5da7a04f24d7b30ae429d4ed6a0713ec1347bfde7d6a1fb2e1f7a350dddd3adb449d62ec160cc457ed481e65d99ca304eaf55 +SHA512 (php-nikic-php-parser4-4.2.2-1bd73cc.tar.gz) = f28591a6daa44d19c367cde731be8b59d2d7116945c857d76bf95bbe9e5ba7b300261efb1e57170657f775371f866a695f4aa72e9ad99e3055f7069a778d15fd From 783163da46bcf0388d70225d7e7e716bfbc0a325 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 20 Aug 2019 15:35:02 +0200 Subject: [PATCH 3/4] update to 4.2.3 use phpunit8 (cherry picked from commit ee331dcfe2b19eaf5eaefc0605ada7ad2f48ef2c) (cherry picked from commit 1be8e98e04a995ac666baed4ec397bd3e1e8feee) --- .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 fa6a737..7cf876a 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 - 4.2.3-1 +- update to 4.2.3 +- use phpunit8 + * Mon May 27 2019 Remi Collet - 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 d430d6846bb044c55677d8a4c0e207effb3cb0d6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Sep 2019 10:23:36 +0200 Subject: [PATCH 4/4] v4.2.4 (cherry picked from commit a3d88c947304cbc8ed15fa574cf704f0b7186e00) ignore test failing on 32-bit (cherry picked from commit 6cbba4df10874911defa16aba104854ee1746335) (cherry picked from commit b48ff2b0a63db1c3fa2b7ecb1e21083cba564b4e) --- .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 7cf876a..03d2ffa 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 - 4.2.4-1 +- update to 4.2.4 + * Mon Aug 19 2019 Remi Collet - 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