diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-28 10:15:45 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-28 10:15:45 +0100 |
| commit | ac561f2c255e4786db4f0726d47f0e84100cd2ea (patch) | |
| tree | 851bd60ab0e0daa6fa6859d5611617f13b1fc53c | |
| parent | 6971c720b05623f0d10fa7c44e8fc175e89e0fa3 (diff) | |
| parent | 27eb81604bf3b78b1f2dc46fb4d0ca763294f33b (diff) | |
| download | php-git-ac561f2c255e4786db4f0726d47f0e84100cd2ea.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
Fix stub for Serializable::serialize()
| -rw-r--r-- | Zend/zend_interfaces.stub.php | 2 | ||||
| -rw-r--r-- | Zend/zend_interfaces_arginfo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_interfaces.stub.php b/Zend/zend_interfaces.stub.php index f58d8abc20..8b2cdae981 100644 --- a/Zend/zend_interfaces.stub.php +++ b/Zend/zend_interfaces.stub.php @@ -48,7 +48,7 @@ interface ArrayAccess interface Serializable { - /** @return string */ + /** @return string|null */ public function serialize(); /** @return void */ diff --git a/Zend/zend_interfaces_arginfo.h b/Zend/zend_interfaces_arginfo.h index 71dc72b95c..8a66da1636 100644 --- a/Zend/zend_interfaces_arginfo.h +++ b/Zend/zend_interfaces_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 29a5ed0b859b0732074c81cf9d26047a6eb9059a */ + * Stub hash: c6ef101bd3881348a74b60cecd22d1d7f80017c8 */ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_IteratorAggregate_getIterator, 0, 0, 0) ZEND_END_ARG_INFO() |