Commit 50e2c7e9 authored by catch's avatar catch
Browse files

Issue #1987262 by the_phi, clemens.tolboom, Damien Tournoud, bshaffer, catch,...

Issue #1987262 by the_phi, clemens.tolboom, Damien Tournoud, bshaffer, catch, alexpott, bvanmeurs: Fixed [Installation Error] Symfony: 'The service definition 'request' does not exist.'
parent 0fbf36c2
...@@ -366,9 +366,6 @@ function install_begin_request(&$install_state) { ...@@ -366,9 +366,6 @@ function install_begin_request(&$install_state) {
// Add the file translation service to the container. // Add the file translation service to the container.
$container->set('string_translator.file_translation', install_file_translation_service()); $container->set('string_translator.file_translation', install_file_translation_service());
$container->get('string_translation')->addTranslator($container->get('string_translator.file_translation')); $container->get('string_translation')->addTranslator($container->get('string_translator.file_translation'));
// Set the request in the kernel to the new created Request above
// so it is available to the rest of the installation process.
$container->set('request', $request);
} }
else { else {
// @todo Move into a proper Drupal\Core\DependencyInjection\InstallContainerBuilder. // @todo Move into a proper Drupal\Core\DependencyInjection\InstallContainerBuilder.
...@@ -440,8 +437,12 @@ function install_begin_request(&$install_state) { ...@@ -440,8 +437,12 @@ function install_begin_request(&$install_state) {
$container->register('asset.css.collection_renderer', 'Drupal\Core\Asset\CssCollectionRenderer'); $container->register('asset.css.collection_renderer', 'Drupal\Core\Asset\CssCollectionRenderer');
$container->register('asset.js.collection_renderer', 'Drupal\Core\Asset\JsCollectionRenderer'); $container->register('asset.js.collection_renderer', 'Drupal\Core\Asset\JsCollectionRenderer');
Drupal::setContainer($container);
} }
// Set the request in the kernel to the new created Request above
// so it is available to the rest of the installation process.
$container->set('request', $request);
Drupal::setContainer($container);
// Set up $language, so t() caller functions will still work. // Set up $language, so t() caller functions will still work.
drupal_language_initialize(); drupal_language_initialize();
......
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