fix: Changed static function invocation

Author: seebeen

src/Core/Asset_Loader.php

@@ -10,11 +10,6 @@
 
 /**
  * Asset loader.
- *
- * @method static self    add_bundle( XWP_Asset_Bundle $bundle )        Add a bundle.
- * @method static self    load_bundle( XWP_Asset_Bundle|array $bundle ) Load a bundle.
- * @method static XWP_Asset_Bundle  make_bundle( array $args )          Create a bundle.
- * @method static ?XWP_Asset_Bundle get_bundle(string $id)              Get a bundle by ID.
  */
 final class XWP_Asset_Loader {
     use Singleton;
@@ -27,20 +22,47 @@ final class XWP_Asset_Loader {
     private array $bundles = array();
 
     /**
-     * Call a static method on the instance.
+     * Load a bundle.
      *
-     * @param  string       $name The name of the method to call.
-     * @param  array<mixed> $args The arguments to pass to the method.
-     * @return mixed
+     * @param  XWP_Asset_Bundle $bundle The bundle to load.
+     * @return self
+     */
+    public static function add_bundle( XWP_Asset_Bundle $bundle ): self {
+        return self::instance()->add( $bundle );
+    }
+
+    /**
+     * Load a bundle, or create a bundle from arguments and load it.
      *
-     * @throws \BadMethodCallException If the method does not exist.
+     * @param  array<string,mixed>|XWP_Asset_Bundle $bundle Bundle instance or bundle arguments.
+     * @return self
      */
-    public static function __callStatic( string $name, array $args = array() ): mixed {
-        if ( ! method_exists( self::class, "call_$name" ) ) {
-            throw new \BadMethodCallException( esc_html( "Method $name does not exist" ) );
+    public static function load_bundle( array|XWP_Asset_Bundle $bundle ): self {
+        if ( ! ( $bundle instanceof XWP_Asset_Bundle ) ) {
+            $bundle = self::make_bundle( $bundle );
         }
 
-        return self::instance()->{"call_$name"}( ...$args );
+        return self::add_bundle( $bundle );
+    }
+
+    /**
+     * Make a bundle from arguments.
+     *
+     * @param  array<string,mixed> $args Bundle arguments.
+     * @return XWP_Asset_Bundle
+     */
+    public static function make_bundle( array $args ): XWP_Asset_Bundle {
+        return new XWP_Asset_Bundle( ...$args );
+    }
+
+    /**
+     * Get a bundle by ID.
+     *
+     * @param  string $id Bundle ID.
+     * @return XWP_Asset_Bundle|null
+     */
+    public static function get_bundle( string $id ): ?XWP_Asset_Bundle {
+        return self::instance()->get( $id );
     }
 
     /**
@@ -107,43 +129,19 @@ static function () use ( $bundle, $context ) {
      * @param  XWP_Asset_Bundle $bundle The bundle to load.
      * @return self
      */
-    private function call_add_bundle( XWP_Asset_Bundle $bundle ): self {
+    private function add( XWP_Asset_Bundle $bundle ): self {
         $this->bundles[ $bundle->id() ] = $bundle;
 
         return $this;
     }
 
-    /**
-     * Load a bundle, or create a bundle from arguments and load it.
-     *
-     * @param  array<string,mixed>|XWP_Asset_Bundle $bundle Bundle instance or bundle arguments.
-     * @return self
-     */
-    private function call_load_bundle( array|XWP_Asset_Bundle $bundle ): self {
-        if ( ! ( $bundle instanceof XWP_Asset_Bundle ) ) {
-            $bundle = self::make_bundle( $bundle );
-        }
-
-        return self::add_bundle( $bundle );
-    }
-
-    /**
-     * Make a bundle from arguments.
-     *
-     * @param  array<string,mixed> $args Bundle arguments.
-     * @return XWP_Asset_Bundle
-     */
-    private function call_make_bundle( array $args ): XWP_Asset_Bundle {
-        return new XWP_Asset_Bundle( ...$args );
-    }
-
     /**
      * Get a bundle by ID.
      *
      * @param  string $id Bundle ID.
      * @return XWP_Asset_Bundle|null
      */
-    private function call_get_bundle( string $id ): ?XWP_Asset_Bundle {
+    private function get( string $id ): ?XWP_Asset_Bundle {
         return $this->bundles[ $id ] ?? null;
     }
 }