fix merge

Author: xabbuh

src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php

@@ -102,7 +102,7 @@ public function testRenderExceptionIgnoreErrors()
 
     public function testRenderExceptionIgnoreErrorsWithAlt()
     {
-        $strategy = new InlineFragmentRenderer($this->getKernel($this->returnCallback(function () {
+        $strategy = new InlineFragmentRenderer($this->getKernel(function () {
             static $firstCall = true;
 
             if ($firstCall) {
@@ -112,7 +112,7 @@ public function testRenderExceptionIgnoreErrorsWithAlt()
             }
 
             return new Response('bar');
-        })));
+        }));
 
         $this->assertEquals('bar', $strategy->render('/', Request::create('/'), ['ignore_errors' => true, 'alt' => '/foo'])->getContent());
     }
@@ -127,6 +127,8 @@ private function getKernel($returnValue)
 
         if ($returnValue instanceof \Exception) {
             $mocker->willThrowException($returnValue);
+        } elseif ($returnValue instanceof \Closure) {
+            $mocker->willReturnCallback($returnValue);
         } else {
             $mocker->willReturn(...(\is_array($returnValue) ? $returnValue : [$returnValue]));
         }