From 1966addc05cd28e7850e8efc22d155de180327d5 Mon Sep 17 00:00:00 2001 From: desrosj Date: Mon, 19 Sep 2022 19:51:09 +0000 Subject: [PATCH] Coding Standards: Various alignment fixes from `composer format`. Follow up to [53874], [54097], [54110], [54155], [54162], [54184]. See #39210, #55443, #56288, #56092, #56408, #56467, #55881. Built from https://develop.svn.wordpress.org/trunk@54210 git-svn-id: http://core.svn.wordpress.org/trunk@53769 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/block-editor.php | 4 ++-- wp-includes/block-template-utils.php | 2 +- wp-includes/class-wp-block-type.php | 2 +- wp-includes/class-wp-image-editor-gd.php | 2 +- wp-includes/cron.php | 4 ++-- wp-includes/l10n.php | 2 +- .../endpoints/class-wp-rest-block-types-controller.php | 8 ++++---- wp-includes/version.php | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/wp-includes/block-editor.php b/wp-includes/block-editor.php index 2977afbeb8c..3aed6e627cf 100644 --- a/wp-includes/block-editor.php +++ b/wp-includes/block-editor.php @@ -428,7 +428,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex $actual_css = wp_get_global_stylesheet( array( $block_classes['css'] ) ); if ( '' !== $actual_css ) { $block_classes['css'] = $actual_css; - $global_styles[] = $block_classes; + $global_styles[] = $block_classes; } } @@ -493,7 +493,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex } if ( isset( $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'] ) ) { - $spacing_sizes_by_origin = $editor_settings['__experimentalFeatures']['spacing']['spacingSizes']; + $spacing_sizes_by_origin = $editor_settings['__experimentalFeatures']['spacing']['spacingSizes']; $editor_settings['spacingSizes'] = isset( $spacing_sizes_by_origin['custom'] ) ? $spacing_sizes_by_origin['custom'] : ( isset( $spacing_sizes_by_origin['theme'] ) ? diff --git a/wp-includes/block-template-utils.php b/wp-includes/block-template-utils.php index 2f2b596c2af..54413d809bc 100644 --- a/wp-includes/block-template-utils.php +++ b/wp-includes/block-template-utils.php @@ -552,7 +552,7 @@ function _build_block_template_result_from_post( $post ) { } $theme = $terms[0]->name; - $template_file = _get_block_template_file( $post->post_type, $post->post_name ); + $template_file = _get_block_template_file( $post->post_type, $post->post_name ); $has_theme_file = wp_get_theme()->get_stylesheet() === $theme && null !== $template_file; $origin = get_post_meta( $post->ID, 'origin', true ); diff --git a/wp-includes/class-wp-block-type.php b/wp-includes/class-wp-block-type.php index b0ca4753158..19cd1c07919 100644 --- a/wp-includes/class-wp-block-type.php +++ b/wp-includes/class-wp-block-type.php @@ -347,7 +347,7 @@ public function __set( $name, $value ) { return; } - $new_name = $name . '_handles'; + $new_name = $name . '_handles'; $this->{$new_name}[0] = $value; } diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php index b329f768abb..1b887240dc1 100644 --- a/wp-includes/class-wp-image-editor-gd.php +++ b/wp-includes/class-wp-image-editor-gd.php @@ -310,7 +310,7 @@ public function make_subsize( $size_data ) { imagedestroy( $resized ); } - $this->size = $orig_size; + $this->size = $orig_size; $this->size_name = $orig_size_name; if ( ! is_wp_error( $saved ) ) { diff --git a/wp-includes/cron.php b/wp-includes/cron.php index 9e83942f707..56e864ed11b 100644 --- a/wp-includes/cron.php +++ b/wp-includes/cron.php @@ -1127,9 +1127,9 @@ function wp_get_ready_cron_jobs() { return $pre; } - $crons = _get_cron_array(); + $crons = _get_cron_array(); $gmt_time = microtime( true ); - $results = array(); + $results = array(); foreach ( $crons as $timestamp => $cronhooks ) { if ( $timestamp > $gmt_time ) { diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index 6b62b158c95..f15775c87f4 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -1270,7 +1270,7 @@ function _load_textdomain_just_in_time( $domain ) { } $locale = determine_locale(); - $path = $wp_textdomain_registry->get( $domain, $locale ); + $path = $wp_textdomain_registry->get( $domain, $locale ); if ( ! $path ) { return false; } diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php index 3ef2aa7e104..af29924c76e 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php @@ -256,7 +256,7 @@ public function prepare_item_for_response( $item, $request ) { $data['is_dynamic'] = $block_type->is_dynamic(); } - $schema = $this->get_item_schema(); + $schema = $this->get_item_schema(); // Fields deprecated in WordPress 6.1, but left in the schema for backwards compatibility. $deprecated_fields = array( 'editor_script', @@ -688,13 +688,13 @@ public function get_item_schema() { 'context' => array( 'embed', 'view', 'edit' ), 'readonly' => true, ), - 'keywords' => $keywords_definition, - 'example' => $example_definition, + 'keywords' => $keywords_definition, + 'example' => $example_definition, ), ); // Properties deprecated in WordPress 6.1, but left in the schema for backwards compatibility. - $deprecated_properties = array( + $deprecated_properties = array( 'editor_script' => array( 'description' => __( 'Editor script handle. DEPRECATED: Use `editor_script_handles` instead.' ), 'type' => array( 'string', 'null' ), diff --git a/wp-includes/version.php b/wp-includes/version.php index 9a66eaeaf2a..86f3f6f4cbe 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-54209'; +$wp_version = '6.1-alpha-54210'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.