Skip to content

Commit 604e925

Browse files
seebeenseebeen
committed
fix: Ajax and CLI handler fix
1 parent fa0f9eb commit 604e925

File tree

6 files changed

+129
-31
lines changed

6 files changed

+129
-31
lines changed

‎src/Decorators/Ajax_Action.php

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ class Ajax_Action extends Action {
4242
/**
4343
* Nonce query var.
4444
*
45-
* @var bool|string
45+
* @var bool|string|array<string,string>
4646
*/
47-
protected bool|string $nonce;
47+
protected bool|string|array $nonce;
4848

4949
/**
5050
* Capability required to perform the action.
@@ -90,7 +90,7 @@ class Ajax_Action extends Action {
9090
* @param null|string $prefix Prefix for the action name.
9191
* @param bool $public Whether the action is public or not.
9292
* @param 'GET'|'POST'|'REQ' $method Method to fetch the variable. GET, POST, or REQ.
93-
* @param bool|string $nonce String defines the query var for nonce, true checks the default vars, false disables nonce check.
93+
* @param bool|string|array<string,string> $nonce Nonce query var, or false to disable nonce check, or query var => action keypair.
9494
* @param null|string|array<string,string|array<int,string>> $cap Capability required to perform the action.
9595
* @param array<string,mixed> $vars Variables to fetch.
9696
* @param array<int,mixed> $params Parameters to pass to the callback. Will be resolved by the container.
@@ -102,7 +102,7 @@ public function __construct(
102102
?string $prefix = null,
103103
bool $public = true,
104104
string $method = self::AJAX_REQ,
105-
bool|string $nonce = false,
105+
bool|string|array $nonce = false,
106106
null|string|array $cap = null,
107107
array $vars = array(),
108108
array $params = array(),
@@ -262,9 +262,9 @@ private function fire_guard_cb( string $type ): void {
262262
}
263263

264264
private function nonce_check(): bool {
265-
$query_arg = \is_string( $this->nonce ) ? $this->nonce : false;
265+
[ $arg, $action ] = $this->get_nonce_args();
266266

267-
return \check_ajax_referer( "{$this->prefix}_{$this->action}", $query_arg, false );
267+
return \check_ajax_referer( $action, $arg, false );
268268
}
269269

270270
private function cap_check(): bool {
@@ -280,4 +280,22 @@ private function cap_check(): bool {
280280

281281
return true;
282282
}
283+
284+
/**
285+
* Get the nonce arguments.
286+
*
287+
* @return array{0: string|false, 1: string}
288+
*/
289+
private function get_nonce_args(): array {
290+
$query_arg = match ( true ) {
291+
\is_array( $this->nonce ) => \key( $this->nonce ),
292+
\is_string( $this->nonce ) => $this->nonce,
293+
default => false,
294+
};
295+
$action = \is_array( $this->nonce )
296+
? \current( $this->nonce )
297+
: "{$this->prefix}_{$this->action}";
298+
299+
return array( $query_arg, $action );
300+
}
283301
}

‎src/Decorators/CLI_Command.php

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,25 @@ public function __construct(
7171
);
7272
}
7373

74+
public function get_data(): array {
75+
return \array_merge(
76+
parent::get_data(),
77+
array(
78+
'args' => array(
79+
'after' => $this->after,
80+
'args' => $this->cmd_args,
81+
'before' => $this->before,
82+
'command' => $this->subcommand,
83+
'deferred' => $this->deferred,
84+
'description' => $this->description,
85+
'params' => $this->params,
86+
'summary' => $this->summary,
87+
'when' => $this->when,
88+
),
89+
),
90+
);
91+
}
92+
7493
public function get_before_invoke(): ?Closure {
7594
return $this->get_invoke( $this->before );
7695
}
@@ -185,14 +204,14 @@ protected function get_arg_opts( array $raw ): mixed {
185204
$cb = \current( $raw );
186205

187206
if ( \str_contains( $cb, '::' ) ) {
188-
return $this->container->call( $cb, \array_slice( $raw, 1 ) );
207+
return $this->get_container()->call( $cb, \array_slice( $raw, 1 ) );
189208
}
190209

191210
$opts = array();
192211

193212
foreach ( $raw as $opt ) {
194-
$opt = $this->container->has( $opt )
195-
? $this->container->get( $opt )
213+
$opt = $this->get_container()->has( $opt )
214+
? $this->get_container()->get( $opt )
196215
: $opt;
197216

198217
$opts = \array_merge( $opts, \xwp_str_to_arr( $opt ) );
@@ -217,7 +236,7 @@ protected function format_pos_args( array $args ): array {
217236
: $args[ $i ] ?? null;
218237

219238
if ( isset( $arg['format'] ) ) {
220-
$val = $this->container->call( $arg['format'], array( $val ) );
239+
$val = $this->get_container()->call( $arg['format'], array( $val ) );
221240
}
222241

223242
$fmtd[ $arg['var'] ?? $arg['name'] ] = $val;

‎src/Decorators/CLI_Handler.php

Lines changed: 62 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,64 @@ class CLI_Handler extends Handler implements Can_Handle_CLI {
6161
*/
6262
protected static int $current;
6363

64+
/**
65+
* Ask for user input.
66+
*
67+
* @param string $question Question to ask.
68+
* @param array<string> $choices Array of choices.
69+
* @param string|null $def Default choice.
70+
* @return string
71+
*/
72+
public static function choice( string $question, array $choices, ?string $def = null ): string {
73+
$lines = array( $question );
74+
$choices = \array_values( $choices );
75+
$length = \strlen( (string) \count( $choices ) ) + 2;
76+
77+
foreach ( $choices as $i => $c ) {
78+
$lines[] = \sprintf( '%s: %s', \str_pad( (string) ( $i + 1 ), $length, ' ', STR_PAD_LEFT ), $c );
79+
}
80+
81+
$choice = \trim( self::prompt( \implode( \PHP_EOL, $lines ), false ) );
82+
83+
if ( ! \preg_match( '/^\d+$/', $choice ) || ! isset( $choices[ \intval( $choice ) - 1 ] ) ) {
84+
WP_CLI::error( 'Invalid choice.' );
85+
}
86+
87+
$choice = (int) $choice - 1;
88+
89+
return $choices[ $choice ] ?? $def ?? '';
90+
}
91+
92+
/**
93+
* Prompt for user input.
94+
*
95+
* @param string $question Question to ask.
96+
* @param bool $multiline Whether to allow multiline input.
97+
* @return string
98+
*/
99+
public static function prompt( string $question, bool $multiline = false ): string {
100+
if ( $multiline ) {
101+
$question .= ' (Press Ctrl+D to finish)';
102+
}
103+
104+
WP_CLI::line( $question );
105+
106+
$loop = true;
107+
$stdin = \fopen( 'php://stdin', 'r' );
108+
$input = '';
109+
110+
do {
111+
$input .= \fgets( $stdin );
112+
$loop = $multiline && ! \feof( $stdin );
113+
114+
} while ( $loop );
115+
116+
//phpcs:ignore
117+
\fclose( $stdin );
118+
119+
return \rtrim( $input );
120+
}
121+
64122
/**
65123
* Track progress.
66124
*
@@ -114,20 +172,16 @@ public static function finish(): void {
114172
* @param string $namespace Command namespace.
115173
* @param string $description Command description.
116174
* @param Closure|string|int|array{class-string,string} $priority Hook priority.
117-
* @param string|null $container Container ID.
175+
* @param mixed ...$args Additional arguments.
118176
*/
119177
public function __construct(
120178
protected string $namespace,
121179
protected string $description = '',
122180
Closure|string|int|array $priority = 10,
123-
?string $container = null,
181+
mixed ...$args,
124182
) {
125-
parent::__construct(
126-
tag: 'cli_init',
127-
priority: $priority,
128-
container: $container,
129-
context: static::CTX_CLI,
130-
);
183+
$ctr = $args['container'] ?? null;
184+
parent::__construct( tag: 'cli_init', priority: $priority, context: static::CTX_CLI, container: $ctr );
131185
}
132186

133187
public function get_data(): array {

‎src/Decorators/Filter.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
namespace XWP\DI\Decorators;
1010

11-
use Automattic\Jetpack\Constants;
1211
use Closure;
1312
use ReflectionMethod;
1413
use Reflector;
@@ -291,13 +290,9 @@ protected function get_cb_args( array $args ): array {
291290
}
292291

293292
protected function get_cb_arg( string $param ): mixed {
294-
return match ( true ) {
295-
'!self.hook' === $param => $this,
296-
'!self.handler' === $param => $this->handler,
297-
\str_starts_with( $param, '!value:' ) => \str_replace( '!value:', '', $param ),
298-
\str_starts_with( $param, '!global:' ) => $GLOBALS[ \str_replace( '!global:', '', $param ) ] ?? null,
299-
\str_starts_with( $param, '!const:' ) => Constants::get_constant( \str_replace( '!const:', '', $param ) ),
300-
default => $this->container->get( $param ),
293+
return match ( $param ) {
294+
'!self.handler' => $this->get_handler(),
295+
default => parent::get_cb_arg( $param ),
301296
};
302297
}
303298

‎src/Decorators/Hook.php

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php //phpcs:disable Squiz.Commenting.FunctionComment.Missing
1+
<?php //phpcs:disable Squiz.Commenting.FunctionComment.Missing, SlevomatCodingStandard.Functions.RequireMultiLineCall.RequiredMultiLineCall
22
/**
33
* Hook class file.
44
*
@@ -8,6 +8,7 @@
88

99
namespace XWP\DI\Decorators;
1010

11+
use Automattic\Jetpack\Constants;
1112
use Closure;
1213
use ReflectionClass;
1314
use ReflectionMethod;
@@ -175,7 +176,9 @@ public function get_tag(): string {
175176
}
176177

177178
public function get_modifiers(): array|string|bool {
178-
return $this->modifiers;
179+
return $this->modifiers
180+
? \array_map( array( $this, 'get_cb_arg' ), (array) $this->modifiers )
181+
: $this->modifiers;
179182
}
180183

181184
public function get_priority(): int {
@@ -274,4 +277,15 @@ protected function get_token_suffix(): string {
274277
protected function get_app_uuid(): string {
275278
return $this->get_container()->get( 'app.uuid' );
276279
}
280+
281+
protected function get_cb_arg( string $param ): mixed {
282+
return match ( true ) {
283+
'!self.hook' === $param => $this,
284+
\str_starts_with( $param, '!value:' ) => \str_replace( '!value:', '', $param ),
285+
\str_starts_with( $param, '!global:' ) => $GLOBALS[ \str_replace( '!global:', '', $param ) ] ?? null,
286+
\str_starts_with( $param, '!const:' ) => Constants::get_constant( \str_replace( '!const:', '', $param ) ),
287+
$this->container->has( $param ) => $this->container->get( $param ),
288+
default => $param,
289+
};
290+
}
277291
}

‎src/Traits/Hook_Invoke_Methods.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ protected function resolve_tag( ?string $tag, array|string|bool $modifiers ): st
6464
return $tag;
6565
}
6666

67-
$modifiers = \is_array( $modifiers )
68-
? $modifiers
69-
: array( $modifiers );
67+
$modifiers = (array) $modifiers;
7068

7169
return \vsprintf( $tag, $modifiers );
7270
}

0 commit comments

Comments
 (0)