diff --git a/core/lib/Drupal/Core/Extension/RequiredModuleUninstallValidator.php b/core/lib/Drupal/Core/Extension/RequiredModuleUninstallValidator.php index 5b51777..09c72c3 100644 --- a/core/lib/Drupal/Core/Extension/RequiredModuleUninstallValidator.php +++ b/core/lib/Drupal/Core/Extension/RequiredModuleUninstallValidator.php @@ -32,7 +32,7 @@ public function validate($module) { $reasons = []; $module_info = $this->getModuleInfoByModule($module); if (!empty($module_info['required'])) { - $reasons[] = $this->t('This module is required.'); + $reasons[] = $this->t('The @module module is required.', ['@module' => $module_info['name']]); } return $reasons; } diff --git a/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php b/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php index 6bc292f..6dba251 100644 --- a/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php @@ -7,6 +7,7 @@ namespace Drupal\Tests\Core\Extension; +use Drupal\Component\Utility\String; use Drupal\Tests\UnitTestCase; /** @@ -50,11 +51,11 @@ public function testValidateNoModule() { * @covers ::validate */ public function testValidateNotRequired() { + $module = $this->randomMachineName(); + $this->uninstallValidator->expects($this->once()) ->method('getModuleInfoByModule') - ->willReturn(['required' => FALSE]); - - $module = $this->randomMachineName(); + ->willReturn(['required' => FALSE, 'name' => $module]); $expected = []; $reasons = $this->uninstallValidator->validate($module); @@ -65,12 +66,13 @@ public function testValidateNotRequired() { * @covers ::validate */ public function testValidateRequired() { + $module = $this->randomMachineName(); + $this->uninstallValidator->expects($this->once()) ->method('getModuleInfoByModule') - ->willReturn(['required' => TRUE]); + ->willReturn(['required' => TRUE, 'name' => $module]); - $module = $this->randomMachineName(); - $expected = ['This module is required.']; + $expected = [String::format('The @module module is required.', ['@module' => $module])]; $reasons = $this->uninstallValidator->validate($module); $this->assertSame($expected, $reasons); }