From e5e3f3cd54b47e61ded3f9605e52eecbfbcf5816 Mon Sep 17 00:00:00 2001
From: Chris Reynolds <chris.reynolds@pantheon.io>
Date: Wed, 27 Mar 2024 08:56:47 -0600
Subject: [PATCH] [CMSP-967] Remove `font_dir` filter (#35)

* remove fonts

* remove font tests
---
 inc/fonts.php                |  38 ---------
 pantheon.php                 |   8 +-
 tests/phpunit/test-fonts.php | 158 -----------------------------------
 3 files changed, 2 insertions(+), 202 deletions(-)
 delete mode 100644 inc/fonts.php
 delete mode 100644 tests/phpunit/test-fonts.php

diff --git a/inc/fonts.php b/inc/fonts.php
deleted file mode 100644
index 68b4984..0000000
--- a/inc/fonts.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Pantheon mu-plugin customizations to the WP_Font_Library added in WordPress 6.5
- *
- * @package pantheon
- */
-
-namespace Pantheon\Fonts;
-
-/**
- * Kick off our customizations to the WP_Font_Library.
- */
-function bootstrap() {
-	// Use the new font_dir filter added in WordPress 6.5. See https://github.com/WordPress/gutenberg/pull/57697.
-	add_filter( 'font_dir', __NAMESPACE__ . '\\pantheon_font_dir', 9 );
-}
-add_action( 'init', __NAMESPACE__ . '\\bootstrap' );
-
-/**
- * Define a custom font directory for the WP Font Library.
- * Default to {WP_CONTENT_DIR}/uploads/fonts.
- *
- * @param array $defaults The default settings for the font directory.
- */
-function pantheon_font_dir( $defaults ) {
-	$upload_dir = wp_get_upload_dir();
-
-	// Set our font directory.
-	$font_dir = $upload_dir['basedir'] . '/fonts';
-	$font_url = $upload_dir['baseurl'] . '/fonts';
-
-	$defaults['path'] = $font_dir;
-	$defaults['url'] = $font_url;
-	$defaults['basedir'] = $font_dir;
-	$defaults['baseurl'] = $font_url;
-
-	return $defaults;
-}
diff --git a/pantheon.php b/pantheon.php
index d00cef6..88c8689 100644
--- a/pantheon.php
+++ b/pantheon.php
@@ -3,14 +3,14 @@
  * Plugin Name: Pantheon
  * Plugin URI: https://pantheon.io/
  * Description: Building on Pantheon's and WordPress's strengths, together.
- * Version: 1.3.1
+ * Version: 1.3.2
  * Author: Pantheon
  * Author URI: https://pantheon.io/
  *
  * @package pantheon
  */
 
-define( 'PANTHEON_MU_PLUGIN_VERSION', '1.3.1' );
+define( 'PANTHEON_MU_PLUGIN_VERSION', '1.3.2' );
 
 if ( isset( $_ENV['PANTHEON_ENVIRONMENT'] ) ) {
 	require_once 'inc/functions.php';
@@ -18,10 +18,6 @@
 	if ( ! defined( 'DISABLE_PANTHEON_UPDATE_NOTICES' ) || ! DISABLE_PANTHEON_UPDATE_NOTICES ) {
 		require_once 'inc/pantheon-updates.php';
 	}
-	// If the WP Font Library exists, we can add our font directory modifications. Use version_compare because the Font Library isn't actually loaded yet.
-	if ( version_compare( Pantheon\_pantheon_get_current_wordpress_version(), '6.5' ) ) {
-		require_once 'inc/fonts.php';
-	}   
 	if ( ! defined( 'RETURN_TO_PANTHEON_BUTTON' ) || RETURN_TO_PANTHEON_BUTTON ) {
 		require_once 'inc/pantheon-login-form-mods.php';
 	}
diff --git a/tests/phpunit/test-fonts.php b/tests/phpunit/test-fonts.php
deleted file mode 100644
index 2cf0559..0000000
--- a/tests/phpunit/test-fonts.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Pantheon MU Plugin Font Library Tests
- * 
- * @package pantheon
- */
-
-use Pantheon\Fonts;
-
-use function Pantheon\Fonts\pantheon_modify_fonts_dir;
-
-/**
- * Main Mu Plugin Test Case
- */
-class Test_Fonts extends WP_UnitTestCase {
-	/**
-	 * The original pantheon upload directory.
-	 * We use this to restore the original value after we run the tests.
-	 *
-	 * @var array
-	 */
-	protected $original_pantheon_upload_dir;
-
-	public function setUp(): void {
-		parent::setUp();
-		remove_all_filters( 'font_dir' );
-
-		// Mock the global variable before each test.
-		global $_pantheon_upload_dir;
-		$this->original_pantheon_upload_dir = $_pantheon_upload_dir; // Backup original global if needed.
-
-		// Manually set the global variable to a mocked value.
-		$_pantheon_upload_dir = [
-			'basedir' => WP_CONTENT_DIR . '/uploads',
-			'baseurl' => 'http://example.org/wp-content/uploads',
-		];      
-	}
-
-	public function tearDown(): void {
-		// Restore original global state after each test if necessary.
-		global $_pantheon_upload_dir;
-		$_pantheon_upload_dir = $this->original_pantheon_upload_dir;
-
-		parent::tearDown();     
-	}
-
-	/**
-	 * Test the font library modifications have been loaded.
-	 */
-	public function test_font_library_modifications() {
-		$this->assertTrue( function_exists( 'Pantheon\Fonts\bootstrap' ) );
-		$this->assertEquals( has_action( 'init', 'Pantheon\Fonts\bootstrap' ), 10 );
-	}
-
-	/**
-	 * Test the pantheon_font_dir function.
-	 */ 
-	public function test_pantheon_font_dir() {
-		$this->assertTrue( function_exists( 'Pantheon\Fonts\pantheon_font_dir' ) );
-
-		$this->maybe_get_font_library();
-		if ( ! function_exists( 'wp_get_font_dir' ) ) {
-			// If the function still doesn't exist after trying to get the font library from gutenberg, mark the test skipped.
-			$this->markTestSkipped( 'The wp_get_font_dir function is not available. We\'re probably not using WP 6.5+' );
-		}
-
-		// Remove the filters we apply to `font_dir` so we're getting the default data.
-		remove_all_filters( 'font_dir' );
-		$default_fonts = wp_get_font_dir();
-		$font_dir = Fonts\pantheon_font_dir( $default_fonts );
-
-		$this->assertNotEquals( $default_fonts, $font_dir );
-		$this->assertEquals( array_keys( $default_fonts ), array_keys( $font_dir ) );
-		$this->assertArrayHasKey( 'path', $font_dir );
-		$this->assertArrayHasKey( 'url', $font_dir );
-		$this->assertArrayHasKey( 'basedir', $font_dir );
-		$this->assertArrayHasKey( 'baseurl', $font_dir );
-		$this->assertStringContainsString( 'uploads/fonts', $font_dir['path'] );
-		$this->assertStringContainsString( 'uploads/fonts', $font_dir['url'] );
-		$this->assertStringContainsString( 'uploads/fonts', $font_dir['basedir'] );
-		$this->assertStringContainsString( 'uploads/fonts', $font_dir['baseurl'] );
-	}
-
-	/**
-	 * Test that our filtered font directory is filtered properly.
-	 */
-	public function test_pantheon_font_dir_filter() {
-		$this->maybe_get_font_library();
-		if ( ! function_exists( 'wp_get_font_dir' ) ) {
-			// If the function still doesn't exist after trying to get the font library from gutenberg, mark the test skipped.
-			$this->markTestSkipped( 'The wp_get_font_dir function is not available. We\'re probably not using WP 6.5+' );
-		}
-
-		add_filter( 'font_dir', '\\Pantheon\\Fonts\\pantheon_font_dir' );
-		$font_dir = wp_get_font_dir();
-		
-		$expected = [
-			'path' => WP_CONTENT_DIR . '/uploads/fonts',
-			'url' => WP_CONTENT_URL . '/uploads/fonts',
-			'subdir' => '',
-			'basedir' => WP_CONTENT_DIR . '/uploads/fonts',
-			'baseurl' => WP_CONTENT_URL . '/uploads/fonts',
-			'error' => false,
-		];
-
-		$this->assertEquals( $expected, $font_dir );
-	}
-
-	/**
-	 * Test that using the font_dir filter at priority 10 overrides our modifications.
-	 */
-	public function test_pantheon_fonts_dir_filter() {
-		$this->maybe_get_font_library();
-		if ( ! function_exists( 'wp_get_font_dir' ) ) {
-			// If the function still doesn't exist after trying to get the font library from gutenberg, mark the test skipped.
-			$this->markTestSkipped( 'The wp_get_font_dir function is not available. We\'re probably not using WP 6.5+' );
-		}
-
-		$custom_directory = [
-			'path' => WP_CONTENT_DIR . '/custom-fonts',
-			'url' => WP_CONTENT_URL . '/custom-fonts',
-			'basedir' => WP_CONTENT_DIR . '/custom-fonts',
-			'baseurl' => WP_CONTENT_URL . '/custom-fonts',
-		];
-
-		add_filter( 'font_dir', function ( $defaults ) use ( $custom_directory ) {
-			$defaults['path'] = $custom_directory['path'];
-			$defaults['url'] = $custom_directory['url'];
-			$defaults['basedir'] = $custom_directory['basedir'];
-			$defaults['baseurl'] = $custom_directory['baseurl'];
-			return $defaults;
-		} );
-
-		Fonts\bootstrap();
-		$font_dir = wp_get_font_dir();
-
-		$expected = [
-			'path' => WP_CONTENT_DIR . '/custom-fonts',
-			'url' => WP_CONTENT_URL . '/custom-fonts',
-			'subdir' => '',
-			'basedir' => WP_CONTENT_DIR . '/custom-fonts',
-			'baseurl' => WP_CONTENT_URL . '/custom-fonts',
-			'error' => false,
-		];
-
-		$this->assertEquals( $expected, $font_dir );
-	}
-
-	/**
-	 * Get the font library from Gutenberg if it's not available.
-	 */
-	private function maybe_get_font_library() {
-		$fonts_php = WP_PLUGIN_DIR . '/gutenberg/lib/compat/wordpress-6.5/fonts/fonts.php';
-		if ( ! function_exists( 'wp_get_font_dir' ) && file_exists( $fonts_php ) ) {
-			require_once $fonts_php;
-		}
-	}
-}