From f1af14b1cc503ac20f56a79a96c7780d02bdfe75 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 24 Jun 2026 03:56:26 +0900 Subject: 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) --- .../src/symfony/console/descriptor/xml_descriptor.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crates/shirabe-external-packages/src/symfony/console/descriptor/xml_descriptor.rs') diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/xml_descriptor.rs b/crates/shirabe-external-packages/src/symfony/console/descriptor/xml_descriptor.rs index 25cdb12..fc2b948 100644 --- a/crates/shirabe-external-packages/src/symfony/console/descriptor/xml_descriptor.rs +++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/xml_descriptor.rs @@ -42,7 +42,7 @@ impl XmlDescriptor { dom } - pub fn get_command_document(&self, command: &mut dyn Command, short: bool) -> DOMDocument { + pub fn get_command_document(&self, command: &dyn Command, short: bool) -> DOMDocument { let dom = DOMDocument::new("1.0", "UTF-8"); let command_xml = dom.append_child(dom.create_element("command")); @@ -125,8 +125,8 @@ impl XmlDescriptor { .values() .map(|c| c.borrow().clone_box()) .collect(); - for mut command in command_list { - let command_xml = self.get_command_document(command.as_mut(), short); + for command in command_list { + let command_xml = self.get_command_document(command.as_ref(), short); self.append_document(&commands_xml, &command_xml.as_node()); } @@ -186,7 +186,7 @@ impl XmlDescriptor { fn describe_command( &mut self, - command: &mut dyn Command, + command: &dyn Command, options: IndexMap, ) -> anyhow::Result<()> { let short = matches!(options.get("short"), Some(PhpMixed::Bool(true))); @@ -399,7 +399,7 @@ impl Descriptor for XmlDescriptor { fn describe_command( &mut self, - command: &mut dyn Command, + command: &dyn Command, options: IndexMap, ) -> anyhow::Result<()> { XmlDescriptor::describe_command(self, command, options) -- cgit v1.3.1