diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc index 0ea1384..efc61c8 100644 --- a/core/includes/bootstrap.inc +++ b/core/includes/bootstrap.inc @@ -849,7 +849,7 @@ function drupal_installation_attempted() { * the installer or during unit tests. * * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0. - * Use Settings::getInstallProfile instead. + * Use \Drupal\Core\Site\Settings::getInstallProfile() instead. */ function drupal_get_profile() { global $install_state; @@ -870,10 +870,11 @@ function drupal_get_profile() { return $profile; } -/* - * Get the name of any discovered profile that is a distribution. If multiple - * profiles are distributions, then the first discovered profile will be - * selected. See https://www.drupal.org/node/2210443. +/** + * Get the name of any discovered profile that is a distribution. + * + * If multiple profiles are distributions, then the first discovered profile + * will be selected. See https://www.drupal.org/node/2210443. * * @return string|null * The machine name of any discovered distribution. diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index f337506..b53db0a 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1211,7 +1211,7 @@ function _install_select_profile(&$install_state) { return $profile; } } - // Check for a Distribution. + // Check for a distribution. if ($distribution = drupal_get_distribution()) { return $distribution; } @@ -2287,8 +2287,7 @@ function install_display_requirements($install_state, $requirements) { } /** - * Installation task; install profile is written to settings.php unless a - * distribution is present. + * Installation task; writes profile to settings.php (absent a distribution). * * @param array $install_state * An array of information about the current installation state. diff --git a/core/lib/Drupal/Core/Site/Settings.php b/core/lib/Drupal/Core/Site/Settings.php index 0ad2c4c..6f2d38a 100644 --- a/core/lib/Drupal/Core/Site/Settings.php +++ b/core/lib/Drupal/Core/Site/Settings.php @@ -149,7 +149,7 @@ public static function getHashSalt() { } /** - * Get the active install profile. + * Gets the active install profile. * * @return string|null * The name of the any active install profile or distribution. diff --git a/core/modules/system/src/Tests/Installer/DistributionProfileTest.php b/core/modules/system/src/Tests/Installer/DistributionProfileTest.php index 889ae2c..54e6792 100644 --- a/core/modules/system/src/Tests/Installer/DistributionProfileTest.php +++ b/core/modules/system/src/Tests/Installer/DistributionProfileTest.php @@ -75,7 +75,7 @@ public function testInstalled() { // Confirm that we are logged-in after installation. $this->assertText($this->rootUser->getUsername()); - // Confirm that Drupal recognizes this Distro as the current profile. + // Confirm that Drupal recognizes this distribution as the current profile. $this->assertEqual(Settings::getInstallProfile(), 'mydistro'); }