From a39d2e8f1ed72a1555f3090f871186b729d05f68 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 9 Feb 2024 14:32:08 +0100 Subject: [PATCH 1/3] Declare return types to be compatible with composer 2.7+ --- .../Plugin/Commands/RequireCommerceCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php index f960f26..671aa8f 100644 --- a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php +++ b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/RequireCommerceCommand.php @@ -61,7 +61,7 @@ class RequireCommerceCommand extends ExtendableRequireCommand * * @return void */ - protected function configure() + protected function configure(): void { parent::configure(); @@ -154,7 +154,7 @@ protected function getFormattedHelp(): string * * @throws Exception */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $this->console = new Console($this->getIO(), $input->getOption(self::INTERACTIVE_OPT)); $console = $this->console; From 71a5a1a0d80a223ab0648219cc62bbbb691af265 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 9 Feb 2024 14:33:05 +0100 Subject: [PATCH 2/3] Declare return types to be compatible with composer 2.7+ --- .../Plugin/Commands/OverrideRequireCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php index 2dec9c9..9657936 100644 --- a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php +++ b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php @@ -86,7 +86,7 @@ public function setApplication(Application $application = null) * * @return void */ - protected function configure() + protected function configure(): void { parent::configure(); @@ -170,7 +170,7 @@ protected function configure() * * @throws Exception */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $this->console = new Console($this->getIO(), $input->getOption(self::INTERACTIVE_OPT)); $this->pkgUtils = new PackageUtils($this->console); From 307a56ec781716358149b79120052a83593ef6f4 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 14 Feb 2024 20:17:18 +0100 Subject: [PATCH 3/3] Add setApplication return type --- .../Plugin/Commands/OverrideRequireCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php index 9657936..d1dfbc2 100644 --- a/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php +++ b/src/Magento/ComposerRootUpdatePlugin/Plugin/Commands/OverrideRequireCommand.php @@ -69,7 +69,7 @@ class OverrideRequireCommand extends ExtendableRequireCommand * @param Application|null $application * @return void */ - public function setApplication(Application $application = null) + public function setApplication(Application $application = null): void { // For Composer versions below 2.1.6: // In order to trick Composer into overriding its native RequireCommand with this class, the name needs to be