From ef690a8a3939a3e6cdc4e42a3ed3e64c79873ded Mon Sep 17 00:00:00 2001
From: kumareshbaksi <baksikumaresh@gmail.com>
Date: Mon, 23 Dec 2024 15:47:12 +0530
Subject: [PATCH] Issue #3494936: Fixed the issue of Conflict with library
 discovery core class.

---
 .../src/Plugin/geolocation/LayerFeature/LeafletMarkerIcon.php | 4 ++--
 src/LayerFeatureBase.php                                      | 4 ++--
 src/MapFeatureBase.php                                        | 4 ++--
 src/Plugin/geolocation/MapFeature/ControlCustomGeocoder.php   | 4 ++--
 src/Plugin/geolocation/MapFeature/ControlTileLayers.php       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/geolocation_leaflet/src/Plugin/geolocation/LayerFeature/LeafletMarkerIcon.php b/modules/geolocation_leaflet/src/Plugin/geolocation/LayerFeature/LeafletMarkerIcon.php
index daf73a0b..774d113d 100644
--- a/modules/geolocation_leaflet/src/Plugin/geolocation/LayerFeature/LeafletMarkerIcon.php
+++ b/modules/geolocation_leaflet/src/Plugin/geolocation/LayerFeature/LeafletMarkerIcon.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\geolocation_leaflet\Plugin\geolocation\LayerFeature;
 
-use Drupal\Core\Asset\LibraryDiscovery;
+use Drupal\Core\Asset\LibraryDiscoveryInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\File\FileUrlGeneratorInterface;
@@ -36,7 +36,7 @@ class LeafletMarkerIcon extends LayerFeatureBase implements ContainerFactoryPlug
     ModuleHandlerInterface $moduleHandler,
     FileSystemInterface $fileSystem,
     Token $token,
-    LibraryDiscovery $libraryDiscovery,
+    LibraryDiscoveryInterface $libraryDiscovery,
     protected FileUrlGeneratorInterface $fileUrlGenerator,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $moduleHandler, $fileSystem, $token, $libraryDiscovery);
diff --git a/src/LayerFeatureBase.php b/src/LayerFeatureBase.php
index 6d542ee7..57ccd268 100644
--- a/src/LayerFeatureBase.php
+++ b/src/LayerFeatureBase.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\geolocation;
 
-use Drupal\Core\Asset\LibraryDiscovery;
+use Drupal\Core\Asset\LibraryDiscoveryInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -43,7 +43,7 @@ abstract class LayerFeatureBase extends PluginBase implements LayerFeatureInterf
     protected ModuleHandlerInterface $moduleHandler,
     protected FileSystemInterface $fileSystem,
     protected Token $token,
-    protected LibraryDiscovery $libraryDiscovery,
+    protected LibraryDiscoveryInterface $libraryDiscovery,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
   }
diff --git a/src/MapFeatureBase.php b/src/MapFeatureBase.php
index 6fb61b89..76206d47 100644
--- a/src/MapFeatureBase.php
+++ b/src/MapFeatureBase.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\geolocation;
 
-use Drupal\Core\Asset\LibraryDiscovery;
+use Drupal\Core\Asset\LibraryDiscoveryInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -43,7 +43,7 @@ abstract class MapFeatureBase extends PluginBase implements MapFeatureInterface,
     protected ModuleHandlerInterface $moduleHandler,
     protected FileSystemInterface $fileSystem,
     protected Token $token,
-    protected LibraryDiscovery $libraryDiscovery,
+    protected LibraryDiscoveryInterface $libraryDiscovery,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
diff --git a/src/Plugin/geolocation/MapFeature/ControlCustomGeocoder.php b/src/Plugin/geolocation/MapFeature/ControlCustomGeocoder.php
index 88afc4bf..b1329599 100644
--- a/src/Plugin/geolocation/MapFeature/ControlCustomGeocoder.php
+++ b/src/Plugin/geolocation/MapFeature/ControlCustomGeocoder.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\geolocation\Plugin\geolocation\MapFeature;
 
-use Drupal\Core\Asset\LibraryDiscovery;
+use Drupal\Core\Asset\LibraryDiscoveryInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Utility\Token;
@@ -33,7 +33,7 @@ class ControlCustomGeocoder extends ControlCustomElementBase {
     ModuleHandlerInterface $module_handler,
     FileSystemInterface $file_system,
     Token $token,
-    LibraryDiscovery $libraryDiscovery,
+    LibraryDiscoveryInterface $libraryDiscovery,
     protected GeocoderManager $geocoderManager,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $module_handler, $file_system, $token, $libraryDiscovery);
diff --git a/src/Plugin/geolocation/MapFeature/ControlTileLayers.php b/src/Plugin/geolocation/MapFeature/ControlTileLayers.php
index 78698417..04ac32b9 100644
--- a/src/Plugin/geolocation/MapFeature/ControlTileLayers.php
+++ b/src/Plugin/geolocation/MapFeature/ControlTileLayers.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\geolocation\Plugin\geolocation\MapFeature;
 
-use Drupal\Core\Asset\LibraryDiscovery;
+use Drupal\Core\Asset\LibraryDiscoveryInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Utility\Token;
@@ -33,7 +33,7 @@ class ControlTileLayers extends ControlCustomElementBase {
     ModuleHandlerInterface $moduleHandler,
     FileSystemInterface $fileSystem,
     Token $token,
-    LibraryDiscovery $libraryDiscovery,
+    LibraryDiscoveryInterface $libraryDiscovery,
     protected TileLayerProviderManager $tileLayerProviderManager,
   ) {
     parent::__construct($configuration, $plugin_id, $plugin_definition, $moduleHandler, $fileSystem, $token, $libraryDiscovery);
-- 
GitLab