Changeset 60787

Timestamp:

09/20/2025 10:11:36 PM (8 weeks ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.21.2.

Version 1.21.2 is mostly to prevent deprecation warnings on PHP 8.5. These should never be encountered in practice (as the only file in scope was an SplFixedArray polyfill for PHP 5.2, which should never be executed on PHP 8.5), but for completeness the polyfill was updated.

References:

• ​sodium_compat 1.21.2 release notes
• ​Full list of changes in sodium_compat 1.21.2

Follow-up to [55699], [58752], [58753].

Props paragoninitiativeenterprises, jrf, johnbillion, TobiasBg, SergeyBiryukov.
Fixes #64008.

File:

• trunk/src/wp-includes/sodium_compat/src/PHP52/SplFixedArray.php (modified) (14 diffs)

trunk/src/wp-includes/sodium_compat/src/PHP52/SplFixedArray.php

@@ -33 +33 @@
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function count()
     {
@@ -73 +74 @@
      * @return int
      */
+    #[\ReturnTypeWillChange]
     public function getSize()
     {
@@ -82 +84 @@
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function setSize($size)
     {
@@ -92 +95 @@
      * @return bool
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($index)
     {
@@ -101 +105 @@
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($index)
     {
@@ -112 +117 @@
      * @psalm-suppress MixedAssignment
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($index, $newval)
     {
@@ -120 +126 @@
      * @param string|int $index
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($index)
     {
@@ -131 +138 @@
      * @since 5.3.0
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
@@ -142 +150 @@
      * @since 5.3.0
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
@@ -152 +161 @@
      * @return int The current array index.
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
@@ -160 +170 @@
      * @return void
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
@@ -170 +181 @@
      * @return bool true if the array contains any more elements, false otherwise.
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
@@ -180 +192 @@
     }
 
+    public function __sleep()
+    {
+        return $this->internalArray;
+    }
+
     /**
      * Do nothing.
@@ -187 +204 @@
         // NOP
     }
+
+    public function __serialize()
+    {
+        return array_values($this->internalArray);
+    }
+
+    public function __unserialize(array $data)
+    {
+        $length = count($data);
+        $values = array_values($data);
+        for ($i = 0; $i < $length; ++$i) {
+            $this->internalArray[$i] = $values[$i];
+        }
+        $this->size = $length;
+    }
 }