OpenEcoLab-LasAlpujarras/farmOS
3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Code Wiki Activity

Fix Call to deprecated function file_create_url().

Browse source
This commit is contained in:
Michael Stenta 2022-09-12 18:04:24 -04:00
parent 8c302cbc1c
commit b81ce9b130
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/core/kml/src/Plugin/Action/EntityKml.php
View file

@ -6,6 +6,7 @@ use Drupal\Core\Action\Plugin\Action\EntityActionBase;
use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\File\FileSystemInterface; use Drupal\Core\File\FileSystemInterface;
use Drupal\Core\File\FileUrlGeneratorInterface;
use Drupal\Core\Session\AccountInterface; use Drupal\Core\Session\AccountInterface;
use Drupal\file\FileRepositoryInterface; use Drupal\file\FileRepositoryInterface;
use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\ContainerInterface;
@ -50,6 +51,13 @@ class EntityKml extends EntityActionBase {
*/ */
protected $fileRepository; protected $fileRepository;
/**
* The file URL generator.
*
* @var \Drupal\Core\File\FileUrlGeneratorInterface
*/
protected $fileUrlGenerator;
/** /**
* Constructs a new EntityKml object. * Constructs a new EntityKml object.
* *
@ -69,13 +77,16 @@ class EntityKml extends EntityActionBase {
* The config factory service. * The config factory service.
* @param \Drupal\file\FileRepositoryInterface $file_repository * @param \Drupal\file\FileRepositoryInterface $file_repository
* The file repository service. * The file repository service.
* @param \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator
* The file URL generator.
*/ */
public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, SerializerInterface $serializer, FileSystemInterface $file_system, ConfigFactoryInterface $config_factory, FileRepositoryInterface $file_repository) { public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, SerializerInterface $serializer, FileSystemInterface $file_system, ConfigFactoryInterface $config_factory, FileRepositoryInterface $file_repository, FileUrlGeneratorInterface $file_url_generator) {
parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager); parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_type_manager);
$this->serializer = $serializer; $this->serializer = $serializer;
$this->fileSystem = $file_system; $this->fileSystem = $file_system;
$this->defaultFileScheme = $config_factory->get('system.file')->get('default_scheme') ?? 'public'; $this->defaultFileScheme = $config_factory->get('system.file')->get('default_scheme') ?? 'public';
$this->fileRepository = $file_repository; $this->fileRepository = $file_repository;
$this->fileUrlGenerator = $file_url_generator;
} }
/** /**
@ -91,6 +102,7 @@ class EntityKml extends EntityActionBase {
$container->get('file_system'), $container->get('file_system'),
$container->get('config.factory'), $container->get('config.factory'),
$container->get('file.repository'), $container->get('file.repository'),
$container->get('file_url_generator'),
); );
} }
@ -137,7 +149,7 @@ class EntityKml extends EntityActionBase {
$file->save(); $file->save();
// Show a link to the file. // Show a link to the file.
$url = file_create_url($file->getFileUri()); $url = $this->fileUrlGenerator->generateAbsoluteString($file->getFileUri());
$this->messenger()->addMessage($this->t('KML file created: <a href=":url">%filename</a>', [ $this->messenger()->addMessage($this->t('KML file created: <a href=":url">%filename</a>', [
':url' => $url, ':url' => $url,
'%filename' => $file->label(), '%filename' => $file->label(),