Merge pull request #57 from dennisinteractive/29770_dc_upgrade

Get profile from settings.php if possible

Author: tashaharrison

src/Command/Site/AbstractCommand.php

@@ -414,18 +414,6 @@ protected function setProfile(InputInterface $input) {
       // Use config from parameter.
       $this->profile = $input->getArgument('profile');
     }
-    elseif (isset($this->config['profile'])) {
-      // Use config from ~/.console/sites/{site}.yml.
-      $this->profile = $this->config['profile'];
-    }
-    else {
-      $this->profile = 'config_installer';
-    }
-
-    // Update input.
-    if ($input->hasArgument('profile')) {
-      $input->setArgument('profile', $this->profile);
-    }
 
     return $this->profile;
   }

src/Command/Site/BuildCommand.php

@@ -81,6 +81,12 @@ protected function configure() {
       InputOption::VALUE_OPTIONAL,
       'Specify which branch to build if different than the global branch found in sites.yml'
     );
+    $this->addOption(
+      'profile',
+      '',
+      InputOption::VALUE_NONE,
+      'Which profile to use. i.e. standard'
+    );
     $this->addOption(
       'skip',
       '',
@@ -105,6 +111,7 @@ protected function interact(InputInterface $input, OutputInterface $output) {
     }
     // Trim input.
     $this->skip = array_map('trim', $this->skip);
+
   }
 
   /**
@@ -119,12 +126,36 @@ protected function execute(InputInterface $input, OutputInterface $output) {
     $this->addCheckoutCommand();
     $this->runList();
 
+    $this->setSiteRoot();
+
+    $profile = $input->getOption('profile');
+    // Try to get the profile from settings.php.
+    if (!$profile) {
+      $settingsPhp = $this->getSiteRoot() . 'settings.php';
+      if (file_exists($settingsPhp)) {
+        $regex = '|\$settings\[\'install_profile\'\] = \'(\w+)\'|';
+        $contents = file_get_contents($settingsPhp);
+        preg_match($regex, $contents, $matches);
+        if (!empty($matches)) {
+          $profile = $matches[1];
+        }
+      }
+    }
+    // Ask for user input.
+    if (!$profile) {
+      $profile = $this->getIo()->ask(
+        $this->trans('Which profile would you like to install?'),
+        'standard'
+      );
+    }
+    $this->profile = $profile;
+    $input->setOption('profile', $profile);
+
     // Run compose now because we need to have core to set the site root.
     $this->addComposeMakeCommand();
     $this->runList();
 
     // Add entry on sites.php.
-    $this->setSiteRoot();
     $this->addSitesPhp();
 
     // Queue other commands.
@@ -354,6 +385,7 @@ private function addDbImportCommand() {
       'command' => 'site:db:import',
       'arguments' => array(
         'name' => $this->siteName,
+        'profile' => $this->profile,
       )
     );
   }