From 57a900bbdb7144ec1200c48d19c76449f190b4b3 Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Sat, 18 Sep 2021 11:25:03 +1000
Subject: [PATCH] Issue #3231393 by catch, daffie, longwave: [Symfony 6]
Symfony\Component\DependencyInjection\Alias::getDeprecationMessage() and
Symfony\Component\DependencyInjection\Definition::getDeprecationMessage()
method is deprecated, use getDeprecation()
---
.../Compiler/DeprecatedServicePass.php | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/DeprecatedServicePass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/DeprecatedServicePass.php
index 04f8fedbaad8..92d1d97a68dd 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/DeprecatedServicePass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/DeprecatedServicePass.php
@@ -19,12 +19,26 @@ public function process(ContainerBuilder $container) {
$deprecated_services = [];
foreach ($container->getDefinitions() as $service_id => $definition) {
if ($definition->isDeprecated()) {
- $deprecated_services[$service_id] = $definition->getDeprecationMessage($service_id);
+ // @todo: remove when Drupal requires Symfony 5. See
+ // https://www.drupal.org/project/drupal/issues/3197482
+ if (method_exists($definition, 'getDeprecation')) {
+ $deprecated_services[$service_id] = $definition->getDeprecation($service_id)['message'];
+ }
+ else {
+ $deprecated_services[$service_id] = $definition->getDeprecationMessage($service_id);
+ }
}
}
foreach ($container->getAliases() as $service_id => $definition) {
if ($definition->isDeprecated()) {
- $deprecated_services[$service_id] = $definition->getDeprecationMessage($service_id);
+ // @todo: remove when Drupal requires Symfony 5. See
+ // https://www.drupal.org/project/drupal/issues/3197482
+ if (method_exists($definition, 'getDeprecation')) {
+ $deprecated_services[$service_id] = $definition->getDeprecation($service_id)['message'];
+ }
+ else {
+ $deprecated_services[$service_id] = $definition->getDeprecationMessage($service_id);
+ }
}
}
$container->setParameter('_deprecated_service_list', $deprecated_services);
--
GitLab