Merge pull request #1348 from xabbuh/issue-1345

GuilhemN · GuilhemN · commit 5a63981078d1 · 2016-02-15T23:17:18.000+01:00
fix the service tag names being cleared
diff --git a/DependencyInjection/FOSRestExtension.php b/DependencyInjection/FOSRestExtension.php
@@ -100,7 +100,7 @@ private function loadAccessDeniedListener(array $config, XmlFileLoader $loader,
 
             if (!empty($config['access_denied_listener']['service'])) {
                 $service = $container->getDefinition('fos_rest.access_denied_listener');
-                $service->clearTag('kernel.event_listener');
+                $service->clearTag('kernel.event_subscriber');
             }
 
             $container->setParameter('fos_rest.access_denied_listener.formats', $config['access_denied_listener']['formats']);
@@ -330,7 +330,7 @@ private function loadException(array $config, XmlFileLoader $loader, ContainerBu
 
             if (!empty($config['exception']['service'])) {
                 $service = $container->getDefinition('fos_rest.exception_listener');
-                $service->clearTag('kernel.event_listener');
+                $service->clearTag('kernel.event_subscriber');
             }
 
             if ($config['exception']['exception_controller']) {

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private function loadAccessDeniedListener(array $config, XmlFileLoader $loader,`
`100`	`100`
`101`	`101`	`if (!empty($config['access_denied_listener']['service'])) {`
`102`	`102`	`$service = $container->getDefinition('fos_rest.access_denied_listener');`
`103`		`- $service->clearTag('kernel.event_listener');`
	`103`	`+ $service->clearTag('kernel.event_subscriber');`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`$container->setParameter('fos_rest.access_denied_listener.formats', $config['access_denied_listener']['formats']);`
`@@ -330,7 +330,7 @@ private function loadException(array $config, XmlFileLoader $loader, ContainerBu`
`330`	`330`
`331`	`331`	`if (!empty($config['exception']['service'])) {`
`332`	`332`	`$service = $container->getDefinition('fos_rest.exception_listener');`
`333`		`- $service->clearTag('kernel.event_listener');`
	`333`	`+ $service->clearTag('kernel.event_subscriber');`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`if ($config['exception']['exception_controller']) {`