Verified Commit b1e32593 authored by Dave Long's avatar Dave Long
Browse files

Issue #3379525 by quietone, smustgrave: Convert enable/disable to... 

Issue #3379525 by quietone, smustgrave: Convert enable/disable to install/uninstall in exception text

(cherry picked from commit 7f4e7ac6)
parent 9ad7b24e

core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php

+1 −1
Original line number Diff line number Diff line
@@ -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);

    }

core/tests/Drupal/KernelTests/KernelTestBase.php

+5 −5
Original line number Diff line number Diff line
@@ -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.");

      }

    }

  }