Trust existing config to have a profile set correctly (#5925)

* Trust existing config to have a profile set correctly - also allow sites with no profile to be installed from config * PHPCS * Add return type hint --------- Co-authored-by: Moshe Weitzman <[email protected]>
drush-ops · Mar 30, 2024 · 48c9793 · 48c9793
1 parent 5491e16
commit 48c9793
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Commands/core/SiteInstallCommands.php b/src/Commands/core/SiteInstallCommands.php
@@ -185,7 +185,7 @@ public function taskCallback($install_state): void
     }
 
 
-    protected function determineProfile($profile, $options)
+    protected function determineProfile($profile, $options): string|bool
     {
         // Try to get profile from existing config if not provided as an argument.
         // @todo Arguably Drupal core [$boot->getKernel()->getInstallProfile()] could do this - https://github.com/drupal/drupal/blob/8.6.x/core/lib/Drupal/Core/DrupalKernel.php#L1606 reads from DB storage but not file storage.
@@ -197,7 +197,8 @@ protected function determineProfile($profile, $options)
                 throw new \Exception(dt('Existing configuration directory @config does not contain a core.extension.yml file.', ['@config' => $config_directory]));
             }
             $config = $source_storage->read('core.extension');
-            $profile = $config['profile'];
+            $profile = $config['profile'] ?? false;
+            return $profile;
         }
 
         if (empty($profile)) {