Merge branch '1.5'

Conflicts:
	Tests/Request/ParamFetcherTest.php

Author: lsmith77

DependencyInjection/Compiler/ExceptionWrapperHandlerPass.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the FOSRestBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FOS\RestBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+/**
+ * Checks if the JMS serializer is available to be able to use the ExceptionWrapperSerializeHandler.
+ *
+ * @author Christian Flothmann <[email protected]>
+ */
+class ExceptionWrapperHandlerPass implements CompilerPassInterface
+{
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->has('fos_rest.serializer.exception_wrapper_serialize_handler')) {
+            return;
+        }
+
+        if (interface_exists('JMS\Serializer\Handler\SubscribingHandlerInterface')) {
+            return;
+        }
+
+        $container->removeDefinition('fos_rest.serializer.exception_wrapper_serialize_handler');
+    }
+}

FOSRestBundle.php

@@ -34,5 +34,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new ConfigurationCheckPass());
         $container->addCompilerPass(new FormatListenerRulesPass());
         $container->addCompilerPass(new TwigExceptionPass());
+        $container->addCompilerPass(new ExceptionWrapperHandlerPass());
     }
 }

Tests/FOSRestBundleTest.php

@@ -25,7 +25,7 @@ public function testBuild()
         $container = $this->getMockBuilder('\Symfony\Component\DependencyInjection\ContainerBuilder')
             ->setMethods(array('addCompilerPass'))
             ->getMock();
-        $container->expects($this->exactly(4))
+        $container->expects($this->exactly(5))
             ->method('addCompilerPass')
             ->with($this->isInstanceOf('\Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface'));