diff --git a/core/includes/module.inc b/core/includes/module.inc index cee6f89469..c441b394b0 100644 --- a/core/includes/module.inc +++ b/core/includes/module.inc @@ -7,90 +7,6 @@ use Drupal\Core\Extension\ExtensionDiscovery; -/** - * Loads a module's installation hooks. - * - * @param $module - * The name of the module (without the .module extension). - * - * @return - * The name of the module's install file, if successful; FALSE otherwise. - * - * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. Use - * \Drupal::moduleHandler()->loadInclude($module, 'install') instead. Note, - * the replacement no longer allows including code from uninstalled modules. - * - * @see https://www.drupal.org/node/3220952 - */ -function module_load_install($module) { - @trigger_error('module_load_install() is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. Instead, you should use \Drupal::moduleHandler()->loadInclude($module, \'install\'). Note, the replacement no longer allows including code from uninstalled modules. See https://www.drupal.org/project/drupal/issues/2010380', E_USER_DEPRECATED); - // Make sure the installation API is available - include_once __DIR__ . '/install.inc'; - - if (\Drupal::hasService('extension.list.module')) { - /** @var \Drupal\Core\Extension\ModuleExtensionList $module_list */ - $module_list = \Drupal::service('extension.list.module'); - $file = DRUPAL_ROOT . '/' . $module_list->getPath($module) . "/$module.install"; - if (is_file($file)) { - require_once $file; - return $file; - } - } - return FALSE; -} - -/** - * Loads a module include file. - * - * Examples: - * @code - * // Load node.admin.inc from the node module. - * module_load_include('inc', 'node', 'node.admin'); - * // Load content_types.inc from the node module. - * module_load_include('inc', 'node', 'content_types'); - * @endcode - * - * Do not use this function to load an install file, use module_load_install() - * instead. Do not use this function in a global context since it requires - * Drupal to be fully bootstrapped, use require_once DRUPAL_ROOT . '/path/file' - * instead. - * - * @param $type - * The include file's type (file extension). - * @param $module - * The module to which the include file belongs. - * @param $name - * (optional) The base file name (without the $type extension). If omitted, - * $module is used; i.e., resulting in "$module.$type" by default. - * - * @return string|false - * The name of the included file, if successful; FALSE otherwise. - * - * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. - * Use \Drupal::moduleHandler()->loadInclude($module, $type, $name = NULL). - * Note that including code from uninstalled extensions is no longer - * supported. - * - * @see https://www.drupal.org/node/2948698 - */ -function module_load_include($type, $module, $name = NULL) { - @trigger_error("module_load_include() is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. Instead, you should use \Drupal::moduleHandler()->loadInclude(). Note that including code from uninstalled extensions is no longer supported. See https://www.drupal.org/project/drupal/issues/697946", E_USER_DEPRECATED); - if (!isset($name)) { - $name = $module; - } - - if (\Drupal::hasService('extension.list.module')) { - /** @var \Drupal\Core\Extension\ModuleExtensionList $module_list */ - $module_list = \Drupal::service('extension.list.module'); - $file = DRUPAL_ROOT . '/' . $module_list->getPath($module) . "/$name.$type"; - if (is_file($file)) { - require_once $file; - return $file; - } - } - return FALSE; -} - /** * Returns an array of modules required by core. */ diff --git a/core/includes/update.inc b/core/includes/update.inc index 2dbcd3ce35..d063cb84b5 100644 --- a/core/includes/update.inc +++ b/core/includes/update.inc @@ -692,7 +692,7 @@ function update_retrieve_dependencies() { // the same order that \Drupal::moduleHandler()->invokeAll() does. foreach ($update_registry->getAllInstalledVersions() as $module => $schema) { // Skip modules that are entirely missing from the filesystem here, since - // module_load_install() will call trigger_error() if invoked on a module + // loading .install file will call trigger_error() if invoked on a module // that doesn't exist. There's no way to catch() that, so avoid it entirely. // This can happen when there are orphaned entries in the system.schema k/v // store for modules that have been removed from a site without first being diff --git a/core/tests/Drupal/KernelTests/Core/Extension/ModuleLegacyTest.php b/core/tests/Drupal/KernelTests/Core/Extension/ModuleLegacyTest.php deleted file mode 100644 index 848170099e..0000000000 --- a/core/tests/Drupal/KernelTests/Core/Extension/ModuleLegacyTest.php +++ /dev/null @@ -1,35 +0,0 @@ -assertFalse($this->container->get('module_handler')->moduleExists('module_test'), 'Ensure module is uninstalled so we test the ability to include uninstalled code.'); - $this->expectDeprecation('module_load_include() is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. Instead, you should use \Drupal::moduleHandler()->loadInclude(). Note that including code from uninstalled extensions is no longer supported. See https://www.drupal.org/project/drupal/issues/697946'); - $filename = module_load_include('inc', 'module_test', 'module_test.file'); - $this->assertStringEndsWith("module_test.file.inc", $filename); - - } - - /** - * Test deprecation of module_load_install() function. - */ - public function testModuleLoadInstall() { - $this->assertFalse(\Drupal::moduleHandler()->moduleExists('node'), 'The Node module is not installed'); - $this->expectDeprecation('module_load_install() is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. Instead, you should use \Drupal::moduleHandler()->loadInclude($module, \'install\'). Note, the replacement no longer allows including code from uninstalled modules. See https://www.drupal.org/project/drupal/issues/2010380'); - $filename = module_load_install('node'); - $this->assertStringEndsWith("node.install", $filename); - } - -}