Issue #3544715 by nicxvan, berdir, godotislate, jurgenhaas, catch, alexpott: Add oop support to hooks currently supported by themes

Author: catch

core.services.yml

@@ -728,7 +728,7 @@ services:
   Drupal\Core\Extension\ThemeHandlerInterface: '@theme_handler'
   theme_installer:
     class: Drupal\Core\Extension\ThemeInstaller
-    arguments: ['@theme_handler', '@config.factory', '@config.installer', '@module_handler', '@config.manager', '@asset.css.collection_optimizer', '@router.builder', '@logger.channel.default', '@state', '@extension.list.module', '@theme.registry', '@extension.list.theme', '@plugin.manager.sdc']
+    autowire: true
   Drupal\Core\Extension\ThemeInstallerInterface: '@theme_installer'
   entity.memory_cache:
     class: Drupal\Core\Cache\MemoryCache\LruMemoryCache
@@ -1590,7 +1590,7 @@ services:
   Drupal\Core\Datetime\DateFormatterInterface: '@date.formatter'
   theme.manager:
     class: Drupal\Core\Theme\ThemeManager
-    arguments: ['%app.root%', '@theme.negotiator', '@theme.initialization', '@module_handler', '@callable_resolver']
+    arguments: ['%app.root%', '@theme.negotiator', '@theme.initialization', '@module_handler', '@callable_resolver', '@keyvalue', '@cache.bootstrap']
     calls:
       - [setThemeRegistry, ['@theme.registry']]
   Drupal\Core\Theme\ThemeManagerInterface: '@theme.manager'

lib/Drupal/Core/CoreServiceProvider.php

@@ -28,6 +28,7 @@
 use Drupal\Core\DependencyInjection\ServiceModifierInterface;
 use Drupal\Core\DependencyInjection\ServiceProviderInterface;
 use Drupal\Core\Extension\ModuleUninstallValidatorInterface;
+use Drupal\Core\Hook\ThemeHookCollectorPass;
 use Drupal\Core\Plugin\PluginManagerPass;
 use Drupal\Core\PreWarm\PreWarmableInterface;
 use Drupal\Core\Queue\QueueFactoryInterface;
@@ -64,6 +65,7 @@ public function register(ContainerBuilder $container) {
     }
 
     $container->addCompilerPass(new HookCollectorPass());
+    $container->addCompilerPass(new ThemeHookCollectorPass());
     $container->addCompilerPass(new HookCollectorKeyValueWritePass(), PassConfig::TYPE_OPTIMIZE);
     // Add the compiler pass that lets service providers modify existing
     // service definitions. This pass must come before all passes operating on

lib/Drupal/Core/DrupalKernel.php

@@ -115,6 +115,17 @@ public function getAppRoot();
    */
   public function updateModules(array $module_list, array $module_filenames = []);
 
+  /**
+   * Updates the kernel's list of themes to the new list.
+   *
+   * The kernel needs to update its list and container to match the new
+   * list.
+   *
+   * array<string, \Drupal\Core\Extension\Extension> $register_themes
+   *   List of theme extensions, keyed by theme name.
+   */
+  public function updateThemes(array $register_themes = []): void;
+
   /**
    * Force a container rebuild.
    *

lib/Drupal/Core/DrupalKernelInterface.php

@@ -89,11 +89,6 @@ public function listInfo() {
    * {@inheritdoc}
    */
   public function addTheme(Extension $theme) {
-    // Register the namespaces of installed themes.
-    // @todo Implement proper theme registration
-    // https://www.drupal.org/project/drupal/issues/2941757
-    \Drupal::service('class_loader')->addPsr4('Drupal\\' . $theme->getName() . '\\', $this->root . '/' . $theme->getPath() . '/src');
-
     if (!empty($theme->info['libraries'])) {
       foreach ($theme->info['libraries'] as $library => $name) {
         $theme->libraries[$library] = $name;

lib/Drupal/Core/Extension/ThemeHandler.php

@@ -8,12 +8,14 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Config\ConfigInstallerInterface;
 use Drupal\Core\Config\ConfigManagerInterface;
+use Drupal\Core\DrupalKernelInterface;
 use Drupal\Core\Extension\Exception\UnknownExtensionException;
 use Drupal\Core\Routing\RouteBuilderInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Theme\Registry;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
 /**
  * Manages theme installation/uninstallation.
@@ -24,23 +26,26 @@ class ThemeInstaller implements ThemeInstallerInterface {
   use StringTranslationTrait;
 
   public function __construct(
-    protected readonly ThemeHandlerInterface $themeHandler,
-    protected readonly ConfigFactoryInterface $configFactory,
-    protected readonly ConfigInstallerInterface $configInstaller,
-    protected readonly ModuleHandlerInterface $moduleHandler,
-    protected readonly ConfigManagerInterface $configManager,
-    protected readonly AssetCollectionOptimizerInterface $cssCollectionOptimizer,
-    protected readonly RouteBuilderInterface $routeBuilder,
-    protected readonly LoggerInterface $logger,
-    protected readonly StateInterface $state,
-    protected readonly ModuleExtensionList $moduleExtensionList,
-    protected readonly Registry $themeRegistry,
-    protected readonly ThemeExtensionList $themeExtensionList,
-    protected ?CachedDiscoveryInterface $componentPluginManager = NULL,
+    protected ThemeHandlerInterface $themeHandler,
+    protected ConfigFactoryInterface $configFactory,
+    protected ConfigInstallerInterface $configInstaller,
+    protected ModuleHandlerInterface $moduleHandler,
+    protected ConfigManagerInterface $configManager,
+    #[Autowire(service: 'asset.css.collection_optimizer')]
+    protected AssetCollectionOptimizerInterface $cssCollectionOptimizer,
+    protected RouteBuilderInterface $routeBuilder,
+    #[Autowire(service: 'logger.channel.default')]
+    protected LoggerInterface $logger,
+    protected StateInterface $state,
+    protected ModuleExtensionList $moduleExtensionList,
+    protected Registry $themeRegistry,
+    protected ThemeExtensionList $themeExtensionList,
+    #[Autowire(service: 'kernel')]
+    protected DrupalKernelInterface|CachedDiscoveryInterface|null $kernel = NULL,
   ) {
-    if ($this->componentPluginManager === NULL) {
-      @trigger_error('Calling ' . __METHOD__ . ' without the $componentPluginManager argument is deprecated in drupal:11.2.0 and it will be required in drupal:12.0.0. See https://www.drupal.org/node/3525649', E_USER_DEPRECATED);
-      $this->componentPluginManager = \Drupal::service('plugin.manager.sdc');
+    if (!$this->kernel instanceof DrupalKernelInterface) {
+      @trigger_error('Calling ' . __METHOD__ . ' without the $kernel argument is deprecated in drupal:11.3.0 and it will be required in drupal:12.0.0. See https://www.drupal.org/node/3551652', E_USER_DEPRECATED);
+      $this->kernel = \Drupal::service('kernel');
     }
   }
 
@@ -170,7 +175,11 @@ public function install(array $theme_list, $install_dependencies = TRUE) {
     }
 
     $this->cssCollectionOptimizer->deleteAll();
-    $this->resetSystem();
+    // Add new themes to the list of installed themes.
+    $register_themes = array_merge(array_keys($installed_themes), $themes_installed);
+    // Get list of extensions for the new list of themes.
+    $register_themes = array_intersect_key($theme_data, array_flip($register_themes));
+    $this->resetSystem($register_themes);
 
     // Invoke hook_themes_installed() after the themes have been installed.
     $this->moduleHandler->invokeAll('themes_installed', [$themes_installed]);
@@ -185,6 +194,8 @@ public function uninstall(array $theme_list) {
     $extension_config = $this->configFactory->getEditable('core.extension');
     $theme_config = $this->configFactory->getEditable('system.theme');
     $list = $this->themeHandler->listInfo();
+    $installed_themes = $extension_config->get('theme') ?: [];
+    $theme_data = $this->themeExtensionList->reset()->getList();
     foreach ($theme_list as $key) {
       if ($extension_config->get("theme.$key") === NULL) {
         throw new UnknownExtensionException("Unknown theme: $key.");
@@ -219,19 +230,43 @@ public function uninstall(array $theme_list) {
     $extension_config->save(TRUE);
 
     // Refresh theme info.
-    $this->resetSystem();
     $this->themeHandler->reset();
+    // Remove themes that were uninstalled from the list.
+    $register_themes = array_diff(array_keys($installed_themes), $theme_list);
+    // Get list of extensions for the new list of themes.
+    $register_themes = array_intersect_key($theme_data, array_flip($register_themes));
+    $this->resetSystem($register_themes);
 
     $this->moduleHandler->invokeAll('themes_uninstalled', [$theme_list]);
   }
 
   /**
    * Resets some other systems like rebuilding the route information or caches.
+   *
+   * @param array<string, \Drupal\Core\Extension\Extension> $register_themes
+   *   Extension data for themes that should be registered, keyed by name.
    */
-  protected function resetSystem() {
-    $this->routeBuilder->setRebuildNeeded();
+  protected function resetSystem(array $register_themes) {
     $this->themeRegistry->reset();
-    $this->componentPluginManager->clearCachedDefinitions();
+    $this->kernel->updateThemes($register_themes);
+    $container = $this->kernel->getContainer();
+    $this->themeHandler = $container->get('theme_handler');
+    $this->configFactory = $container->get('config.factory');
+    $this->configInstaller = $container->get('config.installer');
+    $this->moduleHandler = $container->get('module_handler');
+    $this->configManager = $container->get('config.manager');
+    $this->cssCollectionOptimizer = $container->get('asset.css.collection_optimizer');
+    $this->routeBuilder = $container->get('router.builder');
+    $this->logger = $container->get('logger.channel.default');
+    $this->state = $container->get('state');
+    $this->moduleExtensionList = $container->get('extension.list.module');
+    $this->themeRegistry = $container->get('theme.registry');
+    $this->themeExtensionList = $container->get('extension.list.theme');
+
+    $container->get('stream_wrapper_manager')->register();
+    // Clear all plugin caches.
+    $container->get('plugin.cache_clearer')->clearCachedDefinitions();
+    $this->routeBuilder->setRebuildNeeded();
   }
 
 }

lib/Drupal/Core/Extension/ThemeInstaller.php

@@ -25,10 +25,15 @@ class HookCollectorKeyValueWritePass implements CompilerPassInterface {
    */
   public function process(ContainerBuilder $container): void {
     $hookData = $container->getParameter('.hook_data');
+    if ($container->hasParameter('.theme_hook_data')) {
+      $themeHookData = $container->getParameter('.theme_hook_data');
+      $hookData = array_merge($hookData, $themeHookData);
+      $hookData['preprocess_for_suggestions'] = array_merge($hookData['preprocess_for_suggestions'], $hookData['theme_preprocess_for_suggestions']);
+    }
     $keyvalue = $container->get('keyvalue')->get('hook_data');
     assert($keyvalue instanceof KeyValueStoreInterface);
     $keyvalue->setMultiple($hookData);
-    $container->get('cache.bootstrap')->delete('hook_data');
+    $container->get('cache.bootstrap')->deleteMultiple(['hook_data', 'theme_hook_data']);
   }
 
 }