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/descriptor/json_descriptor.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/descriptor/json_descriptor.rs')
| -rw-r--r-- | crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs b/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs index 381ee69..6dd64f3 100644 --- a/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs +++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs @@ -56,7 +56,7 @@ impl JsonDescriptor { fn describe_command( &mut self, - command: &mut dyn Command, + command: &dyn Command, options: IndexMap<String, PhpMixed>, ) -> anyhow::Result<()> { let short = matches!(options.get("short"), Some(PhpMixed::Bool(true))); @@ -83,9 +83,9 @@ impl JsonDescriptor { .values() .map(|c| c.borrow().clone_box()) .collect(); - for mut command in command_list { + for command in command_list { commands.push(PhpMixed::Array( - self.get_command_data(command.as_mut(), short)? + self.get_command_data(command.as_ref(), short)? .into_iter() .collect(), )); @@ -292,7 +292,7 @@ impl JsonDescriptor { fn get_command_data( &self, - command: &mut dyn Command, + command: &dyn Command, short: bool, ) -> anyhow::Result<IndexMap<String, PhpMixed>> { let mut data: IndexMap<String, PhpMixed> = IndexMap::new(); @@ -333,7 +333,7 @@ impl JsonDescriptor { data.insert( "definition".to_string(), PhpMixed::Array( - self.get_input_definition_data(command.get_definition())? + self.get_input_definition_data(&command.get_definition())? .into_iter() .collect(), ), @@ -392,7 +392,7 @@ impl Descriptor for JsonDescriptor { fn describe_command( &mut self, - command: &mut dyn Command, + command: &dyn Command, options: IndexMap<String, PhpMixed>, ) -> anyhow::Result<()> { JsonDescriptor::describe_command(self, command, options) |