Merge branch 'PHP-8.0'

nikic · nikic · commit ac561f2c255e · 2021-01-28T10:15:45.000+01:00
* PHP-8.0:
  Fix stub for Serializable::serialize()
diff --git a/Zend/zend_interfaces.stub.php b/Zend/zend_interfaces.stub.php
@@ -48,7 +48,7 @@ public function offsetUnset(mixed $offset);
 
 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
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function offsetUnset(mixed $offset);`
`48`	`48`
`49`	`49`	`interface Serializable`
`50`	`50`	`{`
`51`		`- /** @return string */`
	`51`	`+ /** @return string\|null */`
`52`	`52`	`public function serialize();`
`53`	`53`
`54`	`54`	`/** @return void */`