Merge branch 'PHP-8.0'

cmb69 · cmb69 · commit 5a0e4067b606 · 2021-01-25T18:49:50.000+01:00
* PHP-8.0:
  Fix #75850: Unclear error message wrt. __halt_compiler() w/o semicolon
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
@@ -2652,7 +2652,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, zend_long len, int conv
 			}
 			php_stream_close(newfile);
 			if (error) {
-				spprintf(error, 0, "illegal stub for phar \"%s\"", phar->fname);
+				spprintf(error, 0, "illegal stub for phar \"%s\" (__HALT_COMPILER(); is missing)", phar->fname);
 			}
 			if (free_user_stub) {
 				zend_string_free(suser_stub);
diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt
@@ -47,7 +47,7 @@ __HALT_COMPILER();
 string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>"
 string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>"
 bool(true)
-Exception: illegal stub for phar "%sphar_stub_error.phar.php"
+Exception: illegal stub for phar "%sphar_stub_error.phar.php" (__HALT_COMPILER(); is missing)
 string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>"
 bool(true)
 string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>"

Original file line number	Diff line number	Diff line change
`@@ -2652,7 +2652,7 @@ int phar_flush(phar_archive_data phar, char user_stub, zend_long len, int conv`
`2652`	`2652`	`}`
`2653`	`2653`	`php_stream_close(newfile);`
`2654`	`2654`	`if (error) {`
`2655`		`- spprintf(error, 0, "illegal stub for phar \"%s\"", phar->fname);`
	`2655`	`+ spprintf(error, 0, "illegal stub for phar \"%s\" (__HALT_COMPILER(); is missing)", phar->fname);`
`2656`	`2656`	`}`
`2657`	`2657`	`if (free_user_stub) {`
`2658`	`2658`	`zend_string_free(suser_stub);`