Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-27 23:35:04 +02:00
Code Issues Projects Releases Wiki Activity

External Libraries: Remove usage of text strings in assert() in the Text_Diff_Engine_native class.

Browse Source 
See #41526

Built from https://develop.svn.wordpress.org/trunk@42027


git-svn-id: http://core.svn.wordpress.org/trunk@41861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-10-26 11:32:48 +00:00
parent db00af7cc2
commit 4550ef5b2c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/Text/Diff/Engine/native.php
View File

@ -330,7 +330,7 @@ class Text_Diff_Engine_native {
$i = 0; $i = 0;
$j = 0; $j = 0;
assert('count($lines) == count($changed)'); assert(count($lines) == count($changed));
$len = count($lines); $len = count($lines);
$other_len = count($other_changed); $other_len = count($other_changed);
@ -351,7 +351,7 @@ class Text_Diff_Engine_native {
} }
while ($i < $len && ! $changed[$i]) { while ($i < $len && ! $changed[$i]) {
assert('$j < $other_len && ! $other_changed[$j]'); assert($j < $other_len && ! $other_changed[$j]);
$i++; $j++; $i++; $j++;
while ($j < $other_len && $other_changed[$j]) { while ($j < $other_len && $other_changed[$j]) {
$j++; $j++;
@ -383,11 +383,11 @@ class Text_Diff_Engine_native {
while ($start > 0 && $changed[$start - 1]) { while ($start > 0 && $changed[$start - 1]) {
$start--; $start--;
} }
assert('$j > 0'); assert($j > 0);
while ($other_changed[--$j]) { while ($other_changed[--$j]) {
continue; continue;
} }
assert('$j >= 0 && !$other_changed[$j]'); assert($j >= 0 && !$other_changed[$j]);
} }
/* Set CORRESPONDING to the end of the changed run, at the /* Set CORRESPONDING to the end of the changed run, at the
@ -408,7 +408,7 @@ class Text_Diff_Engine_native {
$i++; $i++;
} }
assert('$j < $other_len && ! $other_changed[$j]'); assert($j < $other_len && ! $other_changed[$j]);
$j++; $j++;
if ($j < $other_len && $other_changed[$j]) { if ($j < $other_len && $other_changed[$j]) {
$corresponding = $i; $corresponding = $i;
@ -424,11 +424,11 @@ class Text_Diff_Engine_native {
while ($corresponding < $i) { while ($corresponding < $i) {
$changed[--$start] = 1; $changed[--$start] = 1;
$changed[--$i] = 0; $changed[--$i] = 0;
assert('$j > 0'); assert($j > 0);
while ($other_changed[--$j]) { while ($other_changed[--$j]) {
continue; continue;
} }
assert('$j >= 0 && !$other_changed[$j]'); assert($j >= 0 && !$other_changed[$j]);
} }
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-beta4-42026'; $wp_version = '4.9-beta4-42027';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.