Commit 9a8c85d821 for wordpress.org
commit 9a8c85d821620db05422a24660cfbf2752a995b8
Author: wildworks <wildworks@git.wordpress.org>
Date: Tue Sep 8 11:02:51 2026 +0000
Docs: Align `@param` and `@return` tags in block editor-related code.
Aligns `@param` and `@return` tags in docblocks across block editor-related code per the PHP inline documentation standards.
Developed in: https://github.com/WordPress/wordpress-develop/pull/13416
Props mukesh27, wildworks.
See #65818.
Built from https://develop.svn.wordpress.org/trunk@63529
git-svn-id: http://core.svn.wordpress.org/trunk@62705 1a063a9b-81f0-0310-95a4-ce76da25c4cd
diff --git a/wp-includes/block-supports/background.php b/wp-includes/block-supports/background.php
index ca04322f9c..3b3e277c37 100644
--- a/wp-includes/block-supports/background.php
+++ b/wp-includes/block-supports/background.php
@@ -47,8 +47,8 @@ function wp_register_background_support( $block_type ) {
*
* @access private
*
- * @param string $block_content Rendered block content.
- * @param array $block Block object.
+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
* @return string Filtered block content.
*/
function wp_render_background_support( $block_content, $block ) {
diff --git a/wp-includes/block-supports/block-style-variations.php b/wp-includes/block-supports/block-style-variations.php
index a808ea3d74..746ed38177 100644
--- a/wp-includes/block-supports/block-style-variations.php
+++ b/wp-includes/block-supports/block-style-variations.php
@@ -211,9 +211,9 @@ function wp_render_block_style_variation_support_styles( $parsed_block ) {
*
* @see wp_render_block_style_variation_support_styles
*
- * @param string $block_content Rendered block content.
- * @param array $block Block object.
- * @return string Filtered block content.
+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
+ * @return string Filtered block content.
*/
function wp_render_block_style_variation_class_name( $block_content, $block ) {
if ( ! $block_content || empty( $block['attrs']['className'] ) ) {
diff --git a/wp-includes/block-supports/colors.php b/wp-includes/block-supports/colors.php
index 330f32e352..567a542249 100644
--- a/wp-includes/block-supports/colors.php
+++ b/wp-includes/block-supports/colors.php
@@ -76,8 +76,8 @@ function wp_register_colors_support( $block_type ) {
* @since 7.1.0 Suppresses color.gradient when background.gradient is supported and set.
* @access private
*
- * @param WP_Block_Type $block_type Block type.
- * @param array $block_attributes Block attributes.
+ * @param WP_Block_Type $block_type Block type.
+ * @param array $block_attributes Block attributes.
* @return array Colors CSS classes and inline styles.
*/
function wp_apply_colors_support( $block_type, $block_attributes ) {
diff --git a/wp-includes/block-supports/custom-css.php b/wp-includes/block-supports/custom-css.php
index 7865b73426..50d21d4063 100644
--- a/wp-includes/block-supports/custom-css.php
+++ b/wp-includes/block-supports/custom-css.php
@@ -109,7 +109,7 @@ function wp_enqueue_block_custom_css() {
*
* @param string $block_content Rendered block content.
* @param array $block Block object.
- * @return string Filtered block content.
+ * @return string Filtered block content.
*
* @phpstan-param array{
* attrs: array{
diff --git a/wp-includes/block-supports/dimensions.php b/wp-includes/block-supports/dimensions.php
index beb6e37460..584574f415 100644
--- a/wp-includes/block-supports/dimensions.php
+++ b/wp-includes/block-supports/dimensions.php
@@ -113,9 +113,9 @@ function wp_is_explicit_aspect_ratio_value( $aspect_ratio ) {
* @since 6.5.0
* @access private
*
- * @param string $block_content Rendered block content.
- * @param array $block Block object.
- * @return string Filtered block content.
+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
+ * @return string Filtered block content.
*/
function wp_render_dimensions_support( $block_content, $block ) {
$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
diff --git a/wp-includes/block-supports/elements.php b/wp-includes/block-supports/elements.php
index d765a2c2b4..fe9543a5d5 100644
--- a/wp-includes/block-supports/elements.php
+++ b/wp-includes/block-supports/elements.php
@@ -24,8 +24,8 @@ function wp_get_elements_class_name(): string {
* @since 6.6.0
* @access private
*
- * @param array $block Block object.
- * @param array $options Per element type options e.g. whether to skip serialization.
+ * @param array $block Block object.
+ * @param array $options Per element type options e.g. whether to skip serialization.
* @return bool Whether the block needs an elements class name.
*/
function wp_should_add_elements_class_name( $block, $options ) {
@@ -264,7 +264,7 @@ function wp_render_elements_support_styles( $parsed_block ) {
*
* @param string $block_content Rendered block content.
* @param array $block Block object.
- * @return string Filtered block content.
+ * @return string Filtered block content.
*
* @phpstan-param array{
* attrs: array{
diff --git a/wp-includes/block-supports/position.php b/wp-includes/block-supports/position.php
index f9bcc1b0b7..f8bc49c383 100644
--- a/wp-includes/block-supports/position.php
+++ b/wp-includes/block-supports/position.php
@@ -35,9 +35,9 @@ function wp_register_position_support( $block_type ) {
* @since 6.2.0
* @access private
*
- * @param string $block_content Rendered block content.
- * @param array $block Block object.
- * @return string Filtered block content.
+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
+ * @return string Filtered block content.
*/
function wp_render_position_support( $block_content, $block ) {
$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
diff --git a/wp-includes/block-supports/settings.php b/wp-includes/block-supports/settings.php
index 9cf253defc..6b1eac6def 100644
--- a/wp-includes/block-supports/settings.php
+++ b/wp-includes/block-supports/settings.php
@@ -29,9 +29,9 @@ function _wp_get_presets_class_name( $block ) {
* @since 6.2.0
* @access private
*
- * @param string $block_content Rendered block content.
- * @param array $block Block object.
- * @return string Filtered block content.
+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
+ * @return string Filtered block content.
*/
function _wp_add_block_level_presets_class( $block_content, $block ) {
if ( ! $block_content ) {
diff --git a/wp-includes/block-supports/shadow.php b/wp-includes/block-supports/shadow.php
index fffc72e6b8..4c09ce9d08 100644
--- a/wp-includes/block-supports/shadow.php
+++ b/wp-includes/block-supports/shadow.php
@@ -46,8 +46,8 @@ function wp_register_shadow_support( $block_type ) {
* @since 6.6.0 Return early if __experimentalSkipSerialization is true.
* @access private
*
- * @param WP_Block_Type $block_type Block type.
- * @param array $block_attributes Block attributes.
+ * @param WP_Block_Type $block_type Block type.
+ * @param array $block_attributes Block attributes.
* @return array Shadow CSS classes and inline styles.
*/
function wp_apply_shadow_support( $block_type, $block_attributes ) {
diff --git a/wp-includes/class-wp-duotone.php b/wp-includes/class-wp-duotone.php
index 0e12e7ca7f..482ddc6c13 100644
--- a/wp-includes/class-wp-duotone.php
+++ b/wp-includes/class-wp-duotone.php
@@ -753,8 +753,8 @@ class WP_Duotone {
* @since 6.3.0
* @deprecated 6.3.0
*
- * @param array $preset Duotone preset value as seen in theme.json.
- * @return string Duotone filter CSS id.
+ * @param array $preset Duotone preset value as seen in theme.json.
+ * @return string Duotone filter CSS id.
*/
public static function get_filter_id_from_preset( $preset ) {
_deprecated_function( __FUNCTION__, '6.3.0' );
@@ -1080,9 +1080,9 @@ class WP_Duotone {
*
* @since 6.3.0
*
- * @param string $block_content Rendered block content.
- * @param array $block Block object.
- * @param WP_Block $wp_block The block instance.
+ * @param string $block_content Rendered block content.
+ * @param array $block Block object.
+ * @param WP_Block $wp_block The block instance.
* @return string Filtered block content.
*/
public static function render_duotone_support( $block_content, $block, $wp_block ) {
diff --git a/wp-includes/class-wp-theme-json-resolver.php b/wp-includes/class-wp-theme-json-resolver.php
index b6c205bba0..dc236f8790 100644
--- a/wp-includes/class-wp-theme-json-resolver.php
+++ b/wp-includes/class-wp-theme-json-resolver.php
@@ -234,7 +234,7 @@ class WP_Theme_JSON_Resolver {
* Added registration and merging of block style variations from partial theme.json files and the block styles registry.
*
* @param array $deprecated Deprecated. Not used.
- * @param array $options {
+ * @param array $options {
* Options arguments.
*
* @type bool $with_supports Whether to include theme supports in the data. Default true.
diff --git a/wp-includes/class-wp-theme-json.php b/wp-includes/class-wp-theme-json.php
index c721e42b85..1252ca6736 100644
--- a/wp-includes/class-wp-theme-json.php
+++ b/wp-includes/class-wp-theme-json.php
@@ -3522,7 +3522,7 @@ class WP_Theme_JSON {
*
* @param array $theme_json The theme.json converted to an array.
* @param array $selectors Optional list of selectors per block.
- * @param array $options {
+ * @param array $options {
* Optional. An array of options for now used for internal purposes only (may change without notice).
*
* @type bool $include_block_style_variations Include nodes for block style variations. Default false.
diff --git a/wp-includes/icons.php b/wp-includes/icons.php
index 0af4b6d61b..a00b8a7560 100644
--- a/wp-includes/icons.php
+++ b/wp-includes/icons.php
@@ -47,7 +47,7 @@ function wp_unregister_icon_collection( $slug ) {
* reserved for WordPress core icons; third-party code should
* register icons under its own collection rather than the
* "core" collection.
- * @param array $args {
+ * @param array $args {
* List of properties for the icon.
*
* @type string $label Required. A human-readable label for the icon.
diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index 340d338180..0941ee4ea5 100644
--- a/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -852,7 +852,7 @@ class WP_REST_Templates_Controller extends WP_REST_Controller {
* @since 6.5.0
*
* @param WP_Block_Template $template_object Template instance.
- * @return string Original source of the template one of theme, plugin, site, or user.
+ * @return string Original source of the template one of theme, plugin, site, or user.
*/
private static function get_wp_templates_original_source_field( $template_object ) {
if ( 'wp_template' === $template_object->type || 'wp_template_part' === $template_object->type ) {
@@ -904,7 +904,7 @@ class WP_REST_Templates_Controller extends WP_REST_Controller {
* @since 6.5.0
*
* @param WP_Block_Template $template_object Template instance.
- * @return string Human readable text for the author.
+ * @return string Human readable text for the author.
*/
private static function get_wp_templates_author_text_field( $template_object ) {
$original_source = self::get_wp_templates_original_source_field( $template_object );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e6234fc36d..c219e192bd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
-$wp_version = '7.2-alpha-63528';
+$wp_version = '7.2-alpha-63529';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.