From 267d91dc2782f183116baa9f11bc8a7233f76c77 Mon Sep 17 00:00:00 2001
From: markfullmer <mfullmer@gmail.com>
Date: Fri, 10 May 2024 13:04:25 -0700
Subject: [PATCH] Issue #3422683 by solideogloria, sarwan_verma, Chandreshgiri
Gauswami: [Drupal 11] watchdog_exception() is deprecated in drupal:10.1.0 and
is removed from drupal:11.0.0
---
src/Plugin/Filter/LinkitFilter.php | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/Plugin/Filter/LinkitFilter.php b/src/Plugin/Filter/LinkitFilter.php
index 5105404..73b45fa 100644
--- a/src/Plugin/Filter/LinkitFilter.php
+++ b/src/Plugin/Filter/LinkitFilter.php
@@ -6,9 +6,11 @@ use Drupal\Component\Utility\Html;
use Drupal\Core\Entity\EntityRepositoryInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Utility\Error;
use Drupal\filter\FilterProcessResult;
use Drupal\filter\Plugin\FilterBase;
use Drupal\linkit\SubstitutionManagerInterface;
+use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
@@ -40,6 +42,13 @@ class LinkitFilter extends FilterBase implements ContainerFactoryPluginInterface
*/
protected $substitutionManager;
+ /**
+ * The logger.
+ *
+ * @var \Psr\Log\LoggerInterface
+ */
+ protected $logger;
+
/**
* Constructs a LinkitFilter object.
*
@@ -53,12 +62,15 @@ class LinkitFilter extends FilterBase implements ContainerFactoryPluginInterface
* The entity repository service.
* @param \Drupal\linkit\SubstitutionManagerInterface $substitution_manager
* The substitution manager.
+ * @param \Psr\Log\LoggerInterface $logger
+ * The logger.
*/
- public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityRepositoryInterface $entity_repository, SubstitutionManagerInterface $substitution_manager) {
+ public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityRepositoryInterface $entity_repository, SubstitutionManagerInterface $substitution_manager, LoggerInterface $logger) {
parent::__construct($configuration, $plugin_id, $plugin_definition);
$this->entityRepository = $entity_repository;
$this->substitutionManager = $substitution_manager;
+ $this->logger = $logger;
}
/**
@@ -70,7 +82,8 @@ class LinkitFilter extends FilterBase implements ContainerFactoryPluginInterface
$plugin_id,
$plugin_definition,
$container->get('entity.repository'),
- $container->get('plugin.manager.linkit.substitution')
+ $container->get('plugin.manager.linkit.substitution'),
+ $container->get('logger.factory')->get('linkit')
);
}
@@ -175,7 +188,7 @@ class LinkitFilter extends FilterBase implements ContainerFactoryPluginInterface
}
}
catch (\Exception $e) {
- \Drupal\Component\Utility\DeprecationHelper::backwardsCompatibleCall(\Drupal::VERSION, '10.1.0', fn() => \Drupal\Core\Utility\Error::logException(\Drupal::logger('linkit_filter'), $e), fn() => watchdog_exception('linkit_filter', $e));
+ Error::logException($this->logger, $e);
}
}
--
GitLab