diff --git a/core/lib/Drupal/Core/CoreServiceProvider.php b/core/lib/Drupal/Core/CoreServiceProvider.php index c3b69943e79297e7e5788af83a6ce7a5cd7118d7..68f5a97ba6da2b1e95f157c7791c7380bce1e1b2 100644 --- a/core/lib/Drupal/Core/CoreServiceProvider.php +++ b/core/lib/Drupal/Core/CoreServiceProvider.php @@ -13,7 +13,6 @@ use Drupal\Core\DependencyInjection\Compiler\ModifyServiceDefinitionsPass; use Drupal\Core\DependencyInjection\Compiler\RegisterKernelListenersPass; use Drupal\Core\DependencyInjection\Compiler\RegisterAccessChecksPass; -use Drupal\Core\DependencyInjection\Compiler\RegisterMatchersPass; use Drupal\Core\DependencyInjection\Compiler\RegisterPathProcessorsPass; use Drupal\Core\DependencyInjection\Compiler\RegisterRouteFiltersPass; use Drupal\Core\DependencyInjection\Compiler\RegisterRouteEnhancersPass; @@ -52,7 +51,6 @@ public function register(ContainerBuilder $container) { $this->registerTwig($container); $this->registerModuleHandler($container); - $container->addCompilerPass(new RegisterMatchersPass()); $container->addCompilerPass(new RegisterRouteFiltersPass()); // Add a compiler pass for registering event subscribers. $container->addCompilerPass(new RegisterKernelListenersPass(), PassConfig::TYPE_AFTER_REMOVING); diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterMatchersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterMatchersPass.php deleted file mode 100644 index 793394ba7f583909836554b014f7639be20b9362..0000000000000000000000000000000000000000 --- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterMatchersPass.php +++ /dev/null @@ -1,35 +0,0 @@ -hasDefinition('matcher')) { - return; - } - $matcher = $container->getDefinition('matcher'); - foreach ($container->findTaggedServiceIds('chained_matcher') as $id => $attributes) { - $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0; - $matcher->addMethodCall('add', array(new Reference($id), $priority)); - } - } -} diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterRouteFiltersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterRouteFiltersPass.php index de9d222f8ec4d4c07ecd61097658a93e65580e47..da47fca156032304fa26746c58e885e9f21793a5 100644 --- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterRouteFiltersPass.php +++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterRouteFiltersPass.php @@ -2,7 +2,7 @@ /** * @file - * Contains Drupal\Core\DependencyInjection\Compiler\RegisterNestedMatchersPass. + * Contains Drupal\Core\DependencyInjection\Compiler\RegisterRouteFiltersPass. */ namespace Drupal\Core\DependencyInjection\Compiler; @@ -12,12 +12,12 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; /** - * Adds services tagged 'nested_matcher' to the tagged_matcher service. + * Adds services tagged 'router.matcher' to the matcher service. */ class RegisterRouteFiltersPass implements CompilerPassInterface { /** - * Adds services tagged 'nested_matcher' to the tagged_matcher service. + * Adds services tagged 'router.matcher' to the matcher service. * * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container * The container to process. @@ -26,9 +26,9 @@ public function process(ContainerBuilder $container) { if (!$container->hasDefinition('router.matcher')) { return; } - $nested = $container->getDefinition('router.matcher'); + $matcher = $container->getDefinition('router.matcher'); foreach ($container->findTaggedServiceIds('route_filter') as $id => $attributes) { - $nested->addMethodCall('addRouteFilter', array(new Reference($id))); + $matcher->addMethodCall('addRouteFilter', array(new Reference($id))); } } }