From 34e9aca0ca6c9ea2a7c8df9f693f4f56d3876aa6 Mon Sep 17 00:00:00 2001 From: gziolo Date: Tue, 12 Apr 2022 12:48:18 +0000 Subject: [PATCH] REST API: Use snake case convention for field names in Block Patterns Backports the same changes applied in Gutenberg: https://github.com/WordPress/gutenberg/pull/40254. Follow-up for [53152]. Props jsnajdr, timothyblynjacobs. See #55505. Built from https://develop.svn.wordpress.org/trunk@53154 git-svn-id: http://core.svn.wordpress.org/trunk@52743 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- ...lass-wp-rest-block-patterns-controller.php | 38 +++++++++---------- wp-includes/version.php | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php index a96aa9e98d..0c515d7cd9 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php @@ -107,19 +107,19 @@ class WP_REST_Block_Patterns_Controller extends WP_REST_Controller { public function prepare_item_for_response( $item, $request ) { $fields = $this->get_fields_for_response( $request ); $keys = array( - 'name', - 'title', - 'description', - 'viewportWidth', - 'blockTypes', - 'categories', - 'keywords', - 'content', + 'name' => 'name', + 'title' => 'title', + 'description' => 'description', + 'viewportWidth' => 'viewport_width', + 'blockTypes' => 'block_types', + 'categories' => 'categories', + 'keywords' => 'keywords', + 'content' => 'content', ); $data = array(); - foreach ( $keys as $key ) { - if ( isset( $item[ $key ] ) && rest_is_field_included( $key, $fields ) ) { - $data[ $key ] = $item[ $key ]; + foreach ( $keys as $item_key => $rest_key ) { + if ( isset( $item[ $item_key ] ) && rest_is_field_included( $rest_key, $fields ) ) { + $data[ $rest_key ] = $item[ $item_key ]; } } @@ -142,49 +142,49 @@ class WP_REST_Block_Patterns_Controller extends WP_REST_Controller { 'title' => 'block-pattern', 'type' => 'object', 'properties' => array( - 'name' => array( + 'name' => array( 'description' => __( 'The pattern name.' ), 'type' => 'string', 'readonly' => true, 'context' => array( 'view', 'edit', 'embed' ), ), - 'title' => array( + 'title' => array( 'description' => __( 'The pattern title, in human readable format.' ), 'type' => 'string', 'readonly' => true, 'context' => array( 'view', 'edit', 'embed' ), ), - 'description' => array( + 'description' => array( 'description' => __( 'The pattern detailed description.' ), 'type' => 'string', 'readonly' => true, 'context' => array( 'view', 'edit', 'embed' ), ), - 'viewportWidth' => array( + 'viewport_Width' => array( 'description' => __( 'The pattern viewport width for inserter preview.' ), 'type' => 'number', 'readonly' => true, 'context' => array( 'view', 'edit', 'embed' ), ), - 'blockTypes' => array( + 'block_Types' => array( 'description' => __( 'Block types that the pattern is intended to be used with.' ), 'type' => 'array', 'readonly' => true, 'context' => array( 'view', 'edit', 'embed' ), ), - 'categories' => array( + 'categories' => array( 'description' => __( 'The pattern category slugs.' ), 'type' => 'array', 'readonly' => true, 'context' => array( 'view', 'edit', 'embed' ), ), - 'keywords' => array( + 'keywords' => array( 'description' => __( 'The pattern keywords.' ), 'type' => 'array', 'readonly' => true, 'context' => array( 'view', 'edit', 'embed' ), ), - 'content' => array( + 'content' => array( 'description' => __( 'The pattern content.' ), 'type' => 'string', 'readonly' => true, diff --git a/wp-includes/version.php b/wp-includes/version.php index ba519b8824..995e7ab385 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-alpha-53153'; +$wp_version = '6.0-alpha-53154'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.