Merge branch 'WordPress:trunk' into trunk

Author: dd32

src/wp-includes/fonts.php

@@ -266,7 +266,7 @@ function _wp_register_default_font_collections() {
 		array(
 			'name'          => _x( 'Google Fonts', 'font collection name' ),
 			'description'   => __( 'Install from Google Fonts. Fonts are copied to and served from your site.' ),
-			'font_families' => 'https://s.w.org/images/fonts/wp-7.0/collections/google-fonts-with-preview.json',
+			'font_families' => 'https://s.w.org/images/fonts/wp-7.1/collections/google-fonts-with-preview.json',
 			'categories'    => array(
 				array(
 					'name' => _x( 'Sans Serif', 'font category' ),

tests/phpunit/tests/fonts/font-library/wpRestFontFacesController.php

@@ -583,7 +583,7 @@ public function test_create_item_with_all_properties() {
 			'lineGapOverride'       => '10%',
 			'sizeAdjust'            => '90%',
 			'unicodeRange'          => 'U+0025-00FF, U+4??',
-			'preview'               => 'https://s.w.org/images/fonts/wp-7.0/previews/open-sans/open-sans-400-normal.svg',
+			'preview'               => 'https://s.w.org/images/fonts/wp-7.1/previews/open-sans/open-sans-400-normal.svg',
 			'src'                   => 'https://fonts.gstatic.com/s/open-sans/v30/KFOkCnqEu92Fr1MmgWxPKTM1K9nz.ttf',
 		);
 

tests/phpunit/tests/fonts/font-library/wpRestFontFamiliesController.php

@@ -28,7 +28,7 @@ class Tests_REST_WpRestFontFamiliesController extends WP_Test_REST_Controller_Te
 		'name'       => 'Open Sans',
 		'slug'       => 'open-sans',
 		'fontFamily' => '"Open Sans", sans-serif',
-		'preview'    => 'https://s.w.org/images/fonts/wp-7.0/previews/open-sans/open-sans-400-normal.svg',
+		'preview'    => 'https://s.w.org/images/fonts/wp-7.1/previews/open-sans/open-sans-400-normal.svg',
 	);
 
 	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
@@ -48,7 +48,7 @@ public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
 				'name'       => 'Open Sans',
 				'slug'       => 'open-sans',
 				'fontFamily' => '"Open Sans", sans-serif',
-				'preview'    => 'https://s.w.org/images/fonts/wp-7.0/previews/open-sans/open-sans-400-normal.svg',
+				'preview'    => 'https://s.w.org/images/fonts/wp-7.1/previews/open-sans/open-sans-400-normal.svg',
 			)
 		);
 		self::$font_family_id2 = self::create_font_family_post(
@@ -682,7 +682,7 @@ public function test_create_item_no_permission() {
 					'name'       => 'Open Sans',
 					'slug'       => 'open-sans',
 					'fontFamily' => '"Open Sans", sans-serif',
-					'preview'    => 'https://s.w.org/images/fonts/wp-7.0/previews/open-sans/open-sans-400-normal.svg',
+					'preview'    => 'https://s.w.org/images/fonts/wp-7.1/previews/open-sans/open-sans-400-normal.svg',
 				)
 			)
 		);
@@ -699,7 +699,7 @@ public function test_update_item() {
 		$settings = array(
 			'name'       => 'Open Sans',
 			'fontFamily' => 'Open Sans, "Noto Sans", sans-serif',
-			'preview'    => 'https://s.w.org/images/fonts/wp-7.0/previews/open-sans/open-sans-400-normal.svg',
+			'preview'    => 'https://s.w.org/images/fonts/wp-7.1/previews/open-sans/open-sans-400-normal.svg',
 		);
 
 		$font_family_id = self::create_font_family_post( array( 'slug' => 'open-sans-2' ) );
@@ -755,7 +755,7 @@ public function data_update_item_individual_settings() {
 		return array(
 			array( array( 'name' => 'Opened Sans' ) ),
 			array( array( 'fontFamily' => '"Opened Sans", sans-serif' ) ),
-			array( array( 'preview' => 'https://s.w.org/images/fonts/wp-7.0/previews/opened-sans/opened-sans-400-normal.svg' ) ),
+			array( array( 'preview' => 'https://s.w.org/images/fonts/wp-7.1/previews/opened-sans/opened-sans-400-normal.svg' ) ),
 			// Empty preview is allowed.
 			array( array( 'preview' => '' ) ),
 		);