From 403d2bb7df80ea34a0aa5ddb6eb7d5820df36eb5 Mon Sep 17 00:00:00 2001 From: Brad Jones Date: Tue, 20 Jun 2017 13:52:58 +1000 Subject: [PATCH] Use Console's DrupalFinder for cosntructing Drupal object in installer command (#3345) --- src/Command/Site/InstallCommand.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Command/Site/InstallCommand.php b/src/Command/Site/InstallCommand.php index 720fd57d9..ea4b81519 100644 --- a/src/Command/Site/InstallCommand.php +++ b/src/Command/Site/InstallCommand.php @@ -9,7 +9,6 @@ use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Config\Definition\Exception\Exception; -use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; @@ -24,7 +23,7 @@ use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Bootstrap\Drupal; use Drupal\Console\Utils\Site; -use DrupalFinder\DrupalFinder; +use Drupal\Console\Core\Utils\DrupalFinder; class InstallCommand extends Command { @@ -436,13 +435,10 @@ protected function execute(InputInterface $input, OutputInterface $output) try { $drupalFinder = new DrupalFinder(); $drupalFinder->locateRoot(getcwd()); - $composerRoot = $drupalFinder->getComposerRoot(); - $drupalRoot = $drupalFinder->getDrupalRoot(); - $this->runInstaller($io, $input, $database, $uri); $autoload = $this->container->get('class_loader'); - $drupal = new Drupal($autoload, $composerRoot, $drupalRoot); + $drupal = new Drupal($autoload, $drupalFinder); $container = $drupal->boot(); $this->getApplication()->setContainer($container); } catch (Exception $e) {