diff -u b/core/includes/common.inc b/core/includes/common.inc --- b/core/includes/common.inc +++ b/core/includes/common.inc @@ -280,7 +280,7 @@ } } else { - $profile = Settings()->get('install_profile') ?: 'standard'; + $profile = settings()->get('install_profile') ?: 'standard'; } return $profile; diff -u b/core/includes/install.core.inc b/core/includes/install.core.inc --- b/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1237,7 +1237,7 @@ // Remember the profile which was used. $settings['settings'] = array( 'install_profile' => (object) array( - 'value' => $install_state['parameters']['profile'], + 'value' => $install_state['parameters']['profile'], 'required' => TRUE, ), ); diff -u b/core/includes/update.inc b/core/includes/update.inc --- b/core/includes/update.inc +++ b/core/includes/update.inc @@ -448,7 +448,7 @@ $settings = array( 'settings' => array( 'install_profile' => (object) array( - 'value' => $old_variable, + 'value' => $old_variable, 'required' => TRUE, ), ) interdiff impossible; taking evasive action reverted: --- b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -779,22 +779,6 @@ $this->settingsSet('cache', array('default' => 'cache.backend.memory')); $parameters = $this->installParameters(); install_drupal($parameters); - - // Set the install_profile so that web requests to the requests to the child - // site have the correct profile. - $settings = array( - 'settings' => array( - 'install_profile' => (object) array( - 'value' => $this->profile, - 'required' => TRUE, - ), - ), - ); - $this->writeSettings($settings); - // Override install profile in Settings to so the correct profile is used by - // tests. - $this->settingsSet('install_profile', $this->profile); - $this->settingsSet('cache', array()); $this->rebuildContainer(); unchanged: --- a/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php +++ b/core/modules/simpletest/lib/Drupal/simpletest/WebTestBase.php @@ -786,6 +786,22 @@ protected function setUp() { $this->settingsSet('cache', array('default' => 'cache.backend.memory')); $parameters = $this->installParameters(); install_drupal($parameters); + + // Set the install_profile so that web requests to the requests to the child + // site have the correct profile. + $settings = array( + 'settings' => array( + 'install_profile' => (object) array( + 'value' => $this->profile, + 'required' => TRUE, + ), + ), + ); + $this->writeSettings($settings); + // Override install profile in Settings to so the correct profile is used by + // tests. + $this->settingsSet('install_profile', $this->profile); + $this->settingsSet('cache', array()); $this->rebuildContainer(); diff -u b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php --- b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalAnonymousUpgradePathTest.php @@ -34,7 +34,7 @@ 'required' => TRUE, ), 'install_profile' => (object) array( - 'value' => $this->profile, + 'value' => $this->profile, 'required' => TRUE, ), ); diff -u b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php --- b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/BareMinimalNoConfigUpgradePathTest.php @@ -42,7 +42,7 @@ ); $settings['settings'] = array( 'install_profile' => (object) array( - 'value' => $this->profile, + 'value' => $this->profile, 'required' => TRUE, ), ); diff -u b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php --- b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php @@ -152,7 +152,7 @@ $settings = array( 'settings' => array( 'install_profile' => (object) array( - 'value' => $install_profile, + 'value' => $install_profile, 'required' => TRUE, ), ),