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/src/console | |
| 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/src/console')
| -rw-r--r-- | crates/shirabe/src/console/application.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index 1a661df..7f22a65 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -1263,7 +1263,7 @@ impl Application { // PHP: sprintf('<info>%s</info>', OutputFormatter::escape(sprintf($synopsis, $this->getName()))) // A command synopsis carries no printf conversion specifier, so the inner sprintf is an // identity over the synopsis and the application-name argument is never substituted. - let synopsis = running_command.borrow_mut().get_synopsis(false); + let synopsis = running_command.borrow().get_synopsis(false); output.borrow().writeln( &[format!( "<info>{}</info>", @@ -1868,12 +1868,12 @@ impl ApplicationHandle { command: std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>, ) -> anyhow::Result<Option<std::rc::Rc<std::cell::RefCell<dyn SymfonyCommand>>>> { let application = &self.0; - command.borrow_mut().set_application(Some( + command.borrow().set_application(Some( application.clone() as std::rc::Rc<std::cell::RefCell<dyn BaseApplication>> )); if !command.borrow().is_enabled() { - command.borrow_mut().set_application(None); + command.borrow().set_application(None); return Ok(None); } @@ -2903,7 +2903,7 @@ impl ApplicationHandle { } command - .borrow_mut() + .borrow() .run(input.clone(), output.clone()) .map(|c| c as i32) } |
