Use Console's DrupalFinder for cosntructing Drupal object in installe…

…r command (#3345)
hechoendrupal · Jun 20, 2017 · 403d2bb · 403d2bb
1 parent dcf768c
commit 403d2bb
Showing 1 changed file with 2 additions and 6 deletions.
diff --git 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) {