![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 62687
- Timestamp:
- 07/10/2026 04:45:12 PM (2 months ago)
- Location:
- trunk
- Files:
-
- 1 added
- 14 edited
-
src/wp-includes/html-api/class-wp-html-processor.php (modified) (20 diffs)
-
src/wp-includes/html-api/class-wp-html-tag-processor.php (modified) (25 diffs)
-
src/wp-includes/script-loader.php (modified) (1 diff)
-
tests/phpunit/includes/build-visual-html-tree.php (modified) (1 diff)
-
tests/phpunit/tests/build-visual-html-tree.php (modified) (1 diff)
-
tests/phpunit/tests/dependencies/wpInlineScriptTag.php (modified) (1 diff)
-
tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php (modified) (1 diff)
-
tests/phpunit/tests/html-api/wpHtmlProcessor.php (modified) (1 diff)
-
tests/phpunit/tests/html-api/wpHtmlProcessorComments.php (modified) (1 diff)
-
tests/phpunit/tests/html-api/wpHtmlProcessorModifiableText.php (modified) (1 diff)
-
tests/phpunit/tests/html-api/wpHtmlProcessorProcessingInstructions.php (added)
-
tests/phpunit/tests/html-api/wpHtmlProcessorWebPlatformTests.php (modified) (5 diffs)
-
tests/phpunit/tests/html-api/wpHtmlTagProcessor-token-scanning.php (modified) (4 diffs)
-
tests/phpunit/tests/html-api/wpHtmlTagProcessor.php (modified) (1 diff)
-
tests/phpunit/tests/html-api/wpHtmlTagProcessorModifiableText.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/html-api/class-wp-html-processor.php
r62594 r62687 1403 1403 break; 1404 1404 1405 /** 1406 * Processing instructions are serialized as `"<?" target " " data "?>"`. 1407 * 1408 * @link https://html.spec.whatwg.org/multipage/parsing.html#serialising-html-fragments 1409 */ 1410 case '#processing-instruction': 1411 $html .= "<?{$this->get_tag()} {$this->get_modifiable_text()}?>"; 1412 break; 1413 1405 1414 case '#cdata-section': 1406 1415 $html .= "<![CDATA[{$this->get_modifiable_text()}]]>"; … … 1563 1572 /* 1564 1573 * > A comment token 1574 * > A processing instruction token 1565 1575 */ 1566 1576 case '#comment': 1567 1577 case '#funky-comment': 1568 1578 case '#presumptuous-tag': 1579 case '#processing-instruction': 1569 1580 $this->insert_html_element( $this->state->current_token ); 1570 1581 return true; … … 1629 1640 /* 1630 1641 * > A comment token 1642 * > A processing instruction token 1631 1643 */ 1632 1644 case '#comment': 1633 1645 case '#funky-comment': 1634 1646 case '#presumptuous-tag': 1647 case '#processing-instruction': 1635 1648 $this->insert_html_element( $this->state->current_token ); 1636 1649 return true; … … 1734 1747 /* 1735 1748 * > A comment token 1749 * > A processing instruction token 1736 1750 */ 1737 1751 case '#comment': 1738 1752 case '#funky-comment': 1739 1753 case '#presumptuous-tag': 1754 case '#processing-instruction': 1740 1755 $this->insert_html_element( $this->state->current_token ); 1741 1756 return true; … … 1833 1848 /* 1834 1849 * > A comment token 1850 * > A processing instruction token 1835 1851 */ 1836 1852 case '#comment': 1837 1853 case '#funky-comment': 1838 1854 case '#presumptuous-tag': 1855 case '#processing-instruction': 1839 1856 $this->insert_html_element( $this->state->current_token ); 1840 1857 return true; … … 2159 2176 /* 2160 2177 * > A comment token 2178 * > A processing instruction token 2161 2179 */ 2162 2180 case '#comment': 2163 2181 case '#funky-comment': 2164 2182 case '#presumptuous-tag': 2183 case '#processing-instruction': 2165 2184 $this->insert_html_element( $this->state->current_token ); 2166 2185 return true; … … 2319 2338 case '#funky-comment': 2320 2339 case '#presumptuous-tag': 2340 case '#processing-instruction': 2321 2341 $this->insert_html_element( $this->state->current_token ); 2322 2342 return true; … … 3401 3421 /* 3402 3422 * > A comment token 3423 * > A processing instruction token 3403 3424 */ 3404 3425 case '#comment': 3405 3426 case '#funky-comment': 3406 3427 case '#presumptuous-tag': 3428 case '#processing-instruction': 3407 3429 $this->insert_html_element( $this->state->current_token ); 3408 3430 return true; … … 3722 3744 /* 3723 3745 * > A comment token 3746 * > A processing instruction token 3724 3747 */ 3725 3748 case '#comment': 3726 3749 case '#funky-comment': 3727 3750 case '#presumptuous-tag': 3751 case '#processing-instruction': 3728 3752 $this->insert_html_element( $this->state->current_token ); 3729 3753 return true; … … 4154 4178 /* 4155 4179 * > A comment token 4180 * > A processing instruction token 4156 4181 */ 4157 4182 case '#comment': 4158 4183 case '#funky-comment': 4159 4184 case '#presumptuous-tag': 4185 case '#processing-instruction': 4160 4186 $this->insert_html_element( $this->state->current_token ); 4161 4187 return true; … … 4379 4405 * > A character token 4380 4406 * > A comment token 4407 * > A processing instruction token 4381 4408 * > A DOCTYPE token 4382 4409 */ … … 4385 4412 case '#funky-comment': 4386 4413 case '#presumptuous-tag': 4414 case '#processing-instruction': 4387 4415 case 'html': 4388 4416 return $this->step_in_body(); … … 4520 4548 /* 4521 4549 * > A comment token 4550 * > A processing instruction token 4522 4551 */ 4523 4552 case '#comment': 4524 4553 case '#funky-comment': 4525 4554 case '#presumptuous-tag': 4555 case '#processing-instruction': 4526 4556 $this->bail( 'Content outside of BODY is unsupported.' ); 4527 4557 break; … … 4613 4643 /* 4614 4644 * > A comment token 4645 * > A processing instruction token 4615 4646 */ 4616 4647 case '#comment': 4617 4648 case '#funky-comment': 4618 4649 case '#presumptuous-tag': 4650 case '#processing-instruction': 4619 4651 $this->insert_html_element( $this->state->current_token ); 4620 4652 return true; … … 4733 4765 /* 4734 4766 * > A comment token 4767 * > A processing instruction token 4735 4768 */ 4736 4769 case '#comment': 4737 4770 case '#funky-comment': 4738 4771 case '#presumptuous-tag': 4772 case '#processing-instruction': 4739 4773 $this->insert_html_element( $this->state->current_token ); 4740 4774 return true; … … 4803 4837 /* 4804 4838 * > A comment token 4839 * > A processing instruction token 4805 4840 */ 4806 4841 case '#comment': 4807 4842 case '#funky-comment': 4808 4843 case '#presumptuous-tag': 4844 case '#processing-instruction': 4809 4845 $this->bail( 'Content outside of HTML is unsupported.' ); 4810 4846 break; … … 4867 4903 /* 4868 4904 * > A comment token 4905 * > A processing instruction token 4869 4906 */ 4870 4907 case '#comment': 4871 4908 case '#funky-comment': 4872 4909 case '#presumptuous-tag': 4910 case '#processing-instruction': 4873 4911 $this->bail( 'Content outside of HTML is unsupported.' ); 4874 4912 break; … … 4990 5028 /* 4991 5029 * > A comment token 5030 * > A processing instruction token 4992 5031 */ 4993 5032 case '#comment': 4994 5033 case '#funky-comment': 4995 5034 case '#presumptuous-tag': 5035 case '#processing-instruction': 4996 5036 $this->insert_foreign_element( $this->state->current_token, false ); 4997 5037 return true; … … 5307 5347 * > A start tag whose tag name is "image" 5308 5348 * > Change the token's tag name to "img" and reprocess it. (Don't ask.) 5349 * 5350 * This only applies to tags; a processing instruction target or a 5351 * comment which looks like a processing instruction may also report 5352 * a tag name and must not be rewritten. 5309 5353 */ 5310 return ( 'IMAGE' === $tag_name && 'html' === $this->get_namespace() )5354 return ( 'IMAGE' === $tag_name && 'html' === $this->get_namespace() && '#tag' === $this->get_token_type() ) 5311 5355 ? 'IMG' 5312 5356 : $tag_name; … … 5377 5421 * - `#presumptuous-tag` when matched on an empty tag closer. 5378 5422 * - `#funky-comment` when matched on a funky comment. 5423 * - `#processing-instruction` when matched on a processing instruction. 5379 5424 * 5380 5425 * @since 6.6.0 Subclassed for the HTML Processor. 5426 * @since 7.1.0 Recognize processing instructions according to an HTML 5427 * specification update. 5381 5428 * 5382 5429 * @return string|null What kind of token is matched, or null. -
trunk/src/wp-includes/html-api/class-wp-html-tag-processor.php
r62667 r62687 317 317 * an HTML comment when parsing. E.g. for `</%post_author>` the text is `%post_author`. 318 318 * - `DOCTYPE` declarations like `<DOCTYPE html>` which have no closing tag. 319 * - XMLProcessing instruction nodes like `<?wp __( "Like" ); ?>` (with restrictions [2]).319 * - Processing instruction nodes like `<?wp __( "Like" ); ?>` (with restrictions [2]). 320 320 * - The empty end tag `</>` which is ignored in the browser and DOM. 321 321 * … … 326 326 * CDATA section _were they to exist_, it will indicate this as the type of comment. 327 327 * 328 * [2]: XML allows a broader range of characters in a processing instruction's target name329 * and disallows "xml" as a name, since it's special. The Tag Processor only recognizes330 * target names with an ASCII-representable subset of characters. It also exhibits the331 * same constraint as with CDATA sections, in that `>` cannot exist within the token332 * since Processing Instructions do not exist within HTML and their syntax transforms333 * into a bogus comment in the DOM.328 * [2]: HTML recognizes processing instructions whose target starts with an ASCII letter 329 * or `_` and continues with ASCII alphanumerics, `-`, or `_`. The reserved `xml` 330 * and `xml-stylesheet` targets, as well as XML-valid targets with characters 331 * outside this set, transform into bogus comments in the DOM instead. Processing 332 * instructions exhibit the same constraint as CDATA sections, in that `>` cannot 333 * exist within the token since the processing instruction ends at the first `>`. 334 334 * 335 335 * ## Design and limitations … … 483 483 * Specifies mode of operation of the parser at any given time. 484 484 * 485 * | State | Meaning | 486 * | ----------------|----------------------------------------------------------------------| 487 * | *Ready* | The parser is ready to run. | 488 * | *Complete* | There is nothing left to parse. | 489 * | *Incomplete* | The HTML ended in the middle of a token; nothing more can be parsed. | 490 * | *Matched tag* | Found an HTML tag; it's possible to modify its attributes. | 491 * | *Text node* | Found a #text node; this is plaintext and modifiable. | 492 * | *CDATA node* | Found a CDATA section; this is modifiable. | 493 * | *Comment* | Found a comment or bogus comment; this is modifiable. | 494 * | *Presumptuous* | Found an empty tag closer: `</>`. | 495 * | *Funky comment* | Found a tag closer with an invalid tag name; this is modifiable. | 485 * | State | Meaning | 486 * |--------------------------|----------------------------------------------------------------------| 487 * | *Ready* | The parser is ready to run. | 488 * | *Complete* | There is nothing left to parse. | 489 * | *Incomplete* | The HTML ended in the middle of a token; nothing more can be parsed. | 490 * | *Matched tag* | Found an HTML tag; it's possible to modify its attributes. | 491 * | *Text node* | Found a #text node; this is plaintext and modifiable. | 492 * | *CDATA node* | Found a CDATA section; this is modifiable. | 493 * | *Comment* | Found a comment or bogus comment; this is modifiable. | 494 * | *Presumptuous* | Found an empty tag closer: `</>`. | 495 * | *Funky comment* | Found a tag closer with an invalid tag name; this is modifiable. | 496 * | *Processing instruction* | Found a processing instruction, e.g. `<?pi-target data>`. | 496 497 * 497 498 * @since 6.5.0 … … 507 508 * @see WP_HTML_Tag_Processor::STATE_PRESUMPTUOUS_TAG 508 509 * @see WP_HTML_Tag_Processor::STATE_FUNKY_COMMENT 510 * @see WP_HTML_Tag_Processor::STATE_PROCESSING_INSTRUCTION 509 511 * 510 512 * @var string … … 934 936 * - an HTML comment. 935 937 * - a DOCTYPE declaration. 936 * - a processing instruction, e.g. `<?xml version="1.0"?>`.938 * - an HTML processing instruction, e.g. `<?pi …data?>`. 937 939 * 938 940 * @since 6.5.0 939 941 * @since 6.7.0 Recognizes CDATA sections within foreign content. 942 * @since 7.1.0 Recognizes processing instructions. 940 943 * 941 944 * @return bool Whether a token was parsed. … … 2028 2031 } 2029 2032 2030 /* 2031 * `<?` transitions to a bogus comment state – skip to the nearest > 2032 * See https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state 2033 /** 2034 * `<?` transitions to the processing instruction open state. 2035 * 2036 * A processing instruction whose target starts with an ASCII letter or `_`, 2037 * continues with ASCII alphanumerics, `-`, or `_`, and is not an ASCII 2038 * case-insensitive match for `xml` or `xml-stylesheet` produces a processing 2039 * instruction node. Anything else transitions to the bogus comment state. 2040 * 2041 * Both forms end at the nearest `>`; a processing instruction cannot 2042 * contain one in the HTML syntax. 2043 * 2044 * @link https://html.spec.whatwg.org/multipage/parsing.html#processing-instruction-open-state 2033 2045 */ 2034 2046 if ( ! $this->is_closing_tag && '?' === $html[ $at + 1 ] ) { … … 2038 2050 2039 2051 return false; 2052 } 2053 2054 $target_at = $at + 2; 2055 $target_length = 0; 2056 $first_char = $html[ $target_at ]; 2057 if ( 2058 ( 'a' <= $first_char && 'z' >= $first_char ) || 2059 ( 'A' <= $first_char && 'Z' >= $first_char ) || 2060 '_' === $first_char 2061 ) { 2062 $target_length = 1 + strspn( $html, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-', $target_at + 1 ); 2063 } 2064 2065 /* 2066 * In the processing instruction target state, only whitespace, `?`, 2067 * or `>` may terminate the target; any other character converts the 2068 * token into a bogus comment. 2069 * 2070 * The `xml` and `xml-stylesheet` targets are reserved and disallowed; 2071 * they also convert the token into a bogus comment. 2072 */ 2073 $is_valid_pi = ( 2074 0 !== $target_length && 2075 false !== strpos( " \t\f\r\n?>", $html[ $target_at + $target_length ] ) && 2076 ! ( 3 === $target_length && 0 === substr_compare( $html, 'xml', $target_at, 3, true ) ) && 2077 ! ( 14 === $target_length && 0 === substr_compare( $html, 'xml-stylesheet', $target_at, 14, true ) ) 2078 ); 2079 2080 if ( $is_valid_pi ) { 2081 /* 2082 * The processing instruction data starts after any whitespace 2083 * following the target and ends at the `>`. When the token is 2084 * closed by `?>`, that final `?` is not part of the data. 2085 */ 2086 $data_at = $target_at + $target_length; 2087 $data_at += strspn( $html, " \t\f\r\n", $data_at ); 2088 2089 $data_length = $closer_at - $data_at; 2090 if ( $data_length > 0 && '?' === $html[ $closer_at - 1 ] ) { 2091 --$data_length; 2092 } 2093 2094 $this->parser_state = self::STATE_PROCESSING_INSTRUCTION; 2095 $this->tag_name_starts_at = $target_at; 2096 $this->tag_name_length = $target_length; 2097 $this->token_length = $closer_at + 1 - $this->token_starts_at; 2098 $this->text_starts_at = $data_at; 2099 $this->text_length = $data_length; 2100 $this->bytes_already_parsed = $closer_at + 1; 2101 return true; 2040 2102 } 2041 2103 … … 2048 2110 2049 2111 /* 2050 * Identify a Processing Instruction node were HTML to have them.2112 * Identify an XML-like Processing Instruction node. 2051 2113 * 2052 * This section must occur after identifying the bogus comment end 2053 * because in an HTML parser it will span to the nearest `>`, even 2054 * if there's no `?>` as would be required in an XML document. It 2055 * is therefore not possible to parse a Processing Instruction node 2056 * containing a `>` in the HTML syntax. 2057 * 2058 * XML allows for more target names, but this code only identifies 2059 * those with ASCII-representable target names. This means that it 2060 * may identify some Processing Instruction nodes as bogus comments, 2061 * but it will not misinterpret the HTML structure. By limiting the 2062 * identification to these target names the Tag Processor can avoid 2063 * the need to start parsing UTF-8 sequences. 2114 * HTML and XML processing instructions have different parsing rules. 2115 * The HTML API recognizes XML-like processing instructions that are 2116 * _not_ HTML processing instructions. The HTML standard transforms 2117 * them to "bogus comments," represented by the HTML API as comments 2118 * with the `COMMENT_AS_PI_NODE_LOOKALIKE` type. This includes the 2119 * special targets `xml` and `xml-stylesheet` which are reserved 2120 * targets not allowed in HTML processing instructions. 2064 2121 * 2065 2122 * > NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | … … 2068 2125 * [#x10000-#xEFFFF] 2069 2126 * > NameChar ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040] 2070 *2071 * @todo Processing instruction nodes in SGML may contain any kind of markup. XML defines a2072 * special case with `<?xml ... ?>` syntax, but the `?` is part of the bogus comment.2073 2127 * 2074 2128 * @see https://www.w3.org/TR/2006/REC-xml11-20060816/#NT-PITarget … … 2962 3016 } 2963 3017 3018 /* 3019 * Processing instruction targets are case-sensitive 3020 * and returned as they appear in the input HTML. 3021 */ 3022 if ( self::STATE_PROCESSING_INSTRUCTION === $this->parser_state ) { 3023 return $tag_name; 3024 } 3025 2964 3026 if ( 2965 3027 self::STATE_COMMENT === $this->parser_state && … … 3438 3500 * - `#presumptuous-tag` when matched on an empty tag closer. 3439 3501 * - `#funky-comment` when matched on a funky comment. 3502 * - `#processing-instruction` when matched on a processing instruction. 3440 3503 * 3441 3504 * @since 6.5.0 3505 * @since 7.1.0 Recognizes processing instructions. 3442 3506 * 3443 3507 * @return string|null What kind of token is matched, or null. 3508 * @phpstan-return '#tag'|'#text'|'#cdata-section'|'#comment'|'#doctype'|'#presumptuous-tag'|'#funky-comment'|'#processing-instruction'|null 3444 3509 */ 3445 3510 public function get_token_type(): ?string { … … 3498 3563 case self::STATE_FUNKY_COMMENT: 3499 3564 return '#funky-comment'; 3565 3566 case self::STATE_PROCESSING_INSTRUCTION: 3567 return '#processing-instruction'; 3500 3568 } 3501 3569 … … 3538 3606 * This differs from {@see ::get_modifiable_text()} in that certain comment 3539 3607 * types in the HTML API cannot allow their entire comment text content to 3540 * be modified. Namely, "bogus comments" of the form `<? not allowed in html>`3608 * be modified. Namely, "bogus comments" of the form `<?xml not allowed in html>` 3541 3609 * will create a comment whose text content starts with `?`. Note that if 3542 3610 * that character were modified, it would be possible to change the node … … 3706 3774 ? $this->lexical_updates['modifiable text']->text 3707 3775 : substr( $this->html, $this->text_starts_at, $this->text_length ); 3776 3777 /* 3778 * An enqueued processing instruction update holds normalized raw 3779 * syntax spanning from the end of the target through the end of 3780 * the token: a separating space, the data, and the `?>` closer. 3781 * The data is found by skipping the leading whitespace and 3782 * dropping the two bytes of the closer. 3783 * 3784 * @see WP_HTML_Tag_Processor::set_modifiable_text() 3785 */ 3786 if ( $has_enqueued_update && self::STATE_PROCESSING_INSTRUCTION === $this->parser_state ) { 3787 $text = substr( $text, strspn( $text, " \t\f\r\n" ), -2 ); 3788 } 3708 3789 3709 3790 /* … … 3720 3801 $text = str_replace( "\r", "\n", $text ); 3721 3802 3722 // Comment data is not decoded.3803 // Comment and processing instruction data is not decoded. 3723 3804 if ( 3724 3805 self::STATE_CDATA_NODE === $this->parser_state || 3725 3806 self::STATE_COMMENT === $this->parser_state || 3726 3807 self::STATE_DOCTYPE === $this->parser_state || 3727 self::STATE_FUNKY_COMMENT === $this->parser_state 3808 self::STATE_FUNKY_COMMENT === $this->parser_state || 3809 self::STATE_PROCESSING_INSTRUCTION === $this->parser_state 3728 3810 ) { 3729 3811 return str_replace( "\x00", "\u{FFFD}", $text ); … … 3794 3876 * cases, updates will be rejected and it’s up to calling code to perform 3795 3877 * language-specific escaping or workarounds. Similarly, it will not allow 3796 * setting content into a comment which would prematurely terminate the comment. 3878 * setting content into a comment which would prematurely terminate the comment, 3879 * or processing instruction data which cannot be represented: data containing 3880 * a `>`, which would prematurely terminate the processing instruction, or data 3881 * with leading whitespace, which is indistinguishable from the whitespace 3882 * separating the data from its target. 3797 3883 * 3798 3884 * Example: … … 3832 3918 * @since 6.7.0 3833 3919 * @since 6.9.0 Escapes all character references instead of trying to avoid double-escaping. 3920 * @since 7.1.0 Supports setting processing instruction data. 3834 3921 * 3835 3922 * @param string $plaintext_content New text content to represent in the matched token. … … 3863 3950 // Check if the text could close the comment. 3864 3951 if ( 1 === preg_match( '/--!?>/', $plaintext_content ) ) { 3952 _doing_it_wrong( 3953 __METHOD__, 3954 __( 'Comment text cannot contain a comment closer.' ), 3955 '7.1.0' 3956 ); 3865 3957 return false; 3866 3958 } … … 3870 3962 $this->text_length, 3871 3963 $plaintext_content 3964 ); 3965 3966 return true; 3967 } 3968 3969 // Processing instruction data is not encoded. 3970 if ( self::STATE_PROCESSING_INSTRUCTION === $this->parser_state ) { 3971 /* 3972 * A processing instruction ends at the first `>` in its 3973 * raw syntax: data containing one cannot be represented. 3974 */ 3975 if ( str_contains( $plaintext_content, '>' ) ) { 3976 _doing_it_wrong( 3977 __METHOD__, 3978 __( 'Processing instruction data cannot contain ">".' ), 3979 '7.1.0' 3980 ); 3981 return false; 3982 } 3983 3984 /* 3985 * All whitespace between the target and the data is skipped when 3986 * parsing: data with leading whitespace cannot be represented. 3987 */ 3988 if ( 0 !== strspn( $plaintext_content, " \t\f\r\n" ) ) { 3989 _doing_it_wrong( 3990 __METHOD__, 3991 __( 'Processing instruction data cannot start with whitespace. Try ltrim( $plaintext_content, " \t\f\r\n" ).' ), 3992 '7.1.0' 3993 ); 3994 return false; 3995 } 3996 3997 /** 3998 * A single replacement spans from the end of the target through 3999 * the end of the token, normalizing the raw syntax for that 4000 * region into a fixed form: a separating space, the data, and 4001 * the `?>` closer. 4002 * 4003 * {@see self::get_modifiable_text()} performs necessary parsing to 4004 * return the correct processing instruction data based 4005 * on the modifiable text lexical update. 4006 */ 4007 $data_at = $this->tag_name_starts_at + $this->tag_name_length; 4008 4009 $this->lexical_updates['modifiable text'] = new WP_HTML_Text_Replacement( 4010 $data_at, 4011 $this->token_starts_at + $this->token_length - $data_at, 4012 " {$plaintext_content}?>" 3872 4013 ); 3873 4014 … … 3883 4024 'html' !== $this->get_namespace() 3884 4025 ) { 4026 _doing_it_wrong( 4027 __METHOD__, 4028 __( 'This token does not support setting modifiable text.' ), 4029 '7.1.0' 4030 ); 3885 4031 return false; 3886 4032 } … … 3916 4062 false !== stripos( $plaintext_content, '</script' ) 3917 4063 ) { 4064 _doing_it_wrong( 4065 __METHOD__, 4066 __( 'SCRIPT text with an unrecognized content type cannot contain a SCRIPT tag. Apply the escaping appropriate for the content type.' ), 4067 '7.1.0' 4068 ); 3918 4069 return false; 3919 4070 } … … 3980 4131 } 3981 4132 4133 _doing_it_wrong( 4134 __METHOD__, 4135 __( 'Only the SCRIPT, STYLE, TEXTAREA, and TITLE tags support setting modifiable text.' ), 4136 '7.1.0' 4137 ); 3982 4138 return false; 3983 4139 } … … 4994 5150 4995 5151 /** 5152 * Indicates that the parser has found a processing instruction 5153 * and it's possible to read its target and data. 5154 * 5155 * Example: 5156 * 5157 * <?wp-bit {"just": "kidding"}> 5158 * 5159 * Processing instructions with an allowable target are parsed 5160 * into processing instruction nodes. The reserved `xml` and 5161 * `xml-stylesheet` targets, and targets with characters outside 5162 * an ASCII-representable subset, are turned into bogus comments. 5163 * 5164 * @link https://html.spec.whatwg.org/multipage/parsing.html#processing-instruction-open-state 5165 * 5166 * @since 7.1.0 5167 * 5168 * @access private 5169 */ 5170 const STATE_PROCESSING_INSTRUCTION = 'STATE_PROCESSING_INSTRUCTION'; 5171 5172 /** 4996 5173 * Indicates that a comment was created when encountering abruptly-closed HTML comment. 4997 5174 * … … 5033 5210 /** 5034 5211 * Indicates that a comment would be parsed as a Processing 5035 * Instruction node, were they to existwithin HTML.5212 * Instruction node, were its target allowed within HTML. 5036 5213 * 5037 5214 * Example: 5038 5215 * 5039 * <?wp __( 'Like' ) ?> 5040 * 5041 * This is an HTML comment, but it looks like a CDATA node. 5216 * <?xml version="1.0" ?> 5217 * <?wp.like count=5 ?> 5218 * 5219 * These are HTML comments, but they look like processing 5220 * instructions. HTML parses processing instructions with 5221 * an allowable target into processing instruction nodes, 5222 * but the reserved `xml` and `xml-stylesheet` targets and 5223 * XML-valid targets with characters outside of the allowed 5224 * set become bogus comments instead. 5042 5225 * 5043 5226 * @since 6.5.0 5227 * @since 7.1.0 Only applies to reserved and XML-specific target names; 5228 * other processing instructions produce their own token. 5044 5229 */ 5045 5230 const COMMENT_AS_PI_NODE_LOOKALIKE = 'COMMENT_AS_PI_NODE_LOOKALIKE'; … … 5051 5236 * Example: 5052 5237 * 5053 * <? nothing special>5238 * <?= nothing special ?> 5054 5239 * <!{nothing special}> 5055 5240 * -
trunk/src/wp-includes/script-loader.php
r62652 r62687 3049 3049 3050 3050 if ( ! $processor->set_modifiable_text( $data ) ) { 3051 _doing_it_wrong(3052 __FUNCTION__,3053 __( 'Unable to set inline script data.' ),3054 '7.0.0'3055 );3056 3051 return ''; 3057 3052 } -
trunk/tests/phpunit/includes/build-visual-html-tree.php
r62655 r62687 211 211 break; 212 212 213 case '#processing-instruction': 214 // Processing instructions must be "<?", the target, a space, the data, "?", and ">". 215 $output .= str_repeat( $tree_indent, $indent_level ) . "<?{$processor->get_tag()} {$processor->get_modifiable_text()}?>\n"; 216 break; 217 213 218 case '#funky-comment': 214 219 // Comments must be "<" then "!-- " then the data then " -->". -
trunk/tests/phpunit/tests/build-visual-html-tree.php
r61519 r62687 74 74 75 75 yield 'Text nodes in blocks' => array( $block_markup, $tree_structure ); 76 } 77 78 /** 76 77 yield 'Processing instruction' => array( 78 '<div>before<?target arbitrary="data & things" >after', 79 <<<'TREE' 80 <div> 81 "before" 82 <?target arbitrary="data & things" ?> 83 "after" 84 85 TREE, 86 ); 87 } 88 89 /** 90 * @ticket 65582 79 91 * @ticket 63527 80 92 * @ticket 64531 -
trunk/tests/phpunit/tests/dependencies/wpInlineScriptTag.php
r61485 r62687 170 170 * 171 171 * @ticket 64500 172 * 173 * @expectedIncorrectUsage WP_HTML_Tag_Processor::set_modifiable_text 172 174 */ 173 175 public function test_script_tag_dangerous_unescapeable_contents() { 174 $this->setExpectedIncorrectUsage( 'wp_get_inline_script_tag' );175 176 /* 176 177 * </script> cannot be printed inside a script tag -
trunk/tests/phpunit/tests/html-api/wpHtmlProcessor-serialize.php
r62574 r62687 383 383 'Immediately-closed markup instruction' => array( '<!', '?', '>' ), 384 384 'Warning Symbol' => array( '<!', '', '>' ), 385 'PHP block look-alike' => array( '<', '?php foo();?', '>' ),385 'PHP short echo tag' => array( '<', '?= "Hello" ?', '>' ), 386 386 'Funky comment' => array( '</', '%display-name', '>' ), 387 387 'XML Processing Instruction look-alike' => array( '<', '?xml foo ', '>' ), 388 ); 389 } 390 391 /** 392 * Ensures that processing instructions are serialized in their normative form. 393 * 394 * Note that the serialized form separates the target from the data with a 395 * single space and always terminates with `?>`, regardless of the original 396 * syntax. The closer's `?` is dropped on parse, so this form represents any 397 * data, including data ending in `?`. 398 * 399 * @ticket 61530 400 * 401 * @dataProvider data_processing_instructions 402 * 403 * @param string $html Input containing a processing instruction. 404 * @param string $expected Normative serialization of the input. 405 */ 406 public function test_serializes_processing_instructions( string $html, string $expected ): void { 407 $this->assertSame( 408 WP_HTML_Processor::normalize( $html ), 409 $expected, 410 'Should have serialized the processing instruction in its normative form.' 411 ); 412 } 413 414 /** 415 * Ensures that normalizing an already-normalized processing instruction does not change it. 416 * 417 * @ticket 61530 418 * 419 * @dataProvider data_processing_instructions 420 * 421 * @param string $html Input containing a processing instruction. 422 * @param string $expected Normative serialization of the input. 423 */ 424 public function test_processing_instruction_normalization_is_idempotent( string $html, string $expected ): void { 425 $this->assertSame( 426 $expected, 427 WP_HTML_Processor::normalize( $expected ), 428 'Normalizing an already-normalized processing instruction should not change it.' 429 ); 430 } 431 432 /** 433 * Data provider. 434 * 435 * @return array<string, array{0: string, 1: string}> 436 */ 437 public function data_processing_instructions(): array { 438 return array( 439 'PHP block' => array( '<?php foo(); ?>', '<?php foo(); ?>' ), 440 'Unclosed PHP block' => array( '<?php foo(); >', '<?php foo(); ?>' ), 441 'Empty data' => array( '<?wp-bit?>', '<?wp-bit ?>' ), 442 'Whitespace-only data' => array( '<?wp-bit ?>', '<?wp-bit ?>' ), 443 'Data ending in question mark' => array( '<?target data??>', '<?target data??>' ), 444 'Data of a lone question mark' => array( '<?wp-bit ??>', '<?wp-bit ??>' ), 445 'Data with question mark runs' => array( '<?wp-bit what?? news??>', '<?wp-bit what?? news??>' ), 446 'Question mark then whitespace' => array( '<?wp-bit sure? >', '<?wp-bit sure? ?>' ), 388 447 ); 389 448 } -
trunk/tests/phpunit/tests/html-api/wpHtmlProcessor.php
r62655 r62687 304 304 * Data provider. 305 305 * 306 * @return array []307 */ 308 public static function data_self_contained_node_tokens() {306 * @return array<string, array{string}> 307 */ 308 public static function data_self_contained_node_tokens(): array { 309 309 $self_contained_nodes = array( 310 'Normative comment' => array( '<!-- comment -->' ), 311 'Comment with invalid closing' => array( '<!-- comment --!>' ), 312 'CDATA Section lookalike' => array( '<![CDATA[ comment ]]>' ), 313 'Processing Instruction lookalike' => array( '<?ok comment ?>' ), 314 'Funky comment' => array( '<//wp:post-meta key=isbn>' ), 315 'Text node' => array( 'Trombone' ), 310 'Normative comment' => array( '<!-- comment -->' ), 311 'Comment with invalid closing' => array( '<!-- comment --!>' ), 312 'CDATA Section lookalike' => array( '<![CDATA[ comment ]]>' ), 313 'Processing Instruction' => array( '<?ok pi ?>' ), 314 'Bogus PI-lookalike xml comment' => array( '<?xml version="1.0"?>' ), 315 'Bogus comment' => array( '<?🔥?>' ), 316 'Funky comment' => array( '<//wp:post-meta key=isbn>' ), 317 'Text node' => array( 'Trombone' ), 316 318 ); 317 319 -
trunk/tests/phpunit/tests/html-api/wpHtmlProcessorComments.php
r62507 r62687 33 33 * Data provider. 34 34 * 35 * @return array []35 * @return array<string, array{0:string, 1:string, 2:string, 3?:string}> 36 36 */ 37 public static function data_comments() {37 public static function data_comments(): array { 38 38 return array( 39 'Normative comment' => array( '<!-- A comment. -->', WP_HTML_Processor::COMMENT_AS_HTML_COMMENT, ' A comment. ' ), 40 'Abruptly closed comment' => array( '<!-->', WP_HTML_Processor::COMMENT_AS_ABRUPTLY_CLOSED_COMMENT, '' ), 41 'Invalid HTML comment !' => array( '<! Bang opener >', WP_HTML_Processor::COMMENT_AS_INVALID_HTML, ' Bang opener ' ), 42 'Invalid HTML comment ?' => array( '<? Question opener >', WP_HTML_Processor::COMMENT_AS_INVALID_HTML, ' Question opener ' ), 43 'CDATA comment' => array( '<![CDATA[ cdata body ]]>', WP_HTML_Processor::COMMENT_AS_CDATA_LOOKALIKE, ' cdata body ' ), 44 'Processing instruction comment' => array( '<?pi-target Instruction body. ?>', WP_HTML_Processor::COMMENT_AS_PI_NODE_LOOKALIKE, ' Instruction body. ', 'pi-target' ), 45 'Processing instruction php' => array( '<?php const HTML_COMMENT = true; ?>', WP_HTML_Processor::COMMENT_AS_PI_NODE_LOOKALIKE, ' const HTML_COMMENT = true; ', 'php' ), 39 'Normative comment' => array( '<!-- A comment. -->', WP_HTML_Processor::COMMENT_AS_HTML_COMMENT, ' A comment. ' ), 40 'Abruptly closed comment' => array( '<!-->', WP_HTML_Processor::COMMENT_AS_ABRUPTLY_CLOSED_COMMENT, '' ), 41 'Invalid HTML comment !' => array( '<! Bang opener >', WP_HTML_Processor::COMMENT_AS_INVALID_HTML, ' Bang opener ' ), 42 'Invalid HTML comment ?' => array( '<? Question opener >', WP_HTML_Processor::COMMENT_AS_INVALID_HTML, ' Question opener ' ), 43 'CDATA comment' => array( '<![CDATA[ cdata body ]]>', WP_HTML_Processor::COMMENT_AS_CDATA_LOOKALIKE, ' cdata body ' ), 44 'Processing instruction xml' => array( '<?xml version="1.0" ?>', WP_HTML_Processor::COMMENT_AS_PI_NODE_LOOKALIKE, ' version="1.0" ', 'xml' ), 45 'Processing instruction xml-stylesheet' => array( '<?xml-stylesheet href="a.css" ?>', WP_HTML_Processor::COMMENT_AS_PI_NODE_LOOKALIKE, ' href="a.css" ', 'xml-stylesheet' ), 46 'Processing instruction XML-valid target' => array( '<?wp.bit const HTML_COMMENT = true; ?>', WP_HTML_Processor::COMMENT_AS_PI_NODE_LOOKALIKE, ' const HTML_COMMENT = true; ', 'wp.bit' ), 47 'Processing instruction bad target' => array( '<?$var Not a target. ?>', WP_HTML_Processor::COMMENT_AS_INVALID_HTML, '$var Not a target. ?' ), 48 'PHP short echo tag' => array( '<?= "Hello" ?>', WP_HTML_Processor::COMMENT_AS_INVALID_HTML, '= "Hello" ?' ), 46 49 ); 47 50 } -
trunk/tests/phpunit/tests/html-api/wpHtmlProcessorModifiableText.php
r61796 r62687 78 78 * @ticket 64751 79 79 * @dataProvider data_set_modifiable_fails_non_atomic_tags 80 * 81 * @expectedIncorrectUsage WP_HTML_Tag_Processor::set_modifiable_text 80 82 */ 81 83 public function test_set_modifiable_fails_non_atomic_tags( -
trunk/tests/phpunit/tests/html-api/wpHtmlProcessorWebPlatformTests.php
r62655 r62687 38 38 'tests2/line0697' => 'Unimplemented: This parser does not add missing attributes to existing HTML or BODY tags.', 39 39 'tests2/line0709' => 'Unimplemented: This parser does not add missing attributes to existing HTML or BODY tags.', 40 'tests1/line0601' => 'Unimplemented: This parser treats processing instructions as comments.',41 'tests1/line0640' => 'Unimplemented: This parser treats processing instructions as comments.',42 'html5test-com/line0129' => 'Unimplemented: This parser treats processing instructions as comments.',43 40 'menuitem-element/line0161' => 'Unimplemented: This parser does not support customizable SELECT element content.', 44 41 'tests9/line0048' => 'Unimplemented: This parser does not support customizable SELECT element content.', … … 61 58 'webkit02/line0732' => 'Unimplemented: This parser does not support customizable SELECT element content.', 62 59 'webkit02/line0748' => 'Unimplemented: This parser does not support customizable SELECT element content.', 63 64 'tests1/line0602' => 'Unimplemented: Updated Processing Instruction parsing.',65 'tests1/line0641' => 'Unimplemented: Updated Processing Instruction parsing.',66 );67 68 /**69 * Skip test files that exercise parser behavior unsupported by the HTML API.70 */71 const SKIP_TEST_PREFIXES = array(72 'processing-instructions/' => 'Unimplemented: Updated Processing Instruction parsing.',73 60 ); 74 61 … … 177 164 if ( array_key_exists( $test_name, self::SKIP_TESTS ) ) { 178 165 return true; 179 }180 181 foreach ( array_keys( self::SKIP_TEST_PREFIXES ) as $test_prefix ) {182 if ( str_starts_with( $test_name, $test_prefix ) ) {183 return true;184 }185 166 } 186 167 … … 345 326 break; 346 327 328 case '#processing-instruction': 329 /* 330 * Processing instructions must be "<?" then the target then, 331 * unless the data is empty, a space and the data, and finally "?>". 332 */ 333 $pi_data = $processor->get_modifiable_text(); 334 $output .= str_repeat( self::TREE_INDENT, $indent_level ) . "<?{$processor->get_tag()} {$pi_data}?>\n"; 335 break; 336 347 337 case '#comment': 348 338 // Comments must be "<" then "!-- " then the data then " -->". … … 475 465 * must start with "| ", followed by two spaces per parent node that the node has before 476 466 * the root document node. 477 *478 * - Element nodes must be represented by a "<" then the tag name string ">", and all the attributes must be given, sorted lexicographically by UTF-16 code unit according to their attribute name string, on subsequent lines, as if they were children of the element node.479 * - Attribute nodes must have the attribute name string, then an "=" sign, then the attribute value in double quotes (").480 * - Text nodes must be the string, in double quotes. Newlines aren't escaped.481 * - Comments must be "<" then "!-- " then the data then " -->".482 * - DOCTYPEs must be "<!DOCTYPE " then the name then if either of the system id or public id is non-empty a space, public id in double-quotes, another space an the system id in double-quotes, and then in any case ">".483 * - Processing instructions must be "<?", then the target, then a space, then the data and then ">". (The HTML parser cannot emit processing instructions, but scripts can, and the WebVTT to DOM rules can emit them.)484 * - Template contents are represented by the string "content" with the children below it.485 467 */ 486 468 case 'document': -
trunk/tests/phpunit/tests/html-api/wpHtmlTagProcessor-token-scanning.php
r62439 r62687 580 580 * 581 581 * @since 6.5.0 582 * @since 7.1.0 Processing instructions produce their own token type. 582 583 * 583 584 * @covers WP_HTML_Tag_Processor::next_token … … 585 586 public function test_basic_assertion_processing_instruction() { 586 587 $processor = new WP_HTML_Tag_Processor( '<?wp-bit {"just": "kidding"}?>' ); 588 $processor->next_token(); 589 590 $this->assertSame( 591 '#processing-instruction', 592 $processor->get_token_name(), 593 "Should have found processing instruction token but found {$processor->get_token_name()} instead." 594 ); 595 596 $this->assertNull( 597 $processor->get_comment_type(), 598 'Should not have detected a comment type on a non-comment token.' 599 ); 600 601 $this->assertSame( 602 'wp-bit', 603 $processor->get_tag(), 604 "Should have found PI target as tag name but found {$processor->get_tag()} instead." 605 ); 606 607 $this->assertNull( 608 $processor->get_attribute( 'type' ), 609 'Should not have been able to query attributes on non-element token.' 610 ); 611 612 $this->assertSame( 613 '{"just": "kidding"}', 614 $processor->get_modifiable_text(), 615 'Found incorrect modifiable text.' 616 ); 617 } 618 619 /** 620 * Ensures that Processing Instruction nodes with reserved XML targets 621 * are properly parsed as bogus comments. 622 * 623 * @ticket 60170 624 * 625 * @since 7.1.0 626 * 627 * @covers WP_HTML_Tag_Processor::next_token 628 */ 629 public function test_basic_assertion_xml_processing_instruction(): void { 630 $processor = new WP_HTML_Tag_Processor( '<?xml version="1.0"?>' ); 587 631 $processor->next_token(); 588 632 … … 600 644 601 645 $this->assertSame( 602 ' wp-bit',646 'xml', 603 647 $processor->get_tag(), 604 648 "Should have found PI target as tag name but found {$processor->get_tag()} instead." … … 606 650 607 651 $this->assertNull( 608 $processor->get_attribute( ' type' ),652 $processor->get_attribute( 'version' ), 609 653 'Should not have been able to query attributes on non-element token.' 610 654 ); 611 655 612 656 $this->assertSame( 613 ' {"just": "kidding"}', 614 $processor->get_modifiable_text(), 615 'Found incorrect modifiable text.' 657 ' version="1.0"', 658 $processor->get_modifiable_text(), 659 'Found incorrect modifiable text.' 660 ); 661 662 $this->assertSame( 663 '?xml version="1.0"?', 664 $processor->get_full_comment_text(), 665 'Found incorrect full comment text.' 616 666 ); 617 667 } -
trunk/tests/phpunit/tests/html-api/wpHtmlTagProcessor.php
r62598 r62687 658 658 'Empty comment' => array( '<!---->', 1, '<!---->' ), 659 659 'Funky comment' => array( '</_ funk >', 1, '</_ funk >' ), 660 'PI lookalike comment' => array( '<?processing instruction?>', 1, '<?processing instruction?>' ), 660 'Processing instruction' => array( '<?processing instruction?>', 1, '<?processing instruction?>' ), 661 'PI lookalike comment' => array( '<?xml version="1.0"?>', 1, '<?xml version="1.0"?>' ), 661 662 'CDATA lookalike comment' => array( '<![CDATA[ see? data ]]>', 1, '<![CDATA[ see? data ]]>' ), 662 663 ); -
trunk/tests/phpunit/tests/html-api/wpHtmlTagProcessorModifiableText.php
r62507 r62687 350 350 * @dataProvider data_tokens_not_supporting_modifiable_text_updates 351 351 * 352 * @expectedIncorrectUsage WP_HTML_Tag_Processor::set_modifiable_text 353 * 352 354 * @param string $html Contains HTML with a token not supporting modifiable text updates. 353 355 * @param int $advance_n_tokens Count of times to run `next_token()` before reaching target node. … … 429 431 'Text node (start)' => array( 'Text', 1, 'Blubber', 'Blubber' ), 430 432 'Text node (middle)' => array( '<em>Bold move</em>', 2, 'yo', '<em>yo</em>' ), 433 'PI node' => array( 'before<?wp-bit data?>after', 2, 'other', 'before<?wp-bit other?>after' ), 434 'PI node (no separator)' => array( '<?wp-bit?>', 1, '{"just": "kidding"}', '<?wp-bit {"just": "kidding"}?>' ), 431 435 'Text node (end)' => array( '<img>of a dog', 2, 'of a cat', '<img>of a cat' ), 432 436 'Encoded text node' => array( '<figcaption>birds and dogs</figcaption>', 2, '<birds> & <dogs>', '<figcaption><birds> & <dogs></figcaption>' ), … … 443 447 444 448 /** 449 * Ensures that processing instruction data updates re-parse to the value which was set. 450 * 451 * The processing instruction syntax cannot represent every data value verbatim: 452 * a separating space must be added when the data would abut the target, and 453 * the update always writes the `?>` form of the closer, whose `?` is dropped 454 * when parsing, so that data ending in `?` remains intact. 455 * 456 * @ticket 61530 457 * 458 * @dataProvider data_processing_instruction_data_updates 459 * 460 * @param string $html Contains a processing instruction as its first token. 461 * @param string $new_data Data to set on the processing instruction. 462 * @param string $expected Expected document after the update. 463 */ 464 public function test_sets_processing_instruction_data( string $html, string $new_data, string $expected ): void { 465 $processor = new WP_HTML_Tag_Processor( $html ); 466 $processor->next_token(); 467 468 $this->assertSame( 469 '#processing-instruction', 470 $processor->get_token_name(), 471 'Should have found a processing instruction: check test setup.' 472 ); 473 474 $target = $processor->get_tag(); 475 476 $this->assertTrue( 477 $processor->set_modifiable_text( $new_data ), 478 'Should have set the processing instruction data.' 479 ); 480 481 $this->assertSame( 482 $new_data, 483 $processor->get_modifiable_text(), 484 'Should have read back the enqueued data before flushing the update.' 485 ); 486 487 $this->assertSame( 488 $expected, 489 $processor->get_updated_html(), 490 'Should have updated the document as expected.' 491 ); 492 493 $this->assertSame( 494 $new_data, 495 $processor->get_modifiable_text(), 496 'Should have read back the data after flushing the update.' 497 ); 498 499 $this->assertSame( 500 $target, 501 $processor->get_tag(), 502 'Should not have changed the processing instruction target.' 503 ); 504 505 $reparsed = new WP_HTML_Tag_Processor( $expected ); 506 $reparsed->next_token(); 507 508 $this->assertSame( 509 '#processing-instruction', 510 $reparsed->get_token_name(), 511 'Should have found a processing instruction when re-parsing the updated document.' 512 ); 513 514 $this->assertSame( 515 $target, 516 $reparsed->get_tag(), 517 'Should have preserved the target when re-parsing the updated document.' 518 ); 519 520 $this->assertSame( 521 $new_data, 522 $reparsed->get_modifiable_text(), 523 'Should have found the set data when re-parsing the updated document.' 524 ); 525 } 526 527 /** 528 * Data provider. 529 * 530 * @return array<string, array{0: string, 1: string, 2: string}> 531 */ 532 public static function data_processing_instruction_data_updates(): array { 533 return array( 534 'Replace data' => array( '<?wp-bit before?>', 'after', '<?wp-bit after?>' ), 535 'Bare closer rewritten' => array( '<?wp-bit before>', 'after', '<?wp-bit after?>' ), 536 'Separator inserted' => array( '<?wp-bit?>', '{"just": "kidding"}', '<?wp-bit {"just": "kidding"}?>' ), 537 'Separator inserted (bare closer)' => array( '<?wp-bit>', 'data', '<?wp-bit data?>' ), 538 'Data abutting target' => array( '<?wp-bit?data>', 'x', '<?wp-bit x?>' ), 539 'Data ending in ?' => array( '<?wp-bit d>', 'd?', '<?wp-bit d??>' ), 540 'Data ending in ? (?> closer)' => array( '<?wp-bit x?>', 'd?', '<?wp-bit d??>' ), 541 'Data of only ?' => array( '<?wp-bit?>', '?', '<?wp-bit ??>' ), 542 'Emptied (?> closer)' => array( '<?wp-bit data?>', '', '<?wp-bit ?>' ), 543 'Emptied (bare closer)' => array( '<?wp-bit data>', '', '<?wp-bit ?>' ), 544 'Empty data set on empty data' => array( '<?wp-bit?>', '', '<?wp-bit ?>' ), 545 'Whitespace run normalized' => array( "<?wp-bit \t\n old?>", 'new', '<?wp-bit new?>' ), 546 ); 547 } 548 549 /** 550 * Ensures that repeated processing instruction data updates replace 551 * each other instead of accumulating syntax adjustments. 552 * 553 * @ticket 61530 554 */ 555 public function test_replaces_previous_processing_instruction_data_update(): void { 556 $processor = new WP_HTML_Tag_Processor( '<?wp-bit?>' ); 557 $processor->next_token(); 558 559 $this->assertTrue( 560 $processor->set_modifiable_text( 'first?' ), 561 'Should have set the initial processing instruction data.' 562 ); 563 564 $this->assertTrue( 565 $processor->set_modifiable_text( 'second' ), 566 'Should have replaced the pending processing instruction data.' 567 ); 568 569 $this->assertSame( 570 '<?wp-bit second?>', 571 $processor->get_updated_html(), 572 'Should have applied only the last update to the document.' 573 ); 574 } 575 576 /** 445 577 * Ensures that updates with potentially-compromising values aren't accepted. 446 578 * … … 453 585 * 454 586 * @dataProvider data_unallowed_modifiable_text_updates 587 * 588 * @expectedIncorrectUsage WP_HTML_Tag_Processor::set_modifiable_text 455 589 * 456 590 * @param string $html_with_nonempty_modifiable_text Will be used to find the test element. … … 491 625 'Comment with -->' => array( '<!-- this is a comment -->', 'Comments end in -->' ), 492 626 'Comment with --!>' => array( '<!-- this is a comment -->', 'Invalid but legitimate comments end in --!>' ), 627 'PI with >' => array( '<?wp-bit some data?>', 'Processing instructions end at the first >' ), 628 'PI with leading space' => array( '<?wp-bit some data?>', ' leading whitespace is skipped after the target' ), 629 'PI with leading tab' => array( '<?wp-bit some data?>', "\tleading whitespace is skipped after the target" ), 630 'PI with only whitespace' => array( '<?wp-bit some data?>', ' ' ), 493 631 'Non-JS SCRIPT with <script>' => array( '<script type="text/html">Replace me</script>', '<!-- Just a <script>' ), 494 632 'Non-JS SCRIPT with </script>' => array( '<script type="text/plain">Replace me</script>', 'Just a </script>' ), … … 674 812 * @ticket 64751 675 813 * @dataProvider data_set_modifiable_fails_non_atomic_tags 814 * 815 * @expectedIncorrectUsage WP_HTML_Tag_Processor::set_modifiable_text 676 816 */ 677 817 public function test_set_modifiable_fails_non_atomic_tags(
Note:
See TracChangeset
for help on using the changeset viewer.
