Merge branch '1.7' into 1.8

Author: GuilhemN

DependencyInjection/FOSRestExtension.php

@@ -102,7 +102,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']);
@@ -368,7 +368,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']) {

composer.json

@@ -32,7 +32,7 @@
     },
 
     "require-dev": {
-        "sensio/framework-extra-bundle":  "~2.0|~3.0",
+        "sensio/framework-extra-bundle":  "~2.0|~3.0,<3.0.13",
         "symfony/form":                   "~2.3|~3.0",
         "symfony/validator":              "~2.3|~3.0",
         "symfony/serializer":             "~2.3|~3.0",
@@ -43,21 +43,22 @@
         "symfony/phpunit-bridge":         "~2.7|~3.0",
         "phpoption/phpoption":            "~1.1.0",
         "jms/serializer":                 "~0.13|~1.0",
-        "jms/serializer-bundle":          "~0.12|~1.0",
+        "jms/serializer-bundle":          "~0.11|~1.0",
         "sllh/php-cs-fixer-styleci-bridge": "^1.3"
     },
 
     "suggest": {
-        "sensio/framework-extra-bundle":  "Add support for route annotations and the view response listener, requires ~3.0",
-        "jms/serializer-bundle":          "Add support for advanced serialization capabilities, recommended, requires ~0.12||~1.0",
+        "sensio/framework-extra-bundle":  "Add support for route annotations and the view response listener, requires ~2.0|~3.0",
+        "jms/serializer-bundle":          "Add support for advanced serialization capabilities, recommended, requires ~0.12|~1.0",
         "symfony/serializer":             "Add support for basic serialization capabilities and xml decoding, requires ~2.3",
         "symfony/validator":              "Add support for validation capabilities in the ParamFetcher, requires ~2.3"
     },
 
     "conflict": {
         "symfony/validator": ">=2.5.0,<2.5.5",
-        "jms/serializer": "<0.12",
-        "jms/serializer-bundle": "<0.11"
+        "jms/serializer": "<0.13",
+        "jms/serializer-bundle": "<0.11",
+        "sensio/framework-extra-bundle": ">=3.0.13"
     },
 
     "autoload": {