aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/console/input
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-02 11:08:57 +0900
committernsfisis <nsfisis@gmail.com>2026-08-02 11:08:57 +0900
commit145b4c0a7fadf6dfd8c03b22c735695037930b0a (patch)
treecac7c4e265b2f6aeaefdf0431e2c22e54b26b8ef /crates/shirabe/src/console/input
parent2592062434eeb5fe814dbca953d5fd23458bc135 (diff)
downloadphp-shirabe-145b4c0a7fadf6dfd8c03b22c735695037930b0a.tar.gz
php-shirabe-145b4c0a7fadf6dfd8c03b22c735695037930b0a.tar.zst
php-shirabe-145b4c0a7fadf6dfd8c03b22c735695037930b0a.zip
feat(console-input): port the suggested-values backport onto InputArgument/InputOption
Composer backports symfony/console 6.1's $suggestedValues parameter in Composer\Console\Input\{InputArgument,InputOption}; the Rust newtypes had dropped it. PHP closures are bound to the command ($this), but a command cannot capture a handle to itself while configure() runs inside new(), so the closure receives the bound command as an explicit `this` argument at call time instead. - add SuggestedValues (list | this-taking closure) and wire it through InputArgument::new5 / InputOption::new6 and their complete() methods - track Composer-typed definition entries by name in BaseCommandData side maps, standing in for PHP's instanceof checks (set_definition converts entries to the Symfony types for storage) - add base_command_complete, the BaseCommand::complete dispatch shared by every Composer command - introduce BaseCommand::base_command_data and make command_data a default method on top of it Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/console/input')
-rw-r--r--crates/shirabe/src/console/input/input_argument.rs44
-rw-r--r--crates/shirabe/src/console/input/input_option.rs52
2 files changed, 92 insertions, 4 deletions
diff --git a/crates/shirabe/src/console/input/input_argument.rs b/crates/shirabe/src/console/input/input_argument.rs
index 5fd9cecc..ab32ffba 100644
--- a/crates/shirabe/src/console/input/input_argument.rs
+++ b/crates/shirabe/src/console/input/input_argument.rs
@@ -1,11 +1,15 @@
//! ref: composer/src/Composer/Console/Input/InputArgument.php
+use crate::console::input::SuggestedValues;
+use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput;
+use shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions;
use shirabe_external_packages::symfony::console::input::InputArgument as BaseInputArgument;
use shirabe_php_shim::PhpMixed;
#[derive(Debug)]
pub struct InputArgument {
inner: BaseInputArgument,
+ suggested_values: SuggestedValues,
}
impl InputArgument {
@@ -18,7 +22,23 @@ impl InputArgument {
mode: Option<i64>,
description: &str,
default: Option<PhpMixed>,
- // TODO(cli-completion): suggested_values closure / list dropped along with completion support
+ ) -> anyhow::Result<Self> {
+ Self::new5(
+ name,
+ mode,
+ description,
+ default,
+ SuggestedValues::List(Vec::new()),
+ )
+ }
+
+ /// PHP's constructor with the fifth parameter, `$suggestedValues`.
+ pub fn new5(
+ name: &str,
+ mode: Option<i64>,
+ description: &str,
+ default: Option<PhpMixed>,
+ suggested_values: SuggestedValues,
) -> anyhow::Result<Self> {
let inner = BaseInputArgument::new(
name.to_string(),
@@ -26,7 +46,27 @@ impl InputArgument {
description.to_string(),
default.unwrap_or(PhpMixed::Null),
)?;
- Ok(Self { inner })
+ Ok(Self {
+ inner,
+ suggested_values,
+ })
+ }
+
+ /// Adds suggestions to `suggestions` for the current completion input.
+ ///
+ /// PHP closures are bound to the command; `this` is the command dispatching the
+ /// completion (see [`SuggestedValues`]).
+ pub fn complete(
+ &self,
+ this: &dyn crate::command::BaseCommand,
+ input: &CompletionInput,
+ suggestions: &mut CompletionSuggestions,
+ ) -> anyhow::Result<()> {
+ self.suggested_values.complete(this, input, suggestions)
+ }
+
+ pub(crate) fn get_name(&self) -> String {
+ self.inner.get_name().to_string()
}
/// Unwraps to the underlying Symfony `InputArgument` (used when forwarding a Composer-typed
diff --git a/crates/shirabe/src/console/input/input_option.rs b/crates/shirabe/src/console/input/input_option.rs
index 938f5a39..7fa3d699 100644
--- a/crates/shirabe/src/console/input/input_option.rs
+++ b/crates/shirabe/src/console/input/input_option.rs
@@ -1,11 +1,15 @@
//! ref: composer/src/Composer/Console/Input/InputOption.php
+use crate::console::input::SuggestedValues;
+use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput;
+use shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions;
use shirabe_external_packages::symfony::console::input::InputOption as BaseInputOption;
use shirabe_php_shim::PhpMixed;
#[derive(Debug)]
pub struct InputOption {
inner: BaseInputOption,
+ suggested_values: SuggestedValues,
}
impl InputOption {
@@ -21,13 +25,57 @@ impl InputOption {
mode: Option<i64>,
description: &str,
default: Option<PhpMixed>,
- // TODO(cli-completion): suggested_values closure / list dropped along with completion support
+ ) -> anyhow::Result<Self> {
+ Self::new6(
+ name,
+ shortcut,
+ mode,
+ description,
+ default,
+ SuggestedValues::List(Vec::new()),
+ )
+ }
+
+ /// PHP's constructor with the sixth parameter, `$suggestedValues`.
+ pub fn new6(
+ name: &str,
+ shortcut: Option<PhpMixed>,
+ mode: Option<i64>,
+ description: &str,
+ default: Option<PhpMixed>,
+ suggested_values: SuggestedValues,
) -> anyhow::Result<Self> {
let shortcut = shortcut.unwrap_or(PhpMixed::Null);
let default_mixed = default.unwrap_or(PhpMixed::Null);
let inner =
BaseInputOption::new(name, shortcut, mode, description.to_string(), default_mixed)?;
- Ok(Self { inner })
+ // PHP throws LogicException here; suggested values on a valueless option cannot happen
+ // at runtime unless a configure() is wrong, so this is a programming error.
+ assert!(
+ suggested_values.is_empty() || inner.accept_value(),
+ "Cannot set suggested values if the option does not accept a value."
+ );
+ Ok(Self {
+ inner,
+ suggested_values,
+ })
+ }
+
+ /// Adds suggestions to `suggestions` for the current completion input.
+ ///
+ /// PHP closures are bound to the command; `this` is the command dispatching the
+ /// completion (see [`SuggestedValues`]).
+ pub fn complete(
+ &self,
+ this: &dyn crate::command::BaseCommand,
+ input: &CompletionInput,
+ suggestions: &mut CompletionSuggestions,
+ ) -> anyhow::Result<()> {
+ self.suggested_values.complete(this, input, suggestions)
+ }
+
+ pub(crate) fn get_name(&self) -> String {
+ self.inner.get_name().to_string()
}
/// Unwraps to the underlying Symfony `InputOption` (used when forwarding a Composer-typed