fix all phpstan deprecation errors

wp-media · Jan 13, 2025 · 83b0f85 · 83b0f85
1 parent 15531f5
commit 83b0f85
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/inc/Engine/Common/Cache/FilesystemCache.php b/inc/Engine/Common/Cache/FilesystemCache.php
@@ -27,7 +27,7 @@ class FilesystemCache implements CacheInterface {
 	 * @param string                    $root_folder Root folder from the path.
 	 * @param WP_Filesystem_Direct|null $filesystem WordPress filesystem.
 	 */
-	public function __construct( string $root_folder, WP_Filesystem_Direct $filesystem = null ) {
+	public function __construct( string $root_folder, ?WP_Filesystem_Direct $filesystem = null ) {
 		$this->root_folder = $root_folder;
 		$this->filesystem  = $filesystem ?: rocket_direct_filesystem();
 	}

diff --git a/inc/Engine/Common/PerformanceHints/Frontend/Processor.php b/inc/Engine/Common/PerformanceHints/Frontend/Processor.php
@@ -36,7 +36,7 @@ class Processor {
 	 * @param Options_Data              $options Options instance.
 	 * @param WP_Filesystem_Direct|null $filesystem WordPress filesystem.
 	 */
-	public function __construct( array $factories, Options_Data $options, WP_Filesystem_Direct $filesystem = null ) {
+	public function __construct( array $factories, Options_Data $options, ?WP_Filesystem_Direct $filesystem = null ) {
 		$this->factories  = $factories;
 		$this->options    = $options;
 		$this->filesystem = $filesystem ?: rocket_direct_filesystem();

diff --git a/inc/Engine/Common/Queue/Cleaner.php b/inc/Engine/Common/Queue/Cleaner.php
@@ -46,7 +46,7 @@ class Cleaner extends ActionScheduler_QueueCleaner {
 	 * @param int                        $batch_size The batch size.
 	 * @param string                     $group Current queue group.
 	 */
-	public function __construct( ActionScheduler_Store $store = null, $batch_size = 20, $group = '' ) {
+	public function __construct( ?ActionScheduler_Store $store = null, $batch_size = 20, $group = '' ) {
 		parent::__construct( $store, $batch_size );
 		$this->store = $store ? $store : ActionScheduler_Store::instance();
 		$this->group = $group;

diff --git a/inc/Engine/Common/Queue/RUCSSQueueRunner.php b/inc/Engine/Common/Queue/RUCSSQueueRunner.php
@@ -5,6 +5,9 @@
 
 use WP_Rocket\Logger\Logger;
 use ActionScheduler_Abstract_QueueRunner;
+use ActionScheduler_Store;
+use ActionScheduler_FatalErrorMonitor;
+use ActionScheduler_AsyncRequest_QueueRunner;
 
 class RUCSSQueueRunner extends ActionScheduler_Abstract_QueueRunner {
 
@@ -55,12 +58,12 @@ public static function instance() {
 	/**
 	 * ActionScheduler_QueueRunner constructor.
 	 *
-	 * @param \ActionScheduler_Store|null                    $store Store Instance.
-	 * @param \ActionScheduler_FatalErrorMonitor|null        $monitor Fatal Error monitor instance.
+	 * @param ActionScheduler_Store|null                    $store Store Instance.
+	 * @param ActionScheduler_FatalErrorMonitor|null        $monitor Fatal Error monitor instance.
 	 * @param Cleaner|null                                   $cleaner Cleaner instance.
-	 * @param \ActionScheduler_AsyncRequest_QueueRunner|null $async_request Async Request Queue Runner instance.
+	 * @param ActionScheduler_AsyncRequest_QueueRunner|null $async_request Async Request Queue Runner instance.
 	 */
-	public function __construct( \ActionScheduler_Store $store = null, \ActionScheduler_FatalErrorMonitor $monitor = null, Cleaner $cleaner = null, \ActionScheduler_AsyncRequest_QueueRunner $async_request = null ) {
+	public function __construct( ?ActionScheduler_Store $store = null, ?ActionScheduler_FatalErrorMonitor $monitor = null, ?Cleaner $cleaner = null, ?ActionScheduler_AsyncRequest_QueueRunner $async_request = null ) {
 		if ( is_null( $cleaner ) ) {
 			/**
 			 * Filters the clean batch size.

diff --git a/inc/Engine/Media/Lazyload/CSS/Front/ContentFetcher.php b/inc/Engine/Media/Lazyload/CSS/Front/ContentFetcher.php
@@ -21,7 +21,7 @@ class ContentFetcher {
 	 *
 	 * @param WP_Filesystem_Direct $filesystem WordPress filesystem.
 	 */
-	public function __construct( WP_Filesystem_Direct $filesystem = null ) {
+	public function __construct( ?WP_Filesystem_Direct $filesystem = null ) {
 		$this->filesystem = $filesystem ?: rocket_direct_filesystem();
 	}
 

diff --git a/inc/Engine/Media/Lazyload/CSS/Subscriber.php b/inc/Engine/Media/Lazyload/CSS/Subscriber.php
@@ -118,7 +118,7 @@ class Subscriber implements Subscriber_Interface, LoggerAwareInterface {
 	 * @param LazyloadCSSContentFactory $lazyloaded_content_factory Make LazyloadedContent instance.
 	 * @param WP_Filesystem_Direct|null $filesystem WordPress filesystem.
 	 */
-	public function __construct( Extractor $extractor, RuleFormatter $rule_formatter, FileResolver $file_resolver, CacheInterface $cache, MappingFormatter $mapping_formatter, TagGenerator $tag_generator, ContentFetcher $fetcher, ContextInterface $context, Options_Data $options, LazyloadCSSContentFactory $lazyloaded_content_factory, WP_Filesystem_Direct $filesystem = null ) {
+	public function __construct( Extractor $extractor, RuleFormatter $rule_formatter, FileResolver $file_resolver, CacheInterface $cache, MappingFormatter $mapping_formatter, TagGenerator $tag_generator, ContentFetcher $fetcher, ContextInterface $context, Options_Data $options, LazyloadCSSContentFactory $lazyloaded_content_factory, ?WP_Filesystem_Direct $filesystem = null ) {
 		$this->extractor                  = $extractor;
 		$this->cache                      = $cache;
 		$this->rule_formatter             = $rule_formatter;

diff --git a/inc/ThirdParty/Plugins/I18n/WPML.php b/inc/ThirdParty/Plugins/I18n/WPML.php
@@ -24,7 +24,7 @@ class WPML implements Subscriber_Interface {
 	 *
 	 * @param WP_Filesystem_Direct $filesystem Filesystem instance.
 	 */
-	public function __construct( WP_Filesystem_Direct $filesystem = null ) {
+	public function __construct( ?WP_Filesystem_Direct $filesystem = null ) {
 		$this->filesystem = ! empty( $filesystem ) ? $filesystem : rocket_direct_filesystem();
 	}