<!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>[26972] trunk: Unit tests for get_url_in_content().</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26972">26972</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-01-17 07:46:33 +0000 (Fri, 17 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unit tests for get_url_in_content(). Return false when no content is passed, to match the return value of no links being found.
props mdbitz.
<a href="http://core.trac.wordpress.org/ticket/26171">#26171</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsformattingGetUrlInContentphp">trunk/tests/phpunit/tests/formatting/GetUrlInContent.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (26971 => 26972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php 2014-01-17 04:13:18 UTC (rev 26971)
+++ trunk/src/wp-includes/formatting.php 2014-01-17 07:46:33 UTC (rev 26972)
</span><span class="lines">@@ -3770,11 +3770,13 @@
</span><span class="cx"> * @return string The found URL.
</span><span class="cx"> */
</span><span class="cx"> function get_url_in_content( $content ) {
</span><del>- if ( empty( $content ) )
- return '';
</del><ins>+ if ( empty( $content ) ) {
+ return false;
+ }
</ins><span class="cx">
</span><del>- if ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) )
</del><ins>+ if ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) ) {
</ins><span class="cx"> return esc_url_raw( $matches[2] );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingGetUrlInContentphp"></a>
<div class="addfile"><h4>Added: trunk/tests/phpunit/tests/formatting/GetUrlInContent.php (0 => 26972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/formatting/GetUrlInContent.php (rev 0)
+++ trunk/tests/phpunit/tests/formatting/GetUrlInContent.php 2014-01-17 07:46:33 UTC (rev 26972)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<?php
+
+/**
+ * @group formatting
+ */
+class Tests_Formatting_GetUrlInContent extends WP_UnitTestCase {
+
+ /**
+ * URL Content Data Provider
+ *
+ * array ( input_txt, converted_output_txt )
+ */
+ public function get_input_output() {
+ return array (
+ array (
+ "",
+ false
+ ), //empty content
+ array (
+ "<div>NO URL CONTENT</div>",
+ false
+ ), //no URLs
+ array (
+ '<div href="/relative.php">NO URL CONTENT</div>',
+ false
+ ), // ignore none link elements
+ array (
+ 'ABC<div><a href="/relative.php">LINK</a> CONTENT</div>',
+ "/relative.php"
+ ), // single link
+ array (
+ 'ABC<div><a href="/relative.php">LINK</a> CONTENT <a href="/suppress.php">LINK</a></div>',
+ "/relative.php"
+ ), // multiple links
+ array (
+ 'ABC<div><a href="http://example.com/Mr%20WordPress 2">LINK</a> CONTENT </div>',
+ "http://example.com/Mr%20WordPress2"
+ ), // escape link
+ );
+ }
+
+ /**
+ * Validate the get_url_in_content function
+ * @dataProvider get_input_output
+ */
+ function test_get_url_in_content( $in_str, $exp_str ) {
+ $this->assertEquals($exp_str, get_url_in_content( $in_str ) );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>