feat(Functions): Added wpfs function

Author: seebeen

Hook_Remover.php

@@ -3,7 +3,7 @@
 namespace XWP\Helper\Functions;
 
 class Hook_Remover {
-    private static function get_classname( string|object|false|null $target = '' ): string|false {
+    private static function get_classname( string|object|bool|null $target = '' ): string|bool {
         $classname = match ( true ) {
             \is_null( $target ),
             false === $target     => '',
@@ -15,7 +15,7 @@ private static function get_classname( string|object|false|null $target = '' ):
         return \class_exists( $classname ) ? $classname : false;
     }
 
-    private static function callback_matches( callable|array $callback, string $classname, string|false $method = false ): bool {
+    private static function callback_matches( callable|array $callback, string $classname, string|bool $method = false ): bool {
         if ( ! \is_array( $callback['function'] ) ) {
             return false;
         }
@@ -27,7 +27,7 @@ private static function callback_matches( callable|array $callback, string $clas
         return ! $method || ! ( $method !== $callback['function'][1] ?? false );
     }
 
-    private static function get_callbacks( string $hook_name, int|false $priority = false ): array {
+    private static function get_callbacks( string $hook_name, int|bool $priority = false ): array {
         return $priority
             ? $GLOBALS['wp_filter'][ $hook_name ][ $priority ] ?? array()
             : $GLOBALS['wp_filter'][ $hook_name ]->callbacks ?? array();
@@ -57,9 +57,9 @@ final public static function get_callback_id( string $classname, string $method,
 
     final public static function remove_callbacks(
         string $classname,
-        string|false $target_hook = false,
-        string|false $method = false,
-        int|false $priority = false,
+        string|bool $target_hook = false,
+        string|bool $method = false,
+        int|bool $priority = false,
 	): array {
         $removed = array();
 

WPFS.php

@@ -3,13 +3,44 @@
 namespace XWP\Helper\Functions;
 
 class WPFS {
-	final public static function load( array|false $args = false, string|false $ctx = false, bool $ownr = false ): \WP_Filesystem_Base|false|null {
-        require_once ABSPATH . 'wp-admin/includes/file.php';
+    /**
+     * Whether the class has been hooked.
+     *
+     * @var bool|null
+     */
+    private static ?bool $hooked = null;
+
+	final public static function load(
+        array|bool $args = false,
+        string|bool $ctx = false,
+        bool $ownr = false,
+    ): \WP_Filesystem_Base|bool|null {
+        self::$hooked ??= self::hook();
+
+        if ( isset( $GLOBALS['wp_filesystem'] ) ) {
+            return $GLOBALS['wp_filesystem'];
+        }
 
 		return match ( \WP_Filesystem( $args, $ctx, $ownr ) ) {
             true    => $GLOBALS['wp_filesystem'],
             false   => false,
             default => null
         };
 	}
+
+    private static function hook(): void {
+        require_once ABSPATH . 'wp-admin/includes/file.php';
+        \add_filter( 'filesystem_method', array( self::class, 'fs_method' ), 99, 2 );
+    }
+
+    public static function fs_method( string $method, array|bool $args ) {
+        if ( ! \is_array( $args ) || ! isset( $args['method'] ) ) {
+            return $method;
+        }
+
+        $base  = \ucfirst( \str_replace( 'WP_Filesystem_', '', $args['method'] ) );
+        $cname = 'WP_Filesystem_' . $base;
+
+        return \class_exists( $cname ) ? $base : $method;
+    }
 }

xwp-helper-fns.php

@@ -8,22 +8,47 @@
 
 use XWP\Helper\Functions as f;
 
+if ( ! function_exists( 'xwp_wpfs' ) ) :
+    /**
+	 * Loads the WordPress filesystem
+	 *
+     * @template TFS of \WP_Filesystem_Base
+     *
+     * @param  class-string<TFS> $method  Optional. Filesystem method classname. Default null.
+	 * @param  array|false       $args    Optional. Connection args, These are passed directly to the WP_Filesystem_*() classes. Default false.
+     * @param  string|false      $context Optional. Context for get_filesystem_method(). Default false.
+	 * @return TFS|false|null
+	 */
+	function xwp_wpfs(
+        string $method = null,
+        array|bool $args = false,
+        string|bool $context = false,
+	): WP_Filesystem_Base|bool|null {
+        //phpcs:ignore Universal.Operators.DisallowShortTernary.Found
+        $args = array_filter( $args ?: array( 'method' => $method ) );
+
+		return f\WPFS::load( $args, $context );
+	}
+endif;
+
 if ( ! function_exists( 'wp_load_filesystem' ) ) :
 	/**
 	 * Loads the WordPress filesystem
 	 *
-	 * @param  array|false  $args                         Optional. Connection args, These are passed directly to the WP_Filesystem_*() classes. Default false.
-	 * @param  string|false $context                      Optional. Context for get_filesystem_method(). Default false.
-	 * @param  bool         $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
+     * @template TFS of \WP_Filesystem_Base
+     *
+	 * @param  array{method?: class-string<TFS>}|array<string,mixed>|false $args    Optional. Connection args, These are passed directly to the WP_Filesystem_*() classes. Default false.
+	 * @param  string|false                                                $context Optional. Context for get_filesystem_method(). Default false.
      *
 	 * @return \WP_Filesystem_Base|false|null
+     *
+     * @deprecated 1.10.0 Use xwp_wpfs instead.
 	 */
 	function wp_load_filesystem(
-        array|false $args = false,
-        string|false $context = false,
-        bool $allow_relaxed_file_ownership = false,
-	): \WP_Filesystem_Base|false|null {
-		return f\WPFS::load( $args, $context, $allow_relaxed_file_ownership );
+        array|bool $args = false,
+        string|bool $context = false,
+	): WP_Filesystem_Base|bool|null {
+		return xwp_wpfs( null, $args, $context );
 	}
 endif;
 
@@ -147,9 +172,9 @@ function xwp_deregister_blocks(): array {
      */
     function xwp_remove_hook_callbacks(
         string $classname,
-        string|false $target_hook = false,
-        string|false $method = false,
-        int|false $priority = false,
+        string|bool $target_hook = false,
+        string|bool $method = false,
+        int|bool $priority = false,
 	): array {
         return f\Hook_Remover::remove_callbacks( $classname, $target_hook, $method, $priority );
     }