diff --git a/consts.php b/consts.php index 33e4306..5c65260 100644 --- a/consts.php +++ b/consts.php @@ -139,7 +139,6 @@ 'recipe-core' => '5', 'recipe-form-building' => '2', 'recipe-kitchen-sink' => '5', - 'recipe-plugin' => '2', 'recipe-reporting-tools' => '2', 'recipe-services' => '2', 'recipe-testing' => '3', @@ -165,7 +164,6 @@ 'silverstripe-testsession' => '3', 'silverstripe-versioned' => '2', 'silverstripe-versioned-admin' => '2', - 'vendor-plugin' => '2', ], '6' => [ 'MinkFacebookWebDriver' => '3', @@ -178,7 +176,6 @@ 'recipe-core' => '6', 'recipe-form-building' => '3', 'recipe-kitchen-sink' => '6', - 'recipe-plugin' => '3', 'recipe-reporting-tools' => '3', 'recipe-services' => '3', 'recipe-testing' => '4', @@ -204,7 +201,6 @@ 'silverstripe-testsession' => '4', 'silverstripe-versioned' => '3', 'silverstripe-versioned-admin' => '3', - 'vendor-plugin' => '3', ], ]; diff --git a/tests/JobCreatorTest.php b/tests/JobCreatorTest.php index 481da9a..6337506 100644 --- a/tests/JobCreatorTest.php +++ b/tests/JobCreatorTest.php @@ -985,6 +985,9 @@ public function provideGetInstallerVersionFromComposer(): array ['myaccount/silverstripe-somemodule', '4', ['silverstripe/framework' => '^6'], 'package', ''], ['myaccount/silverstripe-somemodule', '4', ['silverstripe/framework' => '^6'], '', ''], ['myaccount/silverstripe-somemodule', '4', [], '', ''], + // // recipe-plugin and vendor-plugin do not override framework + ['myaccount/silverstripe-admin', 'mybranch', ['silverstripe/recipe-plugin' => '^2', 'silverstripe/framework' => '^6'], 'silverstripe-vendormodule', '6.x-dev'], + ['myaccount/silverstripe-admin', 'mybranch', ['silverstripe/vendor-plugin' => '^2', 'silverstripe/framework' => '^6'], 'silverstripe-vendormodule', '6.x-dev'], ]; }