Commit de1fca01f4 for wordpress.org
commit de1fca01f4ea058903687a2c8588fcd266ee2a55
Author: wildworks <wildworks@git.wordpress.org>
Date: Sat Sep 5 09:33:45 2026 +0000
Docs: Align `@param` tag columns in block editor docblocks.
Aligns `@param` tag columns in docblocks across the block editor per the PHP inline documentation standards.
Developed in: https://github.com/WordPress/wordpress-develop/pull/13311
Props mukesh27, wildworks.
See #65818.
Built from https://develop.svn.wordpress.org/trunk@63495
git-svn-id: http://core.svn.wordpress.org/trunk@62671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-admin/widgets-form-blocks.php b/wp-admin/widgets-form-blocks.php
index f854891cb8..2db8fb4048 100644
--- a/wp-admin/widgets-form-blocks.php
+++ b/wp-admin/widgets-form-blocks.php
@@ -121,7 +121,7 @@ do_action( 'widgets_admin_page' );
*
* @since 6.4.0
*
- * @param string $message The message being displayed.
+ * @param string $message The message being displayed.
* @param bool $installed Whether the Classic Widget plugin is installed.
*/
$message = apply_filters( 'block_widgets_no_javascript_message', $message, $installed );
diff --git a/wp-includes/block-supports/layout.php b/wp-includes/block-supports/layout.php
index deef7ae61e..24431a05bb 100644
--- a/wp-includes/block-supports/layout.php
+++ b/wp-includes/block-supports/layout.php
@@ -1563,7 +1563,7 @@ add_filter( 'render_block_core/group', 'wp_restore_group_inner_container', 10, 2
* @access private
*
* @param string $block_content Rendered block content.
- * @param array $block Block object.
+ * @param array $block Block object.
* @return string Filtered block content.
*/
function wp_restore_image_outer_container( $block_content, $block ) {
diff --git a/wp-includes/block-supports/settings.php b/wp-includes/block-supports/settings.php
index 2af6f865f7..9cf253defc 100644
--- a/wp-includes/block-supports/settings.php
+++ b/wp-includes/block-supports/settings.php
@@ -69,8 +69,8 @@ function _wp_add_block_level_presets_class( $block_content, $block ) {
* @since 6.3.0 Updated preset styles to use Selectors API.
* @access private
*
- * @param string|null $pre_render The pre-rendered content. Default null.
- * @param array $block The block being rendered.
+ * @param string|null $pre_render The pre-rendered content. Default null.
+ * @param array $block The block being rendered.
* @return null
*/
function _wp_add_block_level_preset_styles( $pre_render, $block ) {
diff --git a/wp-includes/block-template-utils.php b/wp-includes/block-template-utils.php
index b8ccd0f94a..4dcba75c6d 100644
--- a/wp-includes/block-template-utils.php
+++ b/wp-includes/block-template-utils.php
@@ -1115,7 +1115,7 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
*
* @param WP_Block_Template[]|null $block_templates Return an array of block templates to short-circuit the default query,
* or null to allow WP to run its normal queries.
- * @param array $query {
+ * @param array $query {
* Arguments to retrieve templates. All arguments are optional.
*
* @type string[] $slug__in List of slugs to include.
@@ -1123,7 +1123,7 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
* @type string $area A 'wp_template_part_area' taxonomy value to filter by (for 'wp_template_part' template type only).
* @type string $post_type Post type to get the templates for.
* }
- * @param string $template_type Template type. Either 'wp_template' or 'wp_template_part'.
+ * @param string $template_type Template type. Either 'wp_template' or 'wp_template_part'.
*/
$templates = apply_filters( 'pre_get_block_templates', null, $query, $template_type );
if ( ! is_null( $templates ) ) {
@@ -1264,7 +1264,7 @@ function get_block_templates( $query = array(), $template_type = 'wp_template' )
*
* @since 5.9.0
*
- * @param WP_Block_Template[] $query_result Array of found block templates.
+ * @param WP_Block_Template[] $query_result Array of found block templates.
* @param array $query {
* Arguments to retrieve templates. All arguments are optional.
*
diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php
index 24d486ec24..487c2765ac 100644
--- a/wp-includes/blocks.php
+++ b/wp-includes/blocks.php
@@ -1258,16 +1258,16 @@ function apply_block_hooks_to_content( $content, $context = null, $callback = 'i
* @since 7.0.0 Added the `$ignored_hooked_blocks_at_root` parameter.
* @access private
*
- * @param string $content Serialized content.
- * @param WP_Post|null $post A post object that the content belongs to. If set to `null`,
- * `get_post()` will be called to use the current post as context.
- * Default: `null`.
- * @param callable $callback A function that will be called for each block to generate
- * the markup for a given list of blocks that are hooked to it.
- * Default: 'insert_hooked_blocks'.
+ * @param string $content Serialized content.
+ * @param WP_Post|null $post A post object that the content belongs to. If set to `null`,
+ * `get_post()` will be called to use the current post as context.
+ * Default: `null`.
+ * @param callable $callback A function that will be called for each block to generate
+ * the markup for a given list of blocks that are hooked to it.
+ * Default: 'insert_hooked_blocks'.
* @param array|null $ignored_hooked_blocks_at_root A reference to an array that will be populated
- * with the ignored hooked blocks at the root level.
- * Default: `null`.
+ * with the ignored hooked blocks at the root level.
+ * Default: `null`.
* @return string The serialized markup.
*/
function apply_block_hooks_to_content_from_post_object(
diff --git a/wp-includes/class-wp-theme-json-schema.php b/wp-includes/class-wp-theme-json-schema.php
index 47c0f016ec..2fc61b7526 100644
--- a/wp-includes/class-wp-theme-json-schema.php
+++ b/wp-includes/class-wp-theme-json-schema.php
@@ -37,9 +37,9 @@ class WP_Theme_JSON_Schema {
* @since 5.9.0
* @since 6.6.0 Migrate up to v3 and add $origin parameter.
*
- * @param array $theme_json The structure to migrate.
- * @param string $origin Optional. What source of data this object represents.
- * One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
+ * @param array $theme_json The structure to migrate.
+ * @param string $origin Optional. What source of data this object represents.
+ * One of 'blocks', 'default', 'theme', or 'custom'. Default 'theme'.
* @return array The structure in the last version.
*/
public static function migrate( $theme_json, $origin = 'theme' ) {
@@ -100,7 +100,7 @@ class WP_Theme_JSON_Schema {
*
* @since 6.6.0
*
- * @param array $old Data to migrate.
+ * @param array $old Data to migrate.
* @param string $origin What source of data this object represents.
* One of 'blocks', 'default', 'theme', or 'custom'.
* @return array Data with defaultFontSizes set to false.
@@ -213,7 +213,7 @@ class WP_Theme_JSON_Schema {
* @since 5.9.0
*
* @param array $settings Reference to the current settings array.
- * @param array $path Path to the property to be removed.
+ * @param array $path Path to the property to be removed.
*/
private static function unset_setting_by_path( &$settings, $path ) {
$tmp_settings = &$settings;
diff --git a/wp-includes/class-wp-theme-json.php b/wp-includes/class-wp-theme-json.php
index c20960bd0f..e600160539 100644
--- a/wp-includes/class-wp-theme-json.php
+++ b/wp-includes/class-wp-theme-json.php
@@ -954,11 +954,11 @@ class WP_Theme_JSON {
/**
* Processes pseudo-selectors for any node (block or variation).
*
- * @param array $node The node data (block or variation).
- * @param string $base_selector The base selector.
- * @param array $settings The theme settings.
- * @param string $block_name The block name.
- * @param array|null $block_metadata Metadata about the block to get styles for.
+ * @param array $node The node data (block or variation).
+ * @param string $base_selector The base selector.
+ * @param array $settings The theme settings.
+ * @param string $block_name The block name.
+ * @param array|null $block_metadata Metadata about the block to get styles for.
* @param array|null $style_variation Style variation metadata.
* @return array Array of pseudo-selector declarations.
*/
@@ -2995,11 +2995,11 @@ class WP_Theme_JSON {
* @since 6.6.0 Pass current theme JSON settings to wp_get_typography_font_size_value(), and process background properties.
* @since 6.7.0 `ref` resolution of background properties, and assigning custom default values.
*
- * @param array $styles Styles to process.
- * @param array $settings Theme settings.
- * @param array $properties Properties metadata.
- * @param array $theme_json Theme JSON array.
- * @param string $selector The style block selector.
+ * @param array $styles Styles to process.
+ * @param array $settings Theme settings.
+ * @param array $properties Properties metadata.
+ * @param array $theme_json Theme JSON array.
+ * @param string $selector The style block selector.
* @param boolean $use_root_padding Whether to add custom properties at root level.
* @return array Returns the modified $declarations.
*/
@@ -3133,8 +3133,8 @@ class WP_Theme_JSON {
* so every property will be in the standard form.
* @since 6.7.0 Added support for background image refs.
*
- * @param array $styles Styles subtree.
- * @param array $path Which property to process.
+ * @param array $styles Styles subtree.
+ * @param array $path Which property to process.
* @param array $theme_json Theme JSON array.
* @return string|array Style property value.
*/
@@ -4195,7 +4195,7 @@ class WP_Theme_JSON {
* Updated specificity of body margin reset and first/last child selectors.
* @since 7.0.0 Added `$options` parameter to control alignment styles output for classic themes.
*
- * @param string $selector The root node selector.
+ * @param string $selector The root node selector.
* @param array $block_metadata The metadata for the root block.
* @param array $options Optional. An array of options for now used for internal purposes only.
* @return string The additional root rules CSS.
@@ -4598,7 +4598,7 @@ class WP_Theme_JSON {
*
* @since 5.9.0
*
- * @param string $slug The slug we want to find a match from default presets.
+ * @param string $slug The slug we want to find a match from default presets.
* @param array $base_path The path to inspect. It's 'settings' by default.
* @return string|null
*/
@@ -5912,7 +5912,7 @@ class WP_Theme_JSON {
*
* @since 7.0.0
*
- * @param array $style_variation Style variation metadata.
+ * @param array $style_variation Style variation metadata.
* @param string $feature_selector CSS selector for the feature.
* @return string Feature selector with block style variation selector added.
*/
diff --git a/wp-includes/style-engine/class-wp-style-engine-css-rules-store.php b/wp-includes/style-engine/class-wp-style-engine-css-rules-store.php
index 02dbfb675a..ea55ceaa64 100644
--- a/wp-includes/style-engine/class-wp-style-engine-css-rules-store.php
+++ b/wp-includes/style-engine/class-wp-style-engine-css-rules-store.php
@@ -125,7 +125,7 @@ class WP_Style_Engine_CSS_Rules_Store {
* @since 6.1.0
* @since 6.6.0 Added the $rules_group parameter.
*
- * @param string $selector The CSS selector.
+ * @param string $selector The CSS selector.
* @param string $rules_group A parent CSS selector in the case of nested CSS, or a CSS nested @rule,
* such as `@media (min-width: 80rem)` or `@layer module`.
* @return WP_Style_Engine_CSS_Rule|null Returns a WP_Style_Engine_CSS_Rule object,
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e0ff8f1616..24b8f91db9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '7.2-alpha-63494';
+$wp_version = '7.2-alpha-63495';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.