Changeset 34933

Timestamp:

10/08/2015 03:11:59 AM (10 years ago)

Author:

johnbillion

Message:

Abstract the shortcode attribute parsing regex into its own function, update the JavaScript counterpart, and introduce a test to ensure they do not diverge again.

Fixes #34191
Props miqrogroove, johnbillion

Location:

trunk

Files:

• src/wp-includes/js/shortcode.js (modified) (1 diff)
• src/wp-includes/shortcodes.php (modified) (2 diffs)
• tests/phpunit/tests/shortcode.php (modified) (1 diff)

trunk/src/wp-includes/js/shortcode.js

@@ -136 +136 @@
             // 7. A numeric attribute in double quotes.
             // 8. An unquoted numeric attribute.
-            pattern = /(\w+)\s*=\s*"([^"]*)"(?:\s|$)|(\w+)\s*=\s*\'([^\']*)\'(?:\s|$)|(\w+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/g;
+            pattern = /([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*'([^']*)'(?:\s|$)|([\w-]+)\s*=\s*([^\s'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/g;
 
             // Map zero-width spaces to actual spaces.

trunk/src/wp-includes/shortcodes.php

@@ -452 +452 @@
 
 /**
+ * Retrieve the shortcode attributes regex.
+ *
+ * @since 4.4.0
+ *
+ * @return string The shortcode attribute regular expression
+ */
+function get_shortcode_atts_regex() {
+    return '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
+}
+
+/**
  * Retrieve all attributes from the shortcodes tag.
  *
@@ -468 +479 @@
 function shortcode_parse_atts($text) {
     $atts = array();
-    $pattern = '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
+    $pattern = get_shortcode_atts_regex();
     $text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
     if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {

trunk/tests/phpunit/tests/shortcode.php

@@ -633 +633 @@
         return data_whole_posts();
     }
+
+    function test_php_and_js_shortcode_attribute_regexes_match() {
+
+        $file = file_get_contents( ABSPATH . WPINC . '/js/shortcode.js' );
+        $matched = preg_match( '|\s+pattern = (\/.+\/)g;|', $file, $matches );
+        $php = get_shortcode_atts_regex();
+
+        $this->assertSame( 1, $matched );
+
+        $js = str_replace( "\'", "'", $matches[1] );
+        $this->assertSame( $php, $js );
+
+    }
+
 }