Skip to content

Commit 3214951

Browse files
committed
Add an additional check to skip WebSetupWizardPluginInstaller on Magento Cloud Docker installations
1 parent 6216caa commit 3214951

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"type": "project",
3+
"name": "magento/composer-root-update-plugin",
34
"description": "Git source for the Magento root update lookahead composer plugin",
45
"license": [
56
"OSL-3.0",

src/Magento/ComposerRootUpdatePlugin/Setup/WebSetupWizardPluginInstaller.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class WebSetupWizardPluginInstaller
3232
* @var PackageUtils $pkgUtils
3333
*/
3434
protected $pkgUtils;
35-
35+
3636
/**
3737
* WebSetupWizardPluginInstaller constructor.
3838
*
@@ -166,7 +166,14 @@ public function updateSetupWizardPlugin($composer, $filePath, $pluginVersion)
166166

167167
if ($this->pkgUtils->findRequire($composer, PackageUtils::CLOUD_METAPACKAGE) !== false) {
168168
$this->console->log(
169-
"Cloud installation detected, Not installing $packageName for the Web Setup Wizard",
169+
"Cloud installation detected, not installing $packageName for the Web Setup Wizard",
170+
Console::VERBOSE
171+
);
172+
return false;
173+
}
174+
if ($this->pkgUtils->findRequire($composer, PackageUtils::MAGENTO_CLOUD_DOCKER_PKG) !== false) {
175+
$this->console->log(
176+
"Magento Cloud Docker installation detected, not installing $packageName for the Web Setup Wizard",
170177
Console::VERBOSE
171178
);
172179
return false;

src/Magento/ComposerRootUpdatePlugin/Utils/PackageUtils.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class PackageUtils
2222
const COMMERCE_PKG_EDITION = 'enterprise';
2323
const CLOUD_PKG_EDITION = 'cloud';
2424
const CLOUD_METAPACKAGE = 'magento/magento-cloud-metapackage';
25+
const MAGENTO_CLOUD_DOCKER_PKG = 'magento/magento-cloud-docker';
2526

2627
/**
2728
* @var Console $console

0 commit comments

Comments
 (0)