Changeset 52372 for trunk/src/wp-includes/class-wp-theme-json-resolver.php

Timestamp:

12/14/2021 04:12:57 PM (5 years ago)

Author:

hellofromTonya

Message:

Themes: Rename public static functions in WP_Theme_JSON_Resolver to remove custom_post_type references.

WordPress Core is not really custom and does not reference "custom post type" in its function naming. This commit renames 2 public static methods:

• WP_Theme_JSON_Resolver::get_user_custom_post_type_id() renamed to WP_Theme_JSON_Resolver::get_user_global_styles_post_id().
• WP_Theme_JSON_Resolver::get_user_data_from_custom_post_type() renamed to WP_Theme_JSON_Resolver:: get_user_data_from_wp_global_styles().

Follow-up to [52049], [52051], [52069], [52232], [52275], [52364].

Props antonvlasenko, bernhard-reiter, costdev, desrosj, hellofromTonya, noisysocks, oandregal, SergeyBiryukov.
Fixes #54517.

File:

• trunk/src/wp-includes/class-wp-theme-json-resolver.php (modified) (7 diffs)

trunk/src/wp-includes/class-wp-theme-json-resolver.php

@@ -226 +226 @@
          * @param WP_Theme $theme              The theme object. If empty, it
          *                                     defaults to the current theme.
-         * @param bool     $should_create_cpt  Optional. Whether a new custom post
+         * @param bool     $create_post        Optional. Whether a new custom post
          *                                     type should be created if none are
          *                                     found. Default false.
@@ -234 +234 @@
          * @return array Custom Post Type for the user's origin config.
          */
-        public static function get_user_data_from_custom_post_type( $theme, $should_create_cpt = false, $post_status_filter = array( 'publish' ) ) {
+        public static function get_user_data_from_wp_global_styles( $theme, $create_post = false, $post_status_filter = array( 'publish' ) ) {
                 if ( ! $theme instanceof WP_Theme ) {
                         $theme = wp_get_theme();
@@ -263 +263 @@
 
                 // Special case: '-1' is a results not found.
-                if ( -1 === $post_id && ! $should_create_cpt ) {
+                if ( -1 === $post_id && ! $create_post ) {
                         return $user_cpt;
                 }
@@ -270 +270 @@
                 if ( is_array( $recent_posts ) && ( count( $recent_posts ) === 1 ) ) {
                         $user_cpt = $recent_posts[0];
-                } elseif ( $should_create_cpt ) {
+                } elseif ( $create_post ) {
                         $cpt_post_id = wp_insert_post(
                                 array(
@@ -297 +297 @@
          * @since 5.9.0
          *
-         * @return WP_Theme_JSON Entity that holds user data.
+         * @return WP_Theme_JSON Entity that holds styles for user data.
          */
         public static function get_user_data() {
@@ -305 +305 @@
 
                 $config   = array();
-                $user_cpt = self::get_user_data_from_custom_post_type( wp_get_theme() );
+                $user_cpt = self::get_user_data_from_wp_global_styles( wp_get_theme() );
 
                 if ( array_key_exists( 'post_content', $user_cpt ) ) {
@@ -382 +382 @@
          * @return integer|null
          */
-        public static function get_user_custom_post_type_id() {
+        public static function get_user_global_styles_post_id() {
                 if ( null !== self::$user_custom_post_type_id ) {
                         return self::$user_custom_post_type_id;
                 }
 
-                $user_cpt = self::get_user_data_from_custom_post_type( wp_get_theme(), true );
+                $user_cpt = self::get_user_data_from_wp_global_styles( wp_get_theme(), true );
 
                 if ( array_key_exists( 'ID', $user_cpt ) ) {