From c66894278c03bf88ccae12fa3d8f3a9d68e64495 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Wed, 25 Oct 2023 17:13:25 +0200 Subject: [PATCH] Bump dev version to 2.7, fix issues with symfony 7 --- composer.json | 2 +- src/Composer/Command/AuditCommand.php | 2 +- src/Composer/Command/BumpCommand.php | 2 +- src/Composer/Command/DiagnoseCommand.php | 2 +- src/Composer/Command/DumpAutoloadCommand.php | 2 +- src/Composer/Command/ExecCommand.php | 2 +- src/Composer/Command/InitCommand.php | 2 +- src/Composer/Command/InstallCommand.php | 2 +- src/Composer/Command/RemoveCommand.php | 2 +- src/Composer/Command/RequireCommand.php | 2 +- src/Composer/Command/ShowCommand.php | 2 +- src/Composer/Command/UpdateCommand.php | 2 +- src/Composer/Composer.php | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 70f488506..c27a8407f 100644 --- a/composer.json +++ b/composer.json @@ -65,7 +65,7 @@ }, "extra": { "branch-alias": { - "dev-main": "2.6-dev" + "dev-main": "2.7-dev" }, "phpstan": { "includes": [ diff --git a/src/Composer/Command/AuditCommand.php b/src/Composer/Command/AuditCommand.php index 3788b8e37..f2abfaeca 100644 --- a/src/Composer/Command/AuditCommand.php +++ b/src/Composer/Command/AuditCommand.php @@ -46,7 +46,7 @@ EOT ; } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $composer = $this->requireComposer(); $packages = $this->getPackages($composer, $input); diff --git a/src/Composer/Command/BumpCommand.php b/src/Composer/Command/BumpCommand.php index 99fe9eaba..db5b9464a 100644 --- a/src/Composer/Command/BumpCommand.php +++ b/src/Composer/Command/BumpCommand.php @@ -70,7 +70,7 @@ EOT /** * @throws \Seld\JsonLint\ParsingException */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { /** @readonly */ $composerJsonPath = Factory::getComposerFile(); diff --git a/src/Composer/Command/DiagnoseCommand.php b/src/Composer/Command/DiagnoseCommand.php index b1af4d6be..d1b4fbee5 100644 --- a/src/Composer/Command/DiagnoseCommand.php +++ b/src/Composer/Command/DiagnoseCommand.php @@ -67,7 +67,7 @@ EOT ; } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $composer = $this->tryComposer(); $io = $this->getIO(); diff --git a/src/Composer/Command/DumpAutoloadCommand.php b/src/Composer/Command/DumpAutoloadCommand.php index 9336ab3b2..c30fae7a8 100644 --- a/src/Composer/Command/DumpAutoloadCommand.php +++ b/src/Composer/Command/DumpAutoloadCommand.php @@ -54,7 +54,7 @@ EOT ; } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $composer = $this->requireComposer(); diff --git a/src/Composer/Command/ExecCommand.php b/src/Composer/Command/ExecCommand.php index edec5c6db..e8c7c96e9 100644 --- a/src/Composer/Command/ExecCommand.php +++ b/src/Composer/Command/ExecCommand.php @@ -75,7 +75,7 @@ EOT $input->setArgument('binary', $binaries[$binary]); } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $composer = $this->requireComposer(); if ($input->getOption('list') || null === $input->getArgument('binary')) { diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php index 3a61ee76a..606bff820 100644 --- a/src/Composer/Command/InitCommand.php +++ b/src/Composer/Command/InitCommand.php @@ -82,7 +82,7 @@ EOT /** * @throws \Seld\JsonLint\ParsingException */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $io = $this->getIO(); diff --git a/src/Composer/Command/InstallCommand.php b/src/Composer/Command/InstallCommand.php index 7ab60260c..1d45eaf48 100644 --- a/src/Composer/Command/InstallCommand.php +++ b/src/Composer/Command/InstallCommand.php @@ -79,7 +79,7 @@ EOT ; } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $io = $this->getIO(); if ($input->getOption('dev')) { diff --git a/src/Composer/Command/RemoveCommand.php b/src/Composer/Command/RemoveCommand.php index e808d63ab..a97896df9 100644 --- a/src/Composer/Command/RemoveCommand.php +++ b/src/Composer/Command/RemoveCommand.php @@ -83,7 +83,7 @@ EOT /** * @throws \Seld\JsonLint\ParsingException */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { if ($input->getArgument('packages') === [] && !$input->getOption('unused')) { throw new InvalidArgumentException('Not enough arguments (missing: "packages").'); diff --git a/src/Composer/Command/RequireCommand.php b/src/Composer/Command/RequireCommand.php index 760bfdb38..51cb69c1d 100644 --- a/src/Composer/Command/RequireCommand.php +++ b/src/Composer/Command/RequireCommand.php @@ -129,7 +129,7 @@ EOT /** * @throws \Seld\JsonLint\ParsingException */ - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $this->file = Factory::getComposerFile(); $io = $this->getIO(); diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php index ea5a9db3b..083a49ec3 100644 --- a/src/Composer/Command/ShowCommand.php +++ b/src/Composer/Command/ShowCommand.php @@ -131,7 +131,7 @@ EOT }; } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $this->versionParser = new VersionParser; if ($input->getOption('tree')) { diff --git a/src/Composer/Command/UpdateCommand.php b/src/Composer/Command/UpdateCommand.php index 7b6948004..b371157e9 100644 --- a/src/Composer/Command/UpdateCommand.php +++ b/src/Composer/Command/UpdateCommand.php @@ -112,7 +112,7 @@ EOT ; } - protected function execute(InputInterface $input, OutputInterface $output) + protected function execute(InputInterface $input, OutputInterface $output): int { $io = $this->getIO(); if ($input->getOption('dev')) { diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php index cb619e1f5..4bf1679f6 100644 --- a/src/Composer/Composer.php +++ b/src/Composer/Composer.php @@ -54,7 +54,7 @@ class Composer extends PartialComposer public const VERSION = '@package_version@'; public const BRANCH_ALIAS_VERSION = '@package_branch_alias_version@'; public const RELEASE_DATE = '@release_date@'; - public const SOURCE_VERSION = '2.6.999-dev+source'; + public const SOURCE_VERSION = '2.7.999-dev+source'; /** * Version number of the internal composer-runtime-api package