diff --git a/src/wp-includes/block-supports/background.php b/src/wp-includes/block-supports/background.php
index ca04322f9c055..3b3e277c377f2 100644
--- a/src/wp-includes/block-supports/background.php
+++ b/src/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/src/wp-includes/block-supports/block-style-variations.php b/src/wp-includes/block-supports/block-style-variations.php
index a808ea3d74ecf..746ed38177a57 100644
--- a/src/wp-includes/block-supports/block-style-variations.php
+++ b/src/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/src/wp-includes/block-supports/colors.php b/src/wp-includes/block-supports/colors.php
index 330f32e352b36..567a5422490b3 100644
--- a/src/wp-includes/block-supports/colors.php
+++ b/src/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/src/wp-includes/block-supports/custom-css.php b/src/wp-includes/block-supports/custom-css.php
index 7865b7342639e..50d21d406378f 100644
--- a/src/wp-includes/block-supports/custom-css.php
+++ b/src/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/src/wp-includes/block-supports/dimensions.php b/src/wp-includes/block-supports/dimensions.php
index beb6e374604c6..584574f4153ce 100644
--- a/src/wp-includes/block-supports/dimensions.php
+++ b/src/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/src/wp-includes/block-supports/elements.php b/src/wp-includes/block-supports/elements.php
index d765a2c2b4b5a..fe9543a5d5474 100644
--- a/src/wp-includes/block-supports/elements.php
+++ b/src/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/src/wp-includes/block-supports/position.php b/src/wp-includes/block-supports/position.php
index f9bcc1b0b727e..f8bc49c38376d 100644
--- a/src/wp-includes/block-supports/position.php
+++ b/src/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/src/wp-includes/block-supports/settings.php b/src/wp-includes/block-supports/settings.php
index 9cf253defc15b..6b1eac6defc7f 100644
--- a/src/wp-includes/block-supports/settings.php
+++ b/src/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/src/wp-includes/block-supports/shadow.php b/src/wp-includes/block-supports/shadow.php
index fffc72e6b88ff..4c09ce9d08f0f 100644
--- a/src/wp-includes/block-supports/shadow.php
+++ b/src/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/src/wp-includes/class-wp-duotone.php b/src/wp-includes/class-wp-duotone.php
index 0e12e7ca7f306..482ddc6c133ba 100644
--- a/src/wp-includes/class-wp-duotone.php
+++ b/src/wp-includes/class-wp-duotone.php
@@ -753,8 +753,8 @@ private static function get_filter_svg( $filter_id, $colors ) {
 	 * @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 @@ private static function get_all_global_style_block_names() {
 	 *
 	 * @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/src/wp-includes/class-wp-theme-json-resolver.php b/src/wp-includes/class-wp-theme-json-resolver.php
index b6c205bba03bd..dc236f87907bb 100644
--- a/src/wp-includes/class-wp-theme-json-resolver.php
+++ b/src/wp-includes/class-wp-theme-json-resolver.php
@@ -234,7 +234,7 @@ protected static function has_same_registered_blocks( $origin ) {
 	 *              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/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php
index c721e42b85e43..1252ca6736fd6 100644
--- a/src/wp-includes/class-wp-theme-json.php
+++ b/src/wp-includes/class-wp-theme-json.php
@@ -3522,7 +3522,7 @@ private static function update_button_width_declarations( $feature_declarations,
 	 *
 	 * @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/src/wp-includes/icons.php b/src/wp-includes/icons.php
index 0af4b6d61b873..a00b8a756046c 100644
--- a/src/wp-includes/icons.php
+++ b/src/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/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
index 340d3381806e4..0941ee4ea53e3 100644
--- a/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
+++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php
@@ -852,7 +852,7 @@ public function prepare_item_for_response( $item, $request ) {
 	 * @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 @@ private static function get_wp_templates_original_source_field( $template_object
 	 * @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 );