ext/spl: Follow-up on GH-9704 (#15295)

Co-authored-by: Tim Düsterhus <[email protected]>
php · Aug 8, 2024 · c8b45aa · c8b45aa
1 parent bb2836e
commit c8b45aa
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -41,6 +41,11 @@ PHP                                                                        NEWS
   . INI settings session.sid_length and session.sid_bits_per_character are now
     deprecated. (timwolla)
 
+- SPL:
+  . The SplFixedArray::__wakeup() method has been deprecated as it implements
+    __serialize() and __unserialize() which need to be overwritten instead.
+    (TysonAndre)
+
 - Standard:
   . Unserializing the uppercase 'S' tag is now deprecated. (timwolla)
 

diff --git a/UPGRADING b/UPGRADING
@@ -467,6 +467,10 @@ PHP 8.4 UPGRADE NOTES
     hexadecimal session IDs and stop changing these two INI settings.
     RFC: https://wiki.php.net/rfc/deprecations_php_8_4
 
+- SPL:
+  . The SplFixedArray::__wakeup() method has been deprecated as it implements
+    __serialize() and __unserialize() which need to be overwritten instead.
+
 - Standard:
   . Calling stream_context_set_option() with 2 arguments is deprecated.
     Use stream_context_set_options() instead.

diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
@@ -22,6 +22,7 @@
 #include "php.h"
 #include "zend_interfaces.h"
 #include "zend_exceptions.h"
+#include "zend_attributes.h"
 
 #include "spl_fixedarray_arginfo.h"
 #include "spl_fixedarray.h"

diff --git a/ext/spl/spl_fixedarray.stub.php b/ext/spl/spl_fixedarray.stub.php
@@ -6,10 +6,8 @@ class SplFixedArray implements IteratorAggregate, ArrayAccess, Countable, JsonSe
 {
     public function __construct(int $size = 0) {}
 
-    /**
-     * @tentative-return-type
-     * @deprecated
-     */
+    /** @tentative-return-type */
+    #[\Deprecated(since: '8.4', message: 'this method is obsolete, as serialization hooks are provided by __unserialize() and __serialize()')]
     public function __wakeup(): void {}
 
     public function __serialize(): array {}

diff --git a/ext/spl/spl_fixedarray_arginfo.h b/ext/spl/spl_fixedarray_arginfo.h