Changeset 57548

Timestamp:

02/07/2024 09:18:38 AM (6 months ago)

Author:

youknowriad

Message:

REST API: Introduce the necessary endpoints for the font library.

This commits add three endpoints to retrieve and manipulate fonts in WordPress.
This commit also means that we now have a fully functional Font Library in the site editor.

Props get_dave, youknowriad, mmaattiiaass, grantmkin, swissspidy, mcsf, jorbin, ocean90.
See #59166.

Location:

trunk

Files:

• src/wp-includes/fonts/class-wp-font-library.php (modified) (2 diffs)
• src/wp-includes/post.php (modified) (4 diffs)
• src/wp-includes/rest-api.php (modified) (1 diff)
• src/wp-includes/rest-api/endpoints/class-wp-rest-font-collections-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-font-faces-controller.php (added)
• src/wp-includes/rest-api/endpoints/class-wp-rest-font-families-controller.php (added)
• src/wp-settings.php (modified) (1 diff)
• tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php (modified) (1 diff)
• tests/phpunit/tests/fonts/font-library/wpRestFontCollectionsController.php (added)
• tests/phpunit/tests/fonts/font-library/wpRestFontFacesController.php (added)
• tests/phpunit/tests/fonts/font-library/wpRestFontFamiliesController.php (added)
• tests/phpunit/tests/rest-api/rest-schema-setup.php (modified) (1 diff)
• tests/qunit/fixtures/wp-api-generated.js (modified) (4 diffs)

trunk/src/wp-includes/fonts/class-wp-font-library.php

@@ -116 +116 @@
      *
      * @param string $slug Font collection slug.
-     * @return WP_Font_Collection|WP_Error Font collection object,
-     *                                     or WP_Error object if the font collection doesn't exist.
+     * @return WP_Font_Collection|null Font collection object, or null if the font collection doesn't exist.
      */
     public function get_font_collection( $slug ) {
@@ -123 +122 @@
             return $this->collections[ $slug ];
         }
-        return new WP_Error( 'font_collection_not_found', __( 'Font collection not found.' ) );
+        return n;
     }
 

trunk/src/wp-includes/post.php

@@ -568 +568 @@
         'wp_font_family',
         array(
-            'labels'       => array(
+            'labels'       => array(
                 'name'          => __( 'Font Families' ),
                 'singular_name' => __( 'Font Family' ),
             ),
-            'public'       => false,
-            '_builtin'     => true, /* internal use only. don't use this when registering your own post type. */
-            'hierarchical' => false,
-            'capabilities' => array(
+            'public'       => false,
+            '_builtin'     => true, /* internal use only. don't use this when registering your own post type. */
+            'hierarchical' => false,
+            'capabilities' => array(
                 'read'                   => 'edit_theme_options',
                 'read_private_posts'     => 'edit_theme_options',
@@ -587 +587 @@
                 'delete_published_posts' => 'edit_theme_options',
             ),
-            'map_meta_cap' => true,
-            'query_var'    => false,
-            'show_in_rest' => false,
-            'rewrite'      => false,
+            'map_meta_cap'                   => true,
+            'query_var'                      => false,
+            'rewrite'                        => false,
+            'show_in_rest'                   => true,
+            'rest_base'                      => 'font-families',
+            'rest_controller_class'          => 'WP_REST_Font_Families_Controller',
+            // Disable autosave endpoints for font families.
+            'autosave_rest_controller_class' => 'stdClass',
         )
     );
@@ -597 +601 @@
         'wp_font_face',
         array(
-            'labels'       => array(
+            'labels'       => array(
                 'name'          => __( 'Font Faces' ),
                 'singular_name' => __( 'Font Face' ),
             ),
-            'public'       => false,
-            '_builtin'     => true, /* internal use only. don't use this when registering your own post type. */
-            'hierarchical' => false,
-            'capabilities' => array(
+            'public'       => false,
+            '_builtin'     => true, /* internal use only. don't use this when registering your own post type. */
+            'hierarchical' => false,
+            'capabilities' => array(
                 'read'                   => 'edit_theme_options',
                 'read_private_posts'     => 'edit_theme_options',
@@ -616 +620 @@
                 'delete_published_posts' => 'edit_theme_options',
             ),
-            'map_meta_cap' => true,
-            'query_var'    => false,
-            'show_in_rest' => false,
-            'rewrite'      => false,
+            'map_meta_cap'                   => true,
+            'query_var'                      => false,
+            'rewrite'                        => false,
+            'show_in_rest'                   => true,
+            'rest_base'                      => 'font-families/(?P<font_family_id>[\d]+)/font-faces',
+            'rest_controller_class'          => 'WP_REST_Font_Faces_Controller',
+            // Disable autosave endpoints for font faces.
+            'autosave_rest_controller_class' => 'stdClass',
         )
     );

trunk/src/wp-includes/rest-api.php

@@ -392 +392 @@
     $controller = new WP_REST_Navigation_Fallback_Controller();
     $controller->register_routes();
+
+
+
+
 }
 

trunk/src/wp-settings.php

@@ -311 +311 @@
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-url-details-controller.php';
 require ABSPATH . WPINC . '/rest-api/endpoints/class-wp-rest-navigation-fallback-controller.php';
+
+
+
 require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-meta-fields.php';
 require ABSPATH . WPINC . '/rest-api/fields/class-wp-rest-comment-meta-fields.php';

trunk/tests/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php

@@ -26 +26 @@
     public function test_should_get_no_font_collection_if_the_slug_is_not_registered() {
         $font_collection = WP_Font_Library::get_instance()->get_font_collection( 'not-registered-font-collection' );
-        $this->assertWPError( $font_collection );
+        $this->assert( $font_collection );
     }
 }

trunk/tests/phpunit/tests/rest-api/rest-schema-setup.php

@@ -190 +190 @@
             '/wp/v2/wp_pattern_category',
             '/wp/v2/wp_pattern_category/(?P<id>[\d]+)',
+
+
+
+
+
+
         );
 

trunk/tests/qunit/fixtures/wp-api-generated.js

@@ -6655 +6655 @@
                             ],
                             "default": "view",
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                             "required": false
                         }
@@ -8786 +9161 @@
                                     "wp_template_part": "wp_template_part",
                                     "wp_navigation": "wp_navigation",
+
+
                                     "attachment": "attachment"
                                 }
@@ -11505 +11882 @@
                 ]
             }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         }
     },
@@ -12542 +12993 @@
         }
     },
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     "attachment": {
         "description": "",