Simplify response conversion configuration

src/Configurator/HttpKernelConfigurator.php

@@ -9,8 +9,8 @@ class HttpKernelConfigurator implements ConfiguratorInterface
 {
     public function configureResponseConversion(HttpKernelInterface $app, $prettyPrint = false)
     {
-        return new HttpKernelDecorator($app, function () use ($prettyPrint) {
+        call_user_func(\Closure::bind(function () use ($prettyPrint) {
             $this->dispatcher->addSubscriber(new ResponseConversionListener($prettyPrint));
-        });
+        }, $app, 'Symfony\Component\HttpKernel\HttpKernel'));
     }
 }

src/Configurator/KernelConfigurator.php

@@ -9,8 +9,8 @@ class KernelConfigurator implements ConfiguratorInterface
 {
     public function configureResponseConversion(HttpKernelInterface $app, $prettyPrint = false)
     {
-        return new KernelDecorator($app, function () use ($prettyPrint) {
+        call_user_func(\Closure::bind(function () use ($prettyPrint) {
             $this->dispatcher->addSubscriber(new ResponseConversionListener($prettyPrint));
-        });
+        }, $app->getContainer()->get('http_kernel'), 'Symfony\Component\HttpKernel\HttpKernel'));
     }
 }

src/Configurator/LaravelConfigurator.php

@@ -27,7 +27,5 @@ public function configureResponseConversion(HttpKernelInterface $app, $prettyPri
 
             return $router;
         });
-
-        return $app;
     }
 }

src/Configurator/NoopConfigurator.php

@@ -8,6 +8,5 @@ class NoopConfigurator implements ConfiguratorInterface
 {
     public function configureResponseConversion(HttpKernelInterface $app, $prettyPrint = false)
     {
-        return $app;
     }
 }

src/Configurator/Silex1Configurator.php

@@ -14,7 +14,5 @@ public function configureResponseConversion(HttpKernelInterface $app, $prettyPri
 
             return $dispatcher;
         }));
-
-        return $app;
     }
 }

src/Configurator/Silex2Configurator.php

@@ -14,7 +14,5 @@ public function configureResponseConversion(HttpKernelInterface $app, $prettyPri
 
             return $dispatcher;
         });
-
-        return $app;
     }
 }

src/ResponseConverter.php

@@ -13,23 +13,22 @@ class ResponseConverter implements HttpKernelInterface
 {
     private $app;
     private $prettyPrint;
+    private $configurator;
+    private $isConfigured = false;
 
     public function __construct(HttpKernelInterface $app,
                                 $prettyPrint = false,
                                 ConfiguratorInterface $configurator = null)
     {
+        $this->app = $app;
         $this->prettyPrint = (bool) $prettyPrint;
-
-        if (!$configurator) {
-            $guesser = new ConfiguratorGuesser();
-            $configurator = $guesser->guess($app);
-        }
-
-        $this->app = $configurator->configureResponseConversion($app, $this->prettyPrint);
+        $this->configurator = $configurator;
     }
 
     public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
     {
+        $this->configure();
+
         $hal = $this->app->handle($request, $type, $catch);
 
         if (!$hal instanceof Hal) {
@@ -38,4 +37,19 @@ public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQ
 
         return new HalResponse($hal, 200, [], $this->prettyPrint);
     }
+
+    protected function configure()
+    {
+        if ($this->isConfigured) {
+            return;
+        }
+
+        if (!$this->configurator) {
+            $guesser = new ConfiguratorGuesser();
+            $this->configurator = $guesser->guess($this->app);
+        }
+
+        $this->configurator->configureResponseConversion($this->app, $this->prettyPrint);
+        $this->isConfigured = true;
+    }
 }