fix: Ajax and CLI handler fix

seebeen · seebeen · commit 604e92576834 · 2025-03-21T18:29:20.000+01:00
diff --git a/src/Decorators/Ajax_Action.php b/src/Decorators/Ajax_Action.php
@@ -42,9 +42,9 @@ class Ajax_Action extends Action {
     /**
      * Nonce query var.
      *
-     * @var bool|string
+     * @var bool|string|array<string,string>
      */
-    protected bool|string $nonce;
+    protected bool|string|array $nonce;
 
     /**
      * Capability required to perform the action.
@@ -90,7 +90,7 @@ class Ajax_Action extends Action {
      * @param null|string                                        $prefix      Prefix for the action name.
      * @param bool                                               $public      Whether the action is public or not.
      * @param 'GET'|'POST'|'REQ'                                 $method      Method to fetch the variable. GET, POST, or REQ.
-     * @param bool|string                                        $nonce       String defines the query var for nonce, true checks the default vars, false disables nonce check.
+     * @param bool|string|array<string,string>                   $nonce       Nonce query var, or false to disable nonce check, or query var => action keypair.
      * @param null|string|array<string,string|array<int,string>> $cap         Capability required to perform the action.
      * @param array<string,mixed>                                $vars        Variables to fetch.
      * @param array<int,mixed>                                   $params      Parameters to pass to the callback. Will be resolved by the container.
@@ -102,7 +102,7 @@ public function __construct(
         ?string $prefix = null,
         bool $public = true,
         string $method = self::AJAX_REQ,
-        bool|string $nonce = false,
+        bool|string|array $nonce = false,
         null|string|array $cap = null,
         array $vars = array(),
         array $params = array(),
@@ -262,9 +262,9 @@ private function fire_guard_cb( string $type ): void {
     }
 
     private function nonce_check(): bool {
-        $query_arg = \is_string( $this->nonce ) ? $this->nonce : false;
+        [ $arg, $action ] = $this->get_nonce_args();
 
-        return \check_ajax_referer( "{$this->prefix}_{$this->action}", $query_arg, false );
+        return \check_ajax_referer( $action, $arg, false );
     }
 
     private function cap_check(): bool {
@@ -280,4 +280,22 @@ private function cap_check(): bool {
 
         return true;
     }
+
+    /**
+     * Get the nonce arguments.
+     *
+     * @return array{0: string|false, 1: string}
+     */
+    private function get_nonce_args(): array {
+        $query_arg = match ( true ) {
+            \is_array( $this->nonce ) => \key( $this->nonce ),
+            \is_string( $this->nonce ) => $this->nonce,
+            default => false,
+        };
+        $action = \is_array( $this->nonce )
+            ? \current( $this->nonce )
+            : "{$this->prefix}_{$this->action}";
+
+        return array( $query_arg, $action );
+    }
 }
diff --git a/src/Decorators/CLI_Command.php b/src/Decorators/CLI_Command.php
@@ -71,6 +71,25 @@ public function __construct(
         );
     }
 
+    public function get_data(): array {
+        return \array_merge(
+            parent::get_data(),
+            array(
+                'args' => array(
+                    'after'       => $this->after,
+                    'args'        => $this->cmd_args,
+                    'before'      => $this->before,
+                    'command'     => $this->subcommand,
+                    'deferred'    => $this->deferred,
+                    'description' => $this->description,
+                    'params'      => $this->params,
+                    'summary'     => $this->summary,
+                    'when'        => $this->when,
+                ),
+            ),
+        );
+    }
+
     public function get_before_invoke(): ?Closure {
         return $this->get_invoke( $this->before );
     }
