<!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>[51135] trunk/tests/phpunit: Tests: Ignore EOL differences in some tests using multiline string assertions.</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/51135">51135</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/51135","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-06-09 19:41:47 +0000 (Wed, 09 Jun 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'>Tests: Ignore EOL differences in some tests using multiline string assertions.

Unix vs. Windows EOL style mismatches can cause misleading failures in tests using the heredoc syntax (`<<<`) or multiline strings as the expected result.

Follow-up to <a href="https://core.trac.wordpress.org/changeset/48466">[48466]</a>, <a href="https://core.trac.wordpress.org/changeset/50995">[50995]</a>, <a href="https://core.trac.wordpress.org/changeset/51079">[51079]</a>.

See <a href="https://core.trac.wordpress.org/ticket/52625">#52625</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunitincludesabstracttestcasephp">trunk/tests/phpunit/includes/abstract-testcase.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestwidgettypescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-widget-types-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestwidgetscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-widgets-controller.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunitincludesabstracttestcasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/abstract-testcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/abstract-testcase.php        2021-06-09 16:20:11 UTC (rev 51134)
+++ trunk/tests/phpunit/includes/abstract-testcase.php  2021-06-09 19:41:47 UTC (rev 51135)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -660,12 +660,27 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * Asserts that two values have the same type and value, with EOL differences discarded.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @since 5.6.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         * @since 5.8.0 Added support for nested arrays.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @param string $expected The expected value.
-        * @param string $actual   The actual value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param string|array $expected The expected value.
+        * @param string|array $actual   The actual value.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><span class="cx" style="display: block; padding: 0 10px">        public function assertSameIgnoreEOL( $expected, $actual ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame( str_replace( "\r\n", "\n", $expected ), str_replace( "\r\n", "\n", $actual ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $expected = map_deep(
+                       $expected,
+                       function ( $value ) {
+                               return str_replace( "\r\n", "\n", $value );
+                       }
+               );
+
+               $actual = map_deep(
+                       $actual,
+                       function ( $value ) {
+                               return str_replace( "\r\n", "\n", $value );
+                       }
+               );
+
+               $this->assertSame( $expected, $actual );
</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="trunktestsphpunittestsrestapirestwidgettypescontrollerphp"></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/rest-api/rest-widget-types-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-widget-types-controller.php       2021-06-09 16:20:11 UTC (rev 51134)
+++ trunk/tests/phpunit/tests/rest-api/rest-widget-types-controller.php 2021-06-09 19:41:47 UTC (rev 51135)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,7 +307,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request  = new WP_REST_Request( 'POST', '/wp/v2/widget-types/search/encode' );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">                $data     = $response->get_data();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(
</ins><span class="cx" style="display: block; padding: 0 10px">                         "<p>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<label for=\"widget-search--1-title\">Title:</label>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<input class=\"widefat\" id=\"widget-search--1-title\" name=\"widget-search[-1][title]\" type=\"text\" value=\"\" />\n" .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +343,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'number', 8 );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">                $data     = $response->get_data();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(
</ins><span class="cx" style="display: block; padding: 0 10px">                         "<p>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<label for=\"widget-search-8-title\">Title:</label>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<input class=\"widefat\" id=\"widget-search-8-title\" name=\"widget-search[8][title]\" type=\"text\" value=\"\" />\n" .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,7 +385,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">                $data     = $response->get_data();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(
</ins><span class="cx" style="display: block; padding: 0 10px">                         "<p>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<label for=\"widget-search--1-title\">Title:</label>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<input class=\"widefat\" id=\"widget-search--1-title\" name=\"widget-search[-1][title]\" type=\"text\" value=\"Test title\" />\n" .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,7 +421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_param( 'form_data', 'widget-search[-1][title]=Updated+title' );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">                $data     = $response->get_data();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(
</ins><span class="cx" style="display: block; padding: 0 10px">                         "<p>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<label for=\"widget-search--1-title\">Title:</label>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<input class=\"widefat\" id=\"widget-search--1-title\" name=\"widget-search[-1][title]\" type=\"text\" value=\"Updated title\" />\n" .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,7 +465,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">                $data     = $response->get_data();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertSame(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(
</ins><span class="cx" style="display: block; padding: 0 10px">                         "<p>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<label for=\"widget-search--1-title\">Title:</label>\n" .
</span><span class="cx" style="display: block; padding: 0 10px">                        "\t\t\t<input class=\"widefat\" id=\"widget-search--1-title\" name=\"widget-search[-1][title]\" type=\"text\" value=\"Test title\" />\n" .
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestwidgetscontrollerphp"></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/rest-api/rest-widgets-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-widgets-controller.php    2021-06-09 16:20:11 UTC (rev 51134)
+++ trunk/tests/phpunit/tests/rest-api/rest-widgets-controller.php      2021-06-09 19:41:47 UTC (rev 51135)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,12 +381,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $response           = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px">                $data               = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px">                $data               = $this->remove_links( $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualSets(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(
</ins><span class="cx" style="display: block; padding: 0 10px">                         array(
</span><span class="cx" style="display: block; padding: 0 10px">                                array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'id'            => 'text-1',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'id_base'       => 'text',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'sidebar'       => 'sidebar-1',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        'rendered'      => '<div class="textwidget">Custom text test</div>',
+                                       'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
+                                                                       '                       <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
+                                                                       '                       <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
+                                                                       '                       <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
</ins><span class="cx" style="display: block; padding: 0 10px">                                         'instance'      => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'encoded' => base64_encode(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        serialize(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,11 +411,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'text' => 'Custom text test',
</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">-                                        'rendered'      => '<div class="textwidget">Custom text test</div>',
-                                       'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
-                                                                       '                       <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
-                                                                       '                       <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
-                                                                       '                       <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
</del><span class="cx" style="display: block; padding: 0 10px">                                 ),
</span><span class="cx" style="display: block; padding: 0 10px">                                array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'id'            => 'testwidget',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1207,11 +1207,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request  = new WP_REST_Request( 'DELETE', '/wp/v2/widgets/text-1' );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_do_request( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualSets(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(
</ins><span class="cx" style="display: block; padding: 0 10px">                         array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'id'            => 'text-1',
</span><span class="cx" style="display: block; padding: 0 10px">                                'id_base'       => 'text',
</span><span class="cx" style="display: block; padding: 0 10px">                                'sidebar'       => 'wp_inactive_widgets',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                'rendered'      => '',
+                               'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
+                                                               '                       <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
+                                                               '                       <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
+                                                               '                       <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
</ins><span class="cx" style="display: block; padding: 0 10px">                                 'instance'      => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'encoded' => base64_encode(
</span><span class="cx" style="display: block; padding: 0 10px">                                                serialize(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1231,11 +1236,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                'text' => 'Custom text test',
</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">-                                'rendered'      => '',
-                               'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
-                                                               '                       <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
-                                                               '                       <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
-                                                               '                       <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
</del><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        $response->get_data()
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1264,7 +1264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $request->set_query_params( array( 'force' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px">                $response = rest_do_request( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $this->assertEqualSets(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $this->assertSameIgnoreEOL(
</ins><span class="cx" style="display: block; padding: 0 10px">                         array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'deleted'  => true,
</span><span class="cx" style="display: block; padding: 0 10px">                                'previous' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1272,6 +1272,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        'id'            => 'text-1',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'id_base'       => 'text',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'sidebar'       => 'sidebar-1',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        'rendered'      => '<div class="textwidget">Custom text test</div>',
+                                       'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
+                                                                       '                       <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
+                                                                       '                       <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
+                                                                       '                       <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
</ins><span class="cx" style="display: block; padding: 0 10px">                                         'instance'      => array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'encoded' => base64_encode(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        serialize(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1291,11 +1296,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                        'text' => 'Custom text test',
</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">-                                        'rendered'      => '<div class="textwidget">Custom text test</div>',
-                                       'rendered_form' => '<input id="widget-text-1-title" name="widget-text[1][title]" class="title sync-input" type="hidden" value="">' . "\n" .
-                                                                       '                       <textarea id="widget-text-1-text" name="widget-text[1][text]" class="text sync-input" hidden>Custom text test</textarea>' . "\n" .
-                                                                       '                       <input id="widget-text-1-filter" name="widget-text[1][filter]" class="filter sync-input" type="hidden" value="on">' . "\n" .
-                                                                       '                       <input id="widget-text-1-visual" name="widget-text[1][visual]" class="visual sync-input" type="hidden" value="on">',
</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></pre>
</div>
</div>

</body>
</html>