diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-25 18:49:50 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-25 18:49:50 +0100 |
| commit | 5a0e4067b606d0d1b1b8c1825b5397abbfd718d4 (patch) | |
| tree | 34961558265b36e12c366fb5d908003ebbb1b4bb | |
| parent | 6bc97b5921a7c76a6cc6b1e56cc1c0b5bc6b1e47 (diff) | |
| parent | 2e580da28ebebb35eefd084dc5a0cdbc94872ff4 (diff) | |
| download | php-git-5a0e4067b606d0d1b1b8c1825b5397abbfd718d4.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix #75850: Unclear error message wrt. __halt_compiler() w/o semicolon
| -rw-r--r-- | ext/phar/phar.c | 2 | ||||
| -rw-r--r-- | ext/phar/tests/phar_stub_error.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c index 7aa454c222..824c5be8e8 100644 --- 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 index 972af851ee..f56f30fece 100644 --- 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(); ?>" |