diff --git a/core/core.services.yml b/core/core.services.yml
index 58db84c..043852a 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -432,6 +432,12 @@ services:
- { name: module_install.uninstall_validator }
arguments: ['@entity.manager', '@string_translation']
lazy: true
+ required_module_uninstall_validator:
+ class: Drupal\Core\Extension\RequiredModuleUninstallValidator
+ tags:
+ - { name: module_install.uninstall_validator }
+ arguments: ['@string_translation']
+ lazy: true
theme_handler:
class: Drupal\Core\Extension\ThemeHandler
arguments: ['@app.root', '@config.factory', '@module_handler', '@state', '@info_parser']
diff --git a/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
index cc139e0..e791d8a 100644
--- a/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
+++ b/core/lib/Drupal/Core/Entity/ContentUninstallValidator.php
@@ -18,6 +18,13 @@ class ContentUninstallValidator implements ModuleUninstallValidatorInterface {
use StringTranslationTrait;
/**
+ * The entity manager.
+ *
+ * @var \Drupal\Core\Entity\EntityManagerInterface
+ */
+ protected $entityManager;
+
+ /**
* Constructs a new ContentUninstallValidator.
*
* @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
diff --git a/core/lib/Drupal/Core/Extension/RequiredModuleUninstallValidator.php b/core/lib/Drupal/Core/Extension/RequiredModuleUninstallValidator.php
new file mode 100644
index 0000000..5ce8a48
--- /dev/null
+++ b/core/lib/Drupal/Core/Extension/RequiredModuleUninstallValidator.php
@@ -0,0 +1,56 @@
+stringTranslation = $string_translation;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate($module) {
+ $reasons = [];
+ $module_info = $this->getModuleInfoByModule($module);
+ if (!empty($module_info['required'])) {
+ $reasons[] = $this->t('The @module module is required.', ['@module' => $module_info['name']]);
+ }
+ return $reasons;
+ }
+
+ /**
+ * Returns the module info for a specific module.
+ *
+ * @param string $module
+ * The name of the module.
+ *
+ * @return array
+ * The module info, or NULL if that module does not exist.
+ */
+ protected function getModuleInfoByModule($module) {
+ $modules = system_rebuild_module_data();
+ return isset($modules[$module]->info) ? $modules[$module]->info : [];
+ }
+
+}
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 40af371..fa4a46a 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -576,33 +576,3 @@ function book_node_type_update(NodeTypeInterface $type) {
$config->save();
}
}
-
-/**
- * Implements hook_system_info_alter().
- *
- * Prevents book module from being uninstalled whilst any book nodes exist or
- * there are any book outline stored.
- */
-function book_system_info_alter(&$info, Extension $file, $type) {
- // It is not safe use the entity query service during maintenance mode.
- if ($type == 'module' && !defined('MAINTENANCE_MODE') && $file->getName() == 'book') {
- if (\Drupal::service('book.outline_storage')->hasBooks()) {
- $info['required'] = TRUE;
- $info['explanation'] = t('To uninstall Book, delete all content that is part of a book.');
- }
- else {
- // The book node type is provided by the Book module. Prevent uninstall if
- // there are any nodes of that type.
- $factory = \Drupal::service('entity.query');
- $nodes = $factory->get('node')
- ->condition('type', 'book')
- ->accessCheck(FALSE)
- ->range(0, 1)
- ->execute();
- if (!empty($nodes)) {
- $info['required'] = TRUE;
- $info['explanation'] = t('To uninstall Book, delete all content that has the Book content type.');
- }
- }
- }
-}
diff --git a/core/modules/book/book.services.yml b/core/modules/book/book.services.yml
index 6d024f7..3b45dae 100644
--- a/core/modules/book/book.services.yml
+++ b/core/modules/book/book.services.yml
@@ -28,3 +28,10 @@ services:
arguments: ['@request_stack']
tags:
- { name: cache.context}
+
+ book.uninstall_validator:
+ class: Drupal\book\BookUninstallValidator
+ tags:
+ - { name: module_install.uninstall_validator }
+ arguments: ['@book.outline_storage', '@entity.query', '@string_translation']
+ lazy: true
diff --git a/core/modules/book/src/BookUninstallValidator.php b/core/modules/book/src/BookUninstallValidator.php
new file mode 100644
index 0000000..6a686c3
--- /dev/null
+++ b/core/modules/book/src/BookUninstallValidator.php
@@ -0,0 +1,98 @@
+bookOutlineStorage = $book_outline_storage;
+ $this->entityQuery = $query_factory->get('node');
+ $this->stringTranslation = $string_translation;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate($module) {
+ $reasons = [];
+ if ($module == 'book') {
+ if ($this->hasBookOutlines()) {
+ $reasons[] = $this->t('To uninstall Book, delete all content that is part of a book.');
+ }
+ else {
+ // The book node type is provided by the Book module. Prevent uninstall
+ // if there are any nodes of that type.
+ if ($this->hasBookNodes()) {
+ $reasons[] = $this->t('To uninstall Book, delete all content that has the Book content type.');
+ }
+ }
+ }
+ return $reasons;
+ }
+
+ /**
+ * Checks if there are any books in an outline.
+ *
+ * @return bool
+ * TRUE if there are books, FALSE if not.
+ */
+ protected function hasBookOutlines() {
+ return $this->bookOutlineStorage->hasBooks();
+ }
+
+ /**
+ * Determines if there is any book nodes or not.
+ *
+ * @return bool
+ * TRUE if there are book nodes, FALSE otherwise.
+ */
+ protected function hasBookNodes() {
+ $nodes = $this->entityQuery
+ ->condition('type', 'book')
+ ->accessCheck(FALSE)
+ ->range(0, 1)
+ ->execute();
+ return !empty($nodes);
+ }
+
+}
diff --git a/core/modules/book/src/Tests/BookUninstallTest.php b/core/modules/book/src/Tests/BookUninstallTest.php
deleted file mode 100644
index 317a16a..0000000
--- a/core/modules/book/src/Tests/BookUninstallTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-installEntitySchema('user');
- $this->installEntitySchema('node');
- $this->installSchema('book', array('book'));
- $this->installSchema('node', array('node_access'));
- $this->installConfig(array('node', 'book', 'field'));
- // For uninstall to work.
- $this->installSchema('user', array('users_data'));
- }
-
- /**
- * Tests the book_system_info_alter() method.
- */
- public function testBookUninstall() {
- // No nodes exist.
- $module_data = _system_rebuild_module_data();
- $this->assertFalse(isset($module_data['book']->info['required']), 'The book module is not required.');
-
- $content_type = NodeType::create(array(
- 'type' => $this->randomMachineName(),
- 'name' => $this->randomString(),
- ));
- $content_type->save();
- $book_config = $this->config('book.settings');
- $allowed_types = $book_config->get('allowed_types');
- $allowed_types[] = $content_type->id();
- $book_config->set('allowed_types', $allowed_types)->save();
-
- $node = Node::create(array('type' => $content_type->id()));
- $node->book['bid'] = 'new';
- $node->save();
-
- // One node in a book but not of type book.
- $module_data = _system_rebuild_module_data();
- $this->assertTrue($module_data['book']->info['required'], 'The book module is required.');
- $this->assertEqual($module_data['book']->info['explanation'], t('To uninstall Book, delete all content that is part of a book.'));
-
- $book_node = Node::create(array('type' => 'book'));
- $book_node->book['bid'] = FALSE;
- $book_node->save();
-
- // Two nodes, one in a book but not of type book and one book node (which is
- // not in a book).
- $module_data = _system_rebuild_module_data();
- $this->assertTrue($module_data['book']->info['required'], 'The book module is required.');
- $this->assertEqual($module_data['book']->info['explanation'], t('To uninstall Book, delete all content that is part of a book.'));
-
- $node->delete();
- // One node of type book but not actually part of a book.
- $module_data = _system_rebuild_module_data();
- $this->assertTrue($module_data['book']->info['required'], 'The book module is required.');
- $this->assertEqual($module_data['book']->info['explanation'], t('To uninstall Book, delete all content that has the Book content type.'));
-
- $book_node->delete();
- // No nodes exist therefore the book module is not required.
- $module_data = _system_rebuild_module_data();
- $this->assertFalse(isset($module_data['book']->info['required']), 'The book module is not required.');
-
- $node = Node::create(array('type' => $content_type->id()));
- $node->save();
- // One node exists but is not part of a book therefore the book module is
- // not required.
- $module_data = _system_rebuild_module_data();
- $this->assertFalse(isset($module_data['book']->info['required']), 'The book module is not required.');
-
- // Uninstall the Book module and check the node type is deleted.
- \Drupal::service('module_installer')->uninstall(array('book'));
- $this->assertNull(NodeType::load('book'), "The book node type does not exist.");
- }
-
-}
diff --git a/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php b/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php
new file mode 100644
index 0000000..4739298
--- /dev/null
+++ b/core/modules/book/tests/src/Unit/BookUninstallValidatorTest.php
@@ -0,0 +1,100 @@
+bookUninstallValidator = $this->getMockBuilder('Drupal\book\BookUninstallValidator')
+ ->disableOriginalConstructor()
+ ->setMethods(['hasBookOutlines', 'hasBookNodes'])
+ ->getMock();
+ $this->bookUninstallValidator->setStringTranslation($this->getStringTranslationStub());
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNotBook() {
+ $this->bookUninstallValidator->expects($this->never())
+ ->method('hasBookOutlines');
+ $this->bookUninstallValidator->expects($this->never())
+ ->method('hasBookNodes');
+
+ $module = 'not_book';
+ $expected = [];
+ $reasons = $this->bookUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateEntityQueryWithoutResults() {
+ $this->bookUninstallValidator->expects($this->once())
+ ->method('hasBookOutlines')
+ ->willReturn(FALSE);
+ $this->bookUninstallValidator->expects($this->once())
+ ->method('hasBookNodes')
+ ->willReturn(FALSE);
+
+ $module = 'book';
+ $expected = [];
+ $reasons = $this->bookUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateEntityQueryWithResults() {
+ $this->bookUninstallValidator->expects($this->once())
+ ->method('hasBookOutlines')
+ ->willReturn(FALSE);
+ $this->bookUninstallValidator->expects($this->once())
+ ->method('hasBookNodes')
+ ->willReturn(TRUE);
+
+ $module = 'book';
+ $expected = ['To uninstall Book, delete all content that has the Book content type.'];
+ $reasons = $this->bookUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateOutlineStorage() {
+ $this->bookUninstallValidator->expects($this->once())
+ ->method('hasBookOutlines')
+ ->willReturn(TRUE);
+ $this->bookUninstallValidator->expects($this->never())
+ ->method('hasBookNodes');
+
+ $module = 'book';
+ $expected = ['To uninstall Book, delete all content that is part of a book.'];
+ $reasons = $this->bookUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+}
diff --git a/core/modules/comment/src/Tests/CommentUninstallTest.php b/core/modules/comment/src/Tests/CommentUninstallTest.php
index 1cca31a..fa97f74 100644
--- a/core/modules/comment/src/Tests/CommentUninstallTest.php
+++ b/core/modules/comment/src/Tests/CommentUninstallTest.php
@@ -8,6 +8,7 @@
namespace Drupal\comment\Tests;
use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\Core\Extension\ModuleUninstallValidatorException;
use Drupal\simpletest\WebTestBase;
/**
@@ -36,19 +37,23 @@ protected function setUp() {
}
/**
- * Tests if comment module uninstallation properly deletes the field.
+ * Tests if comment module uninstallation fails if the field exists.
+ *
+ * @throws \Drupal\Core\Extension\ModuleUninstallValidatorException
*/
function testCommentUninstallWithField() {
// Ensure that the field exists before uninstallation.
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
$this->assertNotNull($field_storage, 'The comment_body field exists.');
- // Uninstall the comment module which should trigger field deletion.
- $this->container->get('module_installer')->uninstall(array('comment'));
-
- // Check that the field is now deleted.
- $field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
- $this->assertNull($field_storage, 'The comment_body field has been deleted.');
+ // Uninstall the comment module which should trigger an exception.
+ try {
+ $this->container->get('module_installer')->uninstall(array('comment'));
+ $this->fail("Expected an exception when uninstall was attempted.");
+ }
+ catch (ModuleUninstallValidatorException $e) {
+ $this->pass("Caught an exception when uninstall was attempted.");
+ }
}
@@ -65,6 +70,16 @@ function testCommentUninstallWithoutField() {
$field_storage = FieldStorageConfig::loadByName('comment', 'comment_body');
$this->assertNull($field_storage, 'The comment_body field has been deleted.');
+ // Manually delete the comment field on the node before module uninstallation.
+ $field_storage = FieldStorageConfig::loadByName('node', 'comment');
+ $this->assertNotNull($field_storage, 'The comment field exists.');
+ $field_storage->delete();
+
+ // Check that the field is now deleted.
+ $field_storage = FieldStorageConfig::loadByName('node', 'comment');
+ $this->assertNull($field_storage, 'The comment field has been deleted.');
+
+ field_purge_batch(10);
// Ensure that uninstallation succeeds even if the field has already been
// deleted manually beforehand.
$this->container->get('module_installer')->uninstall(array('comment'));
diff --git a/core/modules/config/src/Tests/ConfigImportAllTest.php b/core/modules/config/src/Tests/ConfigImportAllTest.php
index 7645847..21312bc 100644
--- a/core/modules/config/src/Tests/ConfigImportAllTest.php
+++ b/core/modules/config/src/Tests/ConfigImportAllTest.php
@@ -108,6 +108,13 @@ public function testInstallUninstall() {
// Can not uninstall config and use admin/config/development/configuration!
unset($modules_to_uninstall['config']);
+ // Can not uninstall Editor and Filter and their dependencies as they
+ // provide filter plugins that can not be removed.
+ unset($modules_to_uninstall['editor']);
+ unset($modules_to_uninstall['filter']);
+ unset($modules_to_uninstall['file']);
+ unset($modules_to_uninstall['field']);
+
$this->assertTrue(isset($modules_to_uninstall['comment']), 'The comment module will be disabled');
// Uninstall all modules that can be uninstalled.
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 1ebea04..455d810 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -146,40 +146,6 @@ function field_cron() {
}
/**
- * Implements hook_system_info_alter().
- *
- * Goes through a list of all modules that provide a field type and makes them
- * required if there are any active fields of that type.
- */
-function field_system_info_alter(&$info, Extension $file, $type) {
- // It is not safe to call entity_load_multiple_by_properties() during
- // maintenance mode.
- if ($type == 'module' && !defined('MAINTENANCE_MODE')) {
- $field_storages = entity_load_multiple_by_properties('field_storage_config', array('module' => $file->getName(), 'include_deleted' => TRUE));
- if ($field_storages) {
- $info['required'] = TRUE;
-
- // Provide an explanation message (only mention pending deletions if there
- // remains no actual, non-deleted fields)
- $non_deleted = FALSE;
- foreach ($field_storages as $field_storage) {
- if (!$field_storage->isDeleted()) {
- $non_deleted = TRUE;
- break;
- }
- }
- if ($non_deleted) {
- $explanation = t('Fields type(s) in use');
- }
- else {
- $explanation = t('Fields pending deletion');
- }
- $info['explanation'] = $explanation;
- }
- }
-}
-
-/**
* Implements hook_entity_field_storage_info().
*/
function field_entity_field_storage_info(\Drupal\Core\Entity\EntityTypeInterface $entity_type) {
diff --git a/core/modules/field/field.services.yml b/core/modules/field/field.services.yml
new file mode 100644
index 0000000..6c2187a
--- /dev/null
+++ b/core/modules/field/field.services.yml
@@ -0,0 +1,7 @@
+services:
+ field.uninstall_validator:
+ class: Drupal\field\FieldUninstallValidator
+ tags:
+ - { name: module_install.uninstall_validator }
+ arguments: ['@entity.manager', '@string_translation']
+ lazy: true
diff --git a/core/modules/field/src/FieldUninstallValidator.php b/core/modules/field/src/FieldUninstallValidator.php
new file mode 100644
index 0000000..3b3fbd5
--- /dev/null
+++ b/core/modules/field/src/FieldUninstallValidator.php
@@ -0,0 +1,80 @@
+fieldStorageConfigStorage = $entity_manager->getStorage('field_storage_config');
+ $this->stringTranslation = $string_translation;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate($module) {
+ $reasons = [];
+ if ($field_storages = $this->getFieldStoragesByModule($module)) {
+ // Provide an explanation message (only mention pending deletions if there
+ // remain no actual, non-deleted fields.)
+ $non_deleted = FALSE;
+ foreach ($field_storages as $field_storage) {
+ if (!$field_storage->isDeleted()) {
+ $non_deleted = TRUE;
+ break;
+ }
+ }
+ if ($non_deleted) {
+ $reasons[] = $this->t('Fields type(s) in use.');
+ }
+ else {
+ $reasons[] = $this->t('Fields pending deletion.');
+ }
+ }
+ return $reasons;
+ }
+
+ /**
+ * Returns all field storages for a specified module.
+ *
+ * @param string $module
+ * The module to filter field storages by.
+ *
+ * @return \Drupal\field\FieldStorageConfigInterface[]
+ * An array of field storages for a specified module.
+ */
+ protected function getFieldStoragesByModule($module) {
+ return $this->fieldStorageConfigStorage->loadByProperties(['module' => $module, 'include_deleted' => TRUE]);
+ }
+
+}
diff --git a/core/modules/field/src/Tests/reEnableModuleFieldTest.php b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
index cbbf386..42fcc2b 100644
--- a/core/modules/field/src/Tests/reEnableModuleFieldTest.php
+++ b/core/modules/field/src/Tests/reEnableModuleFieldTest.php
@@ -92,10 +92,10 @@ function testReEnabledField() {
// for it's fields.
$admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules'));
$this->drupalLogin($admin_user);
- $this->drupalGet('admin/modules');
+ $this->drupalGet('admin/modules/uninstall');
$this->assertText('Fields type(s) in use');
$field_storage->delete();
- $this->drupalGet('admin/modules');
+ $this->drupalGet('admin/modules/uninstall');
$this->assertText('Fields pending deletion');
$this->cronRun();
$this->assertNoText('Fields type(s) in use');
diff --git a/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php b/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php
new file mode 100644
index 0000000..4de38b9
--- /dev/null
+++ b/core/modules/field/tests/src/Unit/FieldUninstallValidatorTest.php
@@ -0,0 +1,89 @@
+fieldUninstallValidator = $this->getMockBuilder('Drupal\field\FieldUninstallValidator')
+ ->disableOriginalConstructor()
+ ->setMethods(['getFieldStoragesByModule'])
+ ->getMock();
+ $this->fieldUninstallValidator->setStringTranslation($this->getStringTranslationStub());
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNoStorages() {
+ $this->fieldUninstallValidator->expects($this->once())
+ ->method('getFieldStoragesByModule')
+ ->willReturn([]);
+
+ $module = $this->randomMachineName();
+ $expected = [];
+ $reasons = $this->fieldUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateDeleted() {
+ $field_storage = $this->getMockBuilder('Drupal\field\Entity\FieldStorageConfig')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $field_storage->expects($this->once())
+ ->method('isDeleted')
+ ->willReturn(TRUE);
+ $this->fieldUninstallValidator->expects($this->once())
+ ->method('getFieldStoragesByModule')
+ ->willReturn([$field_storage]);
+
+ $module = $this->randomMachineName();
+ $expected = ['Fields pending deletion.'];
+ $reasons = $this->fieldUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNoDeleted() {
+ $field_storage = $this->getMockBuilder('Drupal\field\Entity\FieldStorageConfig')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $field_storage->expects($this->once())
+ ->method('isDeleted')
+ ->willReturn(FALSE);
+ $this->fieldUninstallValidator->expects($this->once())
+ ->method('getFieldStoragesByModule')
+ ->willReturn([$field_storage]);
+
+ $module = $this->randomMachineName();
+ $expected = ['Fields type(s) in use.'];
+ $reasons = $this->fieldUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+}
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 51b89e7..b785955 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -84,44 +84,6 @@ function filter_theme() {
}
/**
- * Implements hook_system_info_alter().
- *
- * Prevents uninstallation of modules that provide filter plugins that are being
- * used in a filter format.
- */
-function filter_system_info_alter(&$info, Extension $file, $type) {
- // It is not safe to call filter_formats() during maintenance mode.
- if ($type == 'module' && !defined('MAINTENANCE_MODE')) {
- // Get filter plugins supplied by this module.
- $filter_plugins = array_filter(\Drupal::service('plugin.manager.filter')->getDefinitions(), function ($definition) use ($file) {
- return $definition['provider'] == $file->getName();
- });
- if (!empty($filter_plugins)) {
- $used_in = [];
- // Find out if any filter formats have the plugin enabled.
- foreach (filter_formats() as $filter_format) {
- $filters = $filter_format->filters();
- // Typically, all formats will contain settings for all filter plugins,
- // even if they are disabled. However, if a module which provides filter
- // plugins is being enabled right now, that won't be the case, so we
- // still check to see if this format has this filter before we check
- // the filter status.
- foreach ($filter_plugins as $filter_plugin) {
- if ($filters->has($filter_plugin['id']) && $filters->get($filter_plugin['id'])->status) {
- $used_in[] = $filter_format->label();
- $info['required'] = TRUE;
- break;
- }
- }
- }
- if (!empty($used_in)) {
- $info['explanation'] = t('Provides a filter plugin that is in use in the following filter formats: %formats', array('%formats' => implode(', ', $used_in)));
- }
- }
- }
-}
-
-/**
* Retrieves a list of enabled text formats, ordered by weight.
*
* @param \Drupal\Core\Session\AccountInterface|null $account
diff --git a/core/modules/filter/filter.services.yml b/core/modules/filter/filter.services.yml
index 406161a..996304a 100644
--- a/core/modules/filter/filter.services.yml
+++ b/core/modules/filter/filter.services.yml
@@ -2,3 +2,10 @@ services:
plugin.manager.filter:
class: Drupal\filter\FilterPluginManager
parent: default_plugin_manager
+
+ filter.uninstall_validator:
+ class: Drupal\filter\FilterUninstallValidator
+ tags:
+ - { name: module_install.uninstall_validator }
+ arguments: ['@plugin.manager.filter', '@entity.manager', '@string_translation']
+ lazy: true
diff --git a/core/modules/filter/src/FilterUninstallValidator.php b/core/modules/filter/src/FilterUninstallValidator.php
new file mode 100644
index 0000000..6ab52f5
--- /dev/null
+++ b/core/modules/filter/src/FilterUninstallValidator.php
@@ -0,0 +1,102 @@
+filterManager = $filter_manager;
+ $this->filterStorage = $entity_manager->getStorage('filter_format');
+ $this->stringTranslation = $string_translation;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate($module) {
+ $reasons = [];
+ // Get filter plugins supplied by this module.
+ if ($filter_plugins = $this->getFilterDefinitionsByProvider($module)) {
+ $used_in = [];
+ // Find out if any filter formats have the plugin enabled.
+ foreach ($this->getEnabledFilterFormats() as $filter_format) {
+ $filters = $filter_format->filters();
+ foreach ($filter_plugins as $filter_plugin) {
+ if ($filters->has($filter_plugin['id']) && $filters->get($filter_plugin['id'])->status) {
+ $used_in[] = $filter_format->label();
+ break;
+ }
+ }
+ }
+ if (!empty($used_in)) {
+ $reasons[] = $this->t('Provides a filter plugin that is in use in the following filter formats: %formats.', ['%formats' => implode(', ', $used_in)]);
+ }
+ }
+ return $reasons;
+ }
+
+ /**
+ * Returns all filter definitions that are provided by the specified provider.
+ *
+ * @param string $provider
+ * The provider of the filters.
+ *
+ * @return array
+ * The filter definitions for the specified provider.
+ */
+ protected function getFilterDefinitionsByProvider($provider) {
+ return array_filter($this->filterManager->getDefinitions(), function ($definition) use ($provider) {
+ return $definition['provider'] == $provider;
+ });
+ }
+
+ /**
+ * Returns all enabled filter formats.
+ *
+ * @return \Drupal\filter\FilterFormatInterface[]
+ */
+ protected function getEnabledFilterFormats() {
+ return $this->filterStorage->loadByProperties(['status' => TRUE]);
+ }
+
+}
diff --git a/core/modules/filter/src/Tests/FilterAPITest.php b/core/modules/filter/src/Tests/FilterAPITest.php
index 483bc22..0984d78 100644
--- a/core/modules/filter/src/Tests/FilterAPITest.php
+++ b/core/modules/filter/src/Tests/FilterAPITest.php
@@ -416,18 +416,6 @@ public function testDependencyRemoval() {
$this->installSchema('user', array('users_data'));
$filter_format = \Drupal\filter\Entity\FilterFormat::load('filtered_html');
- // Enable the filter_test_restrict_tags_and_attributes filter plugin on the
- // filtered_html filter format.
- $filter_config = [
- 'weight' => 10,
- 'status' => 1,
- ];
- $filter_format->setFilterConfig('filter_test_restrict_tags_and_attributes', $filter_config)->save();
-
- $module_data = _system_rebuild_module_data();
- $this->assertTrue($module_data['filter_test']->info['required'], 'The filter_test module is required.');
- $this->assertEqual($module_data['filter_test']->info['explanation'], SafeMarkup::format('Provides a filter plugin that is in use in the following filter formats: %formats', array('%formats' => $filter_format->label())));
-
// Disable the filter_test_restrict_tags_and_attributes filter plugin but
// have custom configuration so that the filter plugin is still configured
// in filtered_html the filter format.
diff --git a/core/modules/filter/tests/src/Unit/FilterUninstallValidatorTest.php b/core/modules/filter/tests/src/Unit/FilterUninstallValidatorTest.php
new file mode 100644
index 0000000..e9afa81
--- /dev/null
+++ b/core/modules/filter/tests/src/Unit/FilterUninstallValidatorTest.php
@@ -0,0 +1,172 @@
+filterUninstallValidator = $this->getMockBuilder('Drupal\filter\FilterUninstallValidator')
+ ->disableOriginalConstructor()
+ ->setMethods(['getFilterDefinitionsByProvider', 'getEnabledFilterFormats'])
+ ->getMock();
+ $this->filterUninstallValidator->setStringTranslation($this->getStringTranslationStub());
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNoPlugins() {
+ $this->filterUninstallValidator->expects($this->once())
+ ->method('getFilterDefinitionsByProvider')
+ ->willReturn([]);
+ $this->filterUninstallValidator->expects($this->never())
+ ->method('getEnabledFilterFormats');
+
+ $module = $this->randomMachineName();
+ $expected = [];
+ $reasons = $this->filterUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNoFormats() {
+ $this->filterUninstallValidator->expects($this->once())
+ ->method('getFilterDefinitionsByProvider')
+ ->willReturn([
+ 'test_filter_plugin' => [
+ 'id' => 'test_filter_plugin',
+ 'provider' => 'filter_test',
+ ],
+ ]);
+ $this->filterUninstallValidator->expects($this->once())
+ ->method('getEnabledFilterFormats')
+ ->willReturn([]);
+
+ $module = $this->randomMachineName();
+ $expected = [];
+ $reasons = $this->filterUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNoMatchingFormats() {
+ $this->filterUninstallValidator->expects($this->once())
+ ->method('getFilterDefinitionsByProvider')
+ ->willReturn([
+ 'test_filter_plugin1' => [
+ 'id' => 'test_filter_plugin1',
+ 'provider' => 'filter_test',
+ ],
+ 'test_filter_plugin2' => [
+ 'id' => 'test_filter_plugin2',
+ 'provider' => 'filter_test',
+ ],
+ 'test_filter_plugin3' => [
+ 'id' => 'test_filter_plugin3',
+ 'provider' => 'filter_test',
+ ],
+ 'test_filter_plugin4' => [
+ 'id' => 'test_filter_plugin4',
+ 'provider' => 'filter_test',
+ ],
+ ]);
+
+ $filter_plugin_enabled = $this->getMockForAbstractClass('Drupal\filter\Plugin\FilterBase', [['status' => TRUE], '', ['provider' => 'filter_test']]);
+ $filter_plugin_disabled = $this->getMockForAbstractClass('Drupal\filter\Plugin\FilterBase', [['status' => FALSE], '', ['provider' => 'filter_test']]);
+
+ // The first format has 2 matching and enabled filters, but the loop breaks
+ // after finding the first one.
+ $filter_plugin_collection1 = $this->getMockBuilder('Drupal\filter\FilterPluginCollection')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $filter_plugin_collection1->expects($this->exactly(3))
+ ->method('has')
+ ->willReturnMap([
+ ['test_filter_plugin1', FALSE],
+ ['test_filter_plugin2', TRUE],
+ ['test_filter_plugin3', TRUE],
+ ['test_filter_plugin4', TRUE],
+ ]);
+ $filter_plugin_collection1->expects($this->exactly(2))
+ ->method('get')
+ ->willReturnMap([
+ ['test_filter_plugin2', $filter_plugin_disabled],
+ ['test_filter_plugin3', $filter_plugin_enabled],
+ ['test_filter_plugin4', $filter_plugin_enabled],
+ ]);
+
+ $filter_format1 = $this->getMock('Drupal\filter\FilterFormatInterface');
+ $filter_format1->expects($this->once())
+ ->method('filters')
+ ->willReturn($filter_plugin_collection1);
+ $filter_format1->expects($this->once())
+ ->method('label')
+ ->willReturn('Filter Format 1 Label');
+
+ // The second filter format only has one matching and enabled filter.
+ $filter_plugin_collection2 = $this->getMockBuilder('Drupal\filter\FilterPluginCollection')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $filter_plugin_collection2->expects($this->exactly(4))
+ ->method('has')
+ ->willReturnMap([
+ ['test_filter_plugin1', FALSE],
+ ['test_filter_plugin2', FALSE],
+ ['test_filter_plugin3', FALSE],
+ ['test_filter_plugin4', TRUE],
+ ]);
+ $filter_plugin_collection2->expects($this->exactly(1))
+ ->method('get')
+ ->with('test_filter_plugin4')
+ ->willReturn($filter_plugin_enabled);
+
+ $filter_format2 = $this->getMock('Drupal\filter\FilterFormatInterface');
+ $filter_format2->expects($this->once())
+ ->method('filters')
+ ->willReturn($filter_plugin_collection2);
+ $filter_format2->expects($this->once())
+ ->method('label')
+ ->willReturn('Filter Format 2 Label');
+ $this->filterUninstallValidator->expects($this->once())
+ ->method('getEnabledFilterFormats')
+ ->willReturn([
+ 'test_filter_format1' => $filter_format1,
+ 'test_filter_format2' => $filter_format2,
+ ]);
+
+ $expected = [
+ String::format('Provides a filter plugin that is in use in the following filter formats: %formats.', ['%formats' => implode(', ', [
+ 'Filter Format 1 Label',
+ 'Filter Format 2 Label',
+ ])]),
+ ];
+ $reasons = $this->filterUninstallValidator->validate($this->randomMachineName());
+ $this->assertSame($expected, $reasons);
+ }
+
+}
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 01a66e5..1f0d7ae 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -638,63 +638,3 @@ function template_preprocess_forum_submitted(&$variables) {
}
$variables['time'] = isset($variables['topic']->created) ? \Drupal::service('date.formatter')->formatInterval(REQUEST_TIME - $variables['topic']->created) : '';
}
-
-/**
- * Implements hook_system_info_alter().
- *
- * Prevents forum module from being uninstalled whilst any forum nodes exist
- * or there are any terms in the forum vocabulary.
- */
-function forum_system_info_alter(&$info, Extension $file, $type) {
- // It is not safe use the entity query service during maintenance mode.
- if ($type == 'module' && !defined('MAINTENANCE_MODE') && $file->getName() == 'forum') {
- $factory = \Drupal::service('entity.query');
- $nodes = $factory->get('node')
- ->condition('type', 'forum')
- ->accessCheck(FALSE)
- ->range(0, 1)
- ->execute();
- if (!empty($nodes)) {
- $info['required'] = TRUE;
- $info['explanation'] = t('To uninstall Forum first delete all Forum content.');
- }
- $vid = \Drupal::config('forum.settings')->get('vocabulary');
- $terms = $factory->get('taxonomy_term')
- ->condition('vid', $vid)
- ->accessCheck(FALSE)
- ->range(0, 1)
- ->execute();
- if (!empty($terms)) {
- $vocabulary = Vocabulary::load($vid);
- $info['required'] = TRUE;
- try {
- if (!empty($info['explanation'])) {
- if ($vocabulary->access('view')) {
- $info['explanation'] = t('To uninstall Forum first delete all Forum content and %vocabulary terms.', [
- '%vocabulary' => $vocabulary->label(),
- '!url' => $vocabulary->url('overview-form'),
- ]);
- }
- else {
- $info['explanation'] = t('To uninstall Forum first delete all Forum content and %vocabulary terms.', [
- '%vocabulary' => $vocabulary->label()
- ]);
- }
- }
- else {
- $info['explanation'] = t('To uninstall Forum first delete all %vocabulary terms.', [
- '%vocabulary' => $vocabulary->label(),
- '!url' => $vocabulary->url('overview-form'),
- ]);
- }
- }
- catch (RouteNotFoundException $e) {
- // Route rebuilding might not have occurred before this hook is fired.
- // Just use an explanation without a link for the time being.
- $info['explanation'] = t('To uninstall Forum first delete all Forum content and %vocabulary terms.', [
- '%vocabulary' => $vocabulary->label()
- ]);
- }
- }
- }
-}
diff --git a/core/modules/forum/forum.services.yml b/core/modules/forum/forum.services.yml
index d5c0fe3..6ab41c9 100644
--- a/core/modules/forum/forum.services.yml
+++ b/core/modules/forum/forum.services.yml
@@ -19,3 +19,10 @@ services:
arguments: ['@database', '@forum_manager']
tags:
- { name: backend_overridable }
+
+ forum.uninstall_validator:
+ class: Drupal\forum\ForumUninstallValidator
+ tags:
+ - { name: module_install.uninstall_validator }
+ arguments: ['@entity.manager', '@entity.query', '@config.factory', '@string_translation']
+ lazy: true
diff --git a/core/modules/forum/src/ForumUninstallValidator.php b/core/modules/forum/src/ForumUninstallValidator.php
new file mode 100644
index 0000000..8a09583
--- /dev/null
+++ b/core/modules/forum/src/ForumUninstallValidator.php
@@ -0,0 +1,139 @@
+vocabularyStorage = $entity_manager->getStorage('taxonomy_vocabulary');
+ $this->queryFactory = $query_factory;
+ $this->configFactory = $config_factory;
+ $this->stringTranslation = $string_translation;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function validate($module) {
+ $reasons = [];
+ if ($module == 'forum') {
+ if ($this->hasForumNodes()) {
+ $reasons[] = $this->t('To uninstall Forum, first delete all Forum content.');
+ }
+
+ $vocabulary = $this->getForumVocabulary();
+ if ($this->hasTermsForVocabulary($vocabulary)) {
+ if ($vocabulary->access('view')) {
+ $reasons[] = $this->t('To uninstall Forum, first delete all %vocabulary terms.', [
+ '%vocabulary' => $vocabulary->label(),
+ '!url' => $vocabulary->url('overview-form'),
+ ]);
+ }
+ else {
+ $reasons[] = $this->t('To uninstall Forum, first delete all %vocabulary terms.', [
+ '%vocabulary' => $vocabulary->label()
+ ]);
+ }
+ }
+ }
+
+ return $reasons;
+ }
+
+ /**
+ * Determines if there are any forum nodes or not.
+ *
+ * @return bool
+ * TRUE if there are forum nodes, FALSE otherwise.
+ */
+ protected function hasForumNodes() {
+ $nodes = $this->queryFactory->get('node')
+ ->condition('type', 'forum')
+ ->accessCheck(FALSE)
+ ->range(0, 1)
+ ->execute();
+ return !empty($nodes);
+ }
+
+ /**
+ * Determines if there are any taxonomy terms for a specified vocabulary.
+ *
+ * @param \Drupal\taxonomy\VocabularyInterface $vocabulary
+ * The vocabulary to check for terms.
+ *
+ * @return bool
+ * TRUE if there are terms for this vocabulary, FALSE otherwise.
+ */
+ protected function hasTermsForVocabulary(VocabularyInterface $vocabulary) {
+ $terms = $this->queryFactory->get('taxonomy_term')
+ ->condition('vid', $vocabulary->id())
+ ->accessCheck(FALSE)
+ ->range(0, 1)
+ ->execute();
+ return !empty($terms);
+ }
+
+ /**
+ * Returns the vocabulary configured for forums.
+ *
+ * @return \Drupal\taxonomy\VocabularyInterface
+ * The vocabulary entity for forums.
+ */
+ protected function getForumVocabulary() {
+ $vid = $this->configFactory->get('forum.settings')->get('vocabulary');
+ return $this->vocabularyStorage->load($vid);
+ }
+
+}
diff --git a/core/modules/forum/src/Tests/ForumUninstallTest.php b/core/modules/forum/src/Tests/ForumUninstallTest.php
index a0270ca..f0abe18 100644
--- a/core/modules/forum/src/Tests/ForumUninstallTest.php
+++ b/core/modules/forum/src/Tests/ForumUninstallTest.php
@@ -74,8 +74,7 @@ public function testForumUninstallWithField() {
$this->drupalGet('admin/modules/uninstall');
// Assert forum is required.
$this->assertNoFieldByName('uninstall[forum]');
- $this->drupalGet('admin/modules');
- $this->assertText('To uninstall Forum first delete all Forum content');
+ $this->assertText('To uninstall Forum, first delete all');
// Delete the node.
$this->drupalPostForm('node/' . $node->id() . '/delete', array(), t('Delete'));
@@ -84,8 +83,7 @@ public function testForumUninstallWithField() {
$this->drupalGet('admin/modules/uninstall');
// Assert forum is still required.
$this->assertNoFieldByName('uninstall[forum]');
- $this->drupalGet('admin/modules');
- $this->assertText('To uninstall Forum first delete all Forums terms');
+ $this->assertText('To uninstall Forum, first delete all');
// Delete any forum terms.
$vid = $this->config('forum.settings')->get('vocabulary');
@@ -102,7 +100,6 @@ public function testForumUninstallWithField() {
$this->drupalGet('admin/modules/uninstall');
// Assert forum is no longer required.
$this->assertFieldByName('uninstall[forum]');
- $this->drupalGet('admin/modules');
$this->assertNoText('To uninstall Forum first delete all Forum content');
$this->drupalPostForm('admin/modules/uninstall', array(
'uninstall[forum]' => 1,
@@ -142,6 +139,13 @@ public function testForumUninstallWithoutFieldStorage() {
$field_storage = FieldStorageConfig::loadByName('node', 'taxonomy_forums');
$this->assertNull($field_storage, 'The taxonomy_forums field storage has been deleted.');
+ // Delete all terms in the Forums vocabulary. Uninstalling the forum module
+ // will fail unless this is done.
+ $terms = entity_load_multiple_by_properties('taxonomy_term', array('vid' => 'forums'));
+ foreach($terms as $term) {
+ $term->delete();
+ }
+
// Ensure that uninstallation succeeds even if the field has already been
// deleted manually beforehand.
$this->container->get('module_installer')->uninstall(array('forum'));
diff --git a/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php b/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php
new file mode 100644
index 0000000..16549c8
--- /dev/null
+++ b/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php
@@ -0,0 +1,247 @@
+forumUninstallValidator = $this->getMockBuilder('Drupal\forum\ForumUninstallValidator')
+ ->disableOriginalConstructor()
+ ->setMethods(['hasForumNodes', 'hasTermsForVocabulary', 'getForumVocabulary'])
+ ->getMock();
+ $this->forumUninstallValidator->setStringTranslation($this->getStringTranslationStub());
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNotForum() {
+ $this->forumUninstallValidator->expects($this->never())
+ ->method('hasForumNodes');
+ $this->forumUninstallValidator->expects($this->never())
+ ->method('hasTermsForVocabulary');
+ $this->forumUninstallValidator->expects($this->never())
+ ->method('getForumVocabulary');
+
+ $module = 'not_forum';
+ $expected = [];
+ $reasons = $this->forumUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidate() {
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasForumNodes')
+ ->willReturn(FALSE);
+
+ $vocabulary = $this->getMock('Drupal\taxonomy\VocabularyInterface');
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('getForumVocabulary')
+ ->willReturn($vocabulary);
+
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasTermsForVocabulary')
+ ->willReturn(FALSE);
+
+ $module = 'forum';
+ $expected = [];
+ $reasons = $this->forumUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateHasForumNodes() {
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasForumNodes')
+ ->willReturn(TRUE);
+
+ $vocabulary = $this->getMock('Drupal\taxonomy\VocabularyInterface');
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('getForumVocabulary')
+ ->willReturn($vocabulary);
+
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasTermsForVocabulary')
+ ->willReturn(FALSE);
+
+ $module = 'forum';
+ $expected = [
+ 'To uninstall Forum, first delete all Forum content.',
+ ];
+ $reasons = $this->forumUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateHasTermsForVocabularyWithNodesAccess() {
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasForumNodes')
+ ->willReturn(TRUE);
+
+ $vocabulary = $this->getMock('Drupal\taxonomy\VocabularyInterface');
+ $vocabulary->expects($this->once())
+ ->method('label')
+ ->willReturn('Vocabulary label');
+ $vocabulary->expects($this->once())
+ ->method('url')
+ ->willReturn('/path/to/vocabulary/overview');
+ $vocabulary->expects($this->once())
+ ->method('access')
+ ->willReturn(TRUE);
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('getForumVocabulary')
+ ->willReturn($vocabulary);
+
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasTermsForVocabulary')
+ ->willReturn(TRUE);
+
+ $module = 'forum';
+ $expected = [
+ 'To uninstall Forum, first delete all Forum content.',
+ String::format('To uninstall Forum, first delete all %vocabulary terms.', [
+ '!url' => '/path/to/vocabulary/overview',
+ '%vocabulary' => 'Vocabulary label',
+ ]),
+ ];
+ $reasons = $this->forumUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateHasTermsForVocabularyWithNodesNoAccess() {
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasForumNodes')
+ ->willReturn(TRUE);
+
+ $vocabulary = $this->getMock('Drupal\taxonomy\VocabularyInterface');
+ $vocabulary->expects($this->once())
+ ->method('label')
+ ->willReturn('Vocabulary label');
+ $vocabulary->expects($this->never())
+ ->method('url');
+ $vocabulary->expects($this->once())
+ ->method('access')
+ ->willReturn(FALSE);
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('getForumVocabulary')
+ ->willReturn($vocabulary);
+
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasTermsForVocabulary')
+ ->willReturn(TRUE);
+
+ $module = 'forum';
+ $expected = [
+ 'To uninstall Forum, first delete all Forum content.',
+ String::format('To uninstall Forum, first delete all %vocabulary terms.', [
+ '%vocabulary' => 'Vocabulary label',
+ ]),
+ ];
+ $reasons = $this->forumUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateHasTermsForVocabularyAccess() {
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasForumNodes')
+ ->willReturn(FALSE);
+
+ $vocabulary = $this->getMock('Drupal\taxonomy\VocabularyInterface');
+ $vocabulary->expects($this->once())
+ ->method('url')
+ ->willReturn('/path/to/vocabulary/overview');
+ $vocabulary->expects($this->once())
+ ->method('label')
+ ->willReturn('Vocabulary label');
+ $vocabulary->expects($this->once())
+ ->method('access')
+ ->willReturn(TRUE);
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('getForumVocabulary')
+ ->willReturn($vocabulary);
+
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasTermsForVocabulary')
+ ->willReturn(TRUE);
+
+ $module = 'forum';
+ $expected = [
+ String::format('To uninstall Forum, first delete all %vocabulary terms.', [
+ '!url' => '/path/to/vocabulary/overview',
+ '%vocabulary' => 'Vocabulary label',
+ ]),
+ ];
+ $reasons = $this->forumUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateHasTermsForVocabularyNoAccess() {
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasForumNodes')
+ ->willReturn(FALSE);
+
+ $vocabulary = $this->getMock('Drupal\taxonomy\VocabularyInterface');
+ $vocabulary->expects($this->once())
+ ->method('label')
+ ->willReturn('Vocabulary label');
+ $vocabulary->expects($this->never())
+ ->method('url');
+ $vocabulary->expects($this->once())
+ ->method('access')
+ ->willReturn(FALSE);
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('getForumVocabulary')
+ ->willReturn($vocabulary);
+
+ $this->forumUninstallValidator->expects($this->once())
+ ->method('hasTermsForVocabulary')
+ ->willReturn(TRUE);
+
+ $module = 'forum';
+ $expected = [
+ String::format('To uninstall Forum, first delete all %vocabulary terms.', [
+ '%vocabulary' => 'Vocabulary label',
+ ]),
+ ];
+ $reasons = $this->forumUninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+}
diff --git a/core/modules/system/src/Tests/Module/DependencyTest.php b/core/modules/system/src/Tests/Module/DependencyTest.php
index 88d959a..c833c32 100644
--- a/core/modules/system/src/Tests/Module/DependencyTest.php
+++ b/core/modules/system/src/Tests/Module/DependencyTest.php
@@ -168,8 +168,7 @@ function testUninstallDependents() {
// Check that the comment module cannot be uninstalled.
$this->drupalGet('admin/modules/uninstall');
- $checkbox = $this->xpath('//input[@type="checkbox" and @name="uninstall[comment]"]');
- $this->assert(count($checkbox) == 0, 'Checkbox for uninstalling the comment module not found.');
+ $this->assertNoFieldByName('uninstall[checkbox]');
// Delete any forum terms.
$vid = $this->config('forum.settings')->get('vocabulary');
diff --git a/core/modules/system/src/Tests/Module/UninstallTest.php b/core/modules/system/src/Tests/Module/UninstallTest.php
index c7eb051..613ec2c 100644
--- a/core/modules/system/src/Tests/Module/UninstallTest.php
+++ b/core/modules/system/src/Tests/Module/UninstallTest.php
@@ -56,7 +56,7 @@ function testUninstallPage() {
$this->drupalGet('admin/modules/uninstall');
$this->assertTitle(t('Uninstall') . ' | Drupal');
- $this->assertText(\Drupal::translation()->translate('The following reasons prevents Node from being uninstalled: There is content for the entity type: Content'), 'Content prevents uninstalling node module.');
+ $this->assertText(\Drupal::translation()->translate('The following reason prevents Node from being uninstalled: There is content for the entity type: Content'), 'Content prevents uninstalling node module.');
// Delete the node to allow node to be uninstalled.
$node->delete();
diff --git a/core/modules/system/src/Tests/System/InfoAlterTest.php b/core/modules/system/src/Tests/System/InfoAlterTest.php
index 02cdd17..2af3d05 100644
--- a/core/modules/system/src/Tests/System/InfoAlterTest.php
+++ b/core/modules/system/src/Tests/System/InfoAlterTest.php
@@ -26,15 +26,15 @@ class InfoAlterTest extends KernelTestBase {
* return freshly altered info.
*/
function testSystemInfoAlter() {
- \Drupal::state()->set('module_test.hook_system_info_alter', TRUE);
+ \Drupal::state()->set('module_required_test.hook_system_info_alter', TRUE);
$info = system_rebuild_module_data();
- $this->assertFalse(isset($info['node']->info['required']), 'Before the module_test is installed the node module is not required.');
+ $this->assertFalse(isset($info['node']->info['required']), 'Before the module_required_test is installed the node module is not required.');
// Enable the test module.
- \Drupal::service('module_installer')->install(array('module_test'), FALSE);
- $this->assertTrue(\Drupal::moduleHandler()->moduleExists('module_test'), 'Test module is enabled.');
+ \Drupal::service('module_installer')->install(array('module_required_test'), FALSE);
+ $this->assertTrue(\Drupal::moduleHandler()->moduleExists('module_required_test'), 'Test required module is enabled.');
$info = system_rebuild_module_data();
- $this->assertTrue($info['node']->info['required'], 'After the module_test is installed the node module is required.');
+ $this->assertTrue($info['node']->info['required'], 'After the module_required_test is installed the node module is required.');
}
}
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index 81fa6af..3d9d0e2 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -310,9 +310,9 @@ function theme_system_modules_uninstall($variables) {
}
if (!empty($form['modules'][$module]['#validation_reasons'])) {
$disabled_message = \Drupal::translation()->formatPlural(count($form['modules'][$module]['#validation_reasons']),
- 'The following reason prevents @module from being uninstalled: @reasons',
- 'The following reasons prevents @module from being uninstalled: @reasons',
- array('@module' => $form['modules'][$module]['#module_name'], '@reasons' => implode('; ', $form['modules'][$module]['#validation_reasons'])));
+ 'The following reason prevents @module from being uninstalled: !reasons',
+ 'The following reasons prevents @module from being uninstalled: !reasons',
+ array('@module' => $form['modules'][$module]['#module_name'], '!reasons' => implode('; ', $form['modules'][$module]['#validation_reasons'])));
}
$rows[] = array(
array('data' => drupal_render($form['uninstall'][$module]), 'align' => 'center'),
diff --git a/core/modules/system/tests/modules/module_test/module_test.info.yml b/core/modules/system/tests/modules/module_required_test/module_required_test.info.yml
similarity index 91%
copy from core/modules/system/tests/modules/module_test/module_test.info.yml
copy to core/modules/system/tests/modules/module_required_test/module_required_test.info.yml
index 241c3ad..f424d95 100644
--- a/core/modules/system/tests/modules/module_test/module_test.info.yml
+++ b/core/modules/system/tests/modules/module_required_test/module_required_test.info.yml
@@ -1,4 +1,4 @@
-name: 'Module test'
+name: 'Module required test'
type: module
description: 'Support module for module system testing.'
package: Testing
diff --git a/core/modules/system/tests/modules/module_required_test/module_required_test.module b/core/modules/system/tests/modules/module_required_test/module_required_test.module
new file mode 100644
index 0000000..fbb6f10
--- /dev/null
+++ b/core/modules/system/tests/modules/module_required_test/module_required_test.module
@@ -0,0 +1,15 @@
+getName() == 'module_required_test' && \Drupal::state()->get('module_required_test.hook_system_info_alter')) {
+ $info['required'] = TRUE;
+ $info['explanation'] = 'Testing hook_system_info_alter()';
+ }
+}
diff --git a/core/modules/system/tests/modules/module_test/module_test.info.yml b/core/modules/system/tests/modules/module_test/module_test.info.yml
index 241c3ad..5c63da2 100644
--- a/core/modules/system/tests/modules/module_test/module_test.info.yml
+++ b/core/modules/system/tests/modules/module_test/module_test.info.yml
@@ -4,8 +4,3 @@ description: 'Support module for module system testing.'
package: Testing
version: VERSION
core: 8.x
-# Depends on the Node module to test making a module required using
-# hook_system_info_alter() and ensuring that its dependencies also become
-# required.
-dependencies:
- - drupal:node (>=8.x)
diff --git a/core/modules/system/tests/modules/module_test/module_test.module b/core/modules/system/tests/modules/module_test/module_test.module
index 92f038b..cead329 100644
--- a/core/modules/system/tests/modules/module_test/module_test.module
+++ b/core/modules/system/tests/modules/module_test/module_test.module
@@ -49,10 +49,6 @@ function module_test_system_info_alter(&$info, Extension $file, $type) {
if ($file->getName() == 'seven' && $type == 'theme') {
$info['regions']['test_region'] = t('Test region');
}
- if ($file->getName() == 'module_test' && \Drupal::state()->get('module_test.hook_system_info_alter')) {
- $info['required'] = TRUE;
- $info['explanation'] = 'Testing hook_system_info_alter()';
- }
}
/**
diff --git a/core/profiles/standard/src/Tests/StandardTest.php b/core/profiles/standard/src/Tests/StandardTest.php
index 2171765..fc41818 100644
--- a/core/profiles/standard/src/Tests/StandardTest.php
+++ b/core/profiles/standard/src/Tests/StandardTest.php
@@ -117,17 +117,6 @@ function testStandard() {
$this->assertConfigSchema($typed_config, $name, $config->get());
}
- // Ensure that configuration from the Standard profile is not reused when
- // enabling a module again since it contains configuration that can not be
- // installed. For example, editor.editor.basic_html is editor configuration
- // that depends on the ckeditor module. The ckeditor module can not be
- // installed before the editor module since it depends on the editor module.
- // The installer does not have this limitation since it ensures that all of
- // the install profiles dependencies are installed before creating the
- // editor configuration.
- \Drupal::service('module_installer')->uninstall(array('editor', 'ckeditor'));
- $this->rebuildContainer();
- \Drupal::service('module_installer')->install(array('editor'));
/** @var \Drupal\contact\ContactFormInterface $contact_form */
$contact_form = ContactForm::load('feedback');
$recipients = $contact_form->getRecipients();
diff --git a/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php b/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php
new file mode 100644
index 0000000..6dba251
--- /dev/null
+++ b/core/tests/Drupal/Tests/Core/Extension/RequiredModuleUninstallValidatorTest.php
@@ -0,0 +1,80 @@
+uninstallValidator = $this->getMockBuilder('Drupal\Core\Extension\RequiredModuleUninstallValidator')
+ ->disableOriginalConstructor()
+ ->setMethods(['getModuleInfoByModule'])
+ ->getMock();
+ $this->uninstallValidator->setStringTranslation($this->getStringTranslationStub());
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNoModule() {
+ $this->uninstallValidator->expects($this->once())
+ ->method('getModuleInfoByModule')
+ ->willReturn([]);
+
+ $module = $this->randomMachineName();
+ $expected = [];
+ $reasons = $this->uninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateNotRequired() {
+ $module = $this->randomMachineName();
+
+ $this->uninstallValidator->expects($this->once())
+ ->method('getModuleInfoByModule')
+ ->willReturn(['required' => FALSE, 'name' => $module]);
+
+ $expected = [];
+ $reasons = $this->uninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+ /**
+ * @covers ::validate
+ */
+ public function testValidateRequired() {
+ $module = $this->randomMachineName();
+
+ $this->uninstallValidator->expects($this->once())
+ ->method('getModuleInfoByModule')
+ ->willReturn(['required' => TRUE, 'name' => $module]);
+
+ $expected = [String::format('The @module module is required.', ['@module' => $module])];
+ $reasons = $this->uninstallValidator->validate($module);
+ $this->assertSame($expected, $reasons);
+ }
+
+}