Issue #3269153 by andregp, longwave, catch: Remove BC layers from the extension system

core/lib/Drupal/Core/Extension/ExtensionPathResolver.php

@@ -3,6 +3,7 @@
 namespace Drupal\Core\Extension;
 
 use Drupal\Core\Extension\Exception\UnknownExtensionException;
+use Drupal\Core\Extension\Exception\UnknownExtensionTypeException;
 
 /**
  * Factory for getting extension lists by type.
@@ -51,8 +52,7 @@ public function getPathname(string $type, string $name): ?string {
       return 'core/core.info.yml';
     }
     if (!isset($this->extensionLists[$type])) {
-      @trigger_error('Calling getPathname() with an invalid $type parameter is deprecated in drupal:9.3.0 and will throw an \Drupal\Core\Extension\Exception\UnknownExtensionTypeException in drupal:10.0.0. See https://www.drupal.org/node/2940438', E_USER_DEPRECATED);
-      return NULL;
+      throw new UnknownExtensionTypeException(sprintf('Extension type %s is unknown.', $type));
     }
     try {
       return $this->extensionLists[$type]->getPathname($name);

core/lib/Drupal/Core/Extension/ModuleInstaller.php

@@ -79,25 +79,17 @@ class ModuleInstaller implements ModuleInstallerInterface {
    *   The drupal kernel.
    * @param \Drupal\Core\Database\Connection $connection
    *   The database connection.
-   * @param \Drupal\Core\Update\UpdateHookRegistry|null $update_registry
-   *   (Optional) The update registry service.
+   * @param \Drupal\Core\Update\UpdateHookRegistry $update_registry
+   *   The update registry service.
    *
    * @see \Drupal\Core\DrupalKernel
    * @see \Drupal\Core\CoreServiceProvider
    */
-  public function __construct($root, ModuleHandlerInterface $module_handler, DrupalKernelInterface $kernel, Connection $connection = NULL, UpdateHookRegistry $update_registry = NULL) {
+  public function __construct($root, ModuleHandlerInterface $module_handler, DrupalKernelInterface $kernel, Connection $connection, UpdateHookRegistry $update_registry) {
     $this->root = $root;
     $this->moduleHandler = $module_handler;
     $this->kernel = $kernel;
-    if (!$connection) {
-      @trigger_error('The database connection must be passed to ' . __METHOD__ . '(). Creating ' . __CLASS__ . ' without it is deprecated in drupal:9.2.0 and will be required in drupal:10.0.0. See https://www.drupal.org/node/2970993', E_USER_DEPRECATED);
-      $connection = \Drupal::service('database');
-    }
     $this->connection = $connection;
-    if (!$update_registry) {
-      @trigger_error('Calling ' . __METHOD__ . '() without the $update_registry argument is deprecated in drupal:9.3.0 and $update_registry argument will be required in drupal:10.0.0. See https://www.drupal.org/node/2124069', E_USER_DEPRECATED);
-      $update_registry = \Drupal::service('update.update_hook_registry');
-    }
     $this->updateRegistry = $update_registry;
   }
 

core/lib/Drupal/Core/Extension/ThemeInstaller.php

@@ -101,7 +101,7 @@ class ThemeInstaller implements ThemeInstallerInterface {
    * @param \Drupal\Core\Extension\ModuleExtensionList $module_extension_list
    *   The module extension list.
    */
-  public function __construct(ThemeHandlerInterface $theme_handler, ConfigFactoryInterface $config_factory, ConfigInstallerInterface $config_installer, ModuleHandlerInterface $module_handler, ConfigManagerInterface $config_manager, AssetCollectionOptimizerInterface $css_collection_optimizer, RouteBuilderInterface $route_builder, LoggerInterface $logger, StateInterface $state, ModuleExtensionList $module_extension_list = NULL) {
+  public function __construct(ThemeHandlerInterface $theme_handler, ConfigFactoryInterface $config_factory, ConfigInstallerInterface $config_installer, ModuleHandlerInterface $module_handler, ConfigManagerInterface $config_manager, AssetCollectionOptimizerInterface $css_collection_optimizer, RouteBuilderInterface $route_builder, LoggerInterface $logger, StateInterface $state, ModuleExtensionList $module_extension_list) {
     $this->themeHandler = $theme_handler;
     $this->configFactory = $config_factory;
     $this->configInstaller = $config_installer;
@@ -111,10 +111,6 @@ public function __construct(ThemeHandlerInterface $theme_handler, ConfigFactoryI
     $this->routeBuilder = $route_builder;
     $this->logger = $logger;
     $this->state = $state;
-    if ($module_extension_list === NULL) {
-      @trigger_error('The extension.list.module service must be passed to ' . __NAMESPACE__ . '\ThemeInstaller::__construct(). It was added in drupal:8.9.0 and will be required before drupal:10.0.0.', E_USER_DEPRECATED);
-      $module_extension_list = \Drupal::service('extension.list.module');
-    }
     $this->moduleExtensionList = $module_extension_list;
   }
 

core/tests/Drupal/KernelTests/Core/Bootstrap/ExtensionPathResolverTest.php

@@ -3,6 +3,12 @@
 namespace Drupal\KernelTests\Core\Bootstrap;
 
 use Drupal\Core\Extension\Exception\UnknownExtensionException;
+use Drupal\Core\Extension\Exception\UnknownExtensionTypeException;
+use Drupal\Core\Extension\ExtensionPathResolver;
+use Drupal\Core\Extension\ModuleExtensionList;
+use Drupal\Core\Extension\ProfileExtensionList;
+use Drupal\Core\Extension\ThemeEngineExtensionList;
+use Drupal\Core\Extension\ThemeExtensionList;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
@@ -85,4 +91,24 @@ public function testExtensionPathResolvingWithNonExistingThemeEngine(): void {
       ->getPathname('there_is_an_theme_engine_for_you'), 'Searching for an item that does not exist returns NULL.');
   }
 
+  /**
+   * Tests the getPath() method with an unknown extension.
+   */
+  public function testUnknownExtension() {
+    $module_extension_list = $this->prophesize(ModuleExtensionList::class);
+    $profile_extension_list = $this->prophesize(ProfileExtensionList::class);
+    $theme_extension_list = $this->prophesize(ThemeExtensionList::class);
+    $theme_engine_extension_list = $this->prophesize(ThemeEngineExtensionList::class);
+    $resolver = new ExtensionPathResolver(
+      $module_extension_list->reveal(),
+      $profile_extension_list->reveal(),
+      $theme_extension_list->reveal(),
+      $theme_engine_extension_list->reveal()
+    );
+
+    $this->expectException(UnknownExtensionTypeException::class);
+    $this->expectExceptionMessage('Extension type foo is unknown.');
+    $resolver->getPath('foo', 'bar');
+  }
+
 }

core/tests/Drupal/KernelTests/Core/Extension/LegacyExtensionPathResolverTest.php

-<?php
-
-namespace Drupal\KernelTests\Core\Extension;
-
-use Drupal\Core\Extension\ExtensionPathResolver;
-use Drupal\Core\Extension\ModuleExtensionList;
-use Drupal\Core\Extension\ProfileExtensionList;
-use Drupal\Core\Extension\ThemeEngineExtensionList;
-use Drupal\Core\Extension\ThemeExtensionList;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests the extension path resolver deprecations.
- *
- * @group legacy
- * @group Module
- */
-class LegacyExtensionPathResolverTest extends KernelTestBase {
-
-  /**
-   * @group legacy
-   */
-  public function testDeprecatedWarning() {
-    $this->expectDeprecation('Calling getPathname() with an invalid $type parameter is deprecated in drupal:9.3.0 and will throw an \Drupal\Core\Extension\Exception\UnknownExtensionTypeException in drupal:10.0.0. See https://www.drupal.org/node/2940438');
-    $module_extension_list = $this->prophesize(ModuleExtensionList::class);
-    $profile_extension_list = $this->prophesize(ProfileExtensionList::class);
-    $theme_extension_list = $this->prophesize(ThemeExtensionList::class);
-    $theme_engine_extension_list = $this->prophesize(ThemeEngineExtensionList::class);
-    $resolver = new ExtensionPathResolver(
-      $module_extension_list->reveal(),
-      $profile_extension_list->reveal(),
-      $theme_extension_list->reveal(),
-      $theme_engine_extension_list->reveal()
-    );
-
-    $this->assertEmpty($resolver->getPath('foo', 'bar'));
-
-  }
-
-}

core/tests/Drupal/KernelTests/Core/Extension/ModuleInstallerDeprecationTest.php

-<?php
-
-namespace Drupal\KernelTests\Core\Extension;
-
-use Drupal\Core\DrupalKernelInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Extension\ModuleInstaller;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * @group legacy
- * @group extension
- * @coversDefaultClass \Drupal\Core\Extension\ModuleInstaller
- */
-class ModuleInstallerDeprecationTest extends KernelTestBase {
-
-  /**
-   * @covers ::__construct
-   */
-  public function testConstructorDeprecation() {
-    $this->expectDeprecation('Calling ' . ModuleInstaller::class . '::__construct() without the $update_registry argument is deprecated in drupal:9.3.0 and $update_registry argument will be required in drupal:10.0.0. See https://www.drupal.org/node/2124069');
-    $root = '';
-    $module_handler = $this->prophesize(ModuleHandlerInterface::class);
-    $kernel = $this->prophesize(DrupalKernelInterface::class);
-    $this->assertNotNull(new ModuleInstaller($root, $module_handler->reveal(), $kernel->reveal()));
-  }
-
-}