rebase - combining 46 commits to 1 and resolving lots of conflicts

lib/class-wp-webfonts-provider-local.php

@@ -0,0 +1,263 @@
+<?php
+/**
+ * Webfonts API: Provider for locally-hosted fonts.
+ *
+ * @package    WordPress
+ * @subpackage WebFonts
+ * @since      6.0.0
+ */
+
+/**
+ * A core bundled provider for generating `@font-face` styles
+ * from locally-hosted font files.
+ *
+ * This provider builds an optimized `src` (for browser support)
+ * and then generates the `@font-face` styles.
+ *
+ * When enqueued styles are rendered, the Controller passes its
+ * 'local' webfonts {@see WP_Webfonts_Provider::set_setfonts()}
+ * and then triggers {@see WP_Webfonts_Provider_Local::get_css()}
+ * the processing to transform them into `@font-face` styles.
+ *
+ * All know-how (business logic) for how to interact with and
+ * generate styles from locally-hosted font files is contained
+ * in this provider.
+ *
+ * @since 6.0.0
+ */
+class WP_Webfonts_Provider_Local extends WP_Webfonts_Provider {
+
+	/**
+	 * The provider's unique ID.
+	 *
+	 * @since 6.0.0
+	 *
+	 * @var string
+	 */
+	protected $id = 'local';
+
+	/**
+	 * Gets the `@font-face` CSS styles for locally-hosted font files.
+	 *
+	 * This method does the following processing tasks:
+	 *    1. Orchestrates an optimized `src` (with format) for browser support.
+	 *    2. Generates the `@font-face` for all its webfonts.
+	 *
+	 * For example, when given these webfonts:
+	 * <code>
+	 * array(
+	 *      'source-serif-pro.normal.200 900' => array(
+	 *          'provider'    => 'local',
+	 *          'font_family' => 'Source Serif Pro',
+	 *          'font_weight' => '200 900',
+	 *          'font_style'  => 'normal',
+	 *          'src'         => 'https://example.com/wp-content/themes/twentytwentytwo/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2' ),
+	 *      ),
+	 *      'source-serif-pro.italic.400 900' => array(
+	 *          'provider'    => 'local',
+	 *          'font_family' => 'Source Serif Pro',
+	 *          'font_weight' => '200 900',
+	 *          'font_style'  => 'italic',
+	 *          'src'         => 'https://example.com/wp-content/themes/twentytwentytwo/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2' ),
+	 *      ),
+	 * )
+	 * </code>
+	 *
+	 * the following `@font-face` styles are generated and returned:
+	 * <code>
+	 *
+	 * @font-face{
+	 *      font-family:"Source Serif Pro";
+	 *      font-style:normal;
+	 *      font-weight:200 900;
+	 *      font-stretch:normal;
+	 *      src:local("Source Serif Pro"), url('/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');
+	 * }
+	 * @font-face{
+	 *      font-family:"Source Serif Pro";
+	 *      font-style:italic;
+	 *      font-weight:200 900;
+	 *      font-stretch:normal;
+	 *      src:local("Source Serif Pro"), url('/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');
+	 * }
+	 * </code>
+	 *
+	 * @since 6.0.0
+	 *
+	 * @return string The `@font-face` CSS.
+	 */
+	public function get_css() {
+		$css = '';
+
+		foreach ( $this->webfonts as $webfont ) {
+			// Order the webfont's `src` items to optimize for browser support.
+			$webfont = $this->order_src( $webfont );
+
+			// Build the @font-face CSS for this webfont.
+			$css .= '@font-face{' . $this->build_font_face_css( $webfont ) . '}';
+		}
+
+		return $css;
+	}
+
+	/**
+	 * Order `src` items to optimize for browser support.
+	 *
+	 * @since 6.0.0
+	 *
+	 * @param array $webfont Webfont to process.
+	 * @return array
+	 */
+	private function order_src( array $webfont ) {
+		if ( ! is_array( $webfont['src'] ) ) {
+			$webfont['src'] = (array) $webfont['src'];
+		}
+
+		$src         = array();
+		$src_ordered = array();
+
+		foreach ( $webfont['src'] as $url ) {
+			// Add data URIs first.
+			if ( 0 === strpos( trim( $url ), 'data:' ) ) {
+				$src_ordered[] = array(
+					'url'    => $url,
+					'format' => 'data',
+				);
+				continue;
+			}
+			$format         = pathinfo( $url, PATHINFO_EXTENSION );
+			$src[ $format ] = $url;
+		}
+
+		// Add woff2.
+		if ( ! empty( $src['woff2'] ) ) {
+			$src_ordered[] = array(
+				'url'    => $src['woff2'],
+				'format' => 'woff2',
+			);
+		}
+
+		// Add woff.
+		if ( ! empty( $src['woff'] ) ) {
+			$src_ordered[] = array(
+				'url'    => $src['woff'],
+				'format' => 'woff',
+			);
+		}
+
+		// Add ttf.
+		if ( ! empty( $src['ttf'] ) ) {
+			$src_ordered[] = array(
+				'url'    => $src['ttf'],
+				'format' => 'truetype',
+			);
+		}
+
+		// Add eot.
+		if ( ! empty( $src['eot'] ) ) {
+			$src_ordered[] = array(
+				'url'    => $src['eot'],
+				'format' => 'embedded-opentype',
+			);
+		}
+
+		// Add otf.
+		if ( ! empty( $src['otf'] ) ) {
+			$src_ordered[] = array(
+				'url'    => $src['otf'],
+				'format' => 'opentype',
+			);
+		}
+		$webfont['src'] = $src_ordered;
+
+		return $webfont;
+	}
+
+	/**
+	 * Builds the font-family's CSS.
+	 *
+	 * @since 6.0.0
+	 *
+	 * @param array $webfont Webfont to process.
+	 * @return string This font-family's CSS.
+	 */
+	private function build_font_face_css( array $webfont ) {
+		$css = '';
+
+		// Wrap font-family in quotes if it contains spaces.
+		if (
+			false !== strpos( $webfont['font-family'], ' ' ) &&
+			false === strpos( $webfont['font-family'], '"' ) &&
+			false === strpos( $webfont['font-family'], "'" )
+		) {
+			$webfont['font-family'] = '"' . $webfont['font-family'] . '"';
+		}
+
+		foreach ( $webfont as $key => $value ) {
+
+			// Skip "provider".
+			if ( 'provider' === $key ) {
+				continue;
+			}
+
+			// Compile the "src" parameter.
+			if ( 'src' === $key ) {
+				$value = $this->compile_src( $webfont['font-family'], $value );
+			}
+
+			// If font-variation-settings is an array, convert it to a string.
+			if ( 'font-variation-settings' === $key && is_array( $value ) ) {
+				$value = $this->compile_variations( $value );
+			}
+
+			if ( ! empty( $value ) ) {
+				$css .= "$key:$value;";
+			}
+		}
+
+		return $css;
+	}
+
+	/**
+	 * Compiles the `src` into valid CSS.
+	 *
+	 * @since 6.0.0
+	 *
+	 * @param string $font_family Font family.
+	 * @param array  $value       Value to process.
+	 * @return string The CSS.
+	 */
+	private function compile_src( $font_family, array $value ) {
+		$src = "local($font_family)";
+
+		foreach ( $value as $item ) {
+
+			if ( 0 === strpos( $item['url'], get_site_url() ) ) {
+				$item['url'] = wp_make_link_relative( $item['url'] );
+			}
+
+			$src .= ( 'data' === $item['format'] )
+				? ", url({$item['url']})"
+				: ", url('{$item['url']}') format('{$item['format']}')";
+		}
+		return $src;
+	}
+
+	/**
+	 * Compiles the font variation settings.
+	 *
+	 * @since 6.0.0
+	 *
+	 * @param array $font_variation_settings Array of font variation settings.
+	 * @return string The CSS.
+	 */
+	private function compile_variations( array $font_variation_settings ) {
+		$variations = '';
+
+		foreach ( $font_variation_settings as $key => $value ) {
+			$variations .= "$key $value";
+		}
+
+		return $variations;
+	}
+}

lib/class-wp-webfonts-provider.php

@@ -0,0 +1,68 @@
+<?php
+/**
+ * Webfonts API: Provider abstract class.
+ *
+ * Individual webfonts providers should extend this class and implement.
+ *
+ * @package    WordPress
+ * @subpackage WebFonts
+ * @since      6.0.0
+ */
+
+/**
+ * Abstract class for Webfonts API providers.
+ *
+ * The starting point to building a webfont service provider.
+ *
+ * What is a Provider?
+ *
+ * A provider contains the know-how (business logic) for how to
+ * process its specific font service (i.e. local or remote)
+ * and how to generate the `@font-face` styles for its service.
+ *
+ * It receives a collection of webfonts from the Controller
+ * {@see WP_Webfonts_Provider::set_setfonts()}, and when requested
+ * {@see WP_Webfonts_Provider::get_css()}, it transforms them
+ * into styles (in a performant way for the provider service
+ * it manages).
+ *
+ * @since 6.0.0
+ */
+abstract class WP_Webfonts_Provider {
+
+	/**
+	 * Webfonts to be processed.
+	 *
+	 * @since 6.0.0
+	 *
+	 * @var array[]
+	 */
+	protected $webfonts = array();
+
+	/**
+	 * Sets this provider's webfonts property.
+	 *
+	 * The API's Controller passes this provider's webfonts
+	 * for processing here in the provider.
+	 *
+	 * @since 6.0.0
+	 *
+	 * @param array[] $webfonts Registered webfonts.
+	 */
+	public function set_webfonts( array $webfonts ) {
+		$this->webfonts = $webfonts;
+	}
+
+	/**
+	 * Gets the `@font-face` CSS for the provider's webfonts.
+	 *
+	 * This method is where the provider does it processing to build the
+	 * needed `@font-face` CSS for all of its webfonts. Specifics of how
+	 * this processing is done is contained in each provider.
+	 *
+	 * @since 6.0.0
+	 *
+	 * @return string The `@font-face` CSS.
+	 */
+	abstract public function get_css();
+}