Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trust existing config to have a profile set correctly #5925

Merged
merged 4 commits into from
Mar 30, 2024
Merged

Trust existing config to have a profile set correctly #5925

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be512d0
Trust existing config to have a profile set correctly - also allow si…
alexpott Mar 21, 2024
6076686
PHPCS
weitzman Mar 24, 2024
c9f43e5
Merge branch '13.x' into fix-install-from-config-with-no-profile
weitzman Mar 24, 2024
88bf7db
Add return type hint
weitzman Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Commands/core/SiteInstallCommands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,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.
Expand All @@ -194,7 +194,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)) {
Expand Down