diff --git a/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/core/lib/Drupal/Core/Extension/ModuleInstaller.php index 10fabd412a..9704b3262d 100644 --- a/core/lib/Drupal/Core/Extension/ModuleInstaller.php +++ b/core/lib/Drupal/Core/Extension/ModuleInstaller.php @@ -194,6 +194,10 @@ public function install(array $module_list, $enable_dependencies = TRUE) { // Update the kernel to include it. $this->updateKernel($module_filenames); + // In order to make installing transactional if anything uses routes. + \Drupal::getContainer()->set('router.route_provider.old', \Drupal::service('router.route_provider')); + \Drupal::getContainer()->set('router.route_provider', \Drupal::service('router.route_provider.lazy_builder')); + // Allow modules to react prior to the installation of a module. $this->moduleHandler->invokeAll('module_preinstall', [$module]); @@ -283,10 +287,6 @@ public function install(array $module_list, $enable_dependencies = TRUE) { // @see https://www.drupal.org/node/2208429 \Drupal::service('theme_handler')->refreshInfo(); - // In order to make uninstalling transactional if anything uses routes. - \Drupal::getContainer()->set('router.route_provider.old', \Drupal::service('router.route_provider')); - \Drupal::getContainer()->set('router.route_provider', \Drupal::service('router.route_provider.lazy_builder')); - // Allow the module to perform install tasks. $this->moduleHandler->invoke($module, 'install'); diff --git a/core/modules/content_translation/tests/modules/route_provider_install_test/route_provider_install_test.info.yml b/core/modules/content_translation/tests/modules/route_provider_install_test/route_provider_install_test.info.yml new file mode 100644 index 0000000000..e2e6ff2e02 --- /dev/null +++ b/core/modules/content_translation/tests/modules/route_provider_install_test/route_provider_install_test.info.yml @@ -0,0 +1,6 @@ +name: 'Route provider install test' +description: 'Helps test an insidious bug triggered by the url_generator maintaining a stale route provider.' +type: module +package: Testing +version: VERSION +core: 8.x diff --git a/core/modules/content_translation/tests/modules/route_provider_install_test/route_provider_install_test.services.yml b/core/modules/content_translation/tests/modules/route_provider_install_test/route_provider_install_test.services.yml new file mode 100644 index 0000000000..68ff1ac8db --- /dev/null +++ b/core/modules/content_translation/tests/modules/route_provider_install_test/route_provider_install_test.services.yml @@ -0,0 +1,5 @@ +services: + plugin.manager.route_provider_install_test: + class: '\Drupal\route_provider_install_test\PluginManager' + parent: default_plugin_manager + arguments: ['@url_generator'] diff --git a/core/modules/content_translation/tests/modules/route_provider_install_test/src/PluginManager.php b/core/modules/content_translation/tests/modules/route_provider_install_test/src/PluginManager.php new file mode 100644 index 0000000000..1fe2b5caff --- /dev/null +++ b/core/modules/content_translation/tests/modules/route_provider_install_test/src/PluginManager.php @@ -0,0 +1,30 @@ +container->get('module_installer')->install(['content_translation']); + } + +}