diff --git a/composer.json b/composer.json index a5dad92..0b346fb 100644 --- a/composer.json +++ b/composer.json @@ -11,9 +11,9 @@ "source": "http://cgit.drupalcode.org/leaflet_maptiler" }, "require": { - "drupal/leaflet": "^1.0 || ^2.0" + "drupal/leaflet": "^10.0" }, "conflict": { - "drupal/leaflet": "<1.20" + "drupal/leaflet": "<=5" } } diff --git a/leaflet_maptiler.services.yml b/leaflet_maptiler.services.yml index de1fca9..61248ce 100644 --- a/leaflet_maptiler.services.yml +++ b/leaflet_maptiler.services.yml @@ -4,4 +4,4 @@ services: decorates: leaflet.service decoration_priority: 1 public: false - arguments: ['@leaflet_maptiler.decorator.leaflet.service.inner', '@current_user', '@geofield.geophp', '@module_handler', '@link_generator', '@language_manager', '@stream_wrapper_manager', '@request_stack'] + arguments: ['@leaflet_maptiler.decorator.leaflet.service.inner', '@current_user', '@geofield.geophp', '@module_handler', '@link_generator', '@language_manager', '@stream_wrapper_manager', '@request_stack', '@cache.default'] diff --git a/src/MaptilerLeafletServiceDecorator.php b/src/MaptilerLeafletServiceDecorator.php index 8a1d217..3f712b8 100644 --- a/src/MaptilerLeafletServiceDecorator.php +++ b/src/MaptilerLeafletServiceDecorator.php @@ -8,6 +8,7 @@ use Drupal\geofield\GeoPHP\GeoPHPInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Language\LanguageManagerInterface; use Drupal\Core\Utility\LinkGeneratorInterface; +use Drupal\Core\Cache\CacheBackendInterface; use Drupal\leaflet\LeafletService; use Symfony\Component\HttpFoundation\RequestStack; @@ -52,8 +53,8 @@ class MaptilerLeafletServiceDecorator extends LeafletService { * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack * The stream wrapper manager. */ - public function __construct(LeafletService $leaflet_service, AccountInterface $current_user, GeoPHPInterface $geophp_wrapper, ModuleHandlerInterface $module_handler, LinkGeneratorInterface $link_generator, LanguageManagerInterface $language_manager, StreamWrapperManagerInterface $stream_wrapper_manager, RequestStack $request_stack) { - parent::__construct($current_user, $geophp_wrapper, $module_handler, $link_generator, $stream_wrapper_manager, $request_stack); + public function __construct(LeafletService $leaflet_service, AccountInterface $current_user, GeoPHPInterface $geophp_wrapper, ModuleHandlerInterface $module_handler, LinkGeneratorInterface $link_generator, LanguageManagerInterface $language_manager, StreamWrapperManagerInterface $stream_wrapper_manager, RequestStack $request_stack, CacheBackendInterface $cache) { + parent::__construct($current_user, $geophp_wrapper, $module_handler, $link_generator, $stream_wrapper_manager, $request_stack, $cache); $this->leafletService = $leaflet_service; $this->languageManager = $language_manager;