From 8e39edb200580d10f14966ee49ab678f176c9802 Mon Sep 17 00:00:00 2001 From: SychO9 Date: Tue, 23 Nov 2021 23:06:30 +0100 Subject: [PATCH] chore: remove test code --- .../src/Command/CheckForUpdatesHandler.php | 1 + .../src/Command/MajorUpdateHandler.php | 22 ------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/extensions/package-manager/src/Command/CheckForUpdatesHandler.php b/extensions/package-manager/src/Command/CheckForUpdatesHandler.php index 1ba1d1f90..31ed821e2 100755 --- a/extensions/package-manager/src/Command/CheckForUpdatesHandler.php +++ b/extensions/package-manager/src/Command/CheckForUpdatesHandler.php @@ -49,6 +49,7 @@ class CheckForUpdatesHandler * The results from both commands are properly processed and merged to have new key values `latest-minor` and `latest-major`. * * @throws \Flarum\User\Exception\PermissionDeniedException|ComposerCommandFailedException + * @todo integration test */ public function handle(CheckForUpdates $command) { diff --git a/extensions/package-manager/src/Command/MajorUpdateHandler.php b/extensions/package-manager/src/Command/MajorUpdateHandler.php index ab2ffa2b7..2e20254aa 100644 --- a/extensions/package-manager/src/Command/MajorUpdateHandler.php +++ b/extensions/package-manager/src/Command/MajorUpdateHandler.php @@ -68,28 +68,6 @@ class MajorUpdateHandler { $command->actor->assertAdmin(); - // @todo remove testing code - throw new MajorUpdateFailedException( - '*', - 'Loading composer repositories with package information -Updating dependencies -Your requirements could not be resolved to an installable set of packages. - - Problem 1 - - Root composer.json requires flarum/tags * -> satisfiable by flarum/tags[1.0.0]. - - flarum/tags 1.0.0 requires flarum/core >=0.1.0-beta.15 <0.1.0-beta.16 -> found flarum/core[v0.1.0-beta.15] but it conflicts with your root composer.json require (^1.1.1). - Problem 2 - - Root composer.json requires sycho/flarum-profile-cover * -> satisfiable by sycho/flarum-profile-cover[1.0.0]. - - sycho/flarum-profile-cover 1.0.0 requires flarum/core >=0.1.0-beta.15 <=0.1.0-beta.16 -> found flarum/core[v0.1.0-beta.15, v0.1.0-beta.16] but it conflicts with your root composer.json require (^1.1.1). - Problem 3 - - Root composer.json requires askvortsov/flarum-auto-moderator * -> satisfiable by askvortsov/flarum-auto-moderator[1.0.0]. - - askvortsov/flarum-auto-moderator 1.0.0 requires flarum/core 0.1.0-beta.15 -> found flarum/core[v0.1.0-beta.15] but it conflicts with your root composer.json require (^1.1.1). - -Running update with --no-dev does not mean require-dev is ignored, it just means the packages will not be installed. If dev requirements are blocking the update you have to resolve those problems. - ', - '2.0', - ); - $majorVersion = $this->lastUpdateCheck->getNewMajorVersion(); if (! $majorVersion) {