<!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>[28397] trunk: Eliminate use of `extract()` in `paginate_links()`.</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/28397">28397</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-14 22:28:08 +0000 (Wed, 14 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Eliminate use of `extract()` in `paginate_links()`. Adds unit tests. Moves `tests/general/template.php` (which only had one method) to `tests/general/paginateLinks.php`.
See <a href="http://core.trac.wordpress.org/ticket/22400">#22400</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsgeneralpaginateLinksphp">trunk/tests/phpunit/tests/general/paginateLinks.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsgeneraltemplatephp">trunk/tests/phpunit/tests/general/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/general-template.php (28396 => 28397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/general-template.php 2014-05-14 16:42:42 UTC (rev 28396)
+++ trunk/src/wp-includes/general-template.php 2014-05-14 22:28:08 UTC (rev 28397)
</span><span class="lines">@@ -2447,26 +2447,32 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $args, $defaults );
</span><del>- extract($args, EXTR_SKIP);
</del><span class="cx">
</span><span class="cx"> // Who knows what else people pass in $args
</span><del>- $total = (int) $total;
- if ( $total < 2 )
</del><ins>+ $total = (int) $args['total'];
+ if ( $total < 2 ) {
</ins><span class="cx"> return;
</span><del>- $current = (int) $current;
- $end_size = 0 < (int) $end_size ? (int) $end_size : 1; // Out of bounds? Make it the default.
- $mid_size = 0 <= (int) $mid_size ? (int) $mid_size : 2;
- $add_args = is_array($add_args) ? $add_args : false;
</del><ins>+ }
+ $current = (int) $args['current'];
+ $end_size = (int) $args['end_size']; // Out of bounds? Make it the default.
+ if ( $end_size < 1 ) {
+ $end_size = 1;
+ }
+ $mid_size = (int) $args['mid_size'];
+ if ( $mid_size < 0 ) {
+ $mid_size = 2;
+ }
+ $add_args = is_array( $args['add_args'] ) ? $args['add_args'] : false;
</ins><span class="cx"> $r = '';
</span><span class="cx"> $page_links = array();
</span><span class="cx"> $dots = false;
</span><span class="cx">
</span><del>- if ( $prev_next && $current && 1 < $current ) :
- $link = str_replace('%_%', 2 == $current ? '' : $format, $base);
- $link = str_replace('%#%', $current - 1, $link);
</del><ins>+ if ( $args['prev_next'] && $current && 1 < $current ) :
+ $link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
+ $link = str_replace( '%#%', $current - 1, $link );
</ins><span class="cx"> if ( $add_args )
</span><span class="cx"> $link = add_query_arg( $add_args, $link );
</span><del>- $link .= $add_fragment;
</del><ins>+ $link .= $args['add_fragment'];
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter the paginated links for the given archive pages.
</span><span class="lines">@@ -2475,40 +2481,40 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $link The paginated link URL.
</span><span class="cx"> */
</span><del>- $page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $prev_text . '</a>';
</del><ins>+ $page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';
</ins><span class="cx"> endif;
</span><span class="cx"> for ( $n = 1; $n <= $total; $n++ ) :
</span><span class="cx"> if ( $n == $current ) :
</span><del>- $page_links[] = "<span class='page-numbers current'>" . $before_page_number . number_format_i18n( $n ) . $after_page_number . "</span>";
</del><ins>+ $page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
</ins><span class="cx"> $dots = true;
</span><span class="cx"> else :
</span><del>- if ( $show_all || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
- $link = str_replace('%_%', 1 == $n ? '' : $format, $base);
- $link = str_replace('%#%', $n, $link);
</del><ins>+ if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
+ $link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
+ $link = str_replace( '%#%', $n, $link );
</ins><span class="cx"> if ( $add_args )
</span><span class="cx"> $link = add_query_arg( $add_args, $link );
</span><del>- $link .= $add_fragment;
</del><ins>+ $link .= $args['add_fragment'];
</ins><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/general-template.php */
</span><del>- $page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $before_page_number . number_format_i18n( $n ) . $after_page_number . "</a>";
</del><ins>+ $page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>";
</ins><span class="cx"> $dots = true;
</span><del>- elseif ( $dots && !$show_all ) :
</del><ins>+ elseif ( $dots && ! $args['show_all'] ) :
</ins><span class="cx"> $page_links[] = '<span class="page-numbers dots">' . __( '…' ) . '</span>';
</span><span class="cx"> $dots = false;
</span><span class="cx"> endif;
</span><span class="cx"> endif;
</span><span class="cx"> endfor;
</span><del>- if ( $prev_next && $current && ( $current < $total || -1 == $total ) ) :
- $link = str_replace('%_%', $format, $base);
- $link = str_replace('%#%', $current + 1, $link);
</del><ins>+ if ( $args['prev_next'] && $current && ( $current < $total || -1 == $total ) ) :
+ $link = str_replace( '%_%', $args['format'], $args['base'] );
+ $link = str_replace( '%#%', $current + 1, $link );
</ins><span class="cx"> if ( $add_args )
</span><span class="cx"> $link = add_query_arg( $add_args, $link );
</span><del>- $link .= $add_fragment;
</del><ins>+ $link .= $args['add_fragment'];
</ins><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-includes/general-template.php */
</span><del>- $page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $next_text . '</a>';
</del><ins>+ $page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
</ins><span class="cx"> endif;
</span><del>- switch ( $type ) {
</del><ins>+ switch ( $args['type'] ) {
</ins><span class="cx"> case 'array' :
</span><span class="cx"> return $page_links;
</span><span class="cx">
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralpaginateLinksphpfromrev28396trunktestsphpunittestsgeneraltemplatephp"></a>
<div class="copfile"><h4>Copied: trunk/tests/phpunit/tests/general/paginateLinks.php (from rev 28396, trunk/tests/phpunit/tests/general/template.php) (0 => 28397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/general/paginateLinks.php (rev 0)
+++ trunk/tests/phpunit/tests/general/paginateLinks.php 2014-05-14 22:28:08 UTC (rev 28397)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+<?php
+
+class Tests_Paginate_Links extends WP_UnitTestCase {
+
+ private $i18n_count = 0;
+
+ function test_defaults() {
+ $expected =<<<EXPECTED
+<a class='page-numbers' href=''>1</a>
+<span class="page-numbers dots">…</span>
+<a class='page-numbers' href='?page=50'>50</a>
+EXPECTED;
+
+ $links = paginate_links( array( 'total' => 50 ) );
+ $this->assertEquals( $expected, $links );
+ }
+
+ function test_format() {
+ $expected =<<<EXPECTED
+<a class='page-numbers' href=''>1</a>
+<span class="page-numbers dots">…</span>
+<a class='page-numbers' href='/page/50/'>50</a>
+EXPECTED;
+
+ $links = paginate_links( array( 'total' => 50, 'format' => '/page/%#%/' ) );
+ $this->assertEquals( $expected, $links );
+ }
+
+ function test_prev_next_false() {
+ $expected =<<<EXPECTED
+<a class='page-numbers' href=''>1</a>
+<span class='page-numbers current'>2</span>
+<a class='page-numbers' href='?page=3'>3</a>
+<a class='page-numbers' href='?page=4'>4</a>
+<span class="page-numbers dots">…</span>
+<a class='page-numbers' href='?page=50'>50</a>
+EXPECTED;
+
+ $links = paginate_links( array( 'total' => 50, 'prev_next' => false, 'current' => 2 ) );
+ $this->assertEquals( $expected, $links );
+ }
+
+ function test_prev_next_true() {
+ $expected =<<<EXPECTED
+<a class="prev page-numbers" href="">« Previous</a>
+<a class='page-numbers' href=''>1</a>
+<span class='page-numbers current'>2</span>
+<a class='page-numbers' href='?page=3'>3</a>
+<a class='page-numbers' href='?page=4'>4</a>
+<span class="page-numbers dots">…</span>
+<a class='page-numbers' href='?page=50'>50</a>
+<a class="next page-numbers" href="?page=3">Next »</a>
+EXPECTED;
+
+ $links = paginate_links( array( 'total' => 50, 'prev_next' => true, 'current' => 2 ) );
+ $this->assertEquals( $expected, $links );
+ }
+
+ function increment_i18n_count() {
+ $this->i18n_count += 1;
+ }
+
+ /**
+ * @ticket 25735
+ */
+ function test_paginate_links_number_format() {
+ $this->i18n_count = 0;
+ add_filter( 'number_format_i18n', array( $this, 'increment_i18n_count' ) );
+ paginate_links( array(
+ 'total' => 100,
+ 'current' => 50,
+ 'show_all' => false,
+ 'prev_next' => true,
+ 'end_size' => 1,
+ 'mid_size' => 1,
+ ) );
+ // The links should be:
+ // < Previous 1 ... 49 50 51 ... 100 Next >
+ $this->assertEquals( 5, $this->i18n_count );
+ remove_filter( 'number_format_i18n', array( $this, 'increment_i18n_count' ) );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsgeneraltemplatephp"></a>
<div class="delfile"><h4>Deleted: trunk/tests/phpunit/tests/general/template.php (28396 => 28397)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/general/template.php 2014-05-14 16:42:42 UTC (rev 28396)
+++ trunk/tests/phpunit/tests/general/template.php 2014-05-14 22:28:08 UTC (rev 28397)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-<?php
-
-class Tests_General_Template extends WP_UnitTestCase {
-
- private $i18n_count = 0;
-
- function increment_i18n_count() {
- $this->i18n_count += 1;
- }
-
- /**
- * @ticket 25735
- */
- function test_paginate_links_number_format() {
- $this->i18n_count = 0;
- add_filter( 'number_format_i18n', array( $this, 'increment_i18n_count' ) );
- paginate_links( array(
- 'total' => 100,
- 'current' => 50,
- 'show_all' => false,
- 'prev_next' => true,
- 'end_size' => 1,
- 'mid_size' => 1,
- ) );
- // The links should be:
- // < Previous 1 ... 49 50 51 ... 100 Next >
- $this->assertEquals( 5, $this->i18n_count );
- remove_filter( 'number_format_i18n', array( $this, 'increment_i18n_count' ) );
- }
-
-}
</del></span></pre>
</div>
</div>
</body>
</html>