vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Interactivity API: Skip instead of bail out if HTML contains SVG or MATH.

Browse Source 
Addresses an issue with server-side processing of directives when there is e.g. an SVG icon a navigation menu.

Props cbravobernal, westonruter, dmsnell, swissspidy.
Fixes #60517.

git-svn-id: https://develop.svn.wordpress.org/trunk@57649 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Pascal Birchler
2024-02-17 15:26:43 +00:00
parent 81e3bcfb7d
commit 55a14eae8b
4 changed files with 188 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
tests/phpunit/tests/interactivity-api/wpInteractivityAPI.php
View File

@@ -11,7 +11,7 @@
*
* @coversDefaultClass WP_Interactivity_API
*/
class Tests_WP_Interactivity_API extends WP_UnitTestCase {
class Tests_Interactivity_API_WpInteractivityAPI extends WP_UnitTestCase {
/**
* Instance of WP_Interactivity_API.
*
@@ -508,50 +508,131 @@ class Tests_WP_Interactivity_API extends WP_UnitTestCase {
}
/**
* Tests that the `process_directives` returns the same HTML if it finds an
* SVG tag.
* Tests that the `process_directives` process the HTML outside a SVG tag.
*
* @ticket 60356
* @ticket 60517
*
* @covers ::process_directives
*/
public function test_process_directives_doesnt_change_html_if_contains_svgs() {
$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
public function test_process_directives_changes_html_if_contains_svgs() {
$this->interactivity->state(
'myPlugin',
array(
'id' => 'some-id',
'width' => '100',
)
);
$html = '
<div data-wp-bind--id="myPlugin::state.id">
<svg height="100" width="100">
<header>
<svg height="100" data-wp-bind--width="myPlugin::state.width">
<title>Red Circle</title>
<circle cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red" />
</svg>
</div>
</svg>
<div data-wp-bind--id="myPlugin::state.id"></div>
<div data-wp-bind--id="myPlugin::state.width"></div>
</header>
';
$processed_html = $this->interactivity->process_directives( $html );
$p = new WP_HTML_Tag_Processor( $processed_html );
$p->next_tag();
$p->next_tag( 'svg' );
$this->assertNull( $p->get_attribute( 'width' ) );
$p->next_tag( 'div' );
$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
$p->next_tag( 'div' );
$this->assertEquals( '100', $p->get_attribute( 'id' ) );
}
/**
* Tests that the `process_directives` does not process the HTML
* inside SVG tags.
*
* @ticket 60517
*
* @covers ::process_directives
*/
public function test_process_directives_does_not_change_inner_html_in_svgs() {
$this->interactivity->state(
'myPlugin',
array(
'id' => 'some-id',
)
);
$html = '
<header>
<svg height="100">
<circle cx="50" cy="50" r="40" stroke="black" stroke-width="3" fill="red" />
<g data-wp-bind--id="myPlugin::state.id" />
</svg>
</header>
';
$processed_html = $this->interactivity->process_directives( $html );
$p = new WP_HTML_Tag_Processor( $processed_html );
$p->next_tag( 'div' );
$this->assertNull( $p->get_attribute( 'id' ) );
}
/**
* Tests that the `process_directives` returns the same HTML if it finds an
* Tests that the `process_directives` process the HTML outside the
* MathML tag.
*
* @ticket 60356
* @ticket 60517
*
* @covers ::process_directives
*/
public function test_process_directives_doesnt_change_html_if_contains_math() {
$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
public function test_process_directives_change_html_if_contains_math() {
$this->interactivity->state(
'myPlugin',
array(
'id' => 'some-id',
'math' => 'ml-id',
)
);
$html = '
<div data-wp-bind--id="myPlugin::state.id">
<math>
<header>
<math data-wp-bind--id="myPlugin::state.math">
<mi>x</mi>
<mo>=</mo>
<mi>1</mi>
</math>
</div>
<div data-wp-bind--id="myPlugin::state.id"></div>
</header>
';
$processed_html = $this->interactivity->process_directives( $html );
$p = new WP_HTML_Tag_Processor( $processed_html );
$p->next_tag();
$p->next_tag( 'math' );
$this->assertNull( $p->get_attribute( 'id' ) );
$p->next_tag( 'div' );
$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
}
/**
* Tests that the `process_directives` does not process the HTML
* inside MathML tags.
*
* @ticket 60517
*
* @covers ::process_directives
*/
public function test_process_directives_does_not_change_inner_html_in_math() {
$this->interactivity->state(
'myPlugin',
array(
'id' => 'some-id',
)
);
$html = '
<header>
<math data-wp-bind--id="myPlugin::state.math">
<mrow data-wp-bind--id="myPlugin::state.id" />
<mi>x</mi>
<mo>=</mo>
<mi>1</mi>
</math>
</header>
';
$processed_html = $this->interactivity->process_directives( $html );
$p = new WP_HTML_Tag_Processor( $processed_html );
$p->next_tag( 'div' );
$this->assertNull( $p->get_attribute( 'id' ) );
}

49
tests/phpunit/tests/interactivity-api/wpInteractivityAPIDirectivesProcessor.php
View File

@@ -11,7 +11,7 @@
*
* @coversDefaultClass WP_Interactivity_API_Directives_Processor
*/
class Tests_WP_Interactivity_API_Directives_Processor extends WP_UnitTestCase {
class Tests_Interactivity_API_WpInteractivityAPIDirectivesProcessor extends WP_UnitTestCase {
/**
* Tests the `get_content_between_balanced_template_tags` method on template
* tags.
@@ -778,4 +778,51 @@ class Tests_WP_Interactivity_API_Directives_Processor extends WP_UnitTestCase {
$p->next_tag( array( 'tag_closers' => 'visit' ) );
$this->assertFalse( $p->next_balanced_tag_closer_tag() );
}
/**
* Tests that skip_to_tag_closer skips to the next tag,
* independant of the content.
*
* @ticket 60517
*
* @covers ::skip_to_tag_closer
*/
public function test_skip_to_tag_closer() {
$content = '<div><span>Not closed</div>';
$p = new WP_Interactivity_API_Directives_Processor( $content );
$p->next_tag();
$this->assertTrue( $p->skip_to_tag_closer() );
$this->assertTrue( $p->is_tag_closer() );
$this->assertEquals( 'DIV', $p->get_tag() );
}
/**
* Tests that skip_to_tag_closer does not skip to the
* next tag if there is no closing tag.
*
* @ticket 60517
*
* @covers ::skip_to_tag_closer
*/
public function test_skip_to_tag_closer_bails_not_closed() {
$content = '<div>Not closed parent';
$p = new WP_Interactivity_API_Directives_Processor( $content );
$p->next_tag();
$this->assertFalse( $p->skip_to_tag_closer() );
}
/**
* Tests that skip_to_tag_closer does not skip to the next
* tag if the closing tag is different from the current tag.
*
* @ticket 60517
*
* @covers ::skip_to_tag_closer
*/
public function test_skip_to_tag_closer_bails_different_tags() {
$content = '<div></span>';
$p = new WP_Interactivity_API_Directives_Processor( $content );
$p->next_tag();
$this->assertFalse( $p->skip_to_tag_closer() );
}
}