diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-06-24 03:56:26 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-06-24 03:57:46 +0900 |
| commit | f1af14b1cc503ac20f56a79a96c7780d02bdfe75 (patch) | |
| tree | 3f8661e1dc4d2092ac16b45c574c90ec2d8bec2a /crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs | |
| parent | c5fc34a106a706ac12925c4df273a926811d260b (diff) | |
| download | php-shirabe-f1af14b1cc503ac20f56a79a96c7780d02bdfe75.tar.gz php-shirabe-f1af14b1cc503ac20f56a79a96c7780d02bdfe75.tar.zst php-shirabe-f1af14b1cc503ac20f56a79a96c7780d02bdfe75.zip | |
fix(console): make Command/BaseCommand methods take &self
The Command trait and Composer's BaseCommand took &mut self, so dispatch
held a borrow_mut on the command's RefCell for the whole call. A command
re-entering itself (e.g. the help command describing itself) then panicked
with "RefCell already borrowed".
All Command/BaseCommand methods now take &self and the command state is
interior-mutable (Cell/RefCell). Shared borrows coexist, so re-entrant
describe paths no longer conflict. Getters that returned references now
return Ref guards; the descriptor describe_* methods take &dyn Command;
mixin accessors return Ref/RefMut.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs')
| -rw-r--r-- | crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs b/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs index 1bae4ad..cc700dc 100644 --- a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs +++ b/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs @@ -22,7 +22,7 @@ use crate::symfony::console::output::output_interface::OutputInterface; pub struct CompleteCommand { inner: CommandData, completion_outputs: IndexMap<String, PhpMixed>, - is_debug: bool, + is_debug: std::cell::Cell<bool>, } impl Deref for CompleteCommand { @@ -59,10 +59,10 @@ impl CompleteCommand { ) }); - let mut this = Self { + let this = Self { inner: CommandData::new(None), completion_outputs, - is_debug: false, + is_debug: std::cell::Cell::new(false), }; // PHP: static $defaultName = '|_complete' / $defaultDescription, applied by the parent // constructor before configure(). @@ -121,7 +121,7 @@ impl CompleteCommand { } fn log_many(&self, messages: Vec<String>) { - if !self.is_debug { + if !self.is_debug.get() { return; } @@ -159,7 +159,7 @@ fn instantiate_completion_output(_class: &PhpMixed) -> Box<dyn CompletionOutputI } impl Command for CompleteCommand { - fn configure(&mut self) -> anyhow::Result<()> { + fn configure(&self) -> anyhow::Result<()> { let shells = self .completion_outputs .keys() @@ -200,20 +200,20 @@ impl Command for CompleteCommand { } fn initialize( - &mut self, + &self, input: Rc<RefCell<dyn InputInterface>>, output: Rc<RefCell<dyn OutputInterface>>, ) -> anyhow::Result<()> { let _ = (input, output); - self.is_debug = shirabe_php_shim::filter_var_boolean( + self.is_debug.set(shirabe_php_shim::filter_var_boolean( &shirabe_php_shim::getenv("SYMFONY_COMPLETION_DEBUG").unwrap_or_default(), - ); + )); Ok(()) } fn execute( - &mut self, + &self, input: Rc<RefCell<dyn InputInterface>>, output: Rc<RefCell<dyn OutputInterface>>, ) -> anyhow::Result<i64> { @@ -307,8 +307,8 @@ impl Command for CompleteCommand { ); } Some(command) => { - command.borrow_mut().merge_application_definition(false); - completion_input.bind(command.borrow().get_definition())?; + command.borrow().merge_application_definition(false); + completion_input.bind(&*command.borrow().get_definition())?; if CompletionInput::TYPE_OPTION_NAME == completion_input.get_completion_type() { self.log(&format!( |
