diff --git a/.env b/.env index eeae323..8dd6973 100644 --- a/.env +++ b/.env @@ -2,6 +2,8 @@ WARDEN_ENV_NAME=depends WARDEN_ENV_TYPE=laravel WARDEN_WEB_ROOT=/ WARDEN_PHP=1 -PHP_VERSION=7.2 +COMPOSER_VERSION=2 +PHP_VERSION=7.4 TRAEFIK_DOMAIN=depends.test TRAEFIK_SUBDOMAIN=app +WARDEN_COMPOSER_DIR=./.composer diff --git a/.gitignore b/.gitignore index d1502b0..e634755 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vendor/ composer.lock +.composer/ diff --git a/composer.json b/composer.json index a30cced..6d06ea8 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,8 @@ "license": "MIT", "require": { "php": "^7.2", - "composer-plugin-api": "^1.0", - "composer/composer": "^1", + "composer-plugin-api": "^1|^2", + "composer/composer": "^1|^2", "composer/semver": "^1|^2|^3", "symfony/console": "^5" }, diff --git a/src/Command/WhyBlockCommand.php b/src/Command/WhyBlockCommand.php index d999e48..3e7f4f9 100644 --- a/src/Command/WhyBlockCommand.php +++ b/src/Command/WhyBlockCommand.php @@ -18,7 +18,7 @@ use Symfony\Component\Console\Output\OutputInterface; /** - * @dependency composer/composer:^1 Extends BaseCommand + * @dependency composer/composer:^1|^2 Extends BaseCommand */ class WhyBlockCommand extends BaseCommand { diff --git a/src/Plugin.php b/src/Plugin.php index 5aef080..478174c 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -17,13 +17,19 @@ /** * In charge of registering everything our plugin needs * - * @dependency composer-plugin-api:^1 Reliant Interfaces - * @dependency composer/composer:^1 Existence of IOInterface and Composer class + * @dependency composer-plugin-api:^1|^2 Reliant Interfaces + * @dependency composer/composer:^1|^2 Existence of IOInterface and Composer class */ class Plugin implements PluginInterface, Capable, CommandProvider { public function activate(Composer $composer, IOInterface $io): void { + /* No-op */ + } + + public function deactivate(Composer $composer, IOInterface $io): void + { + /* No-op */ } public function getCapabilities(): array @@ -39,4 +45,9 @@ public function getCommands(): array new WhyBlockCommand(), ]; } + + public function uninstall(Composer $composer, IOInterface $io): void + { + /* No-op */ + } }