Commit 96ea7993 authored by git's avatar git Committed by Kim Pepper
Browse files

Issue #3299275 by Project Update Bot: Automated Drupal 10 compatibility fixes

parent 4c9bdf03

src/Plugin/Field/FieldFormatter/SvgIconFormatter.php

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class SvgIconFormatter extends FormatterBase { 
              '#theme' => 'svg_icon',

              '#wrapper_attributes' => $wrapper_attributes,

              '#svg_attributes' => $svg_attributes,

              '#icon_url' => file_url_transform_relative($file->createFileUrl()) . '#' . $item->svg_id,

              '#icon_url' => \Drupal::service('file_url_generator')->transformRelative($file->createFileUrl()) . '#' . $item->svg_id,

              '#use_canvas' => $this->getSetting('use_canvas'),

              '#attached' => ['library' => ['svg_icon/svg_icon.formatter']],

            ];
@@ -99,7 +99,7 @@ class SvgIconFormatter extends FormatterBase { 
      else {

        $elements[$delta] = [

          '#theme' => 'image',

          '#uri' => file_url_transform_relative($file->getFileUri()),

          '#uri' => \Drupal::service('file_url_generator')->transformRelative($file->getFileUri()),

        ];

      }

    }

src/Plugin/Field/FieldWidget/SvgIconWidget.php

+2 −2
Original line number Diff line number Diff line
@@ -168,14 +168,14 @@ class SvgIconWidget extends FileWidget { 
            '#label' => $fragment->getTitle(),

            '#wrapper_attributes' => $wrapper_attributes,

            '#svg_attributes' => $svg_attributes,

            '#icon_url' => file_url_transform_relative($file->createFileUrl()) . '#' . $fragment->getId(),

            '#icon_url' => \Drupal::service('file_url_generator')->transformRelative($file->createFileUrl()) . '#' . $fragment->getId(),

          ];

        }

      }

      else {

        $element['preview'][$svg->getId()] = [

          '#theme' => 'image',

          '#uri' => file_url_transform_relative($file->getFileUri()),

          '#uri' => \Drupal::service('file_url_generator')->transformRelative($file->getFileUri()),

          '#width' => '50px',

        ];

      }

svg_icon.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ name: SVG Icon 
type: module

description: 'Provides a field type to allow uploading SVG icons and sprites.'

package: SVG

core_version_requirement: ^8 || ^9

core_version_requirement: ^9.3 || ^10



dependencies:

  - drupal:file