Skip to content

Commit 6ac1a5b

Browse files
committed
ACMS-4333: Fixed the bug reported in D11.
1 parent 691c63f commit 6ac1a5b

File tree

4 files changed

+20
-2
lines changed

4 files changed

+20
-2
lines changed

src/Config/DefaultDrushConfig.php

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public function __construct(?DrushConfig $config = NULL) {
2626
}
2727
$this->set('drush.bin', $config->get("runtime.drush-script"));
2828
$this->setDefault('drush.alias', "self");
29+
$this->setDefault('drush.uri', $config->get('options.uri'));
2930
$this->combine($config->export());
3031
}
3132
}

src/Drush/Commands/BaseDrushCommands.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function switchSiteContext(string $site_name): void {
113113
*/
114114
protected function initializeConfig(string $site_name = ""): void {
115115
$config = new DefaultDrushConfig($this->getConfig());
116-
$configInitializer = new ConfigInitializer($config, $this->input());
116+
$configInitializer = new ConfigInitializer($config);
117117
if ($site_name) {
118118
$configInitializer->setSite($site_name);
119119
}

src/Robo/Config/ConfigAwareTrait.php

+16-1
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,29 @@
22

33
namespace Acquia\Drupal\RecommendedSettings\Robo\Config;
44

5+
use Acquia\Drupal\RecommendedSettings\Config\ConfigInitializer;
6+
use Acquia\Drupal\RecommendedSettings\Config\DefaultDrushConfig;
57
use Drush\Config\ConfigAwareTrait as DrushConfigAwareTrait;
8+
use Drush\Config\DrushConfig;
69

710
/**
811
* Adds custom methods to DrushConfigAwareTrait.
912
*/
1013
trait ConfigAwareTrait {
1114

12-
use DrushConfigAwareTrait;
15+
use DrushConfigAwareTrait {
16+
DrushConfigAwareTrait::getConfig as parentDrushGetConfig;
17+
}
18+
19+
/**
20+
* {@inheritdoc}
21+
*/
22+
public function getConfig(): DrushConfig {
23+
if (!$this->config instanceof DefaultDrushConfig) {
24+
$this->config = new DefaultDrushConfig($this->parentDrushGetConfig());
25+
}
26+
return $this->config;
27+
}
1328

1429
/**
1530
* {@inheritdoc}

src/Robo/Tasks/DrushTask.php

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Acquia\Drupal\RecommendedSettings\Robo\Tasks;
44

5+
use Acquia\Drupal\RecommendedSettings\Robo\Config\ConfigAwareTrait;
56
use Robo\Common\CommandArguments;
67
use Robo\Exception\TaskException;
78
use Robo\Task\CommandStack;
@@ -22,6 +23,7 @@
2223
*/
2324
class DrushTask extends CommandStack {
2425

26+
use ConfigAwareTrait;
2527
use CommandArguments {
2628
option as traitOption;
2729
}

0 commit comments

Comments
 (0)