From c8a3115655e3fcad2c02416cb0175139361d08b4 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 22 Jun 2020 15:42:56 +0100
Subject: [PATCH] Issue #3055189 by mikelutz, catch, alexpott: [Symfony 5]
Support for mapping keys in multi-line blocks is deprecated since Symfony 4.3
and will throw a ParseException in 5.0
---
core/assets/scaffold/files/default.services.yml | 6 ++----
.../Drupal/Tests/Listeners/DeprecationListenerTrait.php | 1 -
sites/default/default.services.yml | 6 ++----
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/core/assets/scaffold/files/default.services.yml b/core/assets/scaffold/files/default.services.yml
index e1bbbc7e21f0..dd6d60e54ea4 100644
--- a/core/assets/scaffold/files/default.services.yml
+++ b/core/assets/scaffold/files/default.services.yml
@@ -126,15 +126,13 @@ parameters:
# Not recommended in production environments
# @default false
http.response.debug_cacheability_headers: false
- factory.keyvalue:
- {}
+ factory.keyvalue: {}
# Default key/value storage service to use.
# @default keyvalue.database
# default: keyvalue.database
# Collection-specific overrides.
# state: keyvalue.database
- factory.keyvalue.expirable:
- {}
+ factory.keyvalue.expirable: {}
# Default key/value expirable storage service to use.
# @default keyvalue.database.expirable
# default: keyvalue.database.expirable
diff --git a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
index f5188ac8a4e4..b940fd2c5e33 100644
--- a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
+++ b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
@@ -145,7 +145,6 @@ public static function getSkippedDeprecations() {
// The following Symfony deprecations are introduced in the Symfony 4
// development cycle. They will need to be resolved prior to Symfony 5
// compatibility.
- 'Support for mapping keys in multi-line blocks is deprecated since Symfony 4.3 and will throw a ParseException in 5.0.',
'The "Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser" class is deprecated since Symfony 4.3, use "Symfony\Component\Mime\MimeTypes" instead.',
'The "Drupal\Core\File\MimeType\MimeTypeGuesser" class implements "Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface" that is deprecated since Symfony 4.3, use {@link MimeTypesInterface} instead.',
'The "Symfony\Component\HttpFoundation\File\MimeType\FileBinaryMimeTypeGuesser" class is deprecated since Symfony 4.3, use "Symfony\Component\Mime\FileBinaryMimeTypeGuesser" instead.',
diff --git a/sites/default/default.services.yml b/sites/default/default.services.yml
index e1bbbc7e21f0..dd6d60e54ea4 100644
--- a/sites/default/default.services.yml
+++ b/sites/default/default.services.yml
@@ -126,15 +126,13 @@ parameters:
# Not recommended in production environments
# @default false
http.response.debug_cacheability_headers: false
- factory.keyvalue:
- {}
+ factory.keyvalue: {}
# Default key/value storage service to use.
# @default keyvalue.database
# default: keyvalue.database
# Collection-specific overrides.
# state: keyvalue.database
- factory.keyvalue.expirable:
- {}
+ factory.keyvalue.expirable: {}
# Default key/value expirable storage service to use.
# @default keyvalue.database.expirable
# default: keyvalue.database.expirable
--
GitLab