', 'id' ),
'Triple attributes' => array( '
', 'id' ),
@@ -1162,13 +1162,13 @@ public function data_html_with_duplicated_attributes() {
* @covers WP_HTML_Tag_Processor::remove_attribute
*/
public function test_remove_attribute_with_a_non_existing_attribute_name_does_not_change_the_markup() {
- $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
- $p->next_tag();
- $p->remove_attribute( 'no-such-attribute' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $processor->next_tag();
+ $processor->remove_attribute( 'no-such-attribute' );
$this->assertSame(
self::HTML_SIMPLE,
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Content was changed when attempting to remove an attribute that did not exist'
);
}
@@ -1179,18 +1179,18 @@ public function test_remove_attribute_with_a_non_existing_attribute_name_does_no
* @covers WP_HTML_Tag_Processor::add_class
*/
public function test_add_class_creates_a_class_attribute_when_there_is_none() {
- $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
- $p->next_tag();
- $p->add_class( 'foo-class' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $processor->next_tag();
+ $processor->add_class( 'foo-class' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not include class name added via add_class()'
);
$this->assertSame(
'foo-class',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) did not return class name added via add_class()"
);
}
@@ -1201,19 +1201,19 @@ public function test_add_class_creates_a_class_attribute_when_there_is_none() {
* @covers WP_HTML_Tag_Processor::add_class
*/
public function test_calling_add_class_twice_creates_a_class_attribute_with_both_class_names_when_there_is_no_class_attribute() {
- $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
- $p->next_tag();
- $p->add_class( 'foo-class' );
- $p->add_class( 'bar-class' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $processor->next_tag();
+ $processor->add_class( 'foo-class' );
+ $processor->add_class( 'bar-class' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not include class names added via subsequent add_class() calls'
);
$this->assertSame(
'foo-class bar-class',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) did not return class names added via subsequent add_class() calls"
);
}
@@ -1224,17 +1224,17 @@ public function test_calling_add_class_twice_creates_a_class_attribute_with_both
* @covers WP_HTML_Tag_Processor::remove_class
*/
public function test_remove_class_does_not_change_the_markup_when_there_is_no_class_attribute() {
- $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
- $p->next_tag();
- $p->remove_class( 'foo-class' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $processor->next_tag();
+ $processor->remove_class( 'foo-class' );
$this->assertSame(
self::HTML_SIMPLE,
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML includes class name that was removed by remove_class()'
);
$this->assertNull(
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) did not return null for class name that was removed by remove_class()"
);
}
@@ -1245,19 +1245,19 @@ public function test_remove_class_does_not_change_the_markup_when_there_is_no_cl
* @covers WP_HTML_Tag_Processor::add_class
*/
public function test_add_class_appends_class_names_to_the_existing_class_attribute_when_one_already_exists() {
- $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
- $p->next_tag();
- $p->add_class( 'foo-class' );
- $p->add_class( 'bar-class' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $processor->next_tag();
+ $processor->add_class( 'foo-class' );
+ $processor->add_class( 'bar-class' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not reflect class names added to existing class attribute via subsequent add_class() calls'
);
$this->assertSame(
'main with-border foo-class bar-class',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) does not reflect class names added to existing class attribute via subsequent add_class() calls"
);
}
@@ -1268,18 +1268,18 @@ public function test_add_class_appends_class_names_to_the_existing_class_attribu
* @covers WP_HTML_Tag_Processor::remove_class
*/
public function test_remove_class_removes_a_single_class_from_the_class_attribute_when_one_exists() {
- $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
- $p->next_tag();
- $p->remove_class( 'main' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $processor->next_tag();
+ $processor->remove_class( 'main' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not reflect class name removed from existing class attribute via remove_class()'
);
$this->assertSame(
' with-border',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) does not reflect class name removed from existing class attribute via remove_class()"
);
}
@@ -1290,18 +1290,18 @@ public function test_remove_class_removes_a_single_class_from_the_class_attribut
* @covers WP_HTML_Tag_Processor::remove_class
*/
public function test_calling_remove_class_with_all_listed_class_names_removes_the_existing_class_attribute_from_the_markup() {
- $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
- $p->next_tag();
- $p->remove_class( 'main' );
- $p->remove_class( 'with-border' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $processor->next_tag();
+ $processor->remove_class( 'main' );
+ $processor->remove_class( 'with-border' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not reflect class attribute removed via subesequent remove_class() calls'
);
$this->assertNull(
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) did not return null for class attribute removed via subesequent remove_class() calls"
);
}
@@ -1312,18 +1312,18 @@ public function test_calling_remove_class_with_all_listed_class_names_removes_th
* @covers WP_HTML_Tag_Processor::add_class
*/
public function test_add_class_does_not_add_duplicate_class_names() {
- $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
- $p->next_tag();
- $p->add_class( 'with-border' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $processor->next_tag();
+ $processor->add_class( 'with-border' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not reflect deduplicated class name added via add_class()'
);
$this->assertSame(
'main with-border',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) does not reflect deduplicated class name added via add_class()"
);
}
@@ -1334,18 +1334,18 @@ public function test_add_class_does_not_add_duplicate_class_names() {
* @covers WP_HTML_Tag_Processor::add_class
*/
public function test_add_class_preserves_class_name_order_when_a_duplicate_class_name_is_added() {
- $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
- $p->next_tag();
- $p->add_class( 'main' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $processor->next_tag();
+ $processor->add_class( 'main' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not reflect class name order after adding duplicated class name via add_class()'
);
$this->assertSame(
'main with-border',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) does not reflect class name order after adding duplicated class name added via add_class()"
);
}
@@ -1356,20 +1356,20 @@ public function test_add_class_preserves_class_name_order_when_a_duplicate_class
* @covers WP_HTML_Tag_Processor::add_class
*/
public function test_add_class_when_there_is_a_class_attribute_with_excessive_whitespaces() {
- $p = new WP_HTML_Tag_Processor(
+ $processor = new WP_HTML_Tag_Processor(
'
Text
'
);
- $p->next_tag();
- $p->add_class( 'foo-class' );
+ $processor->next_tag();
+ $processor->add_class( 'foo-class' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not reflect existing excessive whitespace after adding class name via add_class()'
);
$this->assertSame(
' main with-border foo-class',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) does not reflect existing excessive whitespace after adding class name via add_class()"
);
}
@@ -1380,20 +1380,20 @@ public function test_add_class_when_there_is_a_class_attribute_with_excessive_wh
* @covers WP_HTML_Tag_Processor::remove_class
*/
public function test_remove_class_preserves_whitespaces_when_there_is_a_class_attribute_with_excessive_whitespaces() {
- $p = new WP_HTML_Tag_Processor(
+ $processor = new WP_HTML_Tag_Processor(
'
Text
'
);
- $p->next_tag();
- $p->remove_class( 'with-border' );
+ $processor->next_tag();
+ $processor->remove_class( 'with-border' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not reflect existing excessive whitespace after removing class name via remove_class()'
);
$this->assertSame(
' main',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) does not reflect existing excessive whitespace after removing class name via removing_class()"
);
}
@@ -1404,19 +1404,19 @@ public function test_remove_class_preserves_whitespaces_when_there_is_a_class_at
* @covers WP_HTML_Tag_Processor::remove_class
*/
public function test_removing_all_classes_removes_the_existing_class_attribute_from_the_markup_even_when_excessive_whitespaces_are_present() {
- $p = new WP_HTML_Tag_Processor(
+ $processor = new WP_HTML_Tag_Processor(
'
Text
'
);
- $p->next_tag();
- $p->remove_class( 'main' );
- $p->remove_class( 'with-border' );
+ $processor->next_tag();
+ $processor->remove_class( 'main' );
+ $processor->remove_class( 'with-border' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Updated HTML does not reflect removed class attribute after removing all class names via remove_class()'
);
$this->assertNull(
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute( 'class' ) did not return null after removing all class names via remove_class()"
);
}
@@ -1435,33 +1435,33 @@ public function test_removing_all_classes_removes_the_existing_class_attribute_f
* @covers WP_HTML_Tag_Processor::set_attribute
*/
public function test_set_attribute_takes_priority_over_add_class() {
- $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
- $p->next_tag();
- $p->add_class( 'add_class' );
- $p->set_attribute( 'class', 'set_attribute' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $processor->next_tag();
+ $processor->add_class( 'add_class' );
+ $processor->set_attribute( 'class', 'set_attribute' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
"Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
);
$this->assertSame(
'set_attribute',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"Calling get_attribute after updating first tag's attributes did not return the expected class name"
);
- $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
- $p->next_tag();
- $p->set_attribute( 'class', 'set_attribute' );
- $p->add_class( 'add_class' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $processor->next_tag();
+ $processor->set_attribute( 'class', 'set_attribute' );
+ $processor->add_class( 'add_class' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
"Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
);
$this->assertSame(
'set_attribute add_class',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"Calling get_attribute after updating first tag's attributes did not return the expected class name"
);
}
@@ -1482,33 +1482,33 @@ public function test_set_attribute_takes_priority_over_add_class() {
* @covers WP_HTML_Tag_Processor::set_attribute
*/
public function test_set_attribute_takes_priority_over_add_class_even_before_updating() {
- $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
- $p->next_tag();
- $p->add_class( 'add_class' );
- $p->set_attribute( 'class', 'set_attribute' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $processor->next_tag();
+ $processor->add_class( 'add_class' );
+ $processor->set_attribute( 'class', 'set_attribute' );
$this->assertSame(
'set_attribute',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"Calling get_attribute after updating first tag's attributes did not return the expected class name"
);
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
"Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
);
- $p = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
- $p->next_tag();
- $p->set_attribute( 'class', 'set_attribute' );
- $p->add_class( 'add_class' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_WITH_CLASSES );
+ $processor->next_tag();
+ $processor->set_attribute( 'class', 'set_attribute' );
+ $processor->add_class( 'add_class' );
$this->assertSame(
'set_attribute add_class',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"Calling get_attribute after updating first tag's attributes did not return the expected class name"
);
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
"Calling get_updated_html after updating first tag's attributes did not return the expected HTML"
);
}
@@ -1519,18 +1519,18 @@ public function test_set_attribute_takes_priority_over_add_class_even_before_upd
* @covers WP_HTML_Tag_Processor::add_class
*/
public function test_add_class_overrides_boolean_class_attribute() {
- $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
- $p->next_tag();
- $p->set_attribute( 'class', true );
- $p->add_class( 'add_class' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $processor->next_tag();
+ $processor->set_attribute( 'class', true );
+ $processor->add_class( 'add_class' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
"Updated HTML doesn't reflect class added via add_class that was originally set as boolean attribute"
);
$this->assertSame(
'add_class',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute (called after get_updated_html()) doesn't reflect class added via add_class that was originally set as boolean attribute"
);
}
@@ -1541,18 +1541,18 @@ public function test_add_class_overrides_boolean_class_attribute() {
* @covers WP_HTML_Tag_Processor::add_class
*/
public function test_add_class_overrides_boolean_class_attribute_even_before_updating() {
- $p = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
- $p->next_tag();
- $p->set_attribute( 'class', true );
- $p->add_class( 'add_class' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_SIMPLE );
+ $processor->next_tag();
+ $processor->set_attribute( 'class', true );
+ $processor->add_class( 'add_class' );
$this->assertSame(
'add_class',
- $p->get_attribute( 'class' ),
+ $processor->get_attribute( 'class' ),
"get_attribute (called before get_updated_html()) doesn't reflect class added via add_class that was originally set as boolean attribute"
);
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
"Updated HTML doesn't reflect class added via add_class that was originally set as boolean attribute"
);
}
@@ -1613,12 +1613,12 @@ public function test_advanced_use_case() {
HTML;
- $p = new WP_HTML_Tag_Processor( $input );
- $this->assertTrue( $p->next_tag( 'div' ), 'Did not find first DIV tag in input.' );
- $p->set_attribute( 'data-details', '{ "key": "value" }' );
- $p->add_class( 'is-processed' );
+ $processor = new WP_HTML_Tag_Processor( $input );
+ $this->assertTrue( $processor->next_tag( 'div' ), 'Did not find first DIV tag in input.' );
+ $processor->set_attribute( 'data-details', '{ "key": "value" }' );
+ $processor->add_class( 'is-processed' );
$this->assertTrue(
- $p->next_tag(
+ $processor->next_tag(
array(
'tag_name' => 'div',
'class_name' => 'BtnGroup',
@@ -1626,11 +1626,11 @@ public function test_advanced_use_case() {
),
'Did not find the first BtnGroup DIV tag'
);
- $p->remove_class( 'BtnGroup' );
- $p->add_class( 'button-group' );
- $p->add_class( 'Another-Mixed-Case' );
+ $processor->remove_class( 'BtnGroup' );
+ $processor->add_class( 'button-group' );
+ $processor->add_class( 'Another-Mixed-Case' );
$this->assertTrue(
- $p->next_tag(
+ $processor->next_tag(
array(
'tag_name' => 'div',
'class_name' => 'BtnGroup',
@@ -1638,11 +1638,11 @@ public function test_advanced_use_case() {
),
'Did not find the second BtnGroup DIV tag'
);
- $p->remove_class( 'BtnGroup' );
- $p->add_class( 'button-group' );
- $p->add_class( 'Another-Mixed-Case' );
+ $processor->remove_class( 'BtnGroup' );
+ $processor->add_class( 'button-group' );
+ $processor->add_class( 'Another-Mixed-Case' );
$this->assertTrue(
- $p->next_tag(
+ $processor->next_tag(
array(
'tag_name' => 'button',
'class_name' => 'btn',
@@ -1651,10 +1651,10 @@ public function test_advanced_use_case() {
),
'Did not find third BUTTON tag with "btn" CSS class'
);
- $p->remove_attribute( 'class' );
- $this->assertFalse( $p->next_tag( 'non-existent' ), "Found a {$p->get_tag()} tag when none should have been found." );
- $p->set_attribute( 'class', 'test' );
- $this->assertSame( $expected_output, $p->get_updated_html(), 'Calling get_updated_html after updating the attributes did not return the expected HTML' );
+ $processor->remove_attribute( 'class' );
+ $this->assertFalse( $processor->next_tag( 'non-existent' ), "Found a {$processor->get_tag()} tag when none should have been found." );
+ $processor->set_attribute( 'class', 'test' );
+ $this->assertSame( $expected_output, $processor->get_updated_html(), 'Calling get_updated_html after updating the attributes did not return the expected HTML' );
}
/**
@@ -1663,26 +1663,26 @@ public function test_advanced_use_case() {
* @covers WP_HTML_Tag_Processor::next_tag
*/
public function test_correctly_parses_html_attributes_wrapped_in_single_quotation_marks() {
- $p = new WP_HTML_Tag_Processor(
+ $processor = new WP_HTML_Tag_Processor(
'
Text
'
);
- $p->next_tag(
+ $processor->next_tag(
array(
'tag_name' => 'div',
'id' => 'first',
)
);
- $p->remove_attribute( 'id' );
- $p->next_tag(
+ $processor->remove_attribute( 'id' );
+ $processor->next_tag(
array(
'tag_name' => 'span',
'id' => 'second',
)
);
- $p->set_attribute( 'id', 'single-quote' );
+ $processor->set_attribute( 'id', 'single-quote' );
$this->assertSame(
'
Text
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Did not remove single-quoted attribute'
);
}
@@ -1693,14 +1693,14 @@ public function test_correctly_parses_html_attributes_wrapped_in_single_quotatio
* @covers WP_HTML_Tag_Processor::set_attribute
*/
public function test_set_attribute_with_value_equal_to_true_adds_a_boolean_html_attribute_with_implicit_value() {
- $p = new WP_HTML_Tag_Processor(
+ $processor = new WP_HTML_Tag_Processor(
'
'
);
- $p->next_tag( 'input' );
- $p->set_attribute( 'checked', true );
+ $processor->next_tag( 'input' );
+ $processor->set_attribute( 'checked', true );
$this->assertSame(
'
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Did not add "checked" as an expected boolean attribute'
);
}
@@ -1711,14 +1711,14 @@ public function test_set_attribute_with_value_equal_to_true_adds_a_boolean_html_
* @covers WP_HTML_Tag_Processor::set_attribute
*/
public function test_setting_a_boolean_attribute_to_false_removes_it_from_the_markup() {
- $p = new WP_HTML_Tag_Processor(
+ $processor = new WP_HTML_Tag_Processor(
'
'
);
- $p->next_tag( 'input' );
- $p->set_attribute( 'checked', false );
+ $processor->next_tag( 'input' );
+ $processor->set_attribute( 'checked', false );
$this->assertSame(
'
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Did not remove boolean attribute when set to false'
);
}
@@ -1730,12 +1730,12 @@ public function test_setting_a_boolean_attribute_to_false_removes_it_from_the_ma
*/
public function test_setting_a_missing_attribute_to_false_does_not_change_the_markup() {
$html_input = '
';
- $p = new WP_HTML_Tag_Processor( $html_input );
- $p->next_tag( 'input' );
- $p->set_attribute( 'checked', false );
+ $processor = new WP_HTML_Tag_Processor( $html_input );
+ $processor->next_tag( 'input' );
+ $processor->set_attribute( 'checked', false );
$this->assertSame(
$html_input,
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Changed the markup unexpectedly when setting a non-existing attribute to false'
);
}
@@ -1746,14 +1746,14 @@ public function test_setting_a_missing_attribute_to_false_does_not_change_the_ma
* @covers WP_HTML_Tag_Processor::set_attribute
*/
public function test_setting_a_boolean_attribute_to_a_string_value_adds_explicit_value_to_the_markup() {
- $p = new WP_HTML_Tag_Processor(
+ $processor = new WP_HTML_Tag_Processor(
'
'
);
- $p->next_tag( 'input' );
- $p->set_attribute( 'checked', 'checked' );
+ $processor->next_tag( 'input' );
+ $processor->set_attribute( 'checked', 'checked' );
$this->assertSame(
'
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Did not add string value to existing boolean attribute'
);
}
@@ -1765,18 +1765,18 @@ public function test_setting_a_boolean_attribute_to_a_string_value_adds_explicit
* @covers WP_HTML_Tag_Processor::paused_at_incomplete_token
*/
public function test_unclosed_script_tag_should_not_cause_an_infinite_loop() {
- $p = new WP_HTML_Tag_Processor( '
',
@@ -1866,11 +1866,11 @@ public function data_next_tag_ignores_script_tag_contents() {
* element after contain the "start" and "end" CSS classes.
*/
public function test_next_tag_ignores_invalid_first_character_of_tag_name_comments( $html_with_markers ) {
- $p = new WP_HTML_Tag_Processor( $html_with_markers );
- $p->next_tag( array( 'class_name' => 'start' ) );
- $p->next_tag();
+ $processor = new WP_HTML_Tag_Processor( $html_with_markers );
+ $processor->next_tag( array( 'class_name' => 'start' ) );
+ $processor->next_tag();
- $this->assertSame( 'end', $p->get_attribute( 'class' ) );
+ $this->assertSame( 'end', $processor->get_attribute( 'class' ) );
}
/**
@@ -1878,7 +1878,7 @@ public function test_next_tag_ignores_invalid_first_character_of_tag_name_commen
*
* @return array[]
*/
- public function data_next_tag_ignores_invalid_first_character_of_tag_name_comments() {
+ public static function data_next_tag_ignores_invalid_first_character_of_tag_name_comments() {
return array(
'Invalid tag openers as normal text' => array(
'
',
@@ -1905,11 +1905,11 @@ public function data_next_tag_ignores_invalid_first_character_of_tag_name_commen
* @param string $rcdata_tag RCDATA tag.
*/
public function test_next_tag_ignores_contents_of_rcdata_tag( $rcdata_then_div, $rcdata_tag ) {
- $p = new WP_HTML_Tag_Processor( $rcdata_then_div );
- $p->next_tag();
- $this->assertSame( $rcdata_tag, $p->get_tag(), "The first found tag was not '$rcdata_tag'" );
- $p->next_tag();
- $this->assertSame( 'DIV', $p->get_tag(), "The second found tag was not 'div'" );
+ $processor = new WP_HTML_Tag_Processor( $rcdata_then_div );
+ $processor->next_tag();
+ $this->assertSame( $rcdata_tag, $processor->get_tag(), "The first found tag was not '$rcdata_tag'" );
+ $processor->next_tag();
+ $this->assertSame( 'DIV', $processor->get_tag(), "The second found tag was not 'div'" );
}
/**
@@ -1917,7 +1917,7 @@ public function test_next_tag_ignores_contents_of_rcdata_tag( $rcdata_then_div,
*
* @return array[]
*/
- public function data_next_tag_ignores_contents_of_rcdata_tag() {
+ public static function data_next_tag_ignores_contents_of_rcdata_tag() {
return array(
'simple textarea' => array(
'rcdata_then_div' => '
',
@@ -1964,10 +1964,10 @@ public function data_next_tag_ignores_contents_of_rcdata_tag() {
* @covers WP_HTML_Tag_Processor::next_tag
*/
public function test_processes_inside_of_noscript_elements() {
- $p = new WP_HTML_Tag_Processor( '
' );
+ $processor = new WP_HTML_Tag_Processor( '
' );
- $this->assertTrue( $p->next_tag( 'INPUT' ), 'Failed to find INPUT element inside NOSCRIPT element.' );
- $this->assertTrue( $p->next_tag( 'DIV' ), 'Failed to find DIV element after NOSCRIPT element.' );
+ $this->assertTrue( $processor->next_tag( 'INPUT' ), 'Failed to find INPUT element inside NOSCRIPT element.' );
+ $this->assertTrue( $processor->next_tag( 'DIV' ), 'Failed to find DIV element after NOSCRIPT element.' );
}
/**
@@ -1996,7 +1996,7 @@ public function test_next_tag_ignores_contents_of_rawtext_tags( $rawtext_element
*
* @return array[].
*/
- public function data_next_tag_ignores_contents_of_rawtext_tags() {
+ public static function data_next_tag_ignores_contents_of_rawtext_tags() {
return array(
'IFRAME' => array( '
' ),
'NOEMBED' => array( '<![CDATA[<p></p>]]>' ),
@@ -2012,11 +2012,11 @@ public function data_next_tag_ignores_contents_of_rawtext_tags() {
* @covers WP_HTML_Tag_Processor::class_list
*/
public function test_class_list_empty_when_missing_class() {
- $p = new WP_HTML_Tag_Processor( '
' );
- $p->next_tag();
+ $processor = new WP_HTML_Tag_Processor( '
' );
+ $processor->next_tag();
$found_classes = false;
- foreach ( $p->class_list() as $class ) {
+ foreach ( $processor->class_list() as $class ) {
$found_classes = true;
}
@@ -2029,11 +2029,11 @@ public function test_class_list_empty_when_missing_class() {
* @covers WP_HTML_Tag_Processor::class_list
*/
public function test_class_list_empty_when_class_is_boolean() {
- $p = new WP_HTML_Tag_Processor( '
' );
- $p->next_tag();
+ $processor = new WP_HTML_Tag_Processor( '
' );
+ $processor->next_tag();
$found_classes = false;
- foreach ( $p->class_list() as $class ) {
+ foreach ( $processor->class_list() as $class ) {
$found_classes = true;
}
@@ -2046,11 +2046,11 @@ public function test_class_list_empty_when_class_is_boolean() {
* @covers WP_HTML_Tag_Processor::class_list
*/
public function test_class_list_empty_when_class_is_empty() {
- $p = new WP_HTML_Tag_Processor( '
' );
- $p->next_tag();
+ $processor = new WP_HTML_Tag_Processor( '
' );
+ $processor->next_tag();
$found_classes = false;
- foreach ( $p->class_list() as $class ) {
+ foreach ( $processor->class_list() as $class ) {
$found_classes = true;
}
@@ -2063,11 +2063,11 @@ public function test_class_list_empty_when_class_is_empty() {
* @covers WP_HTML_Tag_Processor::class_list
*/
public function test_class_list_visits_each_class_in_order() {
- $p = new WP_HTML_Tag_Processor( '
' );
- $p->next_tag();
+ $processor = new WP_HTML_Tag_Processor( '
' );
+ $processor->next_tag();
$found_classes = array();
- foreach ( $p->class_list() as $class ) {
+ foreach ( $processor->class_list() as $class ) {
$found_classes[] = $class;
}
@@ -2080,11 +2080,11 @@ public function test_class_list_visits_each_class_in_order() {
* @covers WP_HTML_Tag_Processor::class_list
*/
public function test_class_list_decodes_class_names() {
- $p = new WP_HTML_Tag_Processor( '
' );
- $p->next_tag();
+ $processor = new WP_HTML_Tag_Processor( '
' );
+ $processor->next_tag();
$found_classes = array();
- foreach ( $p->class_list() as $class ) {
+ foreach ( $processor->class_list() as $class ) {
$found_classes[] = $class;
}
@@ -2097,11 +2097,11 @@ public function test_class_list_decodes_class_names() {
* @covers WP_HTML_Tag_Processor::class_list
*/
public function test_class_list_visits_unique_class_names_only_once() {
- $p = new WP_HTML_Tag_Processor( '
' );
- $p->next_tag();
+ $processor = new WP_HTML_Tag_Processor( '
' );
+ $processor->next_tag();
$found_classes = array();
- foreach ( $p->class_list() as $class ) {
+ foreach ( $processor->class_list() as $class ) {
$found_classes[] = $class;
}
@@ -2120,13 +2120,13 @@ public function test_class_list_visits_unique_class_names_only_once() {
* @param bool $has_class Whether the sought class exists in the given HTML.
*/
public function test_has_class_handles_expected_class_name_variations( $html, $sought_class, $has_class ) {
- $p = new WP_HTML_Tag_Processor( $html );
- $p->next_tag();
+ $processor = new WP_HTML_Tag_Processor( $html );
+ $processor->next_tag();
if ( $has_class ) {
- $this->assertTrue( $p->has_class( $sought_class ), "Failed to find expected class {$sought_class}." );
+ $this->assertTrue( $processor->has_class( $sought_class ), "Failed to find expected class {$sought_class}." );
} else {
- $this->assertFalse( $p->has_class( $sought_class ), "Found class {$sought_class} when it doesn't exist." );
+ $this->assertFalse( $processor->has_class( $sought_class ), "Found class {$sought_class} when it doesn't exist." );
}
}
@@ -2135,7 +2135,7 @@ public function test_has_class_handles_expected_class_name_variations( $html, $s
*
* @return array[]
*/
- public function data_html_with_variations_of_class_values_and_sought_class_names() {
+ public static function data_html_with_variations_of_class_values_and_sought_class_names() {
return array(
'Tag without any classes' => array( '
', 'foo', false ),
'Tag with boolean class' => array( '
![]()
', 'foo', false ),
@@ -2159,16 +2159,16 @@ public function data_html_with_variations_of_class_values_and_sought_class_names
*
*/
public function test_allows_incorrectly_closed_comments() {
- $p = new WP_HTML_Tag_Processor( '
![]()
![]()
-->
![]()
' );
+ $processor = new WP_HTML_Tag_Processor( '
![]()
![]()
-->
![]()
' );
- $p->next_tag();
- $this->assertSame( 'before', $p->get_attribute( 'id' ), 'Did not find starting tag.' );
+ $processor->next_tag();
+ $this->assertSame( 'before', $processor->get_attribute( 'id' ), 'Did not find starting tag.' );
- $p->next_tag();
- $this->assertSame( 'after', $p->get_attribute( 'id' ), 'Did not properly close improperly-closed comment.' );
+ $processor->next_tag();
+ $this->assertSame( 'after', $processor->get_attribute( 'id' ), 'Did not properly close improperly-closed comment.' );
- $p->next_tag();
- $this->assertSame( 'final', $p->get_attribute( 'id' ), 'Did not skip over unopened comment-closer.' );
+ $processor->next_tag();
+ $this->assertSame( 'final', $processor->get_attribute( 'id' ), 'Did not skip over unopened comment-closer.' );
}
/**
@@ -2184,15 +2184,15 @@ public function test_allows_incorrectly_closed_comments() {
* @param string $html_ending_before_comment_close HTML with opened comments that aren't closed.
*/
public function test_documents_may_end_with_unclosed_comment( $html_ending_before_comment_close ) {
- $p = new WP_HTML_Tag_Processor( $html_ending_before_comment_close );
+ $processor = new WP_HTML_Tag_Processor( $html_ending_before_comment_close );
$this->assertFalse(
- $p->next_tag(),
- "Should not have found any tag, but found {$p->get_tag()}."
+ $processor->next_tag(),
+ "Should not have found any tag, but found {$processor->get_tag()}."
);
$this->assertTrue(
- $p->paused_at_incomplete_token(),
+ $processor->paused_at_incomplete_token(),
"Should have indicated that the parser found an incomplete token but didn't."
);
}
@@ -2202,7 +2202,7 @@ public function test_documents_may_end_with_unclosed_comment( $html_ending_befor
*
* @return array[]
*/
- public function data_html_with_unclosed_comments() {
+ public static function data_html_with_unclosed_comments() {
return array(
'Shortest open valid comment' => array( '
' ),
'Empty comment with two dashes only, improperly closed' => array( '
' ),
@@ -2262,11 +2262,11 @@ public function data_abruptly_closed_empty_comments() {
* @param $input_html HTML with multiple divs, one of which carries the "target" attribute.
*/
public function test_skips_contents_of_script_and_rcdata_regions( $input_html ) {
- $p = new WP_HTML_Tag_Processor( $input_html );
- $p->next_tag( 'div' );
+ $processor = new WP_HTML_Tag_Processor( $input_html );
+ $processor->next_tag( 'div' );
$this->assertTrue(
- $p->get_attribute( 'target' ),
+ $processor->get_attribute( 'target' ),
'Did not properly skip over script and rcdata regions; incorrectly found tags inside'
);
}
@@ -2276,7 +2276,7 @@ public function test_skips_contents_of_script_and_rcdata_regions( $input_html )
*
* @return array[]
*/
- public function data_skips_contents_of_script_and_rcdata_regions() {
+ public static function data_skips_contents_of_script_and_rcdata_regions() {
return array(
'Balanced SCRIPT tags' => array( '
' ),
'Unexpected SCRIPT closer after DIV' => array( 'console.log("
")
' ),
@@ -2295,16 +2295,16 @@ public function data_skips_contents_of_script_and_rcdata_regions() {
* @covers WP_HTML_Tag_Processor::set_attribute
*/
public function test_can_query_and_update_wrongly_nested_tags() {
- $p = new WP_HTML_Tag_Processor(
+ $processor = new WP_HTML_Tag_Processor(
'
123456
789'
);
- $p->next_tag( 'span' );
- $p->set_attribute( 'class', 'span-class' );
- $p->next_tag( 'p' );
- $p->set_attribute( 'class', 'p-class' );
+ $processor->next_tag( 'span' );
+ $processor->set_attribute( 'class', 'span-class' );
+ $processor->next_tag( 'p' );
+ $processor->set_attribute( 'class', 'p-class' );
$this->assertSame(
'
123456
789',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Did not find overlapping p tag'
);
}
@@ -2316,12 +2316,12 @@ public function test_can_query_and_update_wrongly_nested_tags() {
* @covers WP_HTML_Tag_Processor::remove_attribute
*/
public function test_removing_specific_attributes_in_malformed_html() {
- $p = new WP_HTML_Tag_Processor( self::HTML_MALFORMED );
- $p->next_tag( 'span' );
- $p->remove_attribute( 'Notifications<' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_MALFORMED );
+ $processor->next_tag( 'span' );
+ $processor->remove_attribute( 'Notifications<' );
$this->assertSame(
'
Back to notifications
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Did not remove "Notifications<" attribute in malformed input'
);
}
@@ -2357,7 +2357,7 @@ public function test_next_tag_returns_false_when_there_are_no_tags( $html_withou
*
* @return array[]
*/
- public function data_html_without_tags() {
+ public static function data_html_without_tags() {
return array(
'DOCTYPE declaration' => array( 'Just some HTML' ),
'No tags' => array( 'this is nothing more than a text node' ),
@@ -2382,15 +2382,15 @@ public function data_html_without_tags() {
* @param string $incomplete_html HTML text containing some kind of incomplete syntax.
*/
public function test_next_tag_returns_false_for_incomplete_syntax_elements( $incomplete_html ) {
- $p = new WP_HTML_Tag_Processor( $incomplete_html );
+ $processor = new WP_HTML_Tag_Processor( $incomplete_html );
$this->assertFalse(
- $p->next_tag(),
- "Shouldn't have found any tags but found {$p->get_tag()}."
+ $processor->next_tag(),
+ "Shouldn't have found any tags but found {$processor->get_tag()}."
);
$this->assertTrue(
- $p->paused_at_incomplete_token(),
+ $processor->paused_at_incomplete_token(),
"Should have indicated that the parser found an incomplete token but didn't."
);
}
@@ -2400,7 +2400,7 @@ public function test_next_tag_returns_false_for_incomplete_syntax_elements( $inc
*
* @return array[]
*/
- public function data_incomplete_syntax_elements() {
+ public static function data_incomplete_syntax_elements() {
return array(
'Incomplete tag name' => array( '
array( 'next_tag( 'span' );
- $p->set_attribute( 'id', 'first' );
- $p->next_tag( 'span' );
- $p->set_attribute( 'id', 'second' );
+ $processor = new WP_HTML_Tag_Processor( self::HTML_MALFORMED );
+ $processor->next_tag( 'span' );
+ $processor->set_attribute( 'id', 'first' );
+ $processor->next_tag( 'span' );
+ $processor->set_attribute( 'id', 'second' );
$this->assertSame(
'Back to notifications
',
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Did not add id attributes properly to malformed input'
);
}
@@ -2466,16 +2466,16 @@ public function test_updating_specific_attributes_in_malformed_html() {
* @param string $expected Expected updated HTML.
*/
public function test_updating_attributes( $html, $expected ) {
- $p = new WP_HTML_Tag_Processor( $html );
- $p->next_tag();
- $p->set_attribute( 'foo', 'bar' );
- $p->add_class( 'firstTag' );
- $p->next_tag();
- $p->add_class( 'secondTag' );
+ $processor = new WP_HTML_Tag_Processor( $html );
+ $processor->next_tag();
+ $processor->set_attribute( 'foo', 'bar' );
+ $processor->add_class( 'firstTag' );
+ $processor->next_tag();
+ $processor->add_class( 'secondTag' );
$this->assertSame(
$expected,
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Did not properly add attributes and class names'
);
}
@@ -2485,7 +2485,7 @@ public function test_updating_attributes( $html, $expected ) {
*
* @return array[]
*/
- public function data_updating_attributes() {
+ public static function data_updating_attributes() {
return array(
'tags inside of a comment' => array(
'input' => 'test',
@@ -2530,16 +2530,16 @@ public function data_updating_attributes() {
* @param string $expected Expected updated HTML.
*/
public function test_updating_attributes_in_malformed_html( $html, $expected ) {
- $p = new WP_HTML_Tag_Processor( $html );
- $this->assertTrue( $p->next_tag(), 'Could not find first tag.' );
- $p->set_attribute( 'foo', 'bar' );
- $p->add_class( 'firstTag' );
- $p->next_tag();
- $p->add_class( 'secondTag' );
+ $processor = new WP_HTML_Tag_Processor( $html );
+ $this->assertTrue( $processor->next_tag(), 'Could not find first tag.' );
+ $processor->set_attribute( 'foo', 'bar' );
+ $processor->add_class( 'firstTag' );
+ $processor->next_tag();
+ $processor->add_class( 'secondTag' );
$this->assertSame(
$expected,
- $p->get_updated_html(),
+ $processor->get_updated_html(),
'Did not properly update attributes and classnames given malformed input'
);
}
@@ -2549,7 +2549,7 @@ public function test_updating_attributes_in_malformed_html( $html, $expected ) {
*
* @return array[]
*/
- public function data_updating_attributes_in_malformed_html() {
+ public static function data_updating_attributes_in_malformed_html() {
return array(
'Invalid entity inside attribute value' => array(
'input' => '
test',
@@ -2702,8 +2702,8 @@ public function data_updating_attributes_in_malformed_html() {
* @covers WP_HTML_Tag_Processor::next_tag
*/
public function test_handles_malformed_taglike_open_short_html() {
- $p = new WP_HTML_Tag_Processor( '<' );
- $result = $p->next_tag();
+ $processor = new WP_HTML_Tag_Processor( '<' );
+ $result = $processor->next_tag();
$this->assertFalse( $result, 'Did not handle "<" html properly.' );
}
@@ -2711,8 +2711,20 @@ public function test_handles_malformed_taglike_open_short_html() {
* @covers WP_HTML_Tag_Processor::next_tag
*/
public function test_handles_malformed_taglike_close_short_html() {
- $p = new WP_HTML_Tag_Processor( 'next_tag();
+ $processor = new WP_HTML_Tag_Processor( 'next_tag();
$this->assertFalse( $result, 'Did not handle "' );
+ $processor->next_token();
+ $this->assertSame( '#text', $processor->get_token_type(), 'Did not find text node.' );
+ $this->assertSame( 'test< /A>', $processor->get_modifiable_text(), 'Did not find complete text node.' );
+ }
}
diff --git a/tests/phpunit/tests/http/http.php b/tests/phpunit/tests/http/http.php
index 1648cca4eaf9f..77a5239819c64 100644
--- a/tests/phpunit/tests/http/http.php
+++ b/tests/phpunit/tests/http/http.php
@@ -661,4 +661,56 @@ function ( $response, $parsed_args, $url ) use ( &$pre_http_request_filter_has_r
$this->assertSame( 'PASS', wp_remote_retrieve_body( $redirect_response ), 'Redirect response body is expected to be PASS.' );
$this->assertTrue( $pre_http_request_filter_has_run, 'The pre_http_request filter is expected to run.' );
}
+
+ /**
+ * Test that WP_Http::normalize_cookies method correctly casts integer keys to string.
+ * @ticket 58566
+ *
+ * @covers WP_Http::normalize_cookies
+ */
+ public function test_normalize_cookies_casts_integer_keys_to_string() {
+ $http = _wp_http_get_object();
+
+ $cookies = array(
+ '1' => 'foo',
+ 2 => 'bar',
+ 'qux' => 7,
+ );
+
+ $cookie_jar = $http->normalize_cookies( $cookies );
+
+ $this->assertInstanceOf( 'WpOrg\Requests\Cookie\Jar', $cookie_jar );
+
+ foreach ( array_keys( $cookies ) as $cookie ) {
+ if ( is_string( $cookie ) ) {
+ $this->assertInstanceOf( 'WpOrg\Requests\Cookie', $cookie_jar[ $cookie ] );
+ } else {
+ $this->assertInstanceOf( 'WpOrg\Requests\Cookie', $cookie_jar[ (string) $cookie ] );
+ }
+ }
+ }
+
+ /**
+ * Test that WP_Http::normalize_cookies method correctly casts integer cookie names to strings.
+ * @ticket 58566
+ *
+ * @covers WP_Http::normalize_cookies
+ */
+ public function test_normalize_cookies_casts_cookie_name_integer_to_string() {
+ $http = _wp_http_get_object();
+
+ $cookies = array(
+ 'foo' => new WP_Http_Cookie(
+ array(
+ 'name' => 1,
+ 'value' => 'foo',
+ )
+ ),
+ );
+
+ $cookie_jar = $http->normalize_cookies( $cookies );
+
+ $this->assertInstanceOf( 'WpOrg\Requests\Cookie\Jar', $cookie_jar );
+ $this->assertInstanceOf( 'WpOrg\Requests\Cookie', $cookie_jar['1'] );
+ }
}
diff --git a/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php b/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php
index db6a82527455f..ea6de4017be26 100644
--- a/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php
+++ b/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php
@@ -49,6 +49,7 @@ public function tear_down() {
$wp_textdomain_registry = new WP_Textdomain_Registry();
unload_textdomain( 'internationalized-plugin' );
+ unload_textdomain( 'internationalized-plugin-2' );
unload_textdomain( 'internationalized-theme' );
parent::tear_down();
@@ -86,6 +87,27 @@ public function test_plugin_translation_should_be_translated_without_calling_loa
$this->assertTrue( $is_textdomain_loaded_after );
}
+ /**
+ * @ticket 59656
+ *
+ * @covers ::is_textdomain_loaded
+ */
+ public function test_plugin_translation_should_be_translated_with_only_an_l10n_php_file() {
+ add_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
+
+ require_once DIR_TESTDATA . '/plugins/internationalized-plugin-2.php';
+
+ $is_textdomain_loaded_before = is_textdomain_loaded( 'internationalized-plugin-2' );
+ $actual_output = i18n_plugin_2_test();
+ $is_textdomain_loaded_after = is_textdomain_loaded( 'internationalized-plugin-2' );
+
+ remove_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
+
+ $this->assertFalse( $is_textdomain_loaded_before );
+ $this->assertSame( 'Das ist ein Dummy Plugin', $actual_output );
+ $this->assertTrue( $is_textdomain_loaded_after );
+ }
+
/**
* @ticket 34114
*
diff --git a/tests/phpunit/tests/l10n/wpTextdomainRegistry.php b/tests/phpunit/tests/l10n/wpTextdomainRegistry.php
index 19a239428d50a..dd9688e947488 100644
--- a/tests/phpunit/tests/l10n/wpTextdomainRegistry.php
+++ b/tests/phpunit/tests/l10n/wpTextdomainRegistry.php
@@ -151,36 +151,46 @@ public function test_invalidate_mo_files_cache() {
public function data_domains_locales() {
return array(
- 'Non-existent plugin' => array(
+ 'Non-existent plugin' => array(
'unknown-plugin',
'en_US',
false,
),
- 'Non-existent plugin with de_DE' => array(
+ 'Non-existent plugin with de_DE' => array(
'unknown-plugin',
'de_DE',
false,
),
- 'Available de_DE translations' => array(
+ 'Available de_DE translations' => array(
'internationalized-plugin',
'de_DE',
WP_LANG_DIR . '/plugins/',
),
- 'Available es_ES translations' => array(
+ 'Available es_ES translations' => array(
'internationalized-plugin',
'es_ES',
WP_LANG_DIR . '/plugins/',
),
- 'Unavailable fr_FR translations' => array(
+ 'Unavailable fr_FR translations' => array(
'internationalized-plugin',
'fr_FR',
false,
),
- 'Unavailable en_US translations' => array(
+ 'Unavailable en_US translations' => array(
'internationalized-plugin',
'en_US',
false,
),
+ 'Available de_DE translations (.l10n.php)' => array(
+ 'internationalized-plugin-2',
+ 'de_DE',
+ WP_LANG_DIR . '/plugins/',
+ ),
+ 'Available es_ES translations (.l10n.php)' => array(
+ 'internationalized-plugin-2',
+ 'es_ES',
+ WP_LANG_DIR . '/plugins/',
+ ),
);
}
}
diff --git a/tests/phpunit/tests/l10n/wpTranslations.php b/tests/phpunit/tests/l10n/wpTranslations.php
index f2ef4535a0810..70abc4fd3063d 100644
--- a/tests/phpunit/tests/l10n/wpTranslations.php
+++ b/tests/phpunit/tests/l10n/wpTranslations.php
@@ -71,8 +71,8 @@ public function test_get_entries_plural() {
array(
new Translation_Entry(
array(
+ 'is_plural' => true,
'singular' => 'one dragon',
- 'plural' => '%d dragons',
'translations' => array(
'oney dragoney',
'twoey dragoney',
@@ -119,7 +119,6 @@ public function test_get_entries_context() {
array(
'is_plural' => true,
'singular' => 'one dragon',
- 'plural' => '%d dragons',
'context' => 'dragonland',
'translations' => array(
'oney dragoney',
@@ -220,6 +219,52 @@ public function test_translate_plural() {
$this->assertTrue( $unload_successful, 'Text domain not successfully unloaded' );
}
+ /**
+ * @covers ::translate_plural
+ * @covers WP_Translation_File::get_plural_form
+ */
+ public function test_translate_plural_complex() {
+ load_textdomain( 'wp-tests-domain', DIR_TESTDATA . '/l10n/plural-complex.mo' );
+
+ $this->assertSame( '%s razpoložljiva posodobitev', _n( '%s update available', '%s updates available', 101, 'wp-tests-domain' ) ); // 1, 101, 201
+ $this->assertSame( '%s razpoložljivi posodobitvi', _n( '%s update available', '%s updates available', 102, 'wp-tests-domain' ) ); // 2, 102, 202
+ $this->assertSame( '%s razpoložljive posodobitve', _n( '%s update available', '%s updates available', 103, 'wp-tests-domain' ) ); // 3, 4, 103
+ $this->assertSame( '%s razpoložljivih posodobitev', _n( '%s update available', '%s updates available', 5, 'wp-tests-domain' ) ); // 0, 5, 6
+ }
+
+ /**
+ * @covers ::translate_plural
+ * @covers WP_Translation_File::get_plural_form
+ */
+ public function test_translate_plural_complex_php() {
+ load_textdomain( 'wp-tests-domain', DIR_TESTDATA . '/l10n/plural-complex.php' );
+
+ $this->assertSame( '%s razpoložljiva posodobitev', _n( '%s update available', '%s updates available', 101, 'wp-tests-domain' ) ); // 1, 101, 201
+ $this->assertSame( '%s razpoložljivi posodobitvi', _n( '%s update available', '%s updates available', 102, 'wp-tests-domain' ) ); // 2, 102, 202
+ $this->assertSame( '%s razpoložljive posodobitve', _n( '%s update available', '%s updates available', 103, 'wp-tests-domain' ) ); // 3, 4, 103
+ $this->assertSame( '%s razpoložljivih posodobitev', _n( '%s update available', '%s updates available', 5, 'wp-tests-domain' ) ); // 0, 5, 6
+ }
+
+ /**
+ * @covers WP_Translation_File::get_plural_form
+ */
+ public function test_get_plural_form() {
+ $moe = WP_Translation_File::create( DIR_TESTDATA . '/l10n/plural-complex.mo' );
+
+ $this->assertSame( 0, $moe->get_plural_form( 1 ) );
+ $this->assertSame( 0, $moe->get_plural_form( 101 ) );
+ $this->assertSame( 0, $moe->get_plural_form( 201 ) );
+ $this->assertSame( 1, $moe->get_plural_form( 2 ) );
+ $this->assertSame( 1, $moe->get_plural_form( 102 ) );
+ $this->assertSame( 1, $moe->get_plural_form( 202 ) );
+ $this->assertSame( 2, $moe->get_plural_form( 3 ) );
+ $this->assertSame( 2, $moe->get_plural_form( 4 ) );
+ $this->assertSame( 2, $moe->get_plural_form( 103 ) );
+ $this->assertSame( 3, $moe->get_plural_form( 0 ) );
+ $this->assertSame( 3, $moe->get_plural_form( 5 ) );
+ $this->assertSame( 3, $moe->get_plural_form( 6 ) );
+ }
+
/**
* @covers ::translate_plural
*/
diff --git a/tests/phpunit/tests/l10n/wpTranslationsConvert.php b/tests/phpunit/tests/l10n/wpTranslationsConvert.php
index 8f3aa41c05bb9..ea318eb329284 100644
--- a/tests/phpunit/tests/l10n/wpTranslationsConvert.php
+++ b/tests/phpunit/tests/l10n/wpTranslationsConvert.php
@@ -173,6 +173,7 @@ public function test_create_invalid_filetype() {
* @covers ::translate_plural
* @covers ::locate_translation
* @covers ::get_files
+ * @covers WP_Translation_File::translate
*
* @dataProvider data_simple_example_files
*
@@ -198,6 +199,10 @@ public function test_simple_translation_files( string $file ) {
$this->assertSame( 'translation1 with context', $controller->translate_plural( array( 'plural0 with context', 'plural1 with context' ), 0, 'context', 'unittest' ) );
$this->assertSame( 'translation0 with context', $controller->translate_plural( array( 'plural0 with context', 'plural1 with context' ), 1, 'context', 'unittest' ) );
$this->assertSame( 'translation1 with context', $controller->translate_plural( array( 'plural0 with context', 'plural1 with context' ), 2, 'context', 'unittest' ) );
+
+ $this->assertSame( 'Produkt', $controller->translate( 'Product', '', 'unittest' ) );
+ $this->assertSame( 'Produkt', $controller->translate_plural( array( 'Product', 'Products' ), 1, '', 'unittest' ) );
+ $this->assertSame( 'Produkte', $controller->translate_plural( array( 'Product', 'Products' ), 2, '', 'unittest' ) );
}
/**
diff --git a/tests/phpunit/tests/rest-api/rest-attachments-controller.php b/tests/phpunit/tests/rest-api/rest-attachments-controller.php
index 0e721258ed40a..44c4027579d56 100644
--- a/tests/phpunit/tests/rest-api/rest-attachments-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-attachments-controller.php
@@ -1045,6 +1045,28 @@ public function test_create_item_ensure_relative_path() {
$this->assertStringNotContainsString( ABSPATH, get_post_meta( $attachment['id'], '_wp_attached_file', true ) );
}
+ /**
+ * @ticket 57897
+ *
+ * @requires function imagejpeg
+ */
+ public function test_create_item_with_terms() {
+ wp_set_current_user( self::$author_id );
+ register_taxonomy_for_object_type( 'category', 'attachment' );
+ $category = wp_insert_term( 'Media Category', 'category' );
+ $request = new WP_REST_Request( 'POST', '/wp/v2/media' );
+ $request->set_header( 'Content-Type', 'image/jpeg' );
+ $request->set_header( 'Content-Disposition', 'attachment; filename=canola.jpg' );
+
+ $request->set_body( file_get_contents( self::$test_file ) );
+ $request->set_param( 'categories', array( $category['term_id'] ) );
+ $response = rest_get_server()->dispatch( $request );
+ $attachment = $response->get_data();
+
+ $term = wp_get_post_terms( $attachment['id'], 'category' );
+ $this->assertSame( $category['term_id'], $term[0]->term_id );
+ }
+
public function test_update_item() {
wp_set_current_user( self::$editor_id );
$attachment_id = self::factory()->attachment->create_object(
diff --git a/tests/phpunit/tests/rest-api/rest-block-type-controller.php b/tests/phpunit/tests/rest-api/rest-block-type-controller.php
index 59c77e03b68b2..6e314e6af4ab7 100644
--- a/tests/phpunit/tests/rest-api/rest-block-type-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-block-type-controller.php
@@ -207,6 +207,7 @@ public function test_get_item_invalid() {
'category' => true,
'parent' => 'invalid_parent',
'ancestor' => 'invalid_ancestor',
+ 'allowed_blocks' => 'invalid_allowed_blocks',
'icon' => true,
'description' => true,
'keywords' => 'invalid_keywords',
@@ -237,6 +238,7 @@ public function test_get_item_invalid() {
$this->assertNull( $data['category'] );
$this->assertSameSets( array( 'invalid_parent' ), $data['parent'] );
$this->assertSameSets( array( 'invalid_ancestor' ), $data['ancestor'] );
+ $this->assertSameSets( array( 'invalid_allowed_blocks' ), $data['allowed_blocks'] );
$this->assertNull( $data['icon'] );
$this->assertSame( '1', $data['description'] );
$this->assertSameSets( array( 'invalid_keywords' ), $data['keywords'] );
@@ -283,6 +285,7 @@ public function test_get_item_defaults() {
'category' => false,
'parent' => false,
'ancestor' => false,
+ 'allowed_blocks' => false,
'icon' => false,
'description' => false,
'keywords' => false,
@@ -313,6 +316,7 @@ public function test_get_item_defaults() {
$this->assertNull( $data['category'] );
$this->assertSameSets( array(), $data['parent'] );
$this->assertSameSets( array(), $data['ancestor'] );
+ $this->assertSameSets( array(), $data['allowed_blocks'] );
$this->assertNull( $data['icon'] );
$this->assertSame( '', $data['description'] );
$this->assertSameSets( array(), $data['keywords'] );
@@ -550,6 +554,7 @@ public function test_get_variation() {
* @ticket 47620
* @ticket 57585
* @ticket 59346
+ * @ticket 60403
*/
public function test_get_item_schema() {
wp_set_current_user( self::$admin_id );
@@ -557,13 +562,14 @@ public function test_get_item_schema() {
$response = rest_get_server()->dispatch( $request );
$data = $response->get_data();
$properties = $data['schema']['properties'];
- $this->assertCount( 30, $properties );
+ $this->assertCount( 32, $properties );
$this->assertArrayHasKey( 'api_version', $properties );
$this->assertArrayHasKey( 'name', $properties );
$this->assertArrayHasKey( 'title', $properties );
$this->assertArrayHasKey( 'category', $properties );
$this->assertArrayHasKey( 'parent', $properties );
$this->assertArrayHasKey( 'ancestor', $properties );
+ $this->assertArrayHasKey( 'allowed_blocks', $properties );
$this->assertArrayHasKey( 'icon', $properties );
$this->assertArrayHasKey( 'description', $properties );
$this->assertArrayHasKey( 'keywords', $properties );
@@ -582,6 +588,7 @@ public function test_get_item_schema() {
$this->assertArrayHasKey( 'view_script_handles', $properties );
$this->assertArrayHasKey( 'editor_style_handles', $properties );
$this->assertArrayHasKey( 'style_handles', $properties );
+ $this->assertArrayHasKey( 'view_style_handles', $properties, 'schema must contain view_style_handles' );
$this->assertArrayHasKey( 'is_dynamic', $properties );
// Deprecated properties.
$this->assertArrayHasKey( 'editor_script', $properties );
@@ -695,6 +702,7 @@ protected function check_block_type_object( $block_type, $data, $links ) {
'category',
'parent',
'ancestor',
+ 'allowedBlocks',
'icon',
'description',
'keywords',
diff --git a/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php b/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
index 30e5b983eae9c..3773b5fd1f9e4 100644
--- a/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
+++ b/tests/phpunit/tests/rest-api/rest-global-styles-revisions-controller.php
@@ -226,6 +226,7 @@ public function set_up() {
/**
* @ticket 58524
+ * @ticket 59810
*
* @covers WP_REST_Global_Styles_Controller::register_routes
*/
@@ -236,6 +237,11 @@ public function test_register_routes() {
$routes,
'Global style revisions based on the given parentID route does not exist.'
);
+ $this->assertArrayHasKey(
+ '/wp/v2/global-styles/(?P[\d]+)/revisions/(?P[\d]+)',
+ $routes,
+ 'Single global style revisions based on the given parentID and revision ID route does not exist.'
+ );
}
/**
@@ -304,6 +310,38 @@ public function test_get_items() {
$this->check_get_revision_response( $data[2], $this->revision_1 );
}
+ /**
+ * @ticket 59810
+ *
+ * @covers WP_REST_Global_Styles_Controller::get_item
+ */
+ public function test_get_item() {
+ wp_set_current_user( self::$admin_id );
+
+ $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions/' . $this->revision_1_id );
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+
+ $this->assertSame( 200, $response->get_status(), 'Response status is 200.' );
+ $this->check_get_revision_response( $data, $this->revision_1 );
+ }
+
+ /**
+ * @ticket 59810
+ *
+ * @covers WP_REST_Global_Styles_Controller::get_revision
+ */
+ public function test_get_item_invalid_revision_id_should_error() {
+ wp_set_current_user( self::$admin_id );
+
+ $expected_error = 'rest_post_invalid_id';
+ $expected_status = 404;
+ $request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' . self::$global_styles_id . '/revisions/20000001' );
+ $response = rest_get_server()->dispatch( $request );
+
+ $this->assertErrorResponse( $expected_error, $response, $expected_status );
+ }
+
/**
* @ticket 58524
*
@@ -794,13 +832,6 @@ public function test_context_param() {
// Controller does not implement test_context_param().
}
- /**
- * @doesNotPerformAssertions
- */
- public function test_get_item() {
- // Controller does not implement get_item().
- }
-
/**
* @doesNotPerformAssertions
*/
diff --git a/tests/phpunit/tests/rest-api/rest-schema-setup.php b/tests/phpunit/tests/rest-api/rest-schema-setup.php
index c53f887bc822c..3ff35260f0fb8 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-setup.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-setup.php
@@ -135,6 +135,7 @@ public function test_expected_routes_in_schema() {
'/wp/v2/comments/(?P[\\d]+)',
'/wp/v2/global-styles/(?P[\/\w-]+)',
'/wp/v2/global-styles/(?P[\d]+)/revisions',
+ '/wp/v2/global-styles/(?P[\d]+)/revisions/(?P[\d]+)',
'/wp/v2/global-styles/themes/(?P[\/\s%\w\.\(\)\[\]\@_\-]+)/variations',
'/wp/v2/global-styles/themes/(?P[^\/:<>\*\?"\|]+(?:\/[^\/:<>\*\?"\|]+)?)',
'/wp/v2/search',
diff --git a/tests/phpunit/tests/script-modules/wpScriptModules.php b/tests/phpunit/tests/script-modules/wpScriptModules.php
index 1433b25c8a22f..26ca916140693 100644
--- a/tests/phpunit/tests/script-modules/wpScriptModules.php
+++ b/tests/phpunit/tests/script-modules/wpScriptModules.php
@@ -11,7 +11,8 @@
*
* @coversDefaultClass WP_Script_Modules
*/
-class Tests_WP_Script_Modules extends WP_UnitTestCase {
+class Tests_Script_Modules_WpScriptModules extends WP_UnitTestCase {
+
/**
* Instance of WP_Script_Modules.
*
@@ -24,6 +25,7 @@ class Tests_WP_Script_Modules extends WP_UnitTestCase {
*/
public function set_up() {
parent::set_up();
+ // Set up the WP_Script_Modules instance.
$this->script_modules = new WP_Script_Modules();
}
@@ -600,4 +602,37 @@ public function test_wp_enqueue_script_module_registers_all_params() {
$this->assertCount( 1, $import_map );
$this->assertStringStartsWith( '/dep.js', $import_map['dep'] );
}
+
+ /**
+ * @ticket 60348
+ *
+ * @covers ::print_import_map_polyfill()
+ */
+ public function test_wp_print_import_map_has_no_polyfill_when_no_modules_registered() {
+ $import_map_polyfill = get_echo( array( $this->script_modules, 'print_import_map' ) );
+
+ $this->assertEquals( '', $import_map_polyfill );
+ }
+
+ /**
+ * @ticket 60348
+ *
+ * @covers ::print_import_map_polyfill()
+ */
+ public function test_wp_print_import_map_has_polyfill_when_modules_registered() {
+ $script_name = 'wp-polyfill-importmap';
+ wp_register_script( $script_name, '/wp-polyfill-importmap.js' );
+
+ $this->script_modules->enqueue( 'foo', '/foo.js', array( 'dep' ), '1.0' );
+ $this->script_modules->register( 'dep', '/dep.js' );
+ $import_map_polyfill = get_echo( array( $this->script_modules, 'print_import_map' ) );
+
+ wp_deregister_script( $script_name );
+
+ $p = new WP_HTML_Tag_Processor( $import_map_polyfill );
+ $p->next_tag( array( 'tag' => 'SCRIPT' ) );
+ $id = $p->get_attribute( 'id' );
+
+ $this->assertEquals( 'wp-load-polyfill-importmap', $id );
+ }
}
diff --git a/tests/phpunit/tests/style-engine/styleEngine.php b/tests/phpunit/tests/style-engine/styleEngine.php
index b208e4ef0575a..794f540baf422 100644
--- a/tests/phpunit/tests/style-engine/styleEngine.php
+++ b/tests/phpunit/tests/style-engine/styleEngine.php
@@ -184,6 +184,24 @@ public function data_wp_style_engine_get_styles() {
),
),
+ 'inline_valid_aspect_ratio_style' => array(
+ 'block_styles' => array(
+ 'dimensions' => array(
+ 'aspectRatio' => '4/3',
+ 'minHeight' => 'unset',
+ ),
+ ),
+ 'options' => null,
+ 'expected_output' => array(
+ 'css' => 'aspect-ratio:4/3;min-height:unset;',
+ 'declarations' => array(
+ 'aspect-ratio' => '4/3',
+ 'min-height' => 'unset',
+ ),
+ 'classnames' => 'has-aspect-ratio',
+ ),
+ ),
+
'inline_valid_shadow_style' => array(
'block_styles' => array(
'shadow' => 'inset 5em 1em gold',
diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php
index 31a99b3f1ebca..ff98a98e0af65 100644
--- a/tests/phpunit/tests/theme/wpThemeJson.php
+++ b/tests/phpunit/tests/theme/wpThemeJson.php
@@ -279,7 +279,8 @@ public function test_get_settings_appearance_true_opts_in() {
'caption' => true,
),
'dimensions' => array(
- 'minHeight' => true,
+ 'aspectRatio' => true,
+ 'minHeight' => true,
),
'position' => array(
'sticky' => true,
@@ -316,7 +317,8 @@ public function test_get_settings_appearance_true_opts_in() {
'caption' => true,
),
'dimensions' => array(
- 'minHeight' => true,
+ 'aspectRatio' => true,
+ 'minHeight' => true,
),
'position' => array(
'sticky' => true,
@@ -495,6 +497,7 @@ public function test_get_stylesheet_renders_enabled_protected_properties() {
* @ticket 56611
* @ticket 58549
* @ticket 58550
+ * @ticket 60365
*/
public function test_get_stylesheet() {
$theme_json = new WP_Theme_JSON(
@@ -527,12 +530,19 @@ public function test_get_stylesheet() {
'typography' => array(
'fontFamilies' => array(
array(
- 'slug' => 'small',
- 'fontFamily' => '14px',
+ 'name' => 'Arial',
+ 'slug' => 'arial',
+ 'fontFamily' => 'Arial, serif',
),
+ ),
+ 'fontSizes' => array(
array(
- 'slug' => 'big',
- 'fontFamily' => '41px',
+ 'slug' => 'small',
+ 'size' => '14px',
+ ),
+ array(
+ 'slug' => 'big',
+ 'size' => '41px',
),
),
),
@@ -567,6 +577,11 @@ public function test_get_stylesheet() {
),
),
'blocks' => array(
+ 'core/cover' => array(
+ 'dimensions' => array(
+ 'aspectRatio' => '16/9',
+ ),
+ ),
'core/group' => array(
'color' => array(
'gradient' => 'var:preset|gradient|custom-gradient',
@@ -644,9 +659,9 @@ public function test_get_stylesheet() {
)
);
- $variables = 'body{--wp--preset--color--grey: grey;--wp--preset--gradient--custom-gradient: linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%);--wp--preset--font-family--small: 14px;--wp--preset--font-family--big: 41px;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}';
- $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}.wp-element-button, .wp-block-button__link{box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.66);}.wp-block-group{background: var(--wp--preset--gradient--custom-gradient);border-radius: 10px;padding: 24px;}.wp-block-group a:where(:not(.wp-element-button)){color: #111;}.wp-block-heading{color: #123456;}.wp-block-heading a:where(:not(.wp-element-button)){background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a:where(:not(.wp-element-button)){background-color: #777;color: #555;}.wp-block-post-excerpt{column-count: 2;}.wp-block-image{margin-bottom: 30px;}.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}.wp-block-image img, .wp-block-image .components-placeholder{filter: var(--wp--preset--duotone--custom-duotone);}';
- $presets = '.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-custom-gradient-gradient-background{background: var(--wp--preset--gradient--custom-gradient) !important;}.has-small-font-family{font-family: var(--wp--preset--font-family--small) !important;}.has-big-font-family{font-family: var(--wp--preset--font-family--big) !important;}';
+ $variables = 'body{--wp--preset--color--grey: grey;--wp--preset--gradient--custom-gradient: linear-gradient(135deg,rgba(0,0,0) 0%,rgb(0,0,0) 100%);--wp--preset--font-size--small: 14px;--wp--preset--font-size--big: 41px;--wp--preset--font-family--arial: Arial, serif;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}';
+ $styles = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.is-layout-flex){gap: 0.5em;}:where(.is-layout-grid){gap: 0.5em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-constrained > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-constrained > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > :where(:not(.alignleft):not(.alignright):not(.alignfull)){max-width: var(--wp--style--global--content-size);margin-left: auto !important;margin-right: auto !important;}body .is-layout-constrained > .alignwide{max-width: var(--wp--style--global--wide-size);}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}body .is-layout-flex > *{margin: 0;}body .is-layout-grid{display: grid;}body .is-layout-grid > *{margin: 0;}body{color: var(--wp--preset--color--grey);}a:where(:not(.wp-element-button)){background-color: #333;color: #111;}.wp-element-button, .wp-block-button__link{box-shadow: 10px 10px 5px 0px rgba(0,0,0,0.66);}.wp-block-cover{min-height: unset;aspect-ratio: 16/9;}.wp-block-group{background: var(--wp--preset--gradient--custom-gradient);border-radius: 10px;padding: 24px;}.wp-block-group a:where(:not(.wp-element-button)){color: #111;}.wp-block-heading{color: #123456;}.wp-block-heading a:where(:not(.wp-element-button)){background-color: #333;color: #111;font-size: 60px;}.wp-block-post-date{color: #123456;}.wp-block-post-date a:where(:not(.wp-element-button)){background-color: #777;color: #555;}.wp-block-post-excerpt{column-count: 2;}.wp-block-image{margin-bottom: 30px;}.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder{border-top-left-radius: 10px;border-bottom-right-radius: 1em;}.wp-block-image img, .wp-block-image .components-placeholder{filter: var(--wp--preset--duotone--custom-duotone);}';
+ $presets = '.has-grey-color{color: var(--wp--preset--color--grey) !important;}.has-grey-background-color{background-color: var(--wp--preset--color--grey) !important;}.has-grey-border-color{border-color: var(--wp--preset--color--grey) !important;}.has-custom-gradient-gradient-background{background: var(--wp--preset--gradient--custom-gradient) !important;}.has-small-font-size{font-size: var(--wp--preset--font-size--small) !important;}.has-big-font-size{font-size: var(--wp--preset--font-size--big) !important;}.has-arial-font-family{font-family: var(--wp--preset--font-family--arial) !important;}';
$all = $variables . $styles . $presets;
$this->assertSame( $all, $theme_json->get_stylesheet() );
$this->assertSame( $styles, $theme_json->get_stylesheet( array( 'styles' ) ) );
@@ -4970,4 +4985,139 @@ public function test_get_stylesheet_custom_root_selector() {
$actual
);
}
+
+ /**
+ * Tests that invalid properties are removed from the theme.json inside indexed arrays as settings.typography.fontFamilies.
+ *
+ * @ticket 60360
+ */
+ public function test_sanitize_indexed_arrays() {
+ $theme_json = new WP_Theme_JSON(
+ array(
+ 'version' => '2',
+ 'badKey2' => 'I am Evil!',
+ 'settings' => array(
+ 'badKey3' => 'I am Evil!',
+ 'typography' => array(
+ 'badKey4' => 'I am Evil!',
+ 'fontFamilies' => array(
+ 'custom' => array(
+ array(
+ 'badKey4' => 'I am Evil!',
+ 'name' => 'Arial',
+ 'slug' => 'arial',
+ 'fontFamily' => 'Arial, sans-serif',
+ ),
+ ),
+ 'theme' => array(
+ array(
+ 'badKey5' => 'I am Evil!',
+ 'name' => 'Piazzolla',
+ 'slug' => 'piazzolla',
+ 'fontFamily' => 'Piazzolla',
+ 'fontFace' => array(
+ array(
+ 'badKey6' => 'I am Evil!',
+ 'fontFamily' => 'Piazzolla',
+ 'fontStyle' => 'italic',
+ 'fontWeight' => '400',
+ 'src' => 'https://example.com/font.ttf',
+ ),
+ array(
+ 'badKey7' => 'I am Evil!',
+ 'fontFamily' => 'Piazzolla',
+ 'fontStyle' => 'italic',
+ 'fontWeight' => '400',
+ 'src' => 'https://example.com/font.ttf',
+ ),
+ ),
+ ),
+ array(
+ 'badKey8' => 'I am Evil!',
+ 'name' => 'Inter',
+ 'slug' => 'Inter',
+ 'fontFamily' => 'Inter',
+ 'fontFace' => array(
+ array(
+ 'badKey9' => 'I am Evil!',
+ 'fontFamily' => 'Inter',
+ 'fontStyle' => 'italic',
+ 'fontWeight' => '400',
+ 'src' => 'https://example.com/font.ttf',
+ ),
+ array(
+ 'badKey10' => 'I am Evil!',
+ 'fontFamily' => 'Inter',
+ 'fontStyle' => 'italic',
+ 'fontWeight' => '400',
+ 'src' => 'https://example.com/font.ttf',
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ )
+ );
+
+ $expected_sanitized = array(
+ 'version' => '2',
+ 'settings' => array(
+ 'typography' => array(
+ 'fontFamilies' => array(
+ 'custom' => array(
+ array(
+ 'name' => 'Arial',
+ 'slug' => 'arial',
+ 'fontFamily' => 'Arial, sans-serif',
+ ),
+ ),
+ 'theme' => array(
+ array(
+ 'name' => 'Piazzolla',
+ 'slug' => 'piazzolla',
+ 'fontFamily' => 'Piazzolla',
+ 'fontFace' => array(
+ array(
+ 'fontFamily' => 'Piazzolla',
+ 'fontStyle' => 'italic',
+ 'fontWeight' => '400',
+ 'src' => 'https://example.com/font.ttf',
+ ),
+ array(
+ 'fontFamily' => 'Piazzolla',
+ 'fontStyle' => 'italic',
+ 'fontWeight' => '400',
+ 'src' => 'https://example.com/font.ttf',
+ ),
+ ),
+ ),
+ array(
+ 'name' => 'Inter',
+ 'slug' => 'Inter',
+ 'fontFamily' => 'Inter',
+ 'fontFace' => array(
+ array(
+ 'fontFamily' => 'Inter',
+ 'fontStyle' => 'italic',
+ 'fontWeight' => '400',
+ 'src' => 'https://example.com/font.ttf',
+ ),
+ array(
+ 'fontFamily' => 'Inter',
+ 'fontStyle' => 'italic',
+ 'fontWeight' => '400',
+ 'src' => 'https://example.com/font.ttf',
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ );
+ $sanitized_theme_json = $theme_json->get_raw_data();
+ $this->assertSameSetsWithIndex( $expected_sanitized, $sanitized_theme_json, 'Sanitized theme.json does not match' );
+ }
}
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
index ef8e53d4bb508..6c961548eb8e2 100644
--- a/tests/qunit/fixtures/wp-api-generated.js
+++ b/tests/qunit/fixtures/wp-api-generated.js
@@ -10044,6 +10044,42 @@ mockedApiResponse.Schema = {
}
]
},
+ "/wp/v2/global-styles/(?P[\\d]+)/revisions/(?P[\\d]+)": {
+ "namespace": "wp/v2",
+ "methods": [
+ "GET"
+ ],
+ "endpoints": [
+ {
+ "methods": [
+ "GET"
+ ],
+ "args": {
+ "parent": {
+ "description": "The ID for the parent of the global styles revision.",
+ "type": "integer",
+ "required": false
+ },
+ "id": {
+ "description": "Unique identifier for the global styles revision.",
+ "type": "integer",
+ "required": false
+ },
+ "context": {
+ "description": "Scope under which the request is made; determines fields present in response.",
+ "type": "string",
+ "enum": [
+ "view",
+ "embed",
+ "edit"
+ ],
+ "default": "view",
+ "required": false
+ }
+ }
+ }
+ ]
+ },
"/wp/v2/global-styles/themes/(?P[\\/\\s%\\w\\.\\(\\)\\[\\]\\@_\\-]+)/variations": {
"namespace": "wp/v2",
"methods": [
diff --git a/tools/webpack/blocks.js b/tools/webpack/blocks.js
index 91e2cfafbdf84..f1c9d20cd8504 100644
--- a/tools/webpack/blocks.js
+++ b/tools/webpack/blocks.js
@@ -3,135 +3,135 @@
*/
const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
-/**
- * WordPress dependencies
- */
-const DependencyExtractionPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
-
/**
* Internal dependencies
*/
-const { baseDir, getBaseConfig, normalizeJoin, stylesTransform } = require( './shared' );
+const {
+ baseDir,
+ getBaseConfig,
+ normalizeJoin,
+ stylesTransform,
+} = require( './shared' );
const {
isDynamic,
toDirectoryName,
getStableBlocksMetadata,
} = require( '../release/sync-stable-blocks' );
-module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) {
+module.exports = function (
+ env = { environment: 'production', watch: false, buildTarget: false }
+) {
const mode = env.environment;
const suffix = mode === 'production' ? '.min' : '';
- let buildTarget = env.buildTarget ? env.buildTarget : ( mode === 'production' ? 'build' : 'src' );
+ let buildTarget = env.buildTarget
+ ? env.buildTarget
+ : mode === 'production'
+ ? 'build'
+ : 'src';
buildTarget = buildTarget + '/wp-includes';
const blocks = getStableBlocksMetadata();
- const dynamicBlockFolders = blocks.filter( isDynamic ).map( toDirectoryName );
+ const dynamicBlockFolders = blocks
+ .filter( isDynamic )
+ .map( toDirectoryName );
const blockFolders = blocks.map( toDirectoryName );
const blockPHPFiles = {
- 'widgets/src/blocks/legacy-widget/index.php': 'wp-includes/blocks/legacy-widget.php',
- 'widgets/src/blocks/widget-group/index.php': 'wp-includes/blocks/widget-group.php',
+ 'widgets/src/blocks/legacy-widget/index.php':
+ 'wp-includes/blocks/legacy-widget.php',
+ 'widgets/src/blocks/widget-group/index.php':
+ 'wp-includes/blocks/widget-group.php',
...dynamicBlockFolders.reduce( ( files, blockName ) => {
- files[ `block-library/src/${ blockName }/index.php` ] = `wp-includes/blocks/${ blockName }.php`;
+ files[
+ `block-library/src/${ blockName }/index.php`
+ ] = `wp-includes/blocks/${ blockName }.php`;
return files;
}, {} ),
};
const blockMetadataFiles = {
- 'widgets/src/blocks/legacy-widget/block.json': 'wp-includes/blocks/legacy-widget/block.json',
- 'widgets/src/blocks/widget-group/block.json': 'wp-includes/blocks/widget-group/block.json',
+ 'widgets/src/blocks/legacy-widget/block.json':
+ 'wp-includes/blocks/legacy-widget/block.json',
+ 'widgets/src/blocks/widget-group/block.json':
+ 'wp-includes/blocks/widget-group/block.json',
...blockFolders.reduce( ( files, blockName ) => {
- files[ `block-library/src/${ blockName }/block.json` ] = `wp-includes/blocks/${ blockName }/block.json`;
+ files[
+ `block-library/src/${ blockName }/block.json`
+ ] = `wp-includes/blocks/${ blockName }/block.json`;
return files;
}, {} ),
};
const blockPHPCopies = Object.keys( blockPHPFiles ).map( ( filename ) => ( {
- from: normalizeJoin(baseDir, `node_modules/@wordpress/${ filename }` ),
- to: normalizeJoin(baseDir, `src/${ blockPHPFiles[ filename ] }` ),
+ from: normalizeJoin( baseDir, `node_modules/@wordpress/${ filename }` ),
+ to: normalizeJoin( baseDir, `src/${ blockPHPFiles[ filename ] }` ),
} ) );
- const blockMetadataCopies = Object.keys( blockMetadataFiles ).map( ( filename ) => ( {
- from: normalizeJoin(baseDir, `node_modules/@wordpress/${ filename }` ),
- to: normalizeJoin(baseDir, `src/${ blockMetadataFiles[ filename ] }` ),
- } ) );
+ const blockMetadataCopies = Object.keys( blockMetadataFiles ).map(
+ ( filename ) => ( {
+ from: normalizeJoin(
+ baseDir,
+ `node_modules/@wordpress/${ filename }`
+ ),
+ to: normalizeJoin(
+ baseDir,
+ `src/${ blockMetadataFiles[ filename ] }`
+ ),
+ } )
+ );
const blockStylesheetCopies = blockFolders.map( ( blockName ) => ( {
- from: normalizeJoin(baseDir, `node_modules/@wordpress/block-library/build-style/${ blockName }/*.css` ),
- to: normalizeJoin(baseDir, `${ buildTarget }/blocks/${ blockName }/[name]${ suffix }.css` ),
+ from: normalizeJoin(
+ baseDir,
+ `node_modules/@wordpress/block-library/build-style/${ blockName }/*.css`
+ ),
+ to: normalizeJoin(
+ baseDir,
+ `${ buildTarget }/blocks/${ blockName }/[name]${ suffix }.css`
+ ),
transform: stylesTransform( mode ),
noErrorOnMissing: true,
} ) );
+ // Todo: This list need of entry points need to be automatically fetched from the package
+ // We shouldn't have to maintain it manually.
+ const interactiveBlocks = [
+ 'navigation',
+ 'image',
+ 'query',
+ 'file',
+ 'search',
+ ];
+
const baseConfig = getBaseConfig( env );
const config = {
...baseConfig,
- entry: {
- 'navigation/view': normalizeJoin( baseDir, 'node_modules/@wordpress/block-library/build-module/navigation/view' ),
- 'image/view': normalizeJoin( baseDir, 'node_modules/@wordpress/block-library/build-module/image/view' ),
- 'query/view': normalizeJoin( baseDir, 'node_modules/@wordpress/block-library/build-module/query/view' ),
- 'file/view': normalizeJoin( baseDir, 'node_modules/@wordpress/block-library/build-module/file/view' ),
- 'search/view': normalizeJoin( baseDir, 'node_modules/@wordpress/block-library/build-module/search/view' ),
+ entry: interactiveBlocks.reduce(( memo, blockName ) => {
+ memo[ blockName ] = {
+ import: normalizeJoin(
+ baseDir,
+ `node_modules/@wordpress/block-library/build-module/${ blockName }/view`
+ ),
+ };
+ return memo;
+ }, {}),
+ experiments: {
+ outputModule: true,
},
output: {
devtoolNamespace: 'wp',
- filename: `./blocks/[name]${ suffix }.js`,
+ filename: `./blocks/[name]/view${ suffix }.js`,
path: normalizeJoin( baseDir, buildTarget ),
- chunkLoadingGlobal: `__WordPressPrivateInteractivityAPI__`,
- },
- resolve: {
- alias: {
- '@wordpress/interactivity': normalizeJoin( baseDir, 'node_modules/@wordpress/interactivity/src/index.js' ),
+ library: {
+ type: 'module',
},
+ environment: { module: true },
},
- optimization: {
- ...baseConfig.optimization,
- runtimeChunk: {
- name: 'private-interactivity',
- },
- splitChunks: {
- cacheGroups: {
- interactivity: {
- name: 'private-interactivity',
- test: /^(?!.*[\\/]block-library[\\/]).*$/,
- filename: `./js/dist/interactivity${suffix}.js`,
- chunks: 'all',
- minSize: 0,
- priority: -10,
- },
- },
- },
- },
- module: {
- rules: [
- {
- test: /\.(j|t)sx?$/,
- use: [
- {
- loader: require.resolve( 'babel-loader' ),
- options: {
- cacheDirectory: process.env.BABEL_CACHE_DIRECTORY || true,
- babelrc: false,
- configFile: false,
- presets: [
- [
- '@babel/preset-react',
- {
- runtime: 'automatic',
- importSource: 'preact',
- },
- ],
- ],
- },
- },
- ],
- },
- ],
+ externalsType: 'module',
+ externals: {
+ '@wordpress/interactivity': '@wordpress/interactivity',
+ '@wordpress/interactivity-router': 'import @wordpress/interactivity-router',
},
plugins: [
...baseConfig.plugins,
- new DependencyExtractionPlugin( {
- injectPolyfill: false,
- useDefaults: false,
- } ),
new CopyWebpackPlugin( {
patterns: [
...blockPHPCopies,
diff --git a/tools/webpack/modules.js b/tools/webpack/modules.js
new file mode 100644
index 0000000000000..cfb19aedbb3a1
--- /dev/null
+++ b/tools/webpack/modules.js
@@ -0,0 +1,72 @@
+/**
+ * WordPress dependencies
+ */
+const DependencyExtractionPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
+
+/**
+ * Internal dependencies
+ */
+const {
+ baseDir,
+ getBaseConfig,
+ normalizeJoin,
+ MODULES,
+ WORDPRESS_NAMESPACE,
+} = require( './shared' );
+
+module.exports = function (
+ env = { environment: 'production', watch: false, buildTarget: false }
+) {
+ const mode = env.environment;
+ const suffix = mode === 'production' ? '.min' : '';
+ let buildTarget = env.buildTarget
+ ? env.buildTarget
+ : mode === 'production'
+ ? 'build'
+ : 'src';
+ buildTarget = buildTarget + '/wp-includes';
+
+ const baseConfig = getBaseConfig( env );
+ const config = {
+ ...baseConfig,
+ entry: MODULES.map( ( packageName ) =>
+ packageName.replace( WORDPRESS_NAMESPACE, '' )
+ ).reduce( ( memo, packageName ) => {
+ memo[ packageName ] = {
+ import: normalizeJoin(
+ baseDir,
+ `node_modules/@wordpress/${ packageName }`
+ ),
+ };
+
+ return memo;
+ }, {} ),
+ experiments: {
+ outputModule: true,
+ },
+ output: {
+ devtoolNamespace: 'wp',
+ filename: `[name]${ suffix }.js`,
+ path: normalizeJoin( baseDir, `${ buildTarget }/js/dist` ),
+ library: {
+ type: 'module',
+ },
+ environment: { module: true },
+ },
+ externalsType: 'module',
+ externals: {
+ '@wordpress/interactivity': '@wordpress/interactivity',
+ '@wordpress/interactivity-router':
+ 'import @wordpress/interactivity-router',
+ },
+ plugins: [
+ ...baseConfig.plugins,
+ new DependencyExtractionPlugin( {
+ injectPolyfill: false,
+ useDefaults: false,
+ } ),
+ ],
+ };
+
+ return config;
+};
diff --git a/tools/webpack/packages.js b/tools/webpack/packages.js
index fa72d06982600..2b02852d206de 100644
--- a/tools/webpack/packages.js
+++ b/tools/webpack/packages.js
@@ -16,7 +16,15 @@ const DependencyExtractionPlugin = require( '@wordpress/dependency-extraction-we
/**
* Internal dependencies
*/
-const { baseDir, getBaseConfig, normalizeJoin, stylesTransform } = require( './shared' );
+const {
+ baseDir,
+ getBaseConfig,
+ normalizeJoin,
+ stylesTransform,
+ BUNDLED_PACKAGES,
+ MODULES,
+ WORDPRESS_NAMESPACE,
+} = require( './shared' );
const { dependencies } = require( '../../package' );
const exportDefaultPackages = [
@@ -40,37 +48,52 @@ const exportDefaultPackages = [
*/
function mapVendorCopies( vendors, buildTarget ) {
return Object.keys( vendors ).map( ( filename ) => ( {
- from: normalizeJoin(baseDir, `node_modules/${ vendors[ filename ] }` ),
- to: normalizeJoin(baseDir, `${ buildTarget }/js/dist/vendor/${ filename }` ),
+ from: normalizeJoin( baseDir, `node_modules/${ vendors[ filename ] }` ),
+ to: normalizeJoin(
+ baseDir,
+ `${ buildTarget }/js/dist/vendor/${ filename }`
+ ),
} ) );
}
-module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) {
+module.exports = function (
+ env = { environment: 'production', watch: false, buildTarget: false }
+) {
const mode = env.environment;
const suffix = mode === 'production' ? '.min' : '';
- let buildTarget = env.buildTarget ? env.buildTarget : ( mode === 'production' ? 'build' : 'src' );
- buildTarget = buildTarget + '/wp-includes';
+ let buildTarget = env.buildTarget
+ ? env.buildTarget
+ : mode === 'production'
+ ? 'build'
+ : 'src';
+ buildTarget = buildTarget + '/wp-includes';
- const WORDPRESS_NAMESPACE = '@wordpress/';
- const BUNDLED_PACKAGES = [ '@wordpress/icons', '@wordpress/interface', '@wordpress/interactivity', '@wordpress/sync' ];
const packages = Object.keys( dependencies )
- .filter( ( packageName ) =>
- ! BUNDLED_PACKAGES.includes( packageName ) &&
- packageName.startsWith( WORDPRESS_NAMESPACE )
- )
- .map( ( packageName ) => packageName.replace( WORDPRESS_NAMESPACE, '' ) );
+ .filter(
+ ( packageName ) =>
+ ! BUNDLED_PACKAGES.includes( packageName ) &&
+ ! MODULES.includes( packageName ) &&
+ packageName.startsWith( WORDPRESS_NAMESPACE )
+ )
+ .map( ( packageName ) =>
+ packageName.replace( WORDPRESS_NAMESPACE, '' )
+ );
const vendors = {
'lodash.js': 'lodash/lodash.js',
'wp-polyfill.js': '@wordpress/babel-preset-default/build/polyfill.js',
'wp-polyfill-fetch.js': 'whatwg-fetch/dist/fetch.umd.js',
'wp-polyfill-element-closest.js': 'element-closest/browser.js',
- 'wp-polyfill-node-contains.js': 'polyfill-library/polyfills/__dist/Node.prototype.contains/raw.js',
+ 'wp-polyfill-node-contains.js':
+ 'polyfill-library/polyfills/__dist/Node.prototype.contains/raw.js',
'wp-polyfill-url.js': 'core-js-url-browser/url.js',
- 'wp-polyfill-dom-rect.js': 'polyfill-library/polyfills/__dist/DOMRect/raw.js',
+ 'wp-polyfill-dom-rect.js':
+ 'polyfill-library/polyfills/__dist/DOMRect/raw.js',
'wp-polyfill-formdata.js': 'formdata-polyfill/FormData.js',
- 'wp-polyfill-object-fit.js': 'objectFitPolyfill/src/objectFitPolyfill.js',
+ 'wp-polyfill-object-fit.js':
+ 'objectFitPolyfill/src/objectFitPolyfill.js',
'wp-polyfill-inert.js': 'wicg-inert/dist/inert.js',
+ 'wp-polyfill-importmap.js': 'es-module-shims/dist/es-module-shims.wasm.js',
'moment.js': 'moment/moment.js',
'react.js': 'react/umd/react.development.js',
'react-dom.js': 'react-dom/umd/react-dom.development.js',
@@ -79,11 +102,13 @@ module.exports = function( env = { environment: 'production', watch: false, buil
const minifiedVendors = {
'lodash.min.js': 'lodash/lodash.min.js',
- 'wp-polyfill.min.js': '@wordpress/babel-preset-default/build/polyfill.min.js',
+ 'wp-polyfill.min.js':
+ '@wordpress/babel-preset-default/build/polyfill.min.js',
'wp-polyfill-element-closest.min.js': 'element-closest/browser.js',
'wp-polyfill-formdata.min.js': 'formdata-polyfill/formdata.min.js',
'wp-polyfill-url.min.js': 'core-js-url-browser/url.min.js',
- 'wp-polyfill-object-fit.min.js': 'objectFitPolyfill/dist/objectFitPolyfill.min.js',
+ 'wp-polyfill-object-fit.min.js':
+ 'objectFitPolyfill/dist/objectFitPolyfill.min.js',
'wp-polyfill-inert.min.js': 'wicg-inert/dist/inert.min.js',
'moment.min.js': 'moment/min/moment.min.js',
'react.min.js': 'react/umd/react.production.min.js',
@@ -93,39 +118,56 @@ module.exports = function( env = { environment: 'production', watch: false, buil
const minifyVendors = {
'regenerator-runtime.min.js': 'regenerator-runtime/runtime.js',
'wp-polyfill-fetch.min.js': 'whatwg-fetch/dist/fetch.umd.js',
- 'wp-polyfill-node-contains.min.js': 'polyfill-library/polyfills/__dist/Node.prototype.contains/raw.js',
- 'wp-polyfill-dom-rect.min.js': 'polyfill-library/polyfills/__dist/DOMRect/raw.js',
+ 'wp-polyfill-node-contains.min.js':
+ 'polyfill-library/polyfills/__dist/Node.prototype.contains/raw.js',
+ 'wp-polyfill-dom-rect.min.js':
+ 'polyfill-library/polyfills/__dist/DOMRect/raw.js',
+ 'wp-polyfill-importmap.min.js': 'es-module-shims/dist/es-module-shims.wasm.js',
};
const phpFiles = {
- 'block-serialization-default-parser/class-wp-block-parser.php': 'wp-includes/class-wp-block-parser.php',
- 'block-serialization-default-parser/class-wp-block-parser-frame.php': 'wp-includes/class-wp-block-parser-frame.php',
- 'block-serialization-default-parser/class-wp-block-parser-block.php': 'wp-includes/class-wp-block-parser-block.php',
+ 'block-serialization-default-parser/class-wp-block-parser.php':
+ 'wp-includes/class-wp-block-parser.php',
+ 'block-serialization-default-parser/class-wp-block-parser-frame.php':
+ 'wp-includes/class-wp-block-parser-frame.php',
+ 'block-serialization-default-parser/class-wp-block-parser-block.php':
+ 'wp-includes/class-wp-block-parser-block.php',
};
const developmentCopies = mapVendorCopies( vendors, buildTarget );
const minifiedCopies = mapVendorCopies( minifiedVendors, buildTarget );
- const minifyCopies = mapVendorCopies( minifyVendors, buildTarget ).map( ( copyCommand ) => {
- return {
- ...copyCommand,
- transform: ( content ) => {
- return UglifyJS.minify( content.toString() ).code;
- },
- };
- } );
+ const minifyCopies = mapVendorCopies( minifyVendors, buildTarget ).map(
+ ( copyCommand ) => {
+ return {
+ ...copyCommand,
+ transform: ( content ) => {
+ return UglifyJS.minify( content.toString() ).code;
+ },
+ };
+ }
+ );
- let vendorCopies = mode === "development" ? developmentCopies : [ ...minifiedCopies, ...minifyCopies ];
+ let vendorCopies =
+ mode === 'development'
+ ? developmentCopies
+ : [ ...minifiedCopies, ...minifyCopies ];
let cssCopies = packages.map( ( packageName ) => ( {
- from: normalizeJoin(baseDir, `node_modules/@wordpress/${ packageName }/build-style/*.css` ),
- to: normalizeJoin(baseDir, `${ buildTarget }/css/dist/${ packageName }/[name]${ suffix }.css` ),
+ from: normalizeJoin(
+ baseDir,
+ `node_modules/@wordpress/${ packageName }/build-style/*.css`
+ ),
+ to: normalizeJoin(
+ baseDir,
+ `${ buildTarget }/css/dist/${ packageName }/[name]${ suffix }.css`
+ ),
transform: stylesTransform( mode ),
noErrorOnMissing: true,
} ) );
const phpCopies = Object.keys( phpFiles ).map( ( filename ) => ( {
- from: normalizeJoin(baseDir, `node_modules/@wordpress/${ filename }` ),
- to: normalizeJoin(baseDir, `src/${ phpFiles[ filename ] }` ),
+ from: normalizeJoin( baseDir, `node_modules/@wordpress/${ filename }` ),
+ to: normalizeJoin( baseDir, `src/${ phpFiles[ filename ] }` ),
} ) );
const baseConfig = getBaseConfig( env );
@@ -133,7 +175,10 @@ module.exports = function( env = { environment: 'production', watch: false, buil
...baseConfig,
entry: packages.reduce( ( memo, packageName ) => {
memo[ packageName ] = {
- import: normalizeJoin(baseDir, `node_modules/@wordpress/${ packageName }` ),
+ import: normalizeJoin(
+ baseDir,
+ `node_modules/@wordpress/${ packageName }`
+ ),
library: {
name: [ 'wp', camelCaseDash( packageName ) ],
type: 'window',
@@ -148,7 +193,7 @@ module.exports = function( env = { environment: 'production', watch: false, buil
output: {
devtoolNamespace: 'wp',
filename: `[name]${ suffix }.js`,
- path: normalizeJoin(baseDir, `${ buildTarget }/js/dist` ),
+ path: normalizeJoin( baseDir, `${ buildTarget }/js/dist` ),
},
plugins: [
...baseConfig.plugins,
@@ -158,17 +203,17 @@ module.exports = function( env = { environment: 'production', watch: false, buil
combinedOutputFile: `../../assets/script-loader-packages${ suffix }.php`,
} ),
new CopyWebpackPlugin( {
- patterns: [
- ...vendorCopies,
- ...cssCopies,
- ...phpCopies,
- ],
+ patterns: [ ...vendorCopies, ...cssCopies, ...phpCopies ],
} ),
],
};
if ( config.mode === 'development' ) {
- config.plugins.push( new LiveReloadPlugin( { port: process.env.WORDPRESS_LIVE_RELOAD_PORT || 35729 } ) );
+ config.plugins.push(
+ new LiveReloadPlugin( {
+ port: process.env.WORDPRESS_LIVE_RELOAD_PORT || 35729,
+ } )
+ );
}
return config;
diff --git a/tools/webpack/shared.js b/tools/webpack/shared.js
index 5aea4204d31a2..6c1397db40f09 100644
--- a/tools/webpack/shared.js
+++ b/tools/webpack/shared.js
@@ -20,7 +20,7 @@ const getBaseConfig = ( env ) => {
new TerserPlugin( {
extractComments: false,
} ),
- ]
+ ],
},
module: {
rules: [
@@ -32,10 +32,7 @@ const getBaseConfig = ( env ) => {
],
},
resolve: {
- modules: [
- baseDir,
- 'node_modules',
- ],
+ modules: [ baseDir, 'node_modules' ],
alias: {
'lodash-es': 'lodash',
},
@@ -70,15 +67,20 @@ const getBaseConfig = ( env ) => {
const stylesTransform = ( mode ) => ( content ) => {
return postcss( [
require( 'cssnano' )( {
- preset: mode === 'production' ? 'default' : [
- 'default',
- {
- discardComments: {
- removeAll: ! content.includes( 'Copyright' ) && ! content.includes( 'License' ),
- },
- normalizeWhitespace: false,
- },
- ],
+ preset:
+ mode === 'production'
+ ? 'default'
+ : [
+ 'default',
+ {
+ discardComments: {
+ removeAll:
+ ! content.includes( 'Copyright' ) &&
+ ! content.includes( 'License' ),
+ },
+ normalizeWhitespace: false,
+ },
+ ],
} ),
] )
.process( content, { from: 'src/app.css', to: 'dest/app.css' } )
@@ -87,10 +89,25 @@ const stylesTransform = ( mode ) => ( content ) => {
const normalizeJoin = ( ...paths ) => join( ...paths ).replace( /\\/g, '/' );
+const BUNDLED_PACKAGES = [
+ '@wordpress/dataviews',
+ '@wordpress/icons',
+ '@wordpress/interface',
+ '@wordpress/interactivity',
+ '@wordpress/sync',
+];
+const MODULES = [
+ '@wordpress/interactivity',
+ '@wordpress/interactivity-router',
+];
+const WORDPRESS_NAMESPACE = '@wordpress/';
module.exports = {
baseDir,
getBaseConfig,
normalizeJoin,
stylesTransform,
+ BUNDLED_PACKAGES,
+ MODULES,
+ WORDPRESS_NAMESPACE,
};
diff --git a/webpack.config.js b/webpack.config.js
index 5e7c88a2cfc60..963117a7a52de 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,6 +2,7 @@ const blocksConfig = require( './tools/webpack/blocks' );
const developmentConfig = require( './tools/webpack/development' );
const mediaConfig = require( './tools/webpack/media' );
const packagesConfig = require( './tools/webpack/packages' );
+const modulesConfig = require( './tools/webpack/modules' );
module.exports = function( env = { environment: "production", watch: false, buildTarget: false } ) {
if ( ! env.watch ) {
@@ -17,6 +18,7 @@ module.exports = function( env = { environment: "production", watch: false, buil
...developmentConfig( env ),
mediaConfig( env ),
packagesConfig( env ),
+ modulesConfig( env ),
];
return config;