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/descriptor.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs') 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 d4aa575..d086b28 100644 --- a/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs +++ b/crates/shirabe-external-packages/src/symfony/console/descriptor/descriptor.rs @@ -48,7 +48,7 @@ pub trait Descriptor: DescriptorInterface { } // case $object instanceof Application: _ if todo!("$object instanceof Application") => { - let application: std::rc::Rc> = + let application: std::rc::Rc> = todo!("downcast object to Application"); self.describe_application(application, options)?; } @@ -113,7 +113,7 @@ pub trait Descriptor: DescriptorInterface { /// Describes an Application instance. fn describe_application( &mut self, - application: std::rc::Rc>, + application: std::rc::Rc>, options: IndexMap, ) -> anyhow::Result<()>; } -- cgit v1.3.1