From 4e7415b4459fedbccd493c3dabedb68893e6ed50 Mon Sep 17 00:00:00 2001 From: Gael Robin Date: Thu, 14 Nov 2024 06:33:05 +0100 Subject: [PATCH] Fix tests --- inc/Engine/Media/Fonts/Frontend/Controller.php | 7 ++++--- .../Media/Fonts/Frontend/Controller/rewriteFonts.php | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/inc/Engine/Media/Fonts/Frontend/Controller.php b/inc/Engine/Media/Fonts/Frontend/Controller.php index adf4bfed9a..31be93e18c 100644 --- a/inc/Engine/Media/Fonts/Frontend/Controller.php +++ b/inc/Engine/Media/Fonts/Frontend/Controller.php @@ -39,13 +39,14 @@ class Controller { * Constructor. * * @param Context $context Context instance. - * @param WP_Filesystem_Direct $filesystem WordPress filesystem. + * @param WP_Filesystem_Direct|null $filesystem WordPress filesystem. */ - public function __construct( Context $context, WP_Filesystem_Direct $filesystem ) { + public function __construct(Context $context, ?WP_Filesystem_Direct $filesystem ) { $this->context = $context; $this->base_path = rocket_get_constant( 'WP_ROCKET_CACHE_ROOT_PATH', '' ) . 'fonts/' . get_current_blog_id() . '/'; $this->base_url = rocket_get_constant( 'WP_ROCKET_CACHE_ROOT_URL', '' ) . 'fonts/' . get_current_blog_id() . '/'; - $this->filesystem = $filesystem; + $this->filesystem = ! empty( $filesystem ) ? $filesystem : rocket_direct_filesystem(); + } /** diff --git a/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php b/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php index d2bf5940c9..10525629c0 100644 --- a/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php +++ b/tests/Unit/inc/Engine/Media/Fonts/Frontend/Controller/rewriteFonts.php @@ -8,6 +8,7 @@ use WP_Rocket\Engine\Media\Fonts\Frontend\Controller; use WP_Rocket\Engine\Media\Fonts\Context\Context; use WP_Rocket\Tests\Unit\FilesystemTestCase; +use WP_Filesystem_Direct; /** * @group HostFontsLocally @@ -17,13 +18,16 @@ class TestRewriteFonts extends FilesystemTestCase { private $context; private $controller; + protected $filesystem; + public function set_up() { parent::set_up(); Functions\when( 'get_current_blog_id' )->justReturn( 1 ); $this->context = Mockery::mock( Context::class ); - $this->controller = new Controller( $this->context ); + $this->filesystem = Mockery::mock( WP_Filesystem_Direct::class ); + $this->controller = new Controller( $this->context, $this->filesystem ); $this->stubWpParseUrl(); }