diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-03 16:12:24 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2021-01-03 16:12:24 +0100 |
| commit | 533af1eb14dbeb10c83f291b07da62b70d0df8ae (patch) | |
| tree | cf103c09d1d3ecf55823d4dd88c8add75d78044a | |
| parent | dfb9e03336fed7c4c07fb1a30a8be25cfbf546e4 (diff) | |
| parent | e470f9b389313f2c966a87445c8e776c1897f532 (diff) | |
| download | php-git-533af1eb14dbeb10c83f291b07da62b70d0df8ae.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
ZipArchive methods do not return NULL
| -rw-r--r-- | ext/zip/php_zip.c | 4 | ||||
| -rw-r--r-- | ext/zip/php_zip.stub.php | 8 | ||||
| -rw-r--r-- | ext/zip/php_zip_arginfo.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index 92272d270f..6875850687 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -2449,7 +2449,7 @@ PHP_METHOD(ZipArchive, setMtimeName) if (zend_parse_parameters(ZEND_NUM_ARGS(), "sl|l", &name, &name_len, &mtime, &flags) == FAILURE) { - return; + RETURN_THROWS(); } ZIP_FROM_OBJECT(intern, this); @@ -2483,7 +2483,7 @@ PHP_METHOD(ZipArchive, setMtimeIndex) if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll|l", &index, &mtime, &flags) == FAILURE) { - return; + RETURN_THROWS(); } ZIP_FROM_OBJECT(intern, this); diff --git a/ext/zip/php_zip.stub.php b/ext/zip/php_zip.stub.php index 9a276a05df..ddda62d6b0 100644 --- a/ext/zip/php_zip.stub.php +++ b/ext/zip/php_zip.stub.php @@ -111,17 +111,17 @@ class ZipArchive /** @return string|false */ public function getArchiveComment(int $flags = 0) {} - /** @return bool|null */ + /** @return bool */ public function setCommentIndex(int $index, string $comment) {} - /** @return bool|null */ + /** @return bool */ public function setCommentName(string $name, string $comment) {} #ifdef HAVE_SET_MTIME - /** @return bool|null */ + /** @return bool */ public function setMtimeIndex(int $index, int $timestamp, int $flags = 0) {} - /** @return bool|null */ + /** @return bool */ public function setMtimeName(string $name, int $timestamp, int $flags = 0) {} #endif diff --git a/ext/zip/php_zip_arginfo.h b/ext/zip/php_zip_arginfo.h index a4167fa8ca..87212a4975 100644 --- a/ext/zip/php_zip_arginfo.h +++ b/ext/zip/php_zip_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 4ca2b108e71924309abcdc1a0f86f5963a8516f3 */ + * Stub hash: 8994595a1c86072629e051291e87cc5e1774eb7f */ ZEND_BEGIN_ARG_INFO_EX(arginfo_zip_open, 0, 0, 1) ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0) |