Skip to content

Commit 8a7deb6

Browse files
committed
Merge branch 'trunk' into html-api/ignore-internal-methods-from-docs
2 parents 597db47 + a5729e3 commit 8a7deb6

2 files changed

Lines changed: 11 additions & 10 deletions

File tree

src/wp-includes/html-api/class-wp-html-processor.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ private function step_before_html(): bool {
16581658
* This internal function performs the 'before head' insertion mode
16591659
* logic for the generalized WP_HTML_Processor::step() function.
16601660
*
1661-
* @since 6.7.0 Stub implementation.
1661+
* @since 6.7.0
16621662
* @ignore
16631663
*
16641664
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
@@ -1979,7 +1979,7 @@ private function step_in_head(): bool {
19791979
* This internal function performs the 'in head noscript' insertion mode
19801980
* logic for the generalized WP_HTML_Processor::step() function.
19811981
*
1982-
* @since 6.7.0 Stub implementation.
1982+
* @since 6.7.0
19831983
* @ignore
19841984
*
19851985
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
@@ -2083,7 +2083,7 @@ private function step_in_head_noscript(): bool {
20832083
* This internal function performs the 'after head' insertion mode
20842084
* logic for the generalized WP_HTML_Processor::step() function.
20852085
*
2086-
* @since 6.7.0 Stub implementation.
2086+
* @since 6.7.0
20872087
* @ignore
20882088
*
20892089
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
@@ -4285,7 +4285,7 @@ private function step_in_select_in_table(): bool {
42854285
* This internal function performs the 'in template' insertion mode
42864286
* logic for the generalized WP_HTML_Processor::step() function.
42874287
*
4288-
* @since 6.7.0 Stub implementation.
4288+
* @since 6.7.0
42894289
* @ignore
42904290
*
42914291
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
@@ -4415,7 +4415,7 @@ private function step_in_template(): bool {
44154415
* This internal function performs the 'after body' insertion mode
44164416
* logic for the generalized WP_HTML_Processor::step() function.
44174417
*
4418-
* @since 6.7.0 Stub implementation.
4418+
* @since 6.7.0
44194419
* @ignore
44204420
*
44214421
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
@@ -4505,7 +4505,7 @@ private function step_after_body(): bool {
45054505
* This internal function performs the 'in frameset' insertion mode
45064506
* logic for the generalized WP_HTML_Processor::step() function.
45074507
*
4508-
* @since 6.7.0 Stub implementation.
4508+
* @since 6.7.0
45094509
* @ignore
45104510
*
45114511
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
@@ -4625,7 +4625,7 @@ private function step_in_frameset(): bool {
46254625
* This internal function performs the 'after frameset' insertion mode
46264626
* logic for the generalized WP_HTML_Processor::step() function.
46274627
*
4628-
* @since 6.7.0 Stub implementation.
4628+
* @since 6.7.0
46294629
* @ignore
46304630
*
46314631
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
@@ -4711,7 +4711,7 @@ private function step_after_frameset(): bool {
47114711
* This internal function performs the 'after after body' insertion mode
47124712
* logic for the generalized WP_HTML_Processor::step() function.
47134713
*
4714-
* @since 6.7.0 Stub implementation.
4714+
* @since 6.7.0
47154715
* @ignore
47164716
*
47174717
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
@@ -4775,7 +4775,7 @@ private function step_after_after_body(): bool {
47754775
* This internal function performs the 'after after frameset' insertion mode
47764776
* logic for the generalized WP_HTML_Processor::step() function.
47774777
*
4778-
* @since 6.7.0 Stub implementation.
4778+
* @since 6.7.0
47794779
* @ignore
47804780
*
47814781
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
@@ -4844,7 +4844,7 @@ private function step_after_after_frameset(): bool {
48444844
* This internal function performs the 'in foreign content' insertion mode
48454845
* logic for the generalized WP_HTML_Processor::step() function.
48464846
*
4847-
* @since 6.7.0 Stub implementation.
4847+
* @since 6.7.0
48484848
* @ignore
48494849
*
48504850
* @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.

src/wp-includes/theme.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2645,6 +2645,7 @@ function get_theme_starter_content() {
26452645
* @since 6.5.0 The `appearance-tools` feature enables a few design tools for blocks,
26462646
* see `WP_Theme_JSON::APPEARANCE_TOOLS_OPT_INS` for a complete list.
26472647
* @since 6.6.0 The `editor-spacing-sizes` feature was added.
2648+
* @since 7.0.0 The `html5` feature's 'script' and 'style' arguments are deprecated and unused.
26482649
*
26492650
* @global array $_wp_theme_features
26502651
*

0 commit comments

Comments
 (0)