From 69c372ba0eca61b05260d6d208445d9e69d14e34 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 13 Jun 2026 11:38:20 +0900 Subject: fix(console): flatten Application inheritance to restore overrides Composer\Console\Application embedded Symfony's Application as an `inner` field and delegated to it, so polymorphic calls inside the Symfony base (e.g. doRun -> $this->getLongVersion()) resolved to Symfony's own methods and never reached Composer's overrides. As a result `--version` bypassed Composer's getLongVersion()/doRun() entirely. Flatten the PHP inheritance chain into the single shirabe Application struct: take in the Symfony base methods (parent-calling overrides kept under a `base_` prefix) and drop the `inner` delegation. Replace the Symfony Application struct in shirabe-external-packages with an `Application` trait that the merged struct implements, so commands and descriptors can reference it without a reverse crate dependency. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../src/symfony/console/descriptor/xml_descriptor.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 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 209964a..2ed8f17 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 @@ -106,7 +106,7 @@ impl XmlDescriptor { pub fn get_application_document( &self, - application: std::rc::Rc>, + application: std::rc::Rc>, namespace: Option, short: bool, ) -> DOMDocument { @@ -209,7 +209,7 @@ impl XmlDescriptor { fn describe_application( &mut self, - application: std::rc::Rc>, + application: std::rc::Rc>, options: IndexMap, ) -> anyhow::Result<()> { let namespace = match options.get("namespace") { @@ -420,7 +420,7 @@ impl Descriptor for XmlDescriptor { fn describe_application( &mut self, - application: std::rc::Rc>, + application: std::rc::Rc>, options: IndexMap, ) -> anyhow::Result<()> { XmlDescriptor::describe_application(self, application, options) -- cgit v1.3.1