🐛 Fix bug __invoke

Author: Simone-Tarantino

src/Command.php

@@ -53,6 +53,11 @@ abstract class Command
      */
     protected static int $count_after_invoke = 0;
 
+    /**
+     * All subclasses must have an invoke method that handles the command
+     */
+    abstract protected static function invoke( array $args, array $assoc_args );
+
     public function __invoke( array $args, array $assoc_args )
     {
         if ( ! is_multisite() ) {
@@ -73,10 +78,10 @@ public static function invoke_multisite( array $args, array $assoc_args )
         if ( $all_sites_flag && ! static::$allow_all_sites_flag ) {
             WP_CLI::error( 'The --all-sites flag is not allowed for this command.' );
         }
-        
+
         // If the --all-sites flag is set then run the handler on all sites.
         if ( $all_sites_flag ) {
-            Utils::run_on_all_sites( $args, $assoc_args );
+            Utils::run_on_all_sites( [ static::class, 'invoke' ], $args, $assoc_args );
         } else {
             // Run the handler on the current site.
             static::invoke( $args, $assoc_args );
@@ -244,6 +249,7 @@ public static function get_synopsis(): array
                 'type'        => 'flag',
                 'name'        => 'all-sites',
                 'description' => 'Run the command on all sites in the network',
+                'optional'    => true,
             ];
         }
 

src/Utils.php

@@ -28,17 +28,23 @@ public static function is_cli_running(): bool
      * @param mixed  $default    Default value for the flag. Default: NULL.
      * @return mixed
      */
-    public static function get_flag_value( $assoc_args, $flag, $default = null ) 
+    public static function get_flag_value( array $assoc_args, string $flag, mixed $default = null ) : mixed
     {
         return isset( $assoc_args[ $flag ] ) ? $assoc_args[ $flag ] : $default;
     }
 
     /**
      * Loop through all not deleted sites and run the command on each one.
+     * 
+     * The callback must take two array arguments: $args and $assoc_args.
+     *
+     * @param callable $callback
+     * @param array $args
+     * @param array $assoc_args
      */
-    public static function run_on_all_sites( array $args, array $assoc_args )
+    public static function run_on_all_sites( callable $callback, array $args, array $assoc_args ) : void
     {
-        // Get all active sites
+        // Get all active sites.
         $sites = get_sites( array(
             'deleted'  => 0,
         ) );
@@ -48,8 +54,8 @@ public static function run_on_all_sites( array $args, array $assoc_args )
             // Switch to the site.
             switch_to_blog( $site->blog_id );
 
-            // Run invoke.
-            self::__invoke( $args, $assoc_args );
+            // Run callback.
+            call_user_func( $callback, $args, $assoc_args );
 
             // Restore the site.
             restore_current_blog();