<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[49742] branches/5.6/src/wp-includes/sodium_compat/src: Upgrade/Install: Update sodium_compat to v1.14.0.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/49742">49742</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/49742","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-12-03 17:40:57 +0000 (Thu, 03 Dec 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Upgrade/Install: Update sodium_compat to v1.14.0.
This includes improved PHP 8 support and more inclusive language.
A full list of changes in this update can be found on GitHub:
https://github.com/paragonie/sodium_compat/compare/v1.13.0...v1.14.0
Follow-up to <a href="https://core.trac.wordpress.org/changeset/48121">[48121]</a>, <a href="https://core.trac.wordpress.org/changeset/49056">[49056]</a>, <a href="https://core.trac.wordpress.org/changeset/49057">[49057]</a>.
Props jrf.
Reviewed by jrf, SergeyBiryukov.
Merges <a href="https://core.trac.wordpress.org/changeset/49741">[49741]</a> to the 5.6 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/51925">#51925</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches56srcwpincludessodium_compatcomposerjson">branches/5.6/src/wp-includes/sodium_compat/composer.json</a></li>
<li><a href="#branches56srcwpincludessodium_compatsrcCoreSipHashphp">branches/5.6/src/wp-includes/sodium_compat/src/Core/SipHash.php</a></li>
<li><a href="#branches56srcwpincludessodium_compatsrcCoreUtilphp">branches/5.6/src/wp-includes/sodium_compat/src/Core/Util.php</a></li>
<li><a href="#branches56srcwpincludessodium_compatsrcFilephp">branches/5.6/src/wp-includes/sodium_compat/src/File.php</a></li>
<li><a href="#branches56srcwpincludessodium_compatsrcPHP52SplFixedArrayphp">branches/5.6/src/wp-includes/sodium_compat/src/PHP52/SplFixedArray.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches56">branches/5.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.6
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/5.6 2020-12-03 17:39:03 UTC (rev 49741)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.6 2020-12-03 17:40:57 UTC (rev 49742)
</ins><a id="branches56"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49737,49739
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:49645,49649-49651,49668,49673-49674,49677,49681,49685,49691,49702-49705,49708-49710,49713,49716,49718,49720,49722,49725-49726,49731,49737,49739,49741
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches56srcwpincludessodium_compatcomposerjson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/sodium_compat/composer.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/sodium_compat/composer.json 2020-12-03 17:39:03 UTC (rev 49741)
+++ branches/5.6/src/wp-includes/sodium_compat/composer.json 2020-12-03 17:40:57 UTC (rev 49742)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "paragonie/random_compat": ">=1"
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "require-dev": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "phpunit/phpunit": "^3|^4|^5|^6|^7"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "suggest": {
</span><span class="cx" style="display: block; padding: 0 10px"> "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
</span></span></pre></div>
<a id="branches56srcwpincludessodium_compatsrcCoreSipHashphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/sodium_compat/src/Core/SipHash.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/sodium_compat/src/Core/SipHash.php 2020-12-03 17:39:03 UTC (rev 49741)
+++ branches/5.6/src/wp-includes/sodium_compat/src/Core/SipHash.php 2020-12-03 17:40:57 UTC (rev 49742)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,8 +14,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @internal You should not use this directly from another application
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int[] $v
- * @return int[]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array<array-key, int> $v
+ * @return array<array-key, int>
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function sipRound(array $v)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,11 +27,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v1=ROTL(v1,13);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 13);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 13);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v1 ^= v0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v[2] ^= $v[0];
- $v[3] ^= $v[1];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $v[2] = (int) $v[2] ^ (int) $v[0];
+ $v[3] = (int) $v[3] ^ (int) $v[1];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v0=ROTL(v0,32);
</span><span class="cx" style="display: block; padding: 0 10px"> list($v[0], $v[1]) = self::rotl_64((int) $v[0], (int) $v[1], 32);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,16 +38,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v2 += v3;
</span><span class="cx" style="display: block; padding: 0 10px"> list($v[4], $v[5]) = self::add(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array($v[4], $v[5]),
- array($v[6], $v[7])
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array((int) $v[4], (int) $v[5]),
+ array((int) $v[6], (int) $v[7])
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v3=ROTL(v3,16);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 16);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 16);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v3 ^= v2;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v[6] ^= $v[4];
- $v[7] ^= $v[5];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $v[6] = (int) $v[6] ^ (int) $v[4];
+ $v[7] = (int) $v[7] ^ (int) $v[5];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v0 += v3;
</span><span class="cx" style="display: block; padding: 0 10px"> list($v[0], $v[1]) = self::add(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,8 +59,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 21);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v3 ^= v0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v[6] ^= $v[0];
- $v[7] ^= $v[1];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $v[6] = (int) $v[6] ^ (int) $v[0];
+ $v[7] = (int) $v[7] ^ (int) $v[1];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v2 += v1;
</span><span class="cx" style="display: block; padding: 0 10px"> list($v[4], $v[5]) = self::add(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,8 +72,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 17);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v1 ^= v2;;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $v[2] ^= $v[4];
- $v[3] ^= $v[5];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $v[2] = (int) $v[2] ^ (int) $v[4];
+ $v[3] = (int) $v[3] ^ (int) $v[5];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # v2=ROTL(v2,32)
</span><span class="cx" style="display: block; padding: 0 10px"> list($v[4], $v[5]) = self::rotl_64((int) $v[4], (int) $v[5], 32);
</span></span></pre></div>
<a id="branches56srcwpincludessodium_compatsrcCoreUtilphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/sodium_compat/src/Core/Util.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/sodium_compat/src/Core/Util.php 2020-12-03 17:39:03 UTC (rev 49741)
+++ branches/5.6/src/wp-includes/sodium_compat/src/Core/Util.php 2020-12-03 17:40:57 UTC (rev 49742)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -903,6 +903,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @internal You should not use this directly from another application
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Note: MB_OVERLOAD_STRING === 2, but we don't reference the constant
+ * (for nuisance-free PHP 8 support)
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function isMbStringOverride()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -913,7 +916,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mbstring = extension_loaded('mbstring')
</span><span class="cx" style="display: block; padding: 0 10px"> && defined('MB_OVERLOAD_STRING')
</span><span class="cx" style="display: block; padding: 0 10px"> &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ((int) (ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ((int) (ini_get('mbstring.func_overload')) & 2);
+ // MB_OVERLOAD_STRING === 2
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var bool $mbstring */
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="branches56srcwpincludessodium_compatsrcFilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/sodium_compat/src/File.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/sodium_compat/src/File.php 2020-12-03 17:39:03 UTC (rev 49741)
+++ branches/5.6/src/wp-includes/sodium_compat/src/File.php 2020-12-03 17:40:57 UTC (rev 49742)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,6 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ParagonIE_Sodium_Compat::memzero($nonce);
</span><span class="cx" style="display: block; padding: 0 10px"> ParagonIE_Sodium_Compat::memzero($ephKeypair);
</span><span class="cx" style="display: block; padding: 0 10px"> } catch (SodiumException $ex) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @psalm-suppress PossiblyUndefinedVariable */
</ins><span class="cx" style="display: block; padding: 0 10px"> unset($ephKeypair);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $res;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -541,6 +542,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> ParagonIE_Sodium_Compat::memzero($key);
</span><span class="cx" style="display: block; padding: 0 10px"> } catch (SodiumException $ex) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @psalm-suppress PossiblyUndefinedVariable */
</ins><span class="cx" style="display: block; padding: 0 10px"> unset($key);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $res;
</span></span></pre></div>
<a id="branches56srcwpincludessodium_compatsrcPHP52SplFixedArrayphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.6/src/wp-includes/sodium_compat/src/PHP52/SplFixedArray.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.6/src/wp-includes/sodium_compat/src/PHP52/SplFixedArray.php 2020-12-03 17:39:03 UTC (rev 49741)
+++ branches/5.6/src/wp-includes/sodium_compat/src/PHP52/SplFixedArray.php 2020-12-03 17:40:57 UTC (rev 49742)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,6 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function offsetGet($index)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @psalm-suppress MixedReturnStatement */
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->internalArray[(int) $index];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,6 +143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function current()
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @psalm-suppress MixedReturnStatement */
</ins><span class="cx" style="display: block; padding: 0 10px"> return current($this->internalArray);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>