@@ -185,14 +204,14 @@ protected function get_arg_opts( array $raw ): mixed {
         $cb = \current( $raw );
 
         if ( \str_contains( $cb, '::' ) ) {
-            return $this->container->call( $cb, \array_slice( $raw, 1 ) );
+            return $this->get_container()->call( $cb, \array_slice( $raw, 1 ) );
         }
 
         $opts = array();
 
         foreach ( $raw as $opt ) {
-            $opt = $this->container->has( $opt )
-                ? $this->container->get( $opt )
+            $opt = $this->get_container()->has( $opt )
+                ? $this->get_container()->get( $opt )
                 : $opt;
 
             $opts = \array_merge( $opts, \xwp_str_to_arr( $opt ) );
@@ -217,7 +236,7 @@ protected function format_pos_args( array $args ): array {
                 : $args[ $i ] ?? null;
 
             if ( isset( $arg['format'] ) ) {
-                $val = $this->container->call( $arg['format'], array( $val ) );
+                $val = $this->get_container()->call( $arg['format'], array( $val ) );
             }
 
             $fmtd[ $arg['var'] ?? $arg['name'] ] = $val;
diff --git a/src/Decorators/CLI_Handler.php b/src/Decorators/CLI_Handler.php
@@ -61,6 +61,64 @@ class CLI_Handler extends Handler implements Can_Handle_CLI {
      */
     protected static int $current;
 
+    /**
+     * Ask for user input.
+     *
+     * @param  string        $question Question to ask.
+     * @param  array<string> $choices  Array of choices.
+     * @param  string|null   $def  Default choice.
+     * @return string
+     */
+    public static function choice( string $question, array $choices, ?string $def = null ): string {
+        $lines   = array( $question );
+        $choices = \array_values( $choices );
+        $length  = \strlen( (string) \count( $choices ) ) + 2;
+
+        foreach ( $choices as $i => $c ) {
+            $lines[] = \sprintf( '%s: %s', \str_pad( (string) ( $i + 1 ), $length, ' ', STR_PAD_LEFT ), $c );
+        }
+
+        $choice = \trim( self::prompt( \implode( \PHP_EOL, $lines ), false ) );
+
+        if ( ! \preg_match( '/^\d+$/', $choice ) || ! isset( $choices[ \intval( $choice ) - 1 ] ) ) {
+            WP_CLI::error( 'Invalid choice.' );
+        }
+
+        $choice = (int) $choice - 1;
+
+        return $choices[ $choice ] ?? $def ?? '';
+    }
+
+    /**
+     * Prompt for user input.
+     *
+     * @param  string $question  Question to ask.
+     * @param  bool   $multiline Whether to allow multiline input.
+     * @return string
+     */
+    public static function prompt( string $question, bool $multiline = false ): string {
+        if ( $multiline ) {
+            $question .= ' (Press Ctrl+D to finish)';
+        }
+
+        WP_CLI::line( $question );
+
+        $loop  = true;
+        $stdin = \fopen( 'php://stdin', 'r' );
+        $input = '';
+
+        do {
+            $input .= \fgets( $stdin );
+            $loop   = $multiline && ! \feof( $stdin );
+
+        } while ( $loop );
+
+        //phpcs:ignore
+        \fclose( $stdin );
+
+        return \rtrim( $input );
+    }
+
     /**
      * Track progress.
      *
@@ -114,20 +172,16 @@ public static function finish(): void {
      * @param string                                        $namespace   Command namespace.
      * @param string                                        $description Command description.
      * @param Closure|string|int|array{class-string,string} $priority    Hook priority.
-     * @param string|null                                   $container   Container ID.
+     * @param mixed                                         ...$args     Additional arguments.
      */
     public function __construct(
         protected string $namespace,
         protected string $description = '',
         Closure|string|int|array $priority = 10,
-        ?string $container = null,
+        mixed ...$args,
     ) {
-        parent::__construct(
-            tag: 'cli_init',
-            priority: $priority,
-            container: $container,
-            context: static::CTX_CLI,
-        );
+        $ctr = $args['container'] ?? null;
+        parent::__construct( tag: 'cli_init', priority: $priority, context: static::CTX_CLI, container: $ctr );
     }
 
     public function get_data(): array {
diff --git a/src/Decorators/Filter.php b/src/Decorators/Filter.php
@@ -8,7 +8,6 @@
 
 namespace XWP\DI\Decorators;
 
-use Automattic\Jetpack\Constants;
 use Closure;
 use ReflectionMethod;
 use Reflector;
@@ -291,13 +290,9 @@ protected function get_cb_args( array $args ): array {
     }
 
     protected function get_cb_arg( string $param ): mixed {
-        return match ( true ) {
-            '!self.hook' === $param                => $this,
-            '!self.handler' === $param             => $this->handler,
-            \str_starts_with( $param, '!value:' )  => \str_replace( '!value:', '', $param ),
-            \str_starts_with( $param, '!global:' ) => $GLOBALS[ \str_replace( '!global:', '', $param ) ] ?? null,
-            \str_starts_with( $param, '!const:' )  => Constants::get_constant( \str_replace( '!const:', '', $param ) ),
-            default                                => $this->container->get( $param ),
+        return match ( $param ) {
+            '!self.handler' => $this->get_handler(),
+            default        => parent::get_cb_arg( $param ),
         };
     }
 
diff --git a/src/Decorators/Hook.php b/src/Decorators/Hook.php
@@ -1,4 +1,4 @@
-<?php //phpcs:disable Squiz.Commenting.FunctionComment.Missing
+<?php //phpcs:disable Squiz.Commenting.FunctionComment.Missing, SlevomatCodingStandard.Functions.RequireMultiLineCall.RequiredMultiLineCall
 /**
  * Hook class file.
  *
@@ -8,6 +8,7 @@
 
 namespace XWP\DI\Decorators;
 
+use Automattic\Jetpack\Constants;
 use Closure;
 use ReflectionClass;
 use ReflectionMethod;
@@ -175,7 +176,9 @@ public function get_tag(): string {
     }
 
     public function get_modifiers(): array|string|bool {
-        return $this->modifiers;
+        return $this->modifiers
+            ? \array_map( array( $this, 'get_cb_arg' ), (array) $this->modifiers )
+            : $this->modifiers;
     }
 
     public function get_priority(): int {
@@ -274,4 +277,15 @@ protected function get_token_suffix(): string {
     protected function get_app_uuid(): string {
         return $this->get_container()->get( 'app.uuid' );
     }
+
+    protected function get_cb_arg( string $param ): mixed {
+        return match ( true ) {
+            '!self.hook' === $param                => $this,
+            \str_starts_with( $param, '!value:' )  => \str_replace( '!value:', '', $param ),
+            \str_starts_with( $param, '!global:' ) => $GLOBALS[ \str_replace( '!global:', '', $param ) ] ?? null,
+            \str_starts_with( $param, '!const:' )  => Constants::get_constant( \str_replace( '!const:', '', $param ) ),
+            $this->container->has( $param )        => $this->container->get( $param ),
+            default                                => $param,
+        };
+    }
 }
diff --git a/src/Traits/Hook_Invoke_Methods.php b/src/Traits/Hook_Invoke_Methods.php
@@ -64,9 +64,7 @@ protected function resolve_tag( ?string $tag, array|string|bool $modifiers ): st
             return $tag;
         }
 
-        $modifiers = \is_array( $modifiers )
-            ? $modifiers
-            : array( $modifiers );
+        $modifiers = (array) $modifiers;
 
         return \vsprintf( $tag, $modifiers );
     }

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,7 @@ protected function resolve_tag( ?string $tag, array\|string\|bool $modifiers ): st`
`64`	`64`	`return $tag;`
`65`	`65`	`}`
`66`	`66`
`67`		`- $modifiers = \is_array( $modifiers )`
`68`		`- ? $modifiers`
`69`		`- : array( $modifiers );`
	`67`	`+ $modifiers = (array) $modifiers;`
`70`	`68`
`71`	`69`	`return \vsprintf( $tag, $modifiers );`
`72`	`70`	`}`