diff --git a/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php b/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php index 96d3ba6280..c8e4576508 100644 --- a/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php +++ b/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php @@ -17,6 +17,7 @@ class MigrateBookTest extends MigrateDrupal7TestBase { */ public static $modules = [ 'book', + 'filter', 'menu_ui', 'node', 'text', diff --git a/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php b/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php index cfede1e386..0c5a8af1e9 100644 --- a/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php +++ b/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php @@ -23,7 +23,7 @@ class FieldImportDeleteTest extends FieldKernelTestBase { * * @var array */ - public static $modules = ['field_test_config']; + public static $modules = ['field_test_config', 'filter']; /** * Tests deleting field storages and fields as part of config import. diff --git a/core/modules/jsonapi/tests/src/Kernel/Query/FilterTest.php b/core/modules/jsonapi/tests/src/Kernel/Query/FilterTest.php index 3c1e3820b1..9cdee00543 100644 --- a/core/modules/jsonapi/tests/src/Kernel/Query/FilterTest.php +++ b/core/modules/jsonapi/tests/src/Kernel/Query/FilterTest.php @@ -31,6 +31,7 @@ class FilterTest extends JsonapiKernelTestBase { public static $modules = [ 'field', 'file', + 'filter', 'image', 'jsonapi', 'node', diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php index eebe427612..68a2e4f2dd 100644 --- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php @@ -23,6 +23,7 @@ class MigrateMenuLinkTest extends MigrateDrupal7TestBase { */ public static $modules = [ 'content_translation', + 'filter', 'language', 'link', 'menu_ui', diff --git a/core/modules/migrate/tests/src/Kernel/MigrateBundleTest.php b/core/modules/migrate/tests/src/Kernel/MigrateBundleTest.php index b6c3051330..35f76a9d0e 100644 --- a/core/modules/migrate/tests/src/Kernel/MigrateBundleTest.php +++ b/core/modules/migrate/tests/src/Kernel/MigrateBundleTest.php @@ -18,7 +18,7 @@ class MigrateBundleTest extends MigrateTestBase { * * @var array */ - public static $modules = ['taxonomy', 'text', 'user']; + public static $modules = ['filter', 'taxonomy', 'text', 'user']; /** * {@inheritdoc} diff --git a/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php b/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php index de1666be63..b807c001f6 100644 --- a/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php +++ b/core/modules/migrate/tests/src/Kernel/MigrateRollbackTest.php @@ -20,7 +20,7 @@ class MigrateRollbackTest extends MigrateTestBase { * * @var array */ - public static $modules = ['field', 'taxonomy', 'text', 'user']; + public static $modules = ['field', 'filter', 'taxonomy', 'text', 'user']; /** * {@inheritdoc} diff --git a/core/modules/migrate/tests/src/Kernel/TrackChangesTest.php b/core/modules/migrate/tests/src/Kernel/TrackChangesTest.php index 6e4bb1a988..e5ac01c87c 100644 --- a/core/modules/migrate/tests/src/Kernel/TrackChangesTest.php +++ b/core/modules/migrate/tests/src/Kernel/TrackChangesTest.php @@ -19,6 +19,7 @@ class TrackChangesTest extends MigrateTestBase { 'migrate', 'migrate_track_changes_test', 'text', + 'filter', ]; /** diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php index b99f40393d..0b8aaec022 100644 --- a/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php @@ -21,6 +21,7 @@ class FollowUpMigrationsTest extends MigrateDrupal7TestBase { 'content_translation', 'comment', 'datetime', + 'filter', 'image', 'language', 'link', diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php index 7caeb72427..b3edff0a3f 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php @@ -24,6 +24,7 @@ class MigrateNodeTest extends MigrateDrupal7TestBase { 'content_translation', 'comment', 'datetime', + 'filter', 'image', 'language', 'link', diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php index 7b54d5b169..0df4282406 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php @@ -21,6 +21,7 @@ class NodeTranslationRedirectTest extends MigrateDrupal7TestBase { */ public static $modules = [ 'content_translation', + 'filter', 'language', 'menu_ui', // Required for translation migrations. diff --git a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php index e0607b96d2..ada8868083 100644 --- a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php +++ b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php @@ -16,6 +16,7 @@ class MigrateUrlAliasTest extends MigrateDrupal7TestBase { */ public static $modules = [ 'content_translation', + 'filter', 'language', 'menu_ui', // Required for translation migrations. diff --git a/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php b/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php index 2b36a33c4f..fbee603aad 100644 --- a/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php +++ b/core/modules/search/tests/src/Functional/SearchPageCacheTagsTest.php @@ -181,6 +181,7 @@ public function testSearchTagsBubbling() { // Default search cache tags. $default_search_tags = [ + 'config:filter.format.plain_text', 'config:search.page.node_search', 'search_index', 'search_index:node_search', diff --git a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php index d36224825b..67f964483a 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php @@ -16,6 +16,7 @@ class MigrateNodeCounterTest extends MigrateDrupal7TestBase { */ public static $modules = [ 'content_translation', + 'filter', 'language', 'menu_ui', // Required for translation migrations. diff --git a/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php b/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php index aefaec23aa..ad1ff853f4 100644 --- a/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php +++ b/core/modules/system/tests/src/Functional/Entity/EntityReferenceSelection/EntityReferenceSelectionAccessTest.php @@ -35,7 +35,19 @@ class EntityReferenceSelectionAccessTest extends KernelTestBase { * * @var array */ - public static $modules = ['comment', 'field', 'file', 'image', 'node', 'media', 'system', 'taxonomy', 'text', 'user']; + public static $modules = [ + 'comment', + 'field', + 'file', + 'filter', + 'image', + 'node', + 'media', + 'system', + 'taxonomy', + 'text', + 'user' + ]; /** * {@inheritdoc} diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php index 2da51e4a43..649dcb6ae4 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/MigrateTaxonomyTermStubTest.php @@ -20,7 +20,12 @@ class MigrateTaxonomyTermStubTest extends MigrateDrupalTestBase { /** * {@inheritdoc} */ - public static $modules = ['taxonomy', 'text', 'taxonomy_term_stub_test']; + public static $modules = [ + 'filter', + 'taxonomy', + 'text', + 'taxonomy_term_stub_test', + ]; /** * {@inheritdoc} diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php index c3f81fdb47..f9e3e1e9b7 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php @@ -14,6 +14,7 @@ class MigrateNodeTaxonomyTest extends MigrateDrupal7TestBase { public static $modules = [ 'comment', 'datetime', + 'filter', 'image', 'link', 'menu_ui', diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php index b8b0169bbd..94e5d35765 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php @@ -17,6 +17,7 @@ class MigrateTaxonomyTermTest extends MigrateDrupal7TestBase { 'comment', 'content_translation', 'datetime', + 'filter', 'image', 'language', 'link', diff --git a/core/modules/taxonomy/tests/src/Kernel/PendingRevisionTest.php b/core/modules/taxonomy/tests/src/Kernel/PendingRevisionTest.php index e4b2cc051c..9436edd00a 100644 --- a/core/modules/taxonomy/tests/src/Kernel/PendingRevisionTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/PendingRevisionTest.php @@ -20,7 +20,7 @@ class PendingRevisionTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = ['taxonomy', 'node', 'user', 'text', 'field', 'system']; + public static $modules = ['taxonomy', 'node', 'user', 'text', 'field', 'filter', 'system']; /** * {@inheritdoc} diff --git a/core/modules/taxonomy/tests/src/Kernel/TermEntityReferenceTest.php b/core/modules/taxonomy/tests/src/Kernel/TermEntityReferenceTest.php index acc44c32fd..12f3c0e74a 100644 --- a/core/modules/taxonomy/tests/src/Kernel/TermEntityReferenceTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/TermEntityReferenceTest.php @@ -21,6 +21,7 @@ class TermEntityReferenceTest extends KernelTestBase { public static $modules = [ 'entity_test', 'field', + 'filter', 'system', 'taxonomy', 'text', diff --git a/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyViewsFieldAccessTest.php b/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyViewsFieldAccessTest.php index e62232befd..6608278a11 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyViewsFieldAccessTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Views/TaxonomyViewsFieldAccessTest.php @@ -16,7 +16,7 @@ class TaxonomyViewsFieldAccessTest extends FieldFieldAccessTestBase { /** * {@inheritdoc} */ - public static $modules = ['taxonomy', 'text', 'entity_test']; + public static $modules = ['filter', 'taxonomy', 'text', 'entity_test']; /** * {@inheritdoc} diff --git a/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php index e70fadacb1..1de5597a98 100644 --- a/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php +++ b/core/modules/text/src/Plugin/Field/FieldType/TextItemBase.php @@ -49,7 +49,9 @@ public function applyDefaultValue($notify = TRUE) { */ public function isEmpty() { $value = $this->get('value')->getValue(); - return $value === NULL || $value === ''; + $format = $this->get('format')->getValue(); + + return ($value === NULL || $value === '') && ($format === NULL || $format === ''); } /** diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php index 3d762a959b..ffe56f6c3d 100644 --- a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php +++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php @@ -16,6 +16,7 @@ class MigrateTrackerNodeTest extends MigrateDrupal7TestBase { * {@inheritdoc} */ public static $modules = [ + 'filter', 'menu_ui', 'node', 'text', diff --git a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php index 8d1f80e832..8c5d58d414 100644 --- a/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php +++ b/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php @@ -16,7 +16,7 @@ class MigrateTrackerUserTest extends MigrateDrupal7TestBase { * {@inheritdoc} */ public static $modules = [ - 'menu_ui', + 'filter', 'node', 'text', 'tracker', diff --git a/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php b/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php index 6721e5cb0b..d2fd464d17 100644 --- a/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php @@ -35,7 +35,16 @@ class TwigWhiteListTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = ['node', 'taxonomy', 'user', 'system', 'text', 'field', 'entity_reference']; + public static $modules = [ + 'filter', + 'node', + 'taxonomy', + 'user', + 'system', + 'text', + 'field', + 'entity_reference', + ]; /** * {@inheritdoc}