diff --git a/core/modules/responsive_image/responsive_image.module b/core/modules/responsive_image/responsive_image.module index 4b2f85a..ae5cf12 100644 --- a/core/modules/responsive_image/responsive_image.module +++ b/core/modules/responsive_image/responsive_image.module @@ -91,11 +91,11 @@ function template_preprocess_responsive_image_formatter(&$variables) { } $attributes['alt'] = $item->alt; // Need to check that item_attributes has a value since it can be NULL. - if ($variables['item_attributes']) { - $attributes += $variables['item_attributes']; - } - if (($entity = $item->entity) && empty($item->uri)) { - $variables['responsive_image']['#uri'] = $entity->getFileUri(); + if ($variables['item_attributes']) { + $attributes += $variables['item_attributes']; + } + if (($entity = $item->entity) && empty($item->uri)) { + $variables['responsive_image']['#uri'] = $entity->getFileUri(); } else { $variables['responsive_image']['#uri'] = $item->uri; diff --git a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php index 2ee983d..410bd89 100644 --- a/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php +++ b/core/modules/responsive_image/src/Tests/ResponsiveImageFieldDisplayTest.php @@ -190,19 +190,19 @@ protected function doTestResponsiveImageFieldFormatters($scheme, $empty_styles = ); $default_output = str_replace("\n", NULL, $renderer->renderRoot($image)); $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.'); - // Test theme function for responsive image, but using the test formatter. - $display_options = array( - 'type' => 'responsive_image_test', - 'settings' => array( - 'image_link' => 'file', - 'responsive_image_style' => 'style_one', - ), - ); - $display = entity_get_display('node', 'article', 'default'); - $display->setComponent($field_name, $display_options) - ->save(); + // Test theme function for responsive image, but using the test formatter. + $display_options = array( + 'type' => 'responsive_image_test', + 'settings' => array( + 'image_link' => 'file', + 'responsive_image_style' => 'style_one', + ), + ); + $display = entity_get_display('node', 'article', 'default'); + $display->setComponent($field_name, $display_options) + ->save(); - $this->drupalGet('node/' . $nid); + $this->drupalGet('node/' . $nid); // Use the responsive image formatter linked to file formatter. $display_options = array( diff --git a/core/modules/responsive_image/tests/modules/responsive_image_test_module/config/schema/responsive_image_test_module.schema.yml b/core/modules/responsive_image/tests/modules/responsive_image_test_module/config/schema/responsive_image_test_module.schema.yml index 53bf7db..6208012 100644 --- a/core/modules/responsive_image/tests/modules/responsive_image_test_module/config/schema/responsive_image_test_module.schema.yml +++ b/core/modules/responsive_image/tests/modules/responsive_image_test_module/config/schema/responsive_image_test_module.schema.yml @@ -8,4 +8,4 @@ field.formatter.settings.responsive_image_test: label: 'Responsive image style' image_link: type: string - label: 'Link image to' \ No newline at end of file + label: 'Link image to' diff --git a/core/modules/responsive_image/tests/src/Plugin/Field/FieldFormatter/ResponsiveImageTestFormatter.php b/core/modules/responsive_image/tests/src/Plugin/Field/FieldFormatter/ResponsiveImageTestFormatter.php index 74cdf5c..eeb5b09 100644 --- a/core/modules/responsive_image/tests/src/Plugin/Field/FieldFormatter/ResponsiveImageTestFormatter.php +++ b/core/modules/responsive_image/tests/src/Plugin/Field/FieldFormatter/ResponsiveImageTestFormatter.php @@ -10,8 +10,6 @@ use Drupal\responsive_image\Plugin\Field\FieldFormatter\ResponsiveImageFormatter; use Drupal\Core\Field\FieldItemListInterface; - - /** * Plugin to test responsive image formatter. * @@ -25,17 +23,17 @@ */ class ResponsiveImageTestFormatter extends ResponsiveImageFormatter { - /** - * {@inheritdoc} - */ - public function viewElements(FieldItemListInterface $items) { - $elements = parent::viewElements($items); - // Unset #item_attributes to test that the theme function can handle that. - foreach ($elements as &$element) { - if (isset($element['#item_attributes'])) { - unset($element['#item_attributes']); - } - } - return $elements; + /** + * {@inheritdoc} + */ + public function viewElements(FieldItemListInterface $items) { + $elements = parent::viewElements($items); + // Unset #item_attributes to test that the theme function can handle that. + foreach ($elements as &$element) { + if (isset($element['#item_attributes'])) { + unset($element['#item_attributes']); + } } -} \ No newline at end of file + return $elements; + } +}