summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2012-10-27 22:20:35 (GMT)
committerwebchick2012-10-27 22:20:35 (GMT)
commit37241af9eb87ee45969ad6b16b909ae3fd663e34 (patch)
tree5f46c98a86d430dc0b47d98a91fa9fff7b45ccf5
parent2784b6a89ccdf3f3f6004cc65e12d351cd37ce13 (diff)
Issue #1824400 by gapple, katbailey: Rename the service tag 'kernel.event_subscriber()' to just 'event_subscriber()'.
-rw-r--r--core/lib/Drupal/Core/CoreBundle.php24
-rw-r--r--core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php2
-rw-r--r--core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php2
3 files changed, 14 insertions, 14 deletions
diff --git a/core/lib/Drupal/Core/CoreBundle.php b/core/lib/Drupal/Core/CoreBundle.php
index 017aa01..879586d 100644
--- a/core/lib/Drupal/Core/CoreBundle.php
+++ b/core/lib/Drupal/Core/CoreBundle.php
@@ -91,34 +91,34 @@ class CoreBundle extends Bundle
->addTag('nested_matcher', array('method' => 'setFinalMatcher'));
$container->register('router_processor_subscriber', 'Drupal\Core\EventSubscriber\RouteProcessorSubscriber')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('router_listener', 'Symfony\Component\HttpKernel\EventListener\RouterListener')
->addArgument(new Reference('matcher'))
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('content_negotiation', 'Drupal\Core\ContentNegotiation');
$container->register('view_subscriber', 'Drupal\Core\EventSubscriber\ViewSubscriber')
->addArgument(new Reference('content_negotiation'))
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('access_subscriber', 'Drupal\Core\EventSubscriber\AccessSubscriber')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('maintenance_mode_subscriber', 'Drupal\Core\EventSubscriber\MaintenanceModeSubscriber')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('path_subscriber', 'Drupal\Core\EventSubscriber\PathSubscriber')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('legacy_request_subscriber', 'Drupal\Core\EventSubscriber\LegacyRequestSubscriber')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('legacy_controller_subscriber', 'Drupal\Core\EventSubscriber\LegacyControllerSubscriber')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('finish_response_subscriber', 'Drupal\Core\EventSubscriber\FinishResponseSubscriber')
->addArgument(new Reference('language_manager'))
->setScope('request')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('request_close_subscriber', 'Drupal\Core\EventSubscriber\RequestCloseSubscriber')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('config_global_override_subscriber', 'Drupal\Core\EventSubscriber\ConfigGlobalOverrideSubscriber')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
$container->register('exception_listener', 'Drupal\Core\EventSubscriber\ExceptionListener')
- ->addTag('kernel.event_subscriber')
+ ->addTag('event_subscriber')
->addArgument(new Reference('service_container'))
->setFactoryClass('Drupal\Core\ExceptionController')
->setFactoryMethod('getExceptionListener');
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php
index 19388fa..e439c67 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/RegisterKernelListenersPass.php
@@ -20,7 +20,7 @@ class RegisterKernelListenersPass implements CompilerPassInterface {
$definition = $container->getDefinition('dispatcher');
- foreach ($container->findTaggedServiceIds('kernel.event_subscriber') as $id => $attributes) {
+ foreach ($container->findTaggedServiceIds('event_subscriber') as $id => $attributes) {
// We must assume that the class value has been correcly filled, even if the service is created by a factory
$class = $container->getDefinition($id)->getClass();
diff --git a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
index c2db16a..21a62d5 100644
--- a/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
+++ b/core/modules/system/tests/modules/bundle_test/lib/Drupal/bundle_test/BundleTestBundle.php
@@ -19,7 +19,7 @@ class BundleTestBundle extends Bundle
{
public function build(ContainerBuilder $container) {
$container->register('bundle_test_class', 'Drupal\bundle_test\TestClass')
- ->addTag('kernel.event_subscriber');
+ ->addTag('event_subscriber');
// Override a default bundle used by core to a dummy class.
$container->register('file.usage', 'Drupal\bundle_test\TestFileUsage');