Issue #1934772 by sun, andypost, tim.plunkett: Filter module is not required,...

Issue #1934772 by sun, andypost, tim.plunkett: Filter module is not required, but is marked as required.

core/modules/block/lib/Drupal/block/Tests/BlockTestBase.php

@@ -19,7 +19,7 @@ abstract class BlockTestBase extends WebTestBase {
    *
    * @var array
    */
-  public static $modules = array('block', 'test_page_test');
+  public static $modules = array('block', 'filter', 'test_page_test');
 
   /**
    * A list of theme regions to test.

core/modules/edit/edit.info.yml

@@ -7,3 +7,4 @@ version: VERSION
 dependencies:
   - contextual
   - field
+  - filter

core/modules/filter/filter.info.yml

@@ -4,5 +4,6 @@ description: 'Filters content in preparation for display.'
 package: Core
 version: VERSION
 core: 8.x
-required: true
 configure: filter.admin_overview
+dependencies:
+  - user

core/modules/node/node.info.yml

@@ -5,3 +5,5 @@ package: Core
 version: VERSION
 core: 8.x
 configure: node.overview_types
+dependencies:
+  - text

core/modules/text/text.info.yml

@@ -4,6 +4,7 @@ description: 'Defines simple text field types.'
 package: Field types
 version: VERSION
 core: 8.x
+required: true
 dependencies:
   - field
-required: true
+  - filter

core/modules/user/lib/Drupal/user/AccountFormController.php

@@ -217,14 +217,20 @@ public function form(array $form, array &$form_state) {
       '#weight' => 1,
       '#access' => (!$register && $config->get('signatures')),
     );
-
-    $form['signature_settings']['signature'] = array(
-      '#type' => 'text_format',
-      '#title' => $this->t('Signature'),
-      '#default_value' => $account->getSignature(),
-      '#description' => $this->t('Your signature will be publicly displayed at the end of your comments.'),
-      '#format' => $account->getSignatureFormat(),
-    );
+    // While the details group will simply not be rendered if empty, the actual
+    // signature element cannot use #access, since #type 'text_format' is not
+    // available when Filter module is not installed. If the user account has an
+    // existing signature value and format, then the existing field values will
+    // just be re-saved to the database in case of an entity update.
+    if ($this->moduleHandler->moduleExists('filter')) {
+      $form['signature_settings']['signature'] = array(
+        '#type' => 'text_format',
+        '#title' => $this->t('Signature'),
+        '#default_value' => $account->getSignature(),
+        '#description' => $this->t('Your signature will be publicly displayed at the end of your comments.'),
+        '#format' => $account->getSignatureFormat(),
+      );
+    }
 
     $user_preferred_langcode = $register ? $language_interface->id : $account->getPreferredLangcode();
 

core/modules/user/lib/Drupal/user/AccountSettingsForm.php

@@ -147,14 +147,17 @@ public function buildForm(array $form, array &$form_state) {
     }
 
     // Account settings.
+    $filter_exists = $this->moduleHandler->moduleExists('filter');
     $form['personalization'] = array(
       '#type' => 'details',
       '#title' => $this->t('Personalization'),
+      '#access' => $filter_exists,
     );
     $form['personalization']['user_signatures'] = array(
       '#type' => 'checkbox',
       '#title' => $this->t('Enable signatures.'),
-      '#default_value' => $config->get('signatures'),
+      '#default_value' => $filter_exists ? $config->get('signatures') : 0,
+      '#access' => $filter_exists,
     );
 
     // Default notifications address.

core/modules/user/user.module

@@ -1809,6 +1809,10 @@ function user_modules_installed($modules) {
 function user_modules_uninstalled($modules) {
   // Remove any potentially orphan module data stored for users.
   \Drupal::service('user.data')->delete($modules);
+  // User signatures require Filter module.
+  if (in_array('filter', $modules)) {
+    \Drupal::config('user.settings')->set('signatures', FALSE)->save();
+  }
 }
 
 /**

core/modules/user/user.views.inc

@@ -267,18 +267,20 @@ function user_views_data() {
     ),
   );
 
-  $data['users']['signature'] = array(
-    'title' => t('Signature'),
-    'help' => t("The user's signature."),
-    'field' => array(
-      'id' => 'markup',
-      'format' => filter_fallback_format(),
-      'click sortable' => FALSE,
-    ),
-    'filter' => array(
-      'id' => 'string',
-    ),
-  );
+  if (\Drupal::moduleHandler()->moduleExists('filter')) {
+    $data['users']['signature'] = array(
+      'title' => t('Signature'),
+      'help' => t("The user's signature."),
+      'field' => array(
+        'id' => 'markup',
+        'format' => filter_fallback_format(),
+        'click sortable' => FALSE,
+      ),
+      'filter' => array(
+        'id' => 'string',
+      ),
+    );
+  }
 
   if (\Drupal::moduleHandler()->moduleExists('content_translation')) {
     $data['users']['translation_link'] = array(

core/modules/views/views.info.yml

@@ -4,3 +4,5 @@ description: 'Create customized lists and queries from your database.'
 package: Core
 version: VERSION
 core: 8.x
+dependencies:
+  - filter