Skip to content

Editor: prepend_to_selector: optimized with str_replace() #12306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
josephscott wants to merge 1 commit into
base: trunk
Choose a base branch
from
+144 −0
Open

Editor: prepend_to_selector: optimized with str_replace() #12306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/wp-includes/class-wp-theme-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1251,6 +1251,10 @@ protected static function prepend_to_selector( $selector, $to_prepend ) {
if ( ! str_contains( $selector, ',' ) ) {
return $to_prepend . $selector;
}
// Fast path: no parentheses means all commas are top-level separators.
if ( ! str_contains( $selector, '(' ) ) {
return $to_prepend . str_replace( ',', ',' . $to_prepend, $selector );
}
$new_selectors = array();
$selectors = explode( ',', $selector );
foreach ( $selectors as $sel ) {
Expand Down
140 changes: 140 additions & 0 deletions tests/phpunit/tests/theme/wpThemeJson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7532,4 +7532,144 @@ public function test_to_ruleset_skips_non_scalar_values_and_casts_numerics() {
$this->assertStringNotContainsString( 'padding', $result, 'Boolean value should be skipped' );
$this->assertStringNotContainsString( 'gap', $result, 'Array value should be skipped' );
}

/**
* Tests that prepend_to_selector correctly prepends to single and
* compound (comma-separated) selectors.
*
* @ticket 65533
*
* @dataProvider data_prepend_to_selector
*
* @param string $selector Original CSS selector.
* @param string $to_prepend Selector to prepend.
* @param string $expected Expected resulting selector.
*/
public function test_prepend_to_selector( $selector, $to_prepend, $expected ) {
$theme_json = new ReflectionClass( 'WP_Theme_JSON' );

$func = $theme_json->getMethod( 'prepend_to_selector' );
if ( PHP_VERSION_ID < 80100 ) {
$func->setAccessible( true );
}

$actual = $func->invoke( null, $selector, $to_prepend );

$this->assertSame( $expected, $actual );
}

/**
* Data provider for prepend_to_selector tests.
*
* @return array[]
*/
public function data_prepend_to_selector() {
return array(
'single class selector' => array(
'selector' => '.inner',
'to_prepend' => '.wrapper ',
'expected' => '.wrapper .inner',
),
'single element selector' => array(
'selector' => 'p',
'to_prepend' => '.wrapper ',
'expected' => '.wrapper p',
),
'single id selector' => array(
'selector' => '#main',
'to_prepend' => '.wrapper ',
'expected' => '.wrapper #main',
),
'two comma-separated selectors without spaces' => array(
'selector' => 'h1,h2',
'to_prepend' => '.wrapper ',
'expected' => '.wrapper h1,.wrapper h2',
),
'three comma-separated selectors without spaces' => array(
'selector' => 'h1,h2,h3',
'to_prepend' => '.some-class ',
'expected' => '.some-class h1,.some-class h2,.some-class h3',
),
'comma-separated class selectors without spaces' => array(
'selector' => '.foo,.bar',
'to_prepend' => '.prefix ',
'expected' => '.prefix .foo,.prefix .bar',
),
'prepend without trailing space' => array(
'selector' => '.child',
'to_prepend' => '.parent',
'expected' => '.parent.child',
),
'compound selector without trailing space no comma spaces' => array(
'selector' => '.a,.b',
'to_prepend' => '.parent',
'expected' => '.parent.a,.parent.b',
),
'descendant selector prepended' => array(
'selector' => '.block .inner',
'to_prepend' => '.scope ',
'expected' => '.scope .block .inner',
),
'descendant selectors comma-separated without spaces' => array(
'selector' => '.block .inner,.block .alt',
'to_prepend' => '.scope ',
'expected' => '.scope .block .inner,.scope .block .alt',
),
'empty selector' => array(
'selector' => '',
'to_prepend' => '.prefix ',
'expected' => '.prefix ',
),
'empty prepend' => array(
'selector' => '.child',
'to_prepend' => '',
'expected' => '.child',
),
'both empty' => array(
'selector' => '',
'to_prepend' => '',
'expected' => '',
),
'attribute selector' => array(
'selector' => '[data-type="example"]',
'to_prepend' => '.scope ',
'expected' => '.scope [data-type="example"]',
),
'pseudo-class selector' => array(
'selector' => ':where(.is-layout-flex)',
'to_prepend' => '.editor ',
'expected' => '.editor :where(.is-layout-flex)',
),
'many comma-separated selectors without spaces' => array(
'selector' => 'h1,h2,h3,h4,h5,h6',
'to_prepend' => '.content ',
'expected' => '.content h1,.content h2,.content h3,.content h4,.content h5,.content h6',
),
'real world block element selector' => array(
'selector' => 'p',
'to_prepend' => '.wp-block-group ',
'expected' => '.wp-block-group p',
),
'real world compound block element selectors' => array(
'selector' => 'a,.wp-element-button',
'to_prepend' => '.wp-block-group ',
'expected' => '.wp-block-group a,.wp-block-group .wp-element-button',
),
'spaces after commas are preserved' => array(
'selector' => 'h1, h2, h3',
'to_prepend' => '.some-class ',
'expected' => '.some-class h1,.some-class h2,.some-class h3',
),
'spaces after commas preserved with class selectors' => array(
'selector' => '.foo, .bar',
'to_prepend' => '.prefix ',
'expected' => '.prefix .foo,.prefix .bar',
),
'mixed whitespace around commas preserved' => array(
'selector' => '.a , .b , .c',
'to_prepend' => '.pre ',
'expected' => '.pre .a ,.pre .b ,.pre .c',
),
);
}
}
Loading