aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-external-packages/src/symfony/console/descriptor
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-24 03:56:26 +0900
committernsfisis <nsfisis@gmail.com>2026-06-24 03:57:46 +0900
commitf1af14b1cc503ac20f56a79a96c7780d02bdfe75 (patch)
tree3f8661e1dc4d2092ac16b45c574c90ec2d8bec2a /crates/shirabe-external-packages/src/symfony/console/descriptor
parentc5fc34a106a706ac12925c4df273a926811d260b (diff)
downloadphp-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')
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs4
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/descriptor/json_descriptor.rs12
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs8
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs4
-rw-r--r--crates/shirabe-external-packages/src/symfony/console/descriptor/xml_descriptor.rs10
5 files changed, 19 insertions, 19 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs b/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs
index 38824a6..5055b49 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs
@@ -39,7 +39,7 @@ pub trait Descriptor: DescriptorInterface {
self.describe_input_definition(&definition, options)?;
}
DescribableObject::Command(command) => {
- self.describe_command(&mut *command.borrow_mut(), options)?;
+ self.describe_command(&*command.borrow(), options)?;
}
DescribableObject::Application(application) => {
self.describe_application(application, options)?;
@@ -86,7 +86,7 @@ pub trait Descriptor: DescriptorInterface {
/// Describes a Command instance.
fn describe_command(
&mut self,
- command: &mut dyn Command,
+ command: &dyn Command,
options: IndexMap<String, PhpMixed>,
) -> anyhow::Result<()>;
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)
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs b/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs
index 49d958f..ef16fc0 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/markdown_descriptor.rs
@@ -147,7 +147,7 @@ impl MarkdownDescriptor {
fn describe_command(
&mut self,
- command: &mut dyn Command,
+ command: &dyn Command,
options: IndexMap<String, PhpMixed>,
) -> anyhow::Result<()> {
if matches!(options.get("short"), Some(PhpMixed::Bool(true))) {
@@ -285,10 +285,10 @@ impl MarkdownDescriptor {
.values()
.map(|c| c.borrow().clone_box())
.collect();
- for mut command in command_list {
+ for command in command_list {
self.write("\n\n", true);
// describeCommand returns null; the guarded write never runs.
- self.describe_command(command.as_mut(), options.clone())?;
+ self.describe_command(command.as_ref(), options.clone())?;
}
Ok(())
}
@@ -372,7 +372,7 @@ impl Descriptor for MarkdownDescriptor {
fn describe_command(
&mut self,
- command: &mut dyn Command,
+ command: &dyn Command,
options: IndexMap<String, PhpMixed>,
) -> anyhow::Result<()> {
MarkdownDescriptor::describe_command(self, command, options)
diff --git a/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs b/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs
index 097d7f4..b0c0090 100644
--- a/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/text_descriptor.rs
@@ -220,7 +220,7 @@ impl TextDescriptor {
fn describe_command(
&mut self,
- command: &mut dyn Command,
+ command: &dyn Command,
options: IndexMap<String, PhpMixed>,
) -> anyhow::Result<()> {
command.merge_application_definition(false);
@@ -593,7 +593,7 @@ impl Descriptor for TextDescriptor {
fn describe_command(
&mut self,
- command: &mut dyn Command,
+ command: &dyn Command,
options: IndexMap<String, PhpMixed>,
) -> anyhow::Result<()> {
TextDescriptor::describe_command(self, command, options)
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<String, PhpMixed>,
) -> 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<String, PhpMixed>,
) -> anyhow::Result<()> {
XmlDescriptor::describe_command(self, command, options)