<!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>[50965] trunk: General: Some documentation and test improvements for the `_wp_array_set()`:</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/50965">50965</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/50965","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>2021-05-24 12:24:14 +0000 (Mon, 24 May 2021)</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'>General: Some documentation and test improvements for the `_wp_array_set()`:
* Update the function DocBlock per the documentation standards.
* Move the unit tests to a more appropriate place.
* Rename and reorder the tests for consistency with `_wp_array_get()` tests.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/50958">[50958]</a>, <a href="https://core.trac.wordpress.org/changeset/50962">[50962]</a>, <a href="https://core.trac.wordpress.org/changeset/50964">[50964]</a>.
See <a href="https://core.trac.wordpress.org/ticket/53175">#53175</a>, <a href="https://core.trac.wordpress.org/ticket/52625">#52625</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunktestsphpunittestsfunctionswpArrayGetphp">trunk/tests/phpunit/tests/functions/wpArrayGet.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsfunctionswpArraySetphp">trunk/tests/phpunit/tests/functions/wpArraySet.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestswparraysetphp">trunk/tests/phpunit/tests/wp-array-set.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2021-05-24 11:06:15 UTC (rev 50964)
+++ trunk/src/wp-includes/functions.php 2021-05-24 12:24:14 UTC (rev 50965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4636,6 +4636,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * $array = array();
</span><span class="cx" style="display: block; padding: 0 10px"> * _wp_array_set( $array, array( 'a', 'b', 'c', 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * $array becomes:
</span><span class="cx" style="display: block; padding: 0 10px"> * array(
</span><span class="cx" style="display: block; padding: 0 10px"> * 'a' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4645,9 +4646,14 @@
</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"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $array An array that we want to mutate to include a specific value in a path.
- * @param array $path An array of keys describing the path that we want to mutate.
- * @param mixed $value The value that will be set.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @internal
+ *
+ * @since 5.8.0
+ * @access private
+ *
+ * @param array $array An array that we want to mutate to include a specific value in a path.
+ * @param array $path An array of keys describing the path that we want to mutate.
+ * @param mixed $value The value that will be set.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_array_set( &$array, $path, $value = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Confirm $array is valid.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4659,10 +4665,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $path_length = count( $path );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === $path_length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $path as $path_element ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> ! is_string( $path_element ) && ! is_integer( $path_element ) &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4682,6 +4691,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $array = &$array[ $path_element ]; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.VariableRedeclaration
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $array[ $path[ $i ] ] = $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsfunctionswpArrayGetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/functions/wpArrayGet.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpArrayGet.php 2021-05-24 11:06:15 UTC (rev 50964)
+++ trunk/tests/phpunit/tests/functions/wpArrayGet.php 2021-05-24 12:24:14 UTC (rev 50965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,12 +57,12 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Test _wp_array_get() with non subtree paths.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test _wp_array_get() with non-subtree paths.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51720
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_array_get_simple_non_subtree() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Simple non sub tree test.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Simple non-subtree test.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 4
</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">- // Simple non sub tree not found.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Simple non-subtree not found.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> null
</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">- // Simple non sub tree not found with a default.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Simple non-subtree not found with a default.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 1
</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">- // Simple non sub tree integer path.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Simple non-subtree integer path.
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,44 +111,60 @@
</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"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Test _wp_array_get() with zero strings.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Test _wp_array_get() with subtrees.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 51720
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_array_get_handle_zeros() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_array_get_subtree() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '-0' => 'a',
- '0' => 'b',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a' => array(
+ 'b' => array(
+ 'c' => 1,
+ ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 0 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'a', 'b' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'b'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'c' => 1 )
</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"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '-0' => 'a',
- '0' => 'b',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a' => array(
+ 'b' => array(
+ 'c' => 1,
+ ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( -0 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'a', 'b', 'c' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'b'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 1
</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"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '-0' => 'a',
- '0' => 'b',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a' => array(
+ 'b' => array(
+ 'c' => 1,
+ ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '-0' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'a', 'b', 'c', 'd' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ null
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Test _wp_array_get() with zero strings.
+ *
+ * @ticket 51720
+ */
+ public function test_wp_array_get_handle_zeros() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,59 +171,42 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '-0' => 'a',
</span><span class="cx" style="display: block; padding: 0 10px"> '0' => 'b',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '0' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 0 )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'b'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * Test _wp_array_get() with subtrees.
- *
- * @ticket 51720
- */
- public function test_wp_array_get_subtree() {
</del><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a' => array(
- 'b' => array(
- 'c' => 1,
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '-0' => 'a',
+ '0' => 'b',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'a', 'b' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( -0 )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'c' => 1 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'b'
</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"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a' => array(
- 'b' => array(
- 'c' => 1,
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '-0' => 'a',
+ '0' => 'b',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'a', 'b', 'c' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( '-0' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'a'
</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"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'a' => array(
- 'b' => array(
- 'c' => 1,
- ),
- ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '-0' => 'a',
+ '0' => 'b',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'a', 'b', 'c', 'd' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( '0' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- null
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'b'
</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>
<a id="trunktestsphpunittestsfunctionswpArraySetphpfromrev50964trunktestsphpunittestswparraysetphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/tests/phpunit/tests/functions/wpArraySet.php (from rev 50964, trunk/tests/phpunit/tests/wp-array-set.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/functions/wpArraySet.php (rev 0)
+++ trunk/tests/phpunit/tests/functions/wpArraySet.php 2021-05-24 12:24:14 UTC (rev 50965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,135 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Tests for the _wp_array_get() function
+ *
+ * @since 5.8.0
+ *
+ * @group functions.php
+ * @covers ::_wp_array_get
+ */
+class Tests_Functions_wpArraySet extends WP_UnitTestCase {
+
+ /**
+ * Test _wp_array_set() with invalid parameters.
+ *
+ * @ticket 53175
+ */
+ public function test_wp_array_set_invalid_parameters() {
+ $test = 3;
+ _wp_array_set( $test, array( 'a' ), 1 );
+ $this->assertSame(
+ $test,
+ 3
+ );
+
+ $test_array = array( 'a' => 2 );
+ _wp_array_set( $test_array, 'a', 3 );
+ $this->assertSame(
+ $test_array,
+ array( 'a' => 2 )
+ );
+
+ $test_array = array( 'a' => 2 );
+ _wp_array_set( $test_array, null, 3 );
+ $this->assertSame(
+ $test_array,
+ array( 'a' => 2 )
+ );
+
+ $test_array = array( 'a' => 2 );
+ _wp_array_set( $test_array, array(), 3 );
+ $this->assertSame(
+ $test_array,
+ array( 'a' => 2 )
+ );
+
+ $test_array = array( 'a' => 2 );
+ _wp_array_set( $test_array, array( 'a', array() ), 3 );
+ $this->assertSame(
+ $test_array,
+ array( 'a' => 2 )
+ );
+ }
+
+ /**
+ * Test _wp_array_set() with simple non-subtree path.
+ *
+ * @ticket 53175
+ */
+ public function test_wp_array_set_simple_non_subtree() {
+ $test_array = array();
+ _wp_array_set( $test_array, array( 'a' ), 1 );
+ $this->assertSame(
+ $test_array,
+ array( 'a' => 1 )
+ );
+
+ $test_array = array( 'a' => 2 );
+ _wp_array_set( $test_array, array( 'a' ), 3 );
+ $this->assertSame(
+ $test_array,
+ array( 'a' => 3 )
+ );
+
+ $test_array = array( 'b' => 1 );
+ _wp_array_set( $test_array, array( 'a' ), 3 );
+ $this->assertSame(
+ $test_array,
+ array(
+ 'b' => 1,
+ 'a' => 3,
+ )
+ );
+ }
+
+ /**
+ * Test _wp_array_set() with subtree paths.
+ *
+ * @ticket 53175
+ */
+ public function test_wp_array_set_subtree() {
+ $test_array = array();
+ _wp_array_set( $test_array, array( 'a', 'b', 'c' ), 1 );
+ $this->assertSame(
+ $test_array,
+ array( 'a' => array( 'b' => array( 'c' => 1 ) ) )
+ );
+
+ $test_array = array( 'b' => 3 );
+ _wp_array_set( $test_array, array( 'a', 'b', 'c' ), 1 );
+ $this->assertSame(
+ $test_array,
+ array(
+ 'b' => 3,
+ 'a' => array( 'b' => array( 'c' => 1 ) ),
+ )
+ );
+
+ $test_array = array(
+ 'b' => 3,
+ 'a' => 1,
+ );
+ _wp_array_set( $test_array, array( 'a', 'b', 'c' ), 1 );
+ $this->assertSame(
+ $test_array,
+ array(
+ 'b' => 3,
+ 'a' => array( 'b' => array( 'c' => 1 ) ),
+ )
+ );
+
+ $test_array = array(
+ 'b' => 3,
+ 'a' => array(),
+ );
+ _wp_array_set( $test_array, array( 'a', 'b', 'c' ), 1 );
+ $this->assertSame(
+ $test_array,
+ array(
+ 'b' => 3,
+ 'a' => array( 'b' => array( 'c' => 1 ) ),
+ )
+ );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestswparraysetphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/wp-array-set.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/wp-array-set.php 2021-05-24 11:06:15 UTC (rev 50964)
+++ trunk/tests/phpunit/tests/wp-array-set.php 2021-05-24 12:24:14 UTC (rev 50965)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,136 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * _wp_array_set.
- *
- * @package WordPress
- */
-
-/**
- * Test _wp_array_set function.
- *
- * @package WordPress
- */
-class WP_Array_Set_Test extends WP_UnitTestCase {
- /**
- * Test _wp_array_set() with simple non subtree path.
- *
- * @ticket 53175
- */
- public function test_simple_not_subtree_set() {
- $test_array = array();
- _wp_array_set( $test_array, array( 'a' ), 1 );
- $this->assertSame(
- $test_array,
- array( 'a' => 1 )
- );
-
- $test_array = array( 'a' => 2 );
- _wp_array_set( $test_array, array( 'a' ), 3 );
- $this->assertSame(
- $test_array,
- array( 'a' => 3 )
- );
-
- $test_array = array( 'b' => 1 );
- _wp_array_set( $test_array, array( 'a' ), 3 );
- $this->assertSame(
- $test_array,
- array(
- 'b' => 1,
- 'a' => 3,
- )
- );
- }
-
- /**
- * Test _wp_array_set() with subtree paths.
- *
- * @ticket 53175
- */
- public function test_subtree_set() {
- $test_array = array();
- _wp_array_set( $test_array, array( 'a', 'b', 'c' ), 1 );
- $this->assertSame(
- $test_array,
- array( 'a' => array( 'b' => array( 'c' => 1 ) ) )
- );
-
- $test_array = array( 'b' => 3 );
- _wp_array_set( $test_array, array( 'a', 'b', 'c' ), 1 );
- $this->assertSame(
- $test_array,
- array(
- 'b' => 3,
- 'a' => array( 'b' => array( 'c' => 1 ) ),
- )
- );
-
- $test_array = array(
- 'b' => 3,
- 'a' => 1,
- );
- _wp_array_set( $test_array, array( 'a', 'b', 'c' ), 1 );
- $this->assertSame(
- $test_array,
- array(
- 'b' => 3,
- 'a' => array( 'b' => array( 'c' => 1 ) ),
- )
- );
-
- $test_array = array(
- 'b' => 3,
- 'a' => array(),
- );
- _wp_array_set( $test_array, array( 'a', 'b', 'c' ), 1 );
- $this->assertSame(
- $test_array,
- array(
- 'b' => 3,
- 'a' => array( 'b' => array( 'c' => 1 ) ),
- )
- );
- }
-
- /**
- * Test _wp_array_set() with invalid parameters.
- *
- * @ticket 53175
- */
- public function test_invalid_parameters_set() {
- $test = 3;
- _wp_array_set( $test, array( 'a' ), 1 );
- $this->assertSame(
- $test,
- 3
- );
-
- $test_array = array( 'a' => 2 );
- _wp_array_set( $test_array, 'a', 3 );
- $this->assertSame(
- $test_array,
- array( 'a' => 2 )
- );
-
- $test_array = array( 'a' => 2 );
- _wp_array_set( $test_array, null, 3 );
- $this->assertSame(
- $test_array,
- array( 'a' => 2 )
- );
-
- $test_array = array( 'a' => 2 );
- _wp_array_set( $test_array, array(), 3 );
- $this->assertSame(
- $test_array,
- array( 'a' => 2 )
- );
-
- $test_array = array( 'a' => 2 );
- _wp_array_set( $test_array, array( 'a', array() ), 3 );
- $this->assertSame(
- $test_array,
- array( 'a' => 2 )
- );
- }
-}
</del></span></pre>
</div>
</div>
</body>
</html>