Ticket #31909: wp_dropdown_categories-required.31909-5.diff

src/wp-includes/category-template.php

@@ -314 +314 @@
  *
  * @since 2.1.0
  * @since 4.2.0 Introduced the `value_field` argument.
+ * @since 4.6.0 Added required attribute
  *
  * @param string|array $args {
  *     Optional. Array or string of arguments to generate a categories drop-down element.
@@ -351 +352 @@
  *     @type string|array $taxonomy          Name of the category or categories to retrieve. Default 'category'.
  *     @type bool         $hide_if_empty     True to skip generating markup if no categories are found.
  *                                           Default false (create select element even if no categories are found).
+ *     @type bool         $required          Whether the field is required or not using HTML5 'required' attribute.
+ *                                           Accepts 0, 1, or their boolean. Defaults to false.
  * }
  * @return string HTML content only if 'echo' argument is 0.
  */
 function wp_dropdown_categories( $args = '' ) {
         $defaults = array(
-                'show_option_all' => '', 'show_option_none' => '',
-                'orderby' => 'id', 'order' => 'ASC',
+                'show_option_all' => '',
+                'show_option_none' => '',
+                'option_none_value' => -1,
+                'orderby' => 'id',
+                'order' => 'ASC',
                 'show_count' => 0,
-                'hide_empty' => 1, 'child_of' => 0,
-                'exclude' => '', 'echo' => 1,
-                'selected' => 0, 'hierarchical' => 0,
-                'name' => 'cat', 'id' => '',
-                'class' => 'postform', 'depth' => 0,
-                'tab_index' => 0, 'taxonomy' => 'category',
-                'hide_if_empty' => false, 'option_none_value' => -1,
+                'hide_empty' => 1,
+                'child_of' => 0,
+                'exclude' => '',
+                'echo' => 1,
+                'selected' => 0,
+                'hierarchical' => 0,
+                'name' => 'cat',
+                'id' => '',
+                'class' => 'postform',
+                'depth' => 0,
+                'tab_index' => 0,
+                'taxonomy' => 'category',
+                'hide_if_empty' => false,
                 'value_field' => 'term_id',
+                'required' => false
         );
 
         $defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0;
@@ -405 +418 @@
         $name = esc_attr( $r['name'] );
         $class = esc_attr( $r['class'] );
         $id = $r['id'] ? esc_attr( $r['id'] ) : $name;
+        $required = $r['required'] ? 'required' : '';
 
         if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
-                $output = "<select name='$name' id='$id' class='$class' $tab_index_attribute>\n";
+                $output = "<select $required name='$name' id='$id' class='$class' $tab_index_attribute>\n";
         } else {
                 $output = '';
         }

tests/phpunit/tests/category.php

@@ -262 +262 @@
                 // Test to see if it returns the default with the category ID.
                 $this->assertContains( 'value="' . $cat_id . '"', $dropdown_default );
         }
+        /**
+         * @ticket 31909
+         */
+        public function test_wp_dropdown_categories_value_field_should_contain_required() {
+                // Create a test category.
+                $cat_id = self::factory()->category->create( array(
+                        'name' => 'Test Category',
+                        'slug' => 'test_category',
+                ) );
+
+                // Get the default functionality of wp_dropdown_categories().
+                $args = array(
+                        'show_option_none'  => __( 'Select one', 'text-domain' ),
+                        'option_none_value' => "",
+                        'required'          => 1,
+                        'hide_empty'        => 0,
+                        'echo'              => 0,
+                );
+                $dropdown_categories = wp_dropdown_categories( $args );
+
+
+                // Test to see if it contains the "required" attribute.
+                $this->assertContains( 'required', $dropdown_categories );
+        }
 
         /**
          * @ticket 30306