From b1e325937545f8567f30ae5864fce8734b3ae816 Mon Sep 17 00:00:00 2001
From: Dave Long <dave@longwaveconsulting.com>
Date: Wed, 16 Aug 2023 10:37:01 +0100
Subject: [PATCH] Issue #3379525 by quietone, smustgrave: Convert
enable/disable to install/uninstall in exception text
(cherry picked from commit 7f4e7ac62fe6312f15b9f26516c8fc7e9f0ae728)
---
.../KernelTests/Core/Theme/ThemeInstallerTest.php | 2 +-
core/tests/Drupal/KernelTests/KernelTestBase.php | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php b/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
index 0baf1e19e7cb..4c424e55f5e7 100644
--- a/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
@@ -242,7 +242,7 @@ public function testUninstallDefault() {
$this->assertTrue(isset($themes[$other_name]));
try {
- $message = 'ThemeInstaller::uninstall() throws InvalidArgumentException upon disabling default theme.';
+ $message = 'ThemeInstaller::uninstall() throws InvalidArgumentException upon uninstalling default theme.';
$this->themeInstaller()->uninstall([$name]);
$this->fail($message);
}
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index 7f56b8794a55..78e32d0acc66 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -721,7 +721,7 @@ public function tearDownCloseDatabaseConnection() {
protected function installConfig($modules) {
foreach ((array) $modules as $module) {
if (!$this->container->get('module_handler')->moduleExists($module)) {
- throw new \LogicException("$module module is not enabled.");
+ throw new \LogicException("$module module is not installed.");
}
try {
$this->container->get('config.installer')->installDefaultConfig('module', $module);
@@ -753,7 +753,7 @@ protected function installSchema($module, $tables) {
// failures, we only allow the schema of explicitly loaded/enabled modules
// to be installed.
if (!$module_handler->moduleExists($module)) {
- throw new \LogicException("$module module is not enabled.");
+ throw new \LogicException("$module module is not installed.");
}
$specification = SchemaInspector::getTablesSpecification($module_handler, $module);
/** @var \Drupal\Core\Database\Schema $schema */
@@ -854,7 +854,7 @@ protected function enableModules(array $modules) {
$module_handler->reload();
foreach ($modules as $module) {
if (!$module_handler->moduleExists($module)) {
- throw new \RuntimeException("$module module is not enabled after enabling it.");
+ throw new \RuntimeException("$module module is not installed after installing it.");
}
}
}
@@ -880,7 +880,7 @@ protected function disableModules(array $modules) {
$extension_config = $this->config('core.extension');
foreach ($modules as $module) {
if (!$module_handler->moduleExists($module)) {
- throw new \LogicException("$module module cannot be disabled because it is not enabled.");
+ throw new \LogicException("$module module cannot be uninstalled because it is not installed.");
}
unset($module_filenames[$module]);
$extension_config->clear('module.' . $module);
@@ -899,7 +899,7 @@ protected function disableModules(array $modules) {
$module_handler->reload();
foreach ($modules as $module) {
if ($module_handler->moduleExists($module)) {
- throw new \RuntimeException("$module module is not disabled after disabling it.");
+ throw new \RuntimeException("$module module is not uninstalled after uninstalling it.");
}
}
}
--
GitLab