Changeset 41045

Timestamp:

07/14/2017 11:49:34 AM (7 years ago)

Author:

pento

Message:

Emoji: Fix some failing unit tests in PHP 5.2 and 5.3.

• Older versions of PHP don't know how to html_entity_decode() emoji.
• The fall back regex was a little too broad, catching characters that aren't emoji.

See #35293.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/Emoji.php (modified) (3 diffs)

trunk/src/wp-includes/formatting.php

@@ -5291 +5291 @@
     if ( 'codepoints' === $type && ( ! defined( 'PCRE_VERSION' ) || version_compare( PCRE_VERSION, '8.32', '<=' ) ) ) {
         return '/(
-             \xE2\x98[\x80-\xFF]            # Symbols
-           | \xE2\x99[\x00-\xFF]
-           | [\xE3-\xED][\x00-\xFF]{2}
+             \xE2\x99[\x80-\x82]            # Male and female symbols
            | [\x23\x30-\x39]\xE2\x83\xA3    # Digits
            | \xF0\x9F[\x85-\x88][\xA6-\xBF] # Enclosed characters

trunk/tests/phpunit/tests/formatting/Emoji.php

@@ -102 +102 @@
                 '🧚',
             ),
-
         );
     }
@@ -115 +114 @@
 
     public function data_wp_staticize_emoji() {
-        return array(
+        $data = array(
             array(
                 // Not emoji
@@ -124 +123 @@
                 // Simple emoji
                 '🙂',
-                '<img src="' . $this->png_cdn . '1f642.png" alt="🙂" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
+                '<img src="' . $this->png_cdn . '1f642.png" alt="" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
             ),
             array(
                 // Skin tone, gender, ZWJ, emoji selector
                 '👮🏼‍♀️',
-                '<img src="' . $this->png_cdn . '1f46e-1f3fc-200d-2640-fe0f.png" alt="👮🏼‍♀️" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
+                '<img src="' . $this->png_cdn . '1f46e-1f3fc-200d-2640-fe0f.png" alt="" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
             ),
             array(
                 // Unicode 10
                 '🧚',
-                '<img src="' . $this->png_cdn . '1f9da.png" alt="🧚" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
+                '<img src="' . $this->png_cdn . '1f9da.png" alt="" class="wp-smiley" style="height: 1em; max-height: 1em;" />',
             ),
+        );
 
-        );
+        // Older versions of PHP don't html_entity_decode() emoji, so we need to make sure they're testing in the expected form.
+        foreach ( $data as $key => $datum ) {
+            $emoji = html_entity_decode( wp_encode_emoji( $datum[0] ) );
+            $data[ $key ][1] = str_replace( 'alt=""', 'alt="' . $emoji . '"', $datum[1] );
+        }
+
+        return $data;
     }