<!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>[46369] trunk: Shortcodes: Improve handling from `shortcode_parse_attts()`.</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/46369">46369</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/46369","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>whyisjake</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-10-01 03:41:58 +0000 (Tue, 01 Oct 2019)</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'>Shortcodes: Improve handling from `shortcode_parse_attts()`.
Ensure consistency between `shortcode_parse_attts()` when being used directly.
Props mauteri, birgire, SergeyBiryukov, kadamwhite, whyisjake.
Fixes <a href="https://core.trac.wordpress.org/ticket/47863">#47863</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunktestsphpunittestsshortcodephp">trunk/tests/phpunit/tests/shortcode.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesshortcodesphp"></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/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2019-10-01 01:18:03 UTC (rev 46368)
+++ trunk/src/wp-includes/shortcodes.php 2019-10-01 03:41:58 UTC (rev 46369)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,8 +488,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * retrieval of the attributes, since all attributes have to be known.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.3.0 Support of a full shortcode input.
</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 $text
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $text Any single shortcode of any format or key/value pair string.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array|string List of attribute values.
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns empty array if trim( $text ) == '""'.
</span><span class="cx" style="display: block; padding: 0 10px"> * Returns empty string if trim( $text ) == ''.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +499,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function shortcode_parse_atts( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $atts = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $pattern = get_shortcode_atts_regex();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $text = preg_replace( "/[\x{00a0}\x{200b}]+/u", ' ', $text );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $text = trim( preg_replace( "/[\x{00a0}\x{200b}]+/u", ' ', $text ) );
+
+ // Remove everything but attributes from shortcode.
+ if ( preg_match( '#^\[[\w-]+([^\]]*?)\/?\]#', $text, $matches ) ) {
+ $text = $matches[1];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match_all( $pattern, $text, $match, PREG_SET_ORDER ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $match as $m ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $m[1] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +523,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reject any unclosed HTML elements
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Reject any unclosed HTML elements.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $atts as &$value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $value, '<' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 !== preg_match( '/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -527,6 +534,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $atts = ltrim( $text );
</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"> return $atts;
</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="trunktestsphpunittestsshortcodephp"></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/shortcode.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/shortcode.php 2019-10-01 01:18:03 UTC (rev 46368)
+++ trunk/tests/phpunit/tests/shortcode.php 2019-10-01 03:41:58 UTC (rev 46369)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -972,4 +972,136 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'test-shortcode-tag', $this->tagname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Testing the `shortcode_parse_atts()` function.
+ *
+ * @ticket 47863
+ *
+ * @covers ::shortcode_parse_atts
+ * @dataProvider data_shortcode_parse_atts
+ *
+ * @param string $text A single shortcode format or key/value pair string.
+ * @param string|array $expected Expected results.
+ */
+ public function test_shortcode_parse_atts( $text, $expected ) {
+ $actual = shortcode_parse_atts( $text );
+ $this->assertSame( $expected, $actual );
+ }
+
+ /**
+ * Data provider for `test_shortcode_parse_atts()`.
+ *
+ * @return array {
+ * @type array {
+ * @type string $text A single shortcode format or key/value pair string.
+ * @type string|array $expected The expected result.
+ * }
+ * }
+ */
+ public function data_shortcode_parse_atts() {
+
+ return array(
+ array(
+ '',
+ '',
+ ),
+ array(
+ ' ',
+ '',
+ ),
+ array(
+ '""',
+ array(),
+ ),
+ array(
+ '\'\'',
+ array(),
+ ),
+ array(
+ '[unittest]',
+ '',
+ ),
+ array(
+ '[unitest]Unit Test[/unittest]',
+ '',
+ ),
+ array(
+ '[unittest title="unittest" link="https://unit.test/"]',
+ array(
+ 'title' => 'unittest',
+ 'link' => 'https://unit.test/',
+ ),
+ ),
+ array(
+ '[unittest title="unittest" link="https://unit.test/"/]',
+ array(
+ 'title' => 'unittest',
+ 'link' => 'https://unit.test/',
+ ),
+ ),
+ array(
+ '[unit_test title="unittest" link="https://unit.test/"/]',
+ array(
+ 'title' => 'unittest',
+ 'link' => 'https://unit.test/',
+ ),
+ ),
+ array(
+ '[unit-test title="unittest" link="https://unit.test/"/]',
+ array(
+ 'title' => 'unittest',
+ 'link' => 'https://unit.test/',
+ ),
+ ),
+ array(
+ '[unittest link=https://unit.test/ /]',
+ array(
+ 'link' => 'https://unit.test/',
+ ),
+ ),
+ array(
+ '[unittest link=https://unit.test/ ]',
+ array(
+ 'link' => 'https://unit.test/',
+ ),
+ ),
+ array(
+ '[unittest link=https://unit.test/]',
+ array(
+ 'link' => 'https://unit.test',
+ ),
+ ),
+ array(
+ '[unittest link https://unit.test/ /]',
+ array(
+ 'link',
+ 'https://unit.test/',
+ ),
+ ),
+ array(
+ '[unittest title="unittest" link="https://unit.test/"]Unit Test[/unittest]',
+ array(
+ 'title' => 'unittest',
+ 'link' => 'https://unit.test/',
+ ),
+ ),
+ array(
+ '[unittest title="unittest" link="https://unit.test/"][unit_test foo="bar" bar="foo"][/unittest]',
+ array(
+ 'title' => 'unittest',
+ 'link' => 'https://unit.test/',
+ ),
+ ),
+ array(
+ 'title="unittest" link="https://unit.test/"',
+ array(
+ 'title' => 'unittest',
+ 'link' => 'https://unit.test/',
+ ),
+ ),
+ );
+
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>