Changeset 58040 for trunk/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php

Timestamp:

04/24/2024 07:43:02 AM (5 months ago)

Author:

dmsnell

Message:

HTML API: Fix detection of single-length funky comments.

Since [60428] the Tag Processor has been misidentifying single-character
funky comments. It has been asserting that the full token-length for a
funky comment must be at least three characters after the opening (e.g.
</1>), but it has been starting to look for the closing > after
those same three characters. This means that it has been skipping the
actual close of these funky comments and swallowing up the next syntax
until it finds a >, often consuming the next tag in the process.

This patch fixes the detector and restores finding the following token.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/6412
Discussed in https://core.trac.wordpress.org/ticket/60170

Follow-up to [60428].
Fixes #60170.
Props dmsnell, gziolo, jonsurrell.

File:

• trunk/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php (modified) (1 diff)

trunk/tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php

@@ -589 +589 @@
      *
      * @covers ::process_directives
-     */
-    public function test_process_directives_doesnt_change_html_if_contains_unbalanced_tags() {
+     *
+     * @dataProvider data_html_with_unbalanced_tags
+     *
+     * @param string $html HTML containing unbalanced tags and also a directive.
+     */
+    public function test_process_directives_doesnt_change_html_if_contains_unbalanced_tags( $html ) {
         $this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
 
-        $html_samples = array(
-            '<div data-wp-bind--id="myPlugin::state.id">Inner content</div></div>',
-            '<div data-wp-bind--id="myPlugin::state.id">Inner content</div><div>',
-            '<div><div data-wp-bind--id="myPlugin::state.id">Inner content</div>',
-            '</div><div data-wp-bind--id="myPlugin::state.id">Inner content</div>',
-            '<div data-wp-bind--id="myPlugin::state.id">Inner<div>content</div>',
-            '<div data-wp-bind--id="myPlugin::state.id">Inner</div>content</div>',
-            '<div data-wp-bind--id="myPlugin::state.id"><span>Inner content</div>',
-            '<div data-wp-bind--id="myPlugin::state.id">Inner content</div></span>',
-            '<div data-wp-bind--id="myPlugin::state.id"><span>Inner content</div></span>',
-            '<div data-wp-bind--id="myPlugin::state.id">Inner conntent</ ></div>',
-        );
-
-        foreach ( $html_samples as $html ) {
-            $processed_html = $this->interactivity->process_directives( $html );
-            $p              = new WP_HTML_Tag_Processor( $processed_html );
-            $p->next_tag();
-            $this->assertNull( $p->get_attribute( 'id' ) );
-        }
+        $processed_html = $this->interactivity->process_directives( $html );
+        $p              = new WP_HTML_Tag_Processor( $processed_html );
+        $p->next_tag();
+        $this->assertNull( $p->get_attribute( 'id' ) );
+    }
+
+    /**
+     * Data provider.
+     *
+     * @return array[].
+     */
+    public static function data_html_with_unbalanced_tags() {
+        return array(
+            'DIV closer after'   => array( '<div data-wp-bind--id="myPlugin::state.id">Inner content</div></div>' ),
+            'DIV opener after'   => array( '<div data-wp-bind--id="myPlugin::state.id">Inner content</div><div>' ),
+            'DIV opener before'  => array( '<div><div data-wp-bind--id="myPlugin::state.id">Inner content</div>' ),
+            'DIV closer before'  => array( '</div><div data-wp-bind--id="myPlugin::state.id">Inner content</div>' ),
+            'DIV opener inside'  => array( '<div data-wp-bind--id="myPlugin::state.id">Inner<div>content</div>' ),
+            'DIV closer inside'  => array( '<div data-wp-bind--id="myPlugin::state.id">Inner</div>content</div>' ),
+            'SPAN opener inside' => array( '<div data-wp-bind--id="myPlugin::state.id"><span>Inner content</div>' ),
+            'SPAN closer after'  => array( '<div data-wp-bind--id="myPlugin::state.id">Inner content</div></span>' ),
+            'SPAN overlapping'   => array( '<div data-wp-bind--id="myPlugin::state.id"><span>Inner content</div></span>' ),
+        );
     }