<!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>[41633] trunk/src/wp-includes/Text/Diff/Engine/native.php: External Libraries: Update the `Text_Diff_Engine_native` class for PHP 7.2 compatibility.</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 { 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/41633">41633</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/41633","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-09-28 13:58:23 +0000 (Thu, 28 Sep 2017)</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'>External Libraries: Update the `Text_Diff_Engine_native` class for PHP 7.2 compatibility.
This removes usage of `each()` and usage of text strings passed to `assert()`.
Props bor0
Fixes <a href="https://core.trac.wordpress.org/ticket/41526">#41526</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesTextDiffEnginenativephp">trunk/src/wp-includes/Text/Diff/Engine/native.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesTextDiffEnginenativephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/Text/Diff/Engine/native.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/Text/Diff/Engine/native.php 2017-09-28 11:44:30 UTC (rev 41632)
+++ trunk/src/wp-includes/Text/Diff/Engine/native.php 2017-09-28 13:58:23 UTC (rev 41633)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,10 +18,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Geoffrey T. Dairiki <dairiki@dairiki.org>. The original PHP version of this
</span><span class="cx" style="display: block; padding: 0 10px"> * code was written by him, and is used/adapted with his permission.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Copyright 2004-2010 The Horde Project (http://www.horde.org/)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Copyright 2004-2017 Horde LLC (http://www.horde.org/)
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * See the enclosed file COPYING for license information (LGPL). If you did
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * not receive this file, see http://opensource.org/licenses/lgpl-license.php.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * not receive this file, see http://www.horde.org/licenses/lgpl21.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @author Geoffrey T. Dairiki <dairiki@dairiki.org>
</span><span class="cx" style="display: block; padding: 0 10px"> * @package Text_Diff
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,27 +189,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $matches = $ymatches[$line];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- reset($matches);
- while (list(, $y) = each($matches)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ($matches as $y) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if (empty($this->in_seq[$y])) {
</span><span class="cx" style="display: block; padding: 0 10px"> $k = $this->_lcsPos($y);
</span><span class="cx" style="display: block; padding: 0 10px"> assert($k > 0);
</span><span class="cx" style="display: block; padding: 0 10px"> $ymids[$k] = $ymids[$k - 1];
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
- }
- while (list(, $y) = each($matches)) {
- if ($y > $this->seq[$k - 1]) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ($y > $this->seq[$k - 1]) {
</ins><span class="cx" style="display: block; padding: 0 10px"> assert($y <= $this->seq[$k]);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* Optimization: this is a common case: next match is
- * just replacing previous match. */
</del><span class="cx" style="display: block; padding: 0 10px"> $this->in_seq[$this->seq[$k]] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->seq[$k] = $y;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->in_seq[$y] = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif (empty($this->in_seq[$y])) {
- $k = $this->_lcsPos($y);
- assert($k > 0);
- $ymids[$k] = $ymids[$k - 1];
</del><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"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -330,7 +320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $j = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- assert('count($lines) == count($changed)');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ assert(count($lines) == count($changed));
</ins><span class="cx" style="display: block; padding: 0 10px"> $len = count($lines);
</span><span class="cx" style="display: block; padding: 0 10px"> $other_len = count($other_changed);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +341,7 @@
</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"> while ($i < $len && ! $changed[$i]) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- assert('$j < $other_len && ! $other_changed[$j]');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ assert($j < $other_len && ! $other_changed[$j]);
</ins><span class="cx" style="display: block; padding: 0 10px"> $i++; $j++;
</span><span class="cx" style="display: block; padding: 0 10px"> while ($j < $other_len && $other_changed[$j]) {
</span><span class="cx" style="display: block; padding: 0 10px"> $j++;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,11 +373,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> while ($start > 0 && $changed[$start - 1]) {
</span><span class="cx" style="display: block; padding: 0 10px"> $start--;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- assert('$j > 0');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ assert($j > 0);
</ins><span class="cx" style="display: block; padding: 0 10px"> while ($other_changed[--$j]) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- assert('$j >= 0 && !$other_changed[$j]');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ assert($j >= 0 && !$other_changed[$j]);
</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"> /* Set CORRESPONDING to the end of the changed run, at the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +398,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $i++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- assert('$j < $other_len && ! $other_changed[$j]');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ assert($j < $other_len && ! $other_changed[$j]);
</ins><span class="cx" style="display: block; padding: 0 10px"> $j++;
</span><span class="cx" style="display: block; padding: 0 10px"> if ($j < $other_len && $other_changed[$j]) {
</span><span class="cx" style="display: block; padding: 0 10px"> $corresponding = $i;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,11 +414,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> while ($corresponding < $i) {
</span><span class="cx" style="display: block; padding: 0 10px"> $changed[--$start] = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $changed[--$i] = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- assert('$j > 0');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ assert($j > 0);
</ins><span class="cx" style="display: block; padding: 0 10px"> while ($other_changed[--$j]) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- assert('$j >= 0 && !$other_changed[$j]');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ assert($j >= 0 && !$other_changed[$j]);
</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"> }
</span></span></pre>
</div>
</div>
</body>
</html>