summaryrefslogtreecommitdiffstats
path: root/165.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-07-21 15:15:58 +0200
committerRemi Collet <remi@remirepo.net>2020-07-21 15:15:58 +0200
commit0d7335daf815a8cb8da58bf5e4b7829df0c3d58f (patch)
tree1fa2f9836c1c417a9ba2489b8325dd65bcb866da /165.patch
parent53c92f26b7a26e43c3b1d148a2ebdaa8f7db6fcd (diff)
add patch from https://github.com/nikic/php-ast/pull/165
relax tests for 8.0.0alpha3
Diffstat (limited to '165.patch')
-rw-r--r--165.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/165.patch b/165.patch
new file mode 100644
index 0000000..aa0ee41
--- /dev/null
+++ b/165.patch
@@ -0,0 +1,41 @@
+From f3523b85992ac1803294882e320c1111d0b9e055 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 17 Jul 2020 11:14:25 +0200
+Subject: [PATCH] relax tests for 8.0 master
+
+---
+ tests/parse_code_parse_error.phpt | 4 ++--
+ tests/parse_file_parse_error.phpt | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/parse_code_parse_error.phpt b/tests/parse_code_parse_error.phpt
+index 57504cf..d82c043 100644
+--- a/tests/parse_code_parse_error.phpt
++++ b/tests/parse_code_parse_error.phpt
+@@ -18,11 +18,11 @@ try {
+
+ ?>
+ --EXPECTF--
+-ParseError: syntax error, unexpected '&', expecting end of file in string code:1
++ParseError: syntax error, unexpected %s&%s expecting end of file in string code:1
+ Stack trace:
+ #0 %s(%d): ast\parse_code('%s', %d)
+ #1 {main}
+-ParseError: syntax error, unexpected '&', expecting end of file in file.php:1
++ParseError: syntax error, unexpected %s&%s expecting end of file in file.php:1
+ Stack trace:
+ #0 %s(%d): ast\parse_code('%s', %d, 'file.php')
+ #1 {main}
+diff --git a/tests/parse_file_parse_error.phpt b/tests/parse_file_parse_error.phpt
+index 88c0678..8e4a003 100644
+--- a/tests/parse_file_parse_error.phpt
++++ b/tests/parse_file_parse_error.phpt
+@@ -11,7 +11,7 @@ try {
+
+ ?>
+ --EXPECTF--
+-ParseError: syntax error, unexpected ')' in %stests/invalid_file.php:3
++ParseError: syntax error, unexpected %s)%s in %stests/invalid_file.php:3
+ Stack trace:
+ #0 %s(%d): ast\parse_file('%s', %d)
+ #1 {main}