Changeset 55697

Timestamp:

04/28/2023 03:04:19 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Bring some consistency to REST API revisions initialization.

The autosaves and revisions controllers used to set the same class properties in a slightly different order.

This commit makes the ::__construct() methods of both classes more consistent to simplify future maintenance.

Follow-up to [46272], [51962].

See #57839.

Location:

trunk/src/wp-includes/rest-api/endpoints

Files:

• class-wp-rest-autosaves-controller.php (modified) (1 diff)
• class-wp-rest-revisions-controller.php (modified) (1 diff)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php

@@ -69 +69 @@
         $this->revisions_controller = new WP_REST_Revisions_Controller( $parent_post_type );
         $this->rest_base            = 'autosaves';
+        $this->parent_base          = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
         $this->namespace            = ! empty( $post_type_object->rest_namespace ) ? $post_type_object->rest_namespace : 'wp/v2';
-        $this->parent_base          = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
     }
 

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-revisions-controller.php

@@ -49 +49 @@
      */
     public function __construct( $parent_post_type ) {
-        $this->parent_post_type  = $parent_post_type;
+        $this->parent_post_type = $parent_post_type;
+        $post_type_object       = get_post_type_object( $parent_post_type );
+        $parent_controller      = $post_type_object->get_rest_controller();
+
+        if ( ! $parent_controller ) {
+            $parent_controller = new WP_REST_Posts_Controller( $parent_post_type );
+        }
+
+        $this->parent_controller = $parent_controller;
         $this->rest_base         = 'revisions';
-        $post_type_object        = get_post_type_object( $parent_post_type );
         $this->parent_base       = ! empty( $post_type_object->rest_base ) ? $post_type_object->rest_base : $post_type_object->name;
         $this->namespace         = ! empty( $post_type_object->rest_namespace ) ? $post_type_object->rest_namespace : 'wp/v2';
-        $this->parent_controller = $post_type_object->get_rest_controller();
-
-        if ( ! $this->parent_controller ) {
-            $this->parent_controller = new WP_REST_Posts_Controller( $parent_post_type );
-        }
     }