Changeset 28399

Timestamp:

05/15/2014 01:11:21 AM (11 years ago)

Author:

wonderboymusic

Message:

Eliminate use of extract() in wp_dropdown_pages().

Adds unit tests to: tests/post/template.php.
There was previously only one wimpy assertion for wp_dropdown_pages().

See #22400.

Location:

trunk

Files:

• src/wp-includes/post-template.php (modified) (3 diffs)
• tests/phpunit/tests/post/getPages.php (modified) (1 diff)
• tests/phpunit/tests/post/template.php (modified) (1 diff)

trunk/src/wp-includes/post-template.php

@@ -919 +919 @@
  * @return string HTML content, if not displaying.
  */
-function wp_dropdown_pages($args = '') {
+function wp_dropdown_pages( $args = '' ) {
     $defaults = array(
         'depth' => 0, 'child_of' => 0,
@@ -929 +929 @@
 
     $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
-
-    $pages = get_pages($r);
+
+    $pages = get_pages( $r );
     $output = '';
     // Back-compat with old system where both id and name were based on $name argument
-    if ( empty($id) )
-        $id = $name;
-
-    if ( ! empty($pages) ) {
-        $output = "<select name='" . esc_attr( $name ) . "' id='" . esc_attr( $id ) . "'>\n";
-        if ( $show_option_no_change )
-            $output .= "\t<option value=\"-1\">$show_option_no_change</option>";
-        if ( $show_option_none )
-            $output .= "\t<option value=\"" . esc_attr($option_none_value) . "\">$show_option_none</option>\n";
-        $output .= walk_page_dropdown_tree($pages, $depth, $r);
+    if ( empty( $r['id'] ) ) {
+        $r['id'] = $r['name'];
+    }
+
+    if ( ! empty( $pages ) ) {
+        $output = "<select name='" . esc_attr( $r['name'] ) . "' id='" . esc_attr( $r['id'] ) . "'>\n";
+        if ( $r['show_option_no_change'] ) {
+            $output .= "\t<option value=\"-1\">" . $r['show_option_no_change'] . "</option>\n";
+        }
+        if ( $r['show_option_none'] ) {
+            $output .= "\t<option value=\"" . esc_attr( $r['option_none_value'] ) . '">' . $r['show_option_none'] . "</option>\n";
+        }
+        $output .= walk_page_dropdown_tree( $pages, $r['depth'], $r );
         $output .= "</select>\n";
     }
@@ -952 +954 @@
      * @since 2.1.0
      *
-     * @param string $output HTML output for drop down list of pages.
-     */
-    $output = apply_filters( 'wp_dropdown_pages', $output );
-
-    if ( $echo )
-        echo $output;
-
-    return $output;
+     * @param string $html HTML output for drop down list of pages.
+     */
+    $html = apply_filters( 'wp_dropdown_pages', $output );
+
+    if ( $r['echo'] ) {
+        echo $html;
+    }
+    return $html;
 }
 

trunk/tests/phpunit/tests/post/getPages.php

@@ -165 +165 @@
      */
     function test_wp_dropdown_pages() {
-        $posts = $this->factory->post->create_many( 5, array( 'post_type' => 'page' ) );
+        $this->factory->post->create_many( 5, array( 'post_type' => 'page' ) );
 
         preg_match_all( '#<option#', wp_dropdown_pages( 'echo=0' ), $matches );

trunk/tests/phpunit/tests/post/template.php

@@ -73 +73 @@
         $this->assertEquals( $pagelink, $output );
     }
+
+    function test_wp_dropdown_pages() {
+        $none = wp_dropdown_pages( array( 'echo' => 0 ) );
+        $this->assertEmpty( $none );
+
+        $bump = '   ';
+        $page_id = $this->factory->post->create( array( 'post_type' => 'page' ) );
+        $child_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $page_id ) );
+        $grandchild_id = $this->factory->post->create( array( 'post_type' => 'page', 'post_parent' => $child_id ) );
+
+        $lineage =<<<LINEAGE
+<select name='page_id' id='page_id'>
+    <option class="level-0" value="$page_id">Post title 1</option>
+    <option class="level-1" value="$child_id">{$bump}Post title 2</option>
+    <option class="level-2" value="$grandchild_id">{$bump}{$bump}Post title 3</option>
+</select>
+
+LINEAGE;
+
+        $output = wp_dropdown_pages( array( 'echo' => 0 ) );
+        $this->assertEquals( $lineage, $output );
+
+        $depth =<<<DEPTH
+<select name='page_id' id='page_id'>
+    <option class="level-0" value="$page_id">Post title 1</option>
+</select>
+
+DEPTH;
+
+        $output = wp_dropdown_pages( array( 'echo' => 0, 'depth' => 1 ) );
+        $this->assertEquals( $depth, $output );
+
+        $option_none =<<<NONE
+<select name='page_id' id='page_id'>
+    <option value="Woo">Hoo</option>
+    <option class="level-0" value="$page_id">Post title 1</option>
+</select>
+
+NONE;
+
+        $output = wp_dropdown_pages( array( 'echo' => 0, 'depth' => 1,
+            'show_option_none' => 'Hoo', 'option_none_value' => 'Woo'
+        ) );
+        $this->assertEquals( $option_none, $output );
+
+        $option_no_change =<<<NO
+<select name='page_id' id='page_id'>
+    <option value="-1">Burrito</option>
+    <option value="Woo">Hoo</option>
+    <option class="level-0" value="$page_id">Post title 1</option>
+</select>
+
+NO;
+        $output = wp_dropdown_pages( array( 'echo' => 0, 'depth' => 1,
+            'show_option_none' => 'Hoo', 'option_none_value' => 'Woo',
+            'show_option_no_change' => 'Burrito'
+        ) );
+        $this->assertEquals( $option_no_change, $output );
+    }
 }