Commit 4d0211ef authored by Dieter Holvoet's avatar Dieter Holvoet
Browse files

Issue #3293393 by DieterHolvoet: Drupal 10 compatibility

parent 6a62a9bd

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
    "license": "GPL-2.0-or-later",

    "require": {

        "php": "^7.2 || ^8.0",

        "drupal/core": "^8.5 || ^9.0"

        "drupal/core": "^9.3 || ^10"

    },

    "require-dev": {

        "composer-runtime-api": "^2.0"

image_utilities.info.yml

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

description: Developer-oriented improvements to the core image module

core: 8.x

core_version_requirement: ^8 || ^9

core_version_requirement: ^9.3 || ^10

php: 7.2

dependencies:

  - drupal:image

image_utilities.services.yml

+1 −0
Original line number Diff line number Diff line
@@ -8,4 +8,5 @@ services: 
    class: Drupal\image_utilities\Twig\Extension\ImageStyleExtension

    tags: [{ name: twig.extension }]

    arguments:

      - '@file_url_generator'

      - '@image_utilities.image_manager'

src/Twig/Extension/ImageStyleExtension.php

+18 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Drupal\image_utilities\Twig\Extension;



use Drupal\Core\File\FileUrlGeneratorInterface;

use Drupal\image_utilities\ImageManagerInterface;

use Twig\Extension\AbstractExtension;

use Twig\TwigFilter;
@@ -11,6 +12,13 @@ use Twig\TwigFilter; 
 */

class ImageStyleExtension extends AbstractExtension {



  /**

   * The file url generator.

   *

   * @var \Drupal\Core\File\FileUrlGeneratorInterface

   */

  protected $fileUrlGenerator;



  /**

   * The image manager.

   *
@@ -21,11 +29,17 @@ class ImageStyleExtension extends AbstractExtension { 
  /**

   * ImageStyleExtension constructor.

   *

   * @param \Drupal\image_utilities\ImageManagerInterface $image_manager

   * @param \Drupal\Core\File\FileUrlGeneratorInterface $fileUrlGenerator

   *   The file url generator.

   * @param \Drupal\image_utilities\ImageManagerInterface $imageManager

   *   The image manager.

   */

  public function __construct(ImageManagerInterface $image_manager) {

    $this->imageManager = $image_manager;

  public function __construct(

    FileUrlGeneratorInterface $fileUrlGenerator,

    ImageManagerInterface $imageManager

  ) {

    $this->fileUrlGenerator = $fileUrlGenerator;

    $this->imageManager = $imageManager;

  }



  /**
@@ -45,7 +59,7 @@ class ImageStyleExtension extends AbstractExtension { 
    $url = $this->imageManager->getImageUrlByAnyObject($file, $style, $directUrlIfNotSupported);



    if ($url && $relative) {

      return file_url_transform_relative($url);

      return $this->fileUrlGenerator->transformRelative($url);

    }



    return $url;