diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsMismatchProfileBrokenTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsMismatchProfileBrokenTest.php index 32709df493..1a3a304b5f 100644 --- a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsMismatchProfileBrokenTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsMismatchProfileBrokenTest.php @@ -11,7 +11,7 @@ * * @group Installer */ - class InstallerExistingSettingsMismatchProfileBrokenTest extends InstallerTestBase { +class InstallerExistingSettingsMismatchProfileBrokenTest extends InstallerTestBase { /** * {@inheritdoc} diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsNoProfileTest.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsNoProfileTest.php index 150a403fa8..fdcd13c77f 100644 --- a/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsNoProfileTest.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingSettingsNoProfileTest.php @@ -4,7 +4,6 @@ use Drupal\Core\DrupalKernel; use Drupal\Core\Database\Database; -use Drupal\Core\Test\TestRunnerKernel; use Symfony\Component\HttpFoundation\Request; /** diff --git a/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php b/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php index eb9bf6789f..4168809baf 100644 --- a/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php +++ b/core/tests/Drupal/FunctionalTests/Installer/InstallerTestBase.php @@ -6,7 +6,6 @@ use Drupal\Core\DrupalKernel; use Drupal\Core\Language\Language; -use Drupal\Core\Logger\LoggerChannelFactory; use Drupal\Core\Session\UserSession; use Drupal\Core\Site\Settings; use Drupal\Core\Test\HttpClientMiddleware\TestHttpClientMiddleware; @@ -139,14 +138,6 @@ protected function setUp() { $this->container ->register('http_client_factory', 'Drupal\Core\Http\ClientFactory') ->setArguments([new Reference('http_handler_stack')]); - $this->container - ->register('file_system', 'Drupal\Core\File\FileSystem') - ->addArgument(new Reference('stream_wrapper_manager')) - ->addArgument(Settings::getInstance()) - ->addArgument((new LoggerChannelFactory())->get('file')); - $this->container - ->register('stream_wrapper_manager', 'Drupal\Core\StreamWrapper\StreamWrapperManager') - ->addMethodCall('setContainer', [new Reference('service_container')]); $handler_stack = HandlerStack::create(); $handler_stack->push((new TestHttpClientMiddleware())(), 'test.http_client.middleware'); $this->container @@ -157,22 +148,7 @@ protected function setUp() { \Drupal::setContainer($this->container); // Setup Mink. - $session = $this->initMink(); - - -// $this->prepareSettings(); -// require_once DRUPAL_ROOT . '/core/includes/install.core.inc'; -// $settings = $this->parameters; -// global $install_state; -// // Initialize the installation state with the settings that were passed in, -// // as well as a boolean indicating whether or not this is an interactive -// // installation. -// $interactive = empty($this->parameters); -// $install_state = $this->parameters + ['interactive' => $interactive] + install_state_defaults(); -// install_begin_request($this->classLoader, $install_state); -// // Based on the installation state, run the remaining tasks for this page -// // request, and collect any output. -// $output = install_run_tasks($install_state); + $this->initMink(); $this->visitInstaller();