Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Font Library: Change all references to 6.4.0 by 6.5.0 core version #55320

Merged
merged 1 commit into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package WordPress
* @subpackage Font Library
* @since 6.4.0
* @since 6.5.0
*/

if ( class_exists( 'WP_Font_Collection' ) ) {
Expand All @@ -16,14 +16,14 @@
/**
* Font Collection class.
*
* @since 6.4.0
* @since 6.5.0
*/
class WP_Font_Collection {

/**
* Font collection configuration.
*
* @since 6.4.0
* @since 6.5.0
*
* @var array
*/
Expand All @@ -32,7 +32,7 @@ class WP_Font_Collection {
/**
* WP_Font_Collection constructor.
*
* @since 6.4.0
* @since 6.5.0
*
* @param array $config Font collection config options.
* See {@see wp_register_font_collection()} for the supported fields.
Expand Down Expand Up @@ -61,7 +61,7 @@ public function __construct( $config ) {
/**
* Gets the font collection config.
*
* @since 6.4.0
* @since 6.5.0
*
* @return array An array containing the font collection config.
*/
Expand All @@ -72,7 +72,7 @@ public function get_config() {
/**
* Gets the font collection data.
*
* @since 6.4.0
* @since 6.5.0
*
* @return array|WP_Error An array containing the list of font families in theme.json format on success,
* else an instance of WP_Error on failure.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package WordPress
* @subpackage Font Library
* @since 6.4.0
* @since 6.5.0
*/

if ( class_exists( 'WP_Font_Family_Utils' ) ) {
Expand All @@ -16,7 +16,7 @@
/**
* A class of utilities for working with the Font Library.
*
* @since 6.4.0
* @since 6.5.0
*/
class WP_Font_Family_Utils {

Expand All @@ -26,7 +26,7 @@ class WP_Font_Family_Utils {
* Creates a filename for a font face asset using font family, style, weight and
* extension information.
*
* @since 6.4.0
* @since 6.5.0
*
* @param string $font_slug The font slug to use in the filename.
* @param array $font_face The font face array containing 'fontFamily', 'fontStyle', and
Expand All @@ -48,7 +48,7 @@ public static function get_filename_from_font_face( $font_slug, $font_face, $url
/**
* Merges two fonts and their font faces.
*
* @since 6.4.0
* @since 6.5.0
*
* @param array $font1 The first font to merge.
* @param array $font2 The second font to merge.
Expand Down Expand Up @@ -79,7 +79,7 @@ public static function merge_fonts_data( $font1, $font2 ) {
/**
* Returns whether the given file has a font MIME type.
*
* @since 6.4.0
* @since 6.5.0
*
* @param string $filepath The file to check.
* @return bool True if the file has a font MIME type, false otherwise.
Expand Down
48 changes: 24 additions & 24 deletions lib/experimental/fonts/font-library/class-wp-font-family.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* @package WordPress
* @subpackage Font Library
* @since 6.4.0
* @since 6.5.0
*/

if ( class_exists( 'WP_Font_Family' ) ) {
Expand All @@ -16,14 +16,14 @@
/**
* Font Library class.
*
* @since 6.4.0
* @since 6.5.0
*/
class WP_Font_Family {

/**
* Font family data.
*
* @since 6.4.0
* @since 6.5.0
*
* @var array
*/
Expand All @@ -32,7 +32,7 @@ class WP_Font_Family {
/**
* WP_Font_Family constructor.
*
* @since 6.4.0
* @since 6.5.0
*
* @param array $font_data Font family data.
* @throws Exception If the font family data is missing the slug.
Expand All @@ -47,7 +47,7 @@ public function __construct( $font_data = array() ) {
/**
* Gets the font family data.
*
* @since 6.4.0
* @since 6.5.0
*
* @return array An array in fontFamily theme.json format.
*/
Expand All @@ -58,7 +58,7 @@ public function get_data() {
/**
* Gets the font family data.
*
* @since 6.4.0
* @since 6.5.0
*
* @return string fontFamily in theme.json format as stringified JSON.
*/
Expand All @@ -69,7 +69,7 @@ public function get_data_as_json() {
/**
* Checks whether the font family has font faces defined.
*
* @since 6.4.0
* @since 6.5.0
*
* @return bool True if the font family has font faces defined, false otherwise.
*/
Expand All @@ -80,7 +80,7 @@ public function has_font_faces() {
/**
* Removes font family assets.
*
* @since 6.4.0
* @since 6.5.0
*
* @return bool True if assets were removed, false otherwise.
*/
Expand All @@ -99,7 +99,7 @@ private function remove_font_family_assets() {
/**
* Removes a font family from the database and deletes its assets.
*
* @since 6.4.0
* @since 6.5.0
*
* @return bool|WP_Error True if the font family was uninstalled, WP_Error otherwise.
*/
Expand Down Expand Up @@ -128,7 +128,7 @@ public function uninstall() {
/**
* Deletes a specified font asset file from the fonts directory.
*
* @since 6.4.0
* @since 6.5.0
*
* @param string $src The path of the font asset file to delete.
* @return bool Whether the file was deleted.
Expand All @@ -145,7 +145,7 @@ private static function delete_asset( $src ) {
/**
* Deletes all font face asset files associated with a given font face.
*
* @since 6.4.0
* @since 6.5.0
*
* @param array $font_face The font face array containing the 'src' attribute
* with the file path(s) to be deleted.
Expand All @@ -167,7 +167,7 @@ private static function delete_font_face_assets( $font_face ) {
/**
* Gets the overrides for the 'wp_handle_upload' function.
*
* @since 6.4.0
* @since 6.5.0
*
* @param string $filename The filename to be used for the uploaded file.
* @return array The overrides for the 'wp_handle_upload' function.
Expand All @@ -194,7 +194,7 @@ private function get_upload_overrides( $filename ) {
* Downloads a font asset from a specified source URL and saves it to
* the font directory.
*
* @since 6.4.0
* @since 6.5.0
*
* @param string $url The source URL of the font asset to be downloaded.
* @param string $filename The filename to save the downloaded font asset as.
Expand Down Expand Up @@ -244,7 +244,7 @@ private function download_asset( $url, $filename ) {
*
* This is used when uploading local fonts.
*
* @since 6.4.0
* @since 6.5.0
*
* @param array $font_face Font face to download.
* @param array $file Uploaded file.
Expand Down Expand Up @@ -290,7 +290,7 @@ private function move_font_face_asset( $font_face, $file ) {
/**
* Sanitizes the font family data using WP_Theme_JSON.
*
* @since 6.4.0
* @since 6.5.0
*
* @return array A sanitized font family definition.
*/
Expand Down Expand Up @@ -321,7 +321,7 @@ private function sanitize() {
* Downloads the font face asset(s) associated with a font face. It works with
* both single source URLs and arrays of multiple source URLs.
*
* @since 6.4.0
* @since 6.5.0
*
* @param array $font_face The font face array containing the 'src' attribute
* with the source URL(s) of the assets.
Expand Down Expand Up @@ -364,7 +364,7 @@ private function download_font_face_assets( $font_face ) {
* Downloads font face assets if the font family is a Google font,
* or moves them if it is a local font.
*
* @since 6.4.0
* @since 6.5.0
*
* @param array $files An array of files to be installed.
* @return bool True if the font faces were downloaded or moved successfully, false otherwise.
Expand Down Expand Up @@ -429,7 +429,7 @@ private function download_or_move_font_faces( $files ) {
/**
* Gets the post for a font family.
*
* @since 6.4.0
* @since 6.5.0
*
* @return WP_Post|null The post for this font family object or
* null if the post does not exist.
Expand All @@ -455,7 +455,7 @@ public function get_font_post() {
* Gets the data for this object from the database and
* sets it to the data property.
*
* @since 6.4.0
* @since 6.5.0
*
* @return WP_Post|null The post for this font family object or
* null if the post does not exist.
Expand All @@ -473,7 +473,7 @@ private function get_data_from_post() {
/**
* Creates a post for a font family.
*
* @since 6.4.0
* @since 6.5.0
*
* @return int|WP_Error Post ID if the post was created, WP_Error otherwise.
*/
Expand All @@ -500,7 +500,7 @@ private function create_font_post() {
/**
* Gets the font faces that are in both the existing and incoming font families.
*
* @since 6.4.0
* @since 6.5.0
*
* @param array $existing The existing font faces.
* @param array $incoming The incoming font faces.
Expand All @@ -523,7 +523,7 @@ private function get_intersecting_font_faces( $existing, $incoming ) {
/**
* Updates a post for a font family.
*
* @since 6.4.0
* @since 6.5.0
*
* @param WP_Post $post The post to update.
* @return int|WP_Error Post ID if the update was successful, WP_Error otherwise.
Expand Down Expand Up @@ -570,7 +570,7 @@ private function update_font_post( $post ) {
* Creates a post for a font in the Font Library if it doesn't exist,
* or updates it if it does.
*
* @since 6.4.0
* @since 6.5.0
*
* @return int|WP_Error Post id if the post was created or updated successfully,
* WP_Error otherwise.
Expand All @@ -589,7 +589,7 @@ private function create_or_update_font_post() {
/**
* Installs the font family into the library.
*
* @since 6.4.0
* @since 6.5.0
*
* @param array $files Optional. An array of files to be installed. Default null.
* @return array|WP_Error An array of font family data on success, WP_Error otherwise.
Expand Down
Loading
Loading