Ticket #44883: 44883.1.diff

src/wp-content/themes/twentyseventeen/functions.php

@@ -560 +560 @@
 }
 add_filter( 'widget_tag_cloud_args', 'twentyseventeen_widget_tag_cloud_args' );
 
+/**
+ * Get unique ID.
+ *
+ * This is a PHP implementation of Underscore's uniqueId method.
+ * A static variable contains an integer that is incremented with
+ * each call. This number is returned with the optional prefix.
+ * As such the returned value is not universally-unique, but it
+ * is unique across the life of the PHP process.
+ *
+ * @since Twenty Seventeen 1.8
+ * @see wp_unique_id() Themes requiring WordPress 4.9.9 and greater should use this instead.
+ *
+ * @staticvar int $id_counter
+ *
+ * @param string $prefix Prefix for the returned ID.
+ * @return string Unique ID.
+ */
+function twentyseventeen_unique_id( $prefix = '' ) {
+        static $id_counter = 0;
+        if ( function_exists( 'wp_unique_id' ) ) {
+                return wp_unique_id( $prefix );
+        }
+        return $prefix . (string) ++$id_counter;
+}
+
 /**
  * Implement the Custom Header feature.
  */

src/wp-content/themes/twentyseventeen/inc/icon-functions.php

@@ -74 +74 @@
          */
         if ( $args['title'] ) {
                 $aria_hidden     = '';
-                $unique_id       = uniqid();
+                $unique_id       = twentyseventeen_unique_id();
                 $aria_labelledby = ' aria-labelledby="title-' . $unique_id . '"';
 
                 if ( $args['desc'] ) {

src/wp-content/themes/twentyseventeen/searchform.php

@@ -10 +10 @@
 
 ?>
 
-<?php $unique_id = esc_attr( uniqid( 'search-form-' ) ); ?>
+<?php $unique_id = esc_attr( twentyseventeen_unique_id( 'search-form-' ) ); ?>
 
 <form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
         <label for="<?php echo $unique_id; ?>">

src/wp-includes/functions.php

@@ -5722 +5722 @@
         );
 }
 
+/**
+ * Get unique ID.
+ *
+ * This is a PHP implementation of Underscore's uniqueId method.
+ * A static variable contains an integer that is incremented with
+ * each call. This number is returned with the optional prefix.
+ * As such the returned value is not universally-unique, but it
+ * is unique across the life of the PHP process.
+ *
+ * @since 4.9.9
+ *
+ * @staticvar int $id_counter
+ *
+ * @param string $prefix Prefix for the returned ID.
+ * @return string Unique ID.
+ */
+function wp_unique_id( $prefix = '' ) {
+        static $id_counter = 0;
+        return $prefix . (string) ++$id_counter;
+}
+
 /**
  * Validates that a UUID is valid.
  *

tests/phpunit/tests/functions.php

@@ -909 +909 @@
                 $this->assertEquals( $uuids, $unique_uuids );
         }
 
+        /**
+         * Tests wp_unique_id().
+         *
+         * @covers ::wp_unique_id
+         * @ticket 44883
+         */
+        function test_wp_unique_id() {
+
+                // Test without prefix.
+                $ids = array();
+                for ( $i = 0; $i < 20; $i += 1 ) {
+                        $id = wp_unique_id();
+                        $this->assertInternalType( 'string', $id );
+                        $this->assertTrue( is_numeric( $id ) );
+                        $ids[] = $id;
+                }
+                $this->assertEquals( $ids, array_unique( $ids ) );
+
+                // Test with prefix.
+                $ids = array();
+                for ( $i = 0; $i < 20; $i += 1 ) {
+                        $id = wp_unique_id( 'foo-' );
+                        $this->assertRegExp( '/^foo-\d+$/', $id );
+                        $ids[] = $id;
+                }
+                $this->assertEquals( $ids, array_unique( $ids ) );
+        }
+
         /**
          * Tests wp_is_uuid().
          *