Deprecate non_lazy_route_enhancer service tag in favor of route_enhancer, same for non_lazy_route_filter and route_filter

AFAICT this would be a BC breaking API change. I agree we should deprecate non_lazy_route_filter and non_lazy_route_enhancer though. That means we're back to just the Symfony concepts: route_filter and route_enhancer

I think we should also deprecate \Drupal\Core\Routing\RouteFilterInterface and \Drupal\Core\Routing\Enhancer\RouteEnhancerInterface?

#2883680: Force all route filters and route enhancers to be non-lazy is in, we can now do this.

Looks good! 👍

+++ b/core/lib/Drupal/Core/Routing/Router.php
@@ -98,6 +98,17 @@ public function addRouteFilter(FilterInterface $route_filter) {
+    @trigger_error('non_lazy_route_filter is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, should use route_filter, see https://www.drupal.org/node/2894934', E_USER_DEPRECATED);

@@ -108,6 +119,17 @@ public function addRouteEnhancer(EnhancerInterface $route_enhancer) {
+    @trigger_error('non_lazy_route_enhancer is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, should use route_enhancer, see https://www.drupal.org/node/2894934', E_USER_DEPRECATED);

8.5.0

Eh … wow. No. I've had this happen to me too. Seems like a random infra fail. Queued a new test.

+++ b/core/lib/Drupal/Core/Routing/Router.php
@@ -98,6 +98,17 @@ public function addRouteFilter(FilterInterface $route_filter) {
+    @trigger_error('non_lazy_route_filter is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, should use route_filter, see https://www.drupal.org/node/2894934', E_USER_DEPRECATED);

@@ -108,6 +119,17 @@ public function addRouteEnhancer(EnhancerInterface $route_enhancer) {
+    @trigger_error('non_lazy_route_enhancer is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. Instead, should use route_enhancer, see https://www.drupal.org/node/2894934', E_USER_DEPRECATED);

Once these say 8.5.0, this is RTBC. Did that.

+++ b/core/lib/Drupal/Core/Routing/Router.php
@@ -98,6 +98,17 @@ public function addRouteFilter(FilterInterface $route_filter) {
 
   /**
+   * Adds a deprecated route filter.
+   *
+   * @param \Drupal\Core\Routing\FilterInterface $route_filter
+   *   The route filter.
+   */
+  public function addDeprecatedRouteFilter(FilterInterface $route_filter) {
+    @trigger_error('non_lazy_route_filter is deprecated in Drupal 8.5.0 and will be removed before Drupal 9.0.0. Instead, should use route_filter, see https://www.drupal.org/node/2894934', E_USER_DEPRECATED);
+    $this->filters[] = $route_filter;
+  }
+

I think we want to @deprecated the new methods in the docs as well here. I get a bit iffy on this when it's a bc layer rather than actual deprecated code, hence CNR rather than CNW.

So I think having a consistent way to deprecate routes and services and etc. is good. I think we could reuse the methods for any deprecated routes route filters and enhancers? And contrib could use it as well (so not necessarily internal either)?

But for that, we'd presumably need to not hardcode the message (or have a list of messages).

#15++, for marking these @internal. Perhaps also worth adding @todo Remove in Drupal 9.0.0 for both?

Like #17, I don't understand #16.

Re-roll for 9.2.x and fix for deprecation format

Still not sure whether @internal vs @deprecated is best here (could probably be both too), however advantage of @deprecated is it's a signal that it's temporary code, whereas @internal is not.

So +1, also shame this got stuck for nearly four years!

Do we need a deprecation test here too?

As we no longer expect this code useful then it needs deprecation test

Here's a test

Looks ok but the version numbers in deprecation notices need updating.

I bet this does not fit in 9.5(

+++ b/core/lib/Drupal/Core/Routing/Router.php
@@ -84,6 +84,22 @@ public function addRouteFilter(FilterInterface $route_filter) {
+   * @deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use
...
+    @trigger_error('non_lazy_route_filter is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use route_filter instead. See https://www.drupal.org/node/2894934', E_USER_DEPRECATED);

@@ -94,6 +110,22 @@ public function addRouteEnhancer(EnhancerInterface $route_enhancer) {
+   * @deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use
...
+    @trigger_error('non_lazy_route_enhancer is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use route_enhancer instead. See https://www.drupal.org/node/2894934', E_USER_DEPRECATED);

+++ b/core/tests/Drupal/Tests/Core/Routing/RouterLegacyTest.php
@@ -33,4 +35,31 @@ public function testGenerateDeprecated() {
+    $this->expectDeprecation('non_lazy_route_filter is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use route_filter instead. See https://www.drupal.org/node/2894934');
...
+    $this->expectDeprecation('non_lazy_route_enhancer is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use route_enhancer instead. See https://www.drupal.org/node/2894934');

should be 10.1.0 and removed in 11.0.0

Rerolled patch #29 for 10.1.x by addressing #34, please review it.

Fixing custom commands failure issue in #35, please review it.

Looks ready now, CR already exists

Committed 8a993ae and pushed to 10.1.x. Thanks!

Filed follow-up to remove forgotten TODO #3347712: Remove outdated todo to 2915772

and for 11.0 #3347710: [11.x] Remove deprecated non_lazy_route_enhancer and non_lazy_route_filter