',
+ 'filter_html_help' => TRUE,
+ 'filter_html_nofollow' => FALSE,
+ ],
+];
+
+$connection->update('config')
+ ->fields(['data' => serialize($data)])
+ ->condition('collection', '')
+ ->condition('name', 'filter.format.full_html')
+ ->execute();
diff --git a/core/modules/image/tests/modules/image_style_filter_test/image_style_filter_test.info.yml b/core/modules/image/tests/modules/image_style_filter_test/image_style_filter_test.info.yml
new file mode 100644
index 0000000000..60adccce7d
--- /dev/null
+++ b/core/modules/image/tests/modules/image_style_filter_test/image_style_filter_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Image Style Filter views'
+type: module
+description: 'Testing module for Filter integration.'
+package: Testing
+version: VERSION
diff --git a/core/modules/image/tests/modules/image_style_filter_test/image_style_filter_test.module b/core/modules/image/tests/modules/image_style_filter_test/image_style_filter_test.module
new file mode 100644
index 0000000000..c3935884d9
--- /dev/null
+++ b/core/modules/image/tests/modules/image_style_filter_test/image_style_filter_test.module
@@ -0,0 +1,15 @@
+settings['allowed_styles']) {
+ foreach ($this->getAllowedImageStyles() as $image_style_id => $image_style) {
+ // Unlike the parent method, we intentionally don't resolve the 'style2'
+ // dependency to test the case when there are still unresolved
+ // dependencies left after plugins got the chance to act on removal.
+ // @see \Drupal\Tests\image\Kernel\FilterDependencyTest::testDependencyRemoval()
+ if ($image_style_id !== 'style2') {
+ if (isset($dependencies[$image_style->getConfigDependencyKey()][$image_style->getConfigDependencyName()])) {
+ unset($this->settings['allowed_styles'][array_search($image_style_id, $this->settings['allowed_styles'])]);
+ $changed = TRUE;
+ }
+ }
+ }
+ }
+ return $changed;
+ }
+
+}
diff --git a/core/modules/image/tests/src/Functional/FilterImageStyleTest.php b/core/modules/image/tests/src/Functional/FilterImageStyleTest.php
new file mode 100644
index 0000000000..7415eac6cb
--- /dev/null
+++ b/core/modules/image/tests/src/Functional/FilterImageStyleTest.php
@@ -0,0 +1,129 @@
+format = FilterFormat::create([
+ 'format' => $this->randomMachineName(),
+ 'name' => $this->randomString(),
+ 'filters' => [
+ 'filter_html' => [
+ 'status' => TRUE,
+ 'settings' => [
+ 'allowed_html' => '![]()
',
+ ],
+ ],
+ 'filter_image_style' => ['status' => TRUE],
+ 'editor_file_reference' => ['status' => TRUE],
+ ],
+ ]);
+ $this->format->save();
+
+ $user = $this->drupalCreateUser(['access content', 'administer nodes']);
+ $this->drupalLogin($user);
+
+ $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+ }
+
+ /**
+ * Helper function to create a test node with configurable image html.
+ *
+ * @param string $image_html
+ * The image HTML markup.
+ */
+ protected function nodeHelper(string $image_html): void {
+ $node = $this->createNode([
+ 'type' => 'page',
+ 'title' => $this->randomString(),
+ 'body' => [
+ [
+ 'format' => $this->format->id(),
+ 'value' => $image_html,
+ ],
+ ],
+ ]);
+ $node->save();
+
+ $this->drupalGet($node->toUrl());
+ $this->assertSession()->statusCodeEquals(200);
+ }
+
+ /**
+ * Tests that images not uploaded through media module are unmolested.
+ */
+ public function testImageNoStyle(): void {
+ $file_url = Url::fromUri('base:core/themes/stark/screenshot.png')->toString();
+
+ $image_html = '
';
+ $this->nodeHelper($image_html);
+
+ /** @var \Behat\Mink\Element\NodeElement $img_element */
+ $image_element = $this->getSession()->getPage()->find('css', 'img');
+ $this->assertNotEmpty($image_element);
+
+ $this->assertFalse($image_element->hasAttribute('class'));
+ $this->assertSame($file_url, $image_element->getAttribute('src'));
+ $this->assertSame('220', $image_element->getAttribute('width'));
+ $this->assertFalse($image_element->hasAttribute('height'));
+ }
+
+ /**
+ * Tests image style modification of images.
+ */
+ public function testImageStyle(): void {
+ $this->assertArrayHasKey('medium', $this->container->get('entity_type.manager')->getStorage('image_style')->loadMultiple());
+
+ $file = File::create(['uri' => 'core/themes/stark/screenshot.png']);
+ $file->save();
+
+ $image_html = ' . ')
';
+ $this->nodeHelper($image_html);
+
+ /** @var \Behat\Mink\Element\NodeElement $img_element */
+ $image_element = $this->getSession()->getPage()->find('css', 'img[data-entity-uuid="' . $file->uuid() . '"]');
+ $this->assertNotEmpty($image_element);
+
+ $this->assertStringContainsString('medium', $image_element->getAttribute('src'));
+ $this->assertSame('220', $image_element->getAttribute('width'));
+ $this->assertSame('164', $image_element->getAttribute('height'));
+ }
+
+}
diff --git a/core/modules/image/tests/src/Functional/Update/FilterImageStylePostUpdateTest.php b/core/modules/image/tests/src/Functional/Update/FilterImageStylePostUpdateTest.php
new file mode 100644
index 0000000000..cc2b95dcdb
--- /dev/null
+++ b/core/modules/image/tests/src/Functional/Update/FilterImageStylePostUpdateTest.php
@@ -0,0 +1,74 @@
+databaseDumpFiles = [
+ __DIR__ . '/../../../../../system/tests/fixtures/update/drupal-8.8.0.bare.standard.php.gz',
+ __DIR__ . '/../../../fixtures/update/test_enable_filter_image_style.php',
+ ];
+ }
+
+ /**
+ * Tests image_post_update_enable_filter_image_style().
+ *
+ * @see image_post_update_enable_filter_image_style()
+ */
+ public function testFilterImageStylePostUpdate(): void {
+ $config_trail = 'filters.filter_html.settings.allowed_html';
+
+ // A format with an enabled filter_html filter.
+ $basic_html = $this->config('filter.format.basic_html');
+ // A format with a disabled filter_html filter.
+ $full_html = $this->config('filter.format.full_html');
+ // A format without a filter_html filter.
+ $plain_text = $this->config('filter.format.plain_text');
+
+ // Check that 'basic_html' text format has an enabled 'filter_html' filter,
+ // whose 'allowed_html' setting contains an ![]()
tag that is missing
+ // the 'data-image-style' attribute.
+ $this->assertTrue($basic_html->get('filters.filter_html.status'));
+ $this->assertStringNotContainsString('data-image-style', $basic_html->get($config_trail));
+
+ // Check that 'full_html' text format has an disabled 'filter_html' filter,
+ // whose 'allowed_html' setting contains an ![]()
tag that is missing
+ // the 'data-image-style' attribute.
+ $this->assertFalse($full_html->get('filters.filter_html.status'));
+ $this->assertStringNotContainsString('data-image-style', $full_html->get($config_trail));
+
+ // Check that 'plain_text' text format is missing an 'filter_html' filter.
+ $this->assertNull($plain_text->get('filters.filter_html'));
+
+ // Run updates.
+ $this->runUpdates();
+
+ $basic_html = $this->config('filter.format.basic_html');
+ $full_html = $this->config('filter.format.full_html');
+ $plain_text = $this->config('filter.format.plain_text');
+
+ // Check that 'basic_html' text format 'filter_html' filter was updated.
+ $this->assertStringContainsString('data-image-style', $basic_html->get($config_trail));
+
+ // Check that 'full_html' text format 'filter_html' filter was not updated.
+ $this->assertStringNotContainsString('data-image-style', $full_html->get($config_trail));
+
+ // Check that 'plain_text' text format is missing the 'filter_html' filter.
+ $this->assertNull($plain_text->get('filters.filter_html'));
+ }
+
+}
diff --git a/core/modules/image/tests/src/FunctionalJavascript/AddImageTest.php b/core/modules/image/tests/src/FunctionalJavascript/AddImageTest.php
new file mode 100644
index 0000000000..6b65edafcc
--- /dev/null
+++ b/core/modules/image/tests/src/FunctionalJavascript/AddImageTest.php
@@ -0,0 +1,109 @@
+ 'filtered_html',
+ 'name' => $this->randomString(),
+ 'filters' => [
+ 'filter_image_style' => ['status' => TRUE],
+ ],
+ ])->save();
+
+ $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+
+ Editor::create([
+ 'format' => 'filtered_html',
+ 'editor' => 'ckeditor',
+ ])->save();
+
+ $user = $this->drupalCreateUser([
+ 'access content',
+ 'administer nodes',
+ 'create page content',
+ 'use text format filtered_html',
+ ]);
+ $this->drupalLogin($user);
+ }
+
+ /**
+ * Tests if an image can be placed inline with the data-image-style attribute.
+ */
+ public function testDataImageStyleElement(): void {
+ $image_url = Url::fromUri('base:core/themes/bartik/screenshot.png')->toString();
+
+ $this->drupalGet('node/add/page');
+ $this->assertSession()->pageTextContains('Create Basic page');
+
+ $page = $this->getSession()->getPage();
+ // Wait for the ckeditor toolbar elements to appear (loading is done).
+ $image_button_selector = 'a.cke_button__drupalimage';
+ $this->assertJsCondition("jQuery('$image_button_selector').length > 0");
+
+ $image_button = $page->find('css', $image_button_selector);
+ $this->assertNotEmpty($image_button);
+ $image_button->click();
+
+ $url_input = $this->assertSession()->waitForField('attributes[src]');
+ $this->assertNotEmpty($url_input);
+ $url_input->setValue($image_url);
+
+ $alt_input = $page->findField('attributes[alt]');
+ $this->assertNotEmpty($alt_input);
+ $alt_input->setValue('asd');
+
+ $image_style_input_name = 'attributes[data-image-style]';
+ $this->assertNotEmpty($page->findField($image_style_input_name));
+ $page->selectFieldOption($image_style_input_name, 'thumbnail');
+
+ // To prevent 403s on save, we re-set our request (cookie) state.
+ $this->prepareRequest();
+
+ // @todo: Switch to using NodeElement::click() on the button or
+ // NodeElement::submit() on the form when #2831506 is fixed.
+ // @see https://www.drupal.org/node/2831506
+ $script = "jQuery('input[id^=\"edit-actions-save-modal\"]').click()";
+ $this->getSession()->executeScript($script);
+ $this->assertSession()->assertWaitOnAjaxRequest();
+
+ $source_button = $page->find('css', 'a.cke_button__source');
+ $this->assertNotEmpty($source_button);
+ $source_button->click();
+
+ $this->assertStringContainsString('data-image-style="thumbnail"', $page->find('css', 'textarea.cke_source')->getValue());
+ }
+
+}
diff --git a/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php b/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php
new file mode 100644
index 0000000000..a726400377
--- /dev/null
+++ b/core/modules/image/tests/src/Kernel/EditorImageStyleDialogTest.php
@@ -0,0 +1,169 @@
+installEntitySchema('file');
+ $this->installSchema('node', ['node_access']);
+ $this->installSchema('file', ['file_usage']);
+ $this->installConfig(['node']);
+
+ // Install the image module config so we have the medium image style.
+ $this->installConfig('image');
+
+ // Create a node type for testing.
+ $type = NodeType::create(['type' => 'page', 'name' => 'page']);
+ $type->save();
+ node_add_body_field($type);
+ $this->installEntitySchema('user');
+ $this->container->get('router.builder')->rebuild();
+ }
+
+ /**
+ * Fixture to consolidate tasks while making filter status configurable.
+ *
+ * @param bool $enable_image_filter
+ * Whether to activate filter_image_style in the text format.
+ *
+ * @return array|\Symfony\Component\HttpFoundation\Response
+ * The submitted form.
+ */
+ protected function setUpForm(bool $enable_image_filter) {
+ $format = FilterFormat::create([
+ 'format' => $this->randomMachineName(),
+ 'name' => $this->randomString(),
+ 'weight' => 0,
+ 'filters' => [
+ 'filter_image_style' => ['status' => $enable_image_filter],
+ ],
+ ]);
+ $format->save();
+
+ // Set up text editor.
+ /** @var \Drupal\editor\EditorInterface $editor */
+ $editor = Editor::create([
+ 'format' => $format->id(),
+ 'editor' => 'ckeditor',
+ 'image_upload' => [
+ 'max_size' => 100,
+ 'scheme' => 'public',
+ 'directory' => '',
+ 'status' => TRUE,
+ ],
+ ]);
+ $editor->save();
+
+ /** @var \Drupal\file\FileInterface $file */
+ $file = \Drupal::service('file.repository')->writeData(file_get_contents($this->root . '/core/modules/image/sample.png'), 'public://');
+
+ $input = [
+ 'editor_object' => [
+ 'src' => \Drupal::service('file_url_generator')->transformRelative($file->getFileUri()),
+ 'alt' => 'Balloons floating above a field.',
+ 'data-entity-type' => 'file',
+ 'data-entity-uuid' => $file->uuid(),
+ ],
+ 'dialogOptions' => [
+ 'title' => 'Edit Image',
+ 'dialogClass' => 'editor-image-dialog',
+ 'autoResize' => 'true',
+ ],
+ '_drupal_ajax' => '1',
+ 'ajax_page_state' => [
+ 'theme' => 'bartik',
+ 'theme_token' => 'some-token',
+ 'libraries' => '',
+ ],
+ ];
+ if ($enable_image_filter) {
+ $input['editor_object']['data-image-style'] = 'medium';
+ }
+
+ $form_state = (new FormState())
+ ->setRequestMethod('POST')
+ ->setUserInput($input)
+ ->addBuildInfo('args', [$editor]);
+
+ /** @var \Drupal\Core\Form\FormBuilderInterface $form_builder */
+ $form_builder = $this->container->get('form_builder');
+ $form_object = new EditorImageDialog(\Drupal::entityTypeManager()->getStorage('file'));
+ $form_id = $form_builder->getFormId($form_object, $form_state);
+ $form = [];
+
+ /** @var \Drupal\Core\Render\RendererInterface $renderer */
+ $renderer = \Drupal::service('renderer');
+ $renderer->executeInRenderContext(new RenderContext(), function () use (&$form, $form_builder, $form_id, $form_state) {
+ $form = $form_builder->retrieveForm($form_id, $form_state);
+ $form_builder->prepareForm($form_id, $form, $form_state);
+ $form_builder->processForm($form_id, $form, $form_state);
+ });
+
+ return $form;
+ }
+
+ /**
+ * Tests that style selection is hidden when filter_image_style is disabled.
+ */
+ public function testDialogNoStyles(): void {
+ $this->assertArrayNotHasKey('image_style', $this->setUpForm(FALSE));
+ }
+
+ /**
+ * Tests EditorImageDialog when filter_image_style is enabled.
+ */
+ public function testDialogStyles(): void {
+ $form = $this->setUpForm(TRUE);
+
+ $this->assertSame(
+ ['', 'large', 'medium', 'thumbnail', 'wide'],
+ array_keys($form['image_style']['selection']['#options'])
+ );
+ $this->assertSame('medium', $form['image_style']['selection']['#default_value']);
+ }
+
+}
diff --git a/core/modules/image/tests/src/Kernel/FilterDependencyTest.php b/core/modules/image/tests/src/Kernel/FilterDependencyTest.php
new file mode 100644
index 0000000000..9d14f8581e
--- /dev/null
+++ b/core/modules/image/tests/src/Kernel/FilterDependencyTest.php
@@ -0,0 +1,147 @@
+installSchema('dblog', ['watchdog']);
+
+ // Create two image styles and a text format.
+ $style1 = ImageStyle::create(['name' => 'style1', 'label' => 'Style 1']);
+ $style1->save();
+ $style2 = ImageStyle::create(['name' => 'style2', 'label' => 'Style 2']);
+ $style2->save();
+ /** @var \Drupal\filter\FilterFormatInterface $format */
+ $format = FilterFormat::create(['format' => 'format']);
+ $format->save();
+
+ $config = [
+ 'settings' => ['allowed_styles' => []],
+ 'status' => TRUE,
+ ];
+
+ // Add the enabled 'filter_image_style' filter with no 'allowed_styles'.
+ $format->setFilterConfig('filter_image_style', $config);
+ $format->save();
+
+ // Check that no config dependencies were added.
+ $this->assertEmpty($format->filters('filter_image_style')->getConfiguration()['settings']['allowed_styles']);
+ $this->assertSame([
+ 'module' => [
+ 'image',
+ ],
+ ], $format->getDependencies());
+ $this->assertTrue($format->filters('filter_image_style')->getConfiguration()['status']);
+
+ // Add a dependency but disable the filter.
+ $config['settings']['allowed_styles'][] = 'style1';
+ $config['status'] = FALSE;
+ $format->setFilterConfig('filter_image_style', $config);
+ $format->save();
+
+ // Check dependencies are added also for disabled filters.
+ $this->assertSame(
+ ['style1'],
+ $format->filters('filter_image_style')->getConfiguration()['settings']['allowed_styles']
+ );
+ $this->assertSame([
+ 'config' => [
+ 'image.style.style1',
+ ],
+ 'module' => [
+ 'image',
+ ],
+ ], $format->getDependencies());
+ $this->assertFalse($format->filters('filter_image_style')->getConfiguration()['status']);
+
+ // Re-enable the filter and add second dependency.
+ $config['status'] = TRUE;
+ $config['settings']['allowed_styles'] = [
+ // Descending order to test if they're stored in ascending order.
+ 'style2',
+ 'style1',
+ ];
+ $format->setFilterConfig('filter_image_style', $config);
+ $format->save();
+
+ $this->assertSame([
+ // The allowed styles list was ordered ascending by label.
+ 'style1',
+ 'style2',
+ ], $format->filters('filter_image_style')->getConfiguration()['settings']['allowed_styles']);
+ $this->assertSame([
+ 'config' => [
+ 'image.style.style1',
+ 'image.style.style2',
+ ],
+ 'module' => [
+ 'image',
+ ],
+ ], $format->getDependencies());
+
+ // Delete the first dependency and reload the entity.
+ $style1->delete();
+ $format = FilterFormat::load('format');
+
+ // Check that the text format entity has been updated.
+ $this->assertSame([
+ 'style2',
+ ], $format->filters('filter_image_style')->getConfiguration()['settings']['allowed_styles']);
+ $this->assertSame([
+ 'config' => [
+ 'image.style.style2',
+ ],
+ 'module' => [
+ 'image',
+ ],
+ ], $format->getDependencies());
+
+ // Delete the second dependency and reload the entity.
+ $style2->delete();
+ $format = FilterFormat::load('format');
+
+ // Check that an unresolved removed dependency disables the filter.
+ // @see \Drupal\image_style_filter_test\FilterTestImageStyle::onDependencyRemoval()
+ $this->assertEmpty($format->filters('filter_image_style')->getConfiguration()['settings']['allowed_styles']);
+ $this->assertEmpty($format->getDependencies());
+ $this->assertFalse($format->filters('filter_image_style')->getConfiguration()['status']);
+
+ // Check that the correct warning message has been logged.
+ $arguments = ['@format' => 'format', '@filter' => 'filter_image_style'];
+ $logged = (bool) Database::getConnection()->select('watchdog', 'w')
+ ->fields('w', ['wid'])
+ ->condition('type', 'filter')
+ ->condition('message', "The '@format' filter '@filter' has been disabled because its configuration depends on removed dependencies.")
+ ->condition('variables', serialize($arguments))
+ ->execute()
+ ->fetchAll();
+ $this->assertTrue($logged);
+ }
+
+}
diff --git a/core/modules/views/src/Plugin/views/PluginBase.php b/core/modules/views/src/Plugin/views/PluginBase.php
index e478e91301..a07b7b8924 100644
--- a/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/core/modules/views/src/Plugin/views/PluginBase.php
@@ -357,12 +357,9 @@ public function globalTokenReplace($string = '', array $options = []) {
*/
protected function viewsTokenReplace($text, $tokens) {
if (!strlen($text)) {
- // No need to run filterAdmin on an empty string.
+ // No need to run on an empty string.
return '';
}
- if (empty($tokens)) {
- return Xss::filterAdmin($text);
- }
$twig_tokens = [];
foreach ($tokens as $token => $replacement) {
diff --git a/core/profiles/demo_umami/config/install/filter.format.basic_html.yml b/core/profiles/demo_umami/config/install/filter.format.basic_html.yml
index b57e2a67a7..1cfc83f98c 100644
--- a/core/profiles/demo_umami/config/install/filter.format.basic_html.yml
+++ b/core/profiles/demo_umami/config/install/filter.format.basic_html.yml
@@ -5,6 +5,7 @@ dependencies:
- core.entity_view_mode.media.responsive_3x2
module:
- editor
+ - image
- media
name: 'Basic HTML'
format: basic_html
@@ -40,7 +41,7 @@ filters:
status: true
weight: -10
settings:
- allowed_html: ' -
-
-
![]()
'
+ allowed_html: ' -
-
-
![]()
'
filter_html_help: false
filter_html_nofollow: false
filter_html_image_secure:
@@ -71,3 +72,10 @@ filters:
image: image
remote_video: remote_video
video: video
+ filter_image_style:
+ id: filter_image_style
+ provider: image
+ status: true
+ weight: 12
+ settings:
+ allowed_styles: { }
diff --git a/core/profiles/demo_umami/config/install/filter.format.full_html.yml b/core/profiles/demo_umami/config/install/filter.format.full_html.yml
index 44a1d1ab59..5ecd5b9729 100644
--- a/core/profiles/demo_umami/config/install/filter.format.full_html.yml
+++ b/core/profiles/demo_umami/config/install/filter.format.full_html.yml
@@ -5,6 +5,7 @@ dependencies:
- core.entity_view_mode.media.responsive_3x2
module:
- editor
+ - image
- media
name: 'Full HTML'
format: full_html
@@ -63,4 +64,11 @@ filters:
document: document
image: image
remote_video: remote_video
+ filter_image_style:
+ id: filter_image_style
+ provider: image
+ status: true
+ weight: 12
+ settings:
+ allowed_styles: { }
video: video
diff --git a/core/profiles/standard/config/install/filter.format.basic_html.yml b/core/profiles/standard/config/install/filter.format.basic_html.yml
index d81fc17303..87fc32e052 100644
--- a/core/profiles/standard/config/install/filter.format.basic_html.yml
+++ b/core/profiles/standard/config/install/filter.format.basic_html.yml
@@ -3,6 +3,7 @@ status: true
dependencies:
module:
- editor
+ - image
name: 'Basic HTML'
format: basic_html
weight: 0
@@ -13,7 +14,7 @@ filters:
id: editor_file_reference
provider: editor
status: true
- weight: 11
+ weight: 10
settings: { }
filter_align:
id: filter_align
@@ -33,7 +34,7 @@ filters:
status: true
weight: -10
settings:
- allowed_html: '