From 9075bc970efbdf5efa47cbb12c50c2f5ed61b103 Mon Sep 17 00:00:00 2001 From: Kristiaan Van den Eynde Date: Fri, 21 Sep 2018 13:32:23 +0200 Subject: [PATCH] interdiff --- core/modules/field_ui/field_ui.module | 1 - core/modules/field_ui/src/Routing/DeprecatedRouteMatcher.php | 2 +- core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index bff5a821ce..a6a7fa1b57 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -10,7 +10,6 @@ use Drupal\Core\Routing\RouteMatchInterface; use Drupal\Core\Entity\EntityViewModeInterface; use Drupal\Core\Entity\EntityFormModeInterface; -use Drupal\Core\Routing\RouteProviderLazyBuilder; use Drupal\field_ui\FieldUI; use Drupal\field_ui\Plugin\Derivative\FieldUiLocalTask; diff --git a/core/modules/field_ui/src/Routing/DeprecatedRouteMatcher.php b/core/modules/field_ui/src/Routing/DeprecatedRouteMatcher.php index 9310783dbf..9aa29402ce 100644 --- a/core/modules/field_ui/src/Routing/DeprecatedRouteMatcher.php +++ b/core/modules/field_ui/src/Routing/DeprecatedRouteMatcher.php @@ -10,7 +10,7 @@ /** * Favors deprecated routes over correct ones for backwards compatibility. * - * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0. Remove + * @deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Remove * the old route names \Drupal\field_ui\Routing\RouteSubscriber in favor of the * new ones when removing this class. */ diff --git a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php index db8312a4f1..f7d7b39610 100644 --- a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php +++ b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php @@ -149,6 +149,7 @@ public static function getSkippedDeprecations() { 'The Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHandler class is deprecated since Symfony 3.4 and will be removed in 4.0. Implement `SessionUpdateTimestampHandlerInterface` or extend `AbstractSessionHandler` instead.', 'The "session_handler.write_check" service relies on the deprecated "Symfony\Component\HttpFoundation\Session\Storage\Handler\WriteCheckSessionHandler" class. It should either be deprecated or its implementation upgraded.', 'Not setting the strict option of the Choice constraint to true is deprecated since Symfony 3.4 and will throw an exception in 4.0.', + 'The "field_ui.deprecated_route_matcher" service relies on the deprecated "Drupal\field_ui\Routing\DeprecatedRouteMatcher" class. It should either be deprecated or its implementation upgraded.', ]; } -- 2.17.1