diff --git a/core/modules/content_moderation/content_moderation.services.yml b/core/modules/content_moderation/content_moderation.services.yml index 8ab4a58fc8..3d6055a9a7 100644 --- a/core/modules/content_moderation/content_moderation.services.yml +++ b/core/modules/content_moderation/content_moderation.services.yml @@ -2,7 +2,6 @@ services: paramconverter.latest_revision: class: Drupal\content_moderation\ParamConverter\EntityRevisionConverter parent: paramconverter.entity - deprecated: The "%service_id%" service is deprecated. You should use the "paramconverter.entity" service instead, which now supports loading the latest revision. tags: - { name: paramconverter, priority: 5 } content_moderation.state_transition_validation: diff --git a/core/modules/content_moderation/src/ParamConverter/EntityRevisionConverter.php b/core/modules/content_moderation/src/ParamConverter/EntityRevisionConverter.php index be4e6e084b..9533dcfbd6 100644 --- a/core/modules/content_moderation/src/ParamConverter/EntityRevisionConverter.php +++ b/core/modules/content_moderation/src/ParamConverter/EntityRevisionConverter.php @@ -7,10 +7,11 @@ /** * Defines a class for making sure the edit-route loads the current draft. * - * @deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0. - * The parent class EntityConverter now understands the load_latest_revision - * flag. The load_pending_revision flag and this class has been deprecated - * as a result. + * @internal + * This class only exists to provide backwards compatibility with the + * load_pending_revision flag. The core entity converter now natively loads + * the latest revision of an entity for entity forms and when the + * load_latest_revision flag is present. */ class EntityRevisionConverter extends EntityConverter { diff --git a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php index a868d9db70..97e1112a6d 100644 --- a/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php +++ b/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php @@ -285,7 +285,6 @@ public static function getSkippedDeprecations() { '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.', 'Using the Yaml::PARSE_KEYS_AS_STRINGS flag is deprecated since Symfony 3.4 as it will be removed in 4.0. Quote your keys when they are evaluable instead.', - 'The "paramconverter.latest_revision" service is deprecated. You should use the "paramconverter.entity" service instead, which now supports loading the latest revision.', ]; }