Commit 805e1d6d authored by alexpott's avatar alexpott
Browse files

Issue #2589599 by tstoeckler: Dead code in WebTestBase

parent 5e5738dc
...@@ -680,14 +680,11 @@ protected function setUp() { ...@@ -680,14 +680,11 @@ protected function setUp() {
// Initialize user 1 and session name. // Initialize user 1 and session name.
$this->initUserSession(); $this->initUserSession();
// Get parameters for install_drupal() before removing global variables.
$parameters = $this->installParameters();
// Prepare the child site settings. // Prepare the child site settings.
$this->prepareSettings(); $this->prepareSettings();
// Execute the non-interactive installer. // Execute the non-interactive installer.
$this->doInstall($parameters); $this->doInstall();
// Import new settings.php written by the installer. // Import new settings.php written by the installer.
$this->initSettings(); $this->initSettings();
...@@ -711,12 +708,9 @@ protected function setUp() { ...@@ -711,12 +708,9 @@ protected function setUp() {
/** /**
* Execute the non-interactive installer. * Execute the non-interactive installer.
* *
* @param array $parameters
* Parameters to pass to install_drupal().
*
* @see install_drupal() * @see install_drupal()
*/ */
protected function doInstall(array $parameters = []) { protected function doInstall() {
require_once DRUPAL_ROOT . '/core/includes/install.core.inc'; require_once DRUPAL_ROOT . '/core/includes/install.core.inc';
install_drupal($this->classLoader, $this->installParameters()); install_drupal($this->classLoader, $this->installParameters());
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment