X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=vendor%2Fdrupal%2Fconsole%2Fbin%2Fdrupal.php;h=6070fc633d045b764ff26654195cdd871c47dc3f;hb=74df008bdbb3a11eeea356744f39b802369bda3c;hp=35c172344b0a0e734305fb650ec03b85df3a18ea;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website
diff --git a/vendor/drupal/console/bin/drupal.php b/vendor/drupal/console/bin/drupal.php
index 35c172344..6070fc633 100644
--- a/vendor/drupal/console/bin/drupal.php
+++ b/vendor/drupal/console/bin/drupal.php
@@ -1,12 +1,18 @@
hasParameterOption(['--debug']);
+$output = new ConsoleOutput();
+$input = new ArrayInput([]);
+$io = new DrupalStyle($input, $output);
+
+$argvInputReader = new ArgvInputReader();
+$root = $argvInputReader->get('root', getcwd());
$drupalFinder = new DrupalFinder();
-if (!$drupalFinder->locateRoot(getcwd())) {
- echo ' DrupalConsole must be executed within a Drupal Site.'.PHP_EOL;
+if (!$drupalFinder->locateRoot($root)) {
+ $io->error('DrupalConsole must be executed within a Drupal Site.');
exit(1);
}
-$composerRoot = $drupalFinder->getComposerRoot();
-$drupalRoot = $drupalFinder->getDrupalRoot();
-chdir($drupalRoot);
+chdir($drupalFinder->getDrupalRoot());
+$configurationManager = new ConfigurationManager();
+$configuration = $configurationManager
+ ->loadConfiguration($drupalFinder->getComposerRoot())
+ ->getConfiguration();
+
+$debug = $argvInputReader->get('debug', false);
+if ($configuration && $options = $configuration->get('application.options') ?: []) {
+ $argvInputReader->setOptionsFromConfiguration($options);
+}
+$argvInputReader->setOptionsAsArgv();
-$drupal = new Drupal($autoload, $composerRoot, $drupalRoot);
-$container = $drupal->boot($debug);
+if ($debug) {
+ $io->writeln(
+ sprintf(
+ '%s version %s',
+ Application::NAME,
+ Application::VERSION
+ )
+ );
+}
+
+$drupal = new Drupal($autoload, $drupalFinder, $configurationManager);
+$container = $drupal->boot();
if (!$container) {
- echo ' Something was wrong. Drupal can not be bootstrap.';
+ $io->error('Something was wrong. Drupal can not be bootstrap.');
exit(1);
}
-$configuration = $container->get('console.configuration_manager')
- ->getConfiguration();
-
-$argvInputReader = new ArgvInputReader();
-if ($options = $configuration->get('application.options') ?: []) {
- $argvInputReader->setOptionsFromConfiguration($options);
-}
-$argvInputReader->setOptionsAsArgv();
$application = new Application($container);
-$application->setDefaultCommand('about');
+$application->setDrupal($drupal);
$application->run();