Skip to content

Commit 8f47242

Browse files
authored
[console] Implement ConfigurationManager changes. (#3649)
1 parent abc8313 commit 8f47242

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

bin/drupal.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
chdir($drupalFinder->getDrupalRoot());
5757
$configurationManager = new ConfigurationManager();
5858
$configuration = $configurationManager
59-
->loadConfigurationFromDirectory($drupalFinder->getComposerRoot());
59+
->loadConfiguration($drupalFinder->getComposerRoot())
60+
->getConfiguration();
6061

6162
$debug = $argvInputReader->get('debug', false);
6263
if ($configuration && $options = $configuration->get('application.options') ?: []) {
@@ -74,7 +75,7 @@
7475
);
7576
}
7677

77-
$drupal = new Drupal($autoload, $drupalFinder);
78+
$drupal = new Drupal($autoload, $drupalFinder, $configurationManager);
7879
$container = $drupal->boot();
7980

8081
if (!$container) {

src/Bootstrap/Drupal.php

+18-8
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Drupal\Console\Core\Bootstrap\DrupalConsoleCore;
1414
use Drupal\Console\Core\Utils\DrupalFinder;
1515
use Drupal\Console\Core\Bootstrap\DrupalInterface;
16+
use Drupal\Console\Core\Utils\ConfigurationManager;
1617

1718
class Drupal implements DrupalInterface
1819
{
@@ -23,16 +24,26 @@ class Drupal implements DrupalInterface
2324
*/
2425
protected $drupalFinder;
2526

27+
/**
28+
* @var ConfigurationManager
29+
*/
30+
protected $configurationManager;
31+
2632
/**
2733
* Drupal constructor.
2834
*
2935
* @param $autoload
3036
* @param $drupalFinder
37+
* @param $configurationManager
3138
*/
32-
public function __construct($autoload, DrupalFinder $drupalFinder)
33-
{
39+
public function __construct(
40+
$autoload,
41+
DrupalFinder $drupalFinder,
42+
ConfigurationManager $configurationManager
43+
) {
3444
$this->autoload = $autoload;
3545
$this->drupalFinder = $drupalFinder;
46+
$this->configurationManager = $configurationManager;
3647
}
3748

3849
/**
@@ -177,13 +188,12 @@ public function boot()
177188

178189
AnnotationRegistry::registerLoader([$this->autoload, "loadClass"]);
179190

180-
// Load configuration from directory
181-
$container->get('console.configuration_manager')
182-
->loadConfiguration($this->drupalFinder->getComposerRoot())
183-
->getConfiguration();
191+
$container->set(
192+
'console.configuration_manager',
193+
$this->configurationManager
194+
);
184195

185-
$configuration = $container->get('console.configuration_manager')
186-
->getConfiguration();
196+
$configuration = $this->configurationManager->getConfiguration();
187197

188198
$container->get('console.translator_manager')
189199
->loadCoreLanguage(

0 commit comments

Comments
 (0)