merged 2.0

Author: fabpot

HttpKernel.php

@@ -126,14 +126,17 @@ public function render($controller, array $options = array())
         // controller or URI?
         if (0 === strpos($controller, '/')) {
             $subRequest = Request::create($request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());
-            $subRequest->setSession($request->getSession());
+            if ($session = $request->getSession()) {
+                $subRequest->setSession($session);
+            }
         } else {
             $options['attributes']['_controller'] = $controller;
             $options['attributes']['_format'] = $request->getRequestFormat();
             $options['attributes']['_route'] = '_internal';
             $subRequest = $request->duplicate($options['query'], null, $options['attributes']);
         }
 
+        $level = ob_get_level();
         try {
             $response = $this->handle($subRequest, HttpKernelInterface::SUB_REQUEST, false);
 
@@ -155,6 +158,11 @@ public function render($controller, array $options = array())
             if (!$options['ignore_errors']) {
                 throw $e;
             }
+
+            // let's clean up the output buffers that were created by the sub-request
+            while (ob_get_level() > $level) {
+                ob_get_clean();
+            }
         }
     }
 

Templating/Helper/CodeHelper.php

@@ -200,7 +200,7 @@ public function formatFileFromText($text)
     {
         $that = $this;
 
-        return preg_replace_callback('/in (")?(.*?)\1(?: +(?:on|at))? +line (\d+)/', function ($match) use ($that) {
+        return preg_replace_callback('/in ("|")?(.+?)\1(?: +(?:on|at))? +line (\d+)/s', function ($match) use ($that) {
             return 'in '.$that->formatFile($match[2], $match[3]);
         }, $text);
     }

Test/WebTestCase.php

@@ -116,11 +116,12 @@ static protected function getKernelClass()
 
         $finder = new Finder();
         $finder->name('*Kernel.php')->depth(0)->in($dir);
-        if (!count($finder)) {
-            throw new \RuntimeException('You must override the WebTestCase::createKernel() method.');
+        $results = iterator_to_array($finder);
+        if (!count($results)) {
+            throw new \RuntimeException('Either set KERNEL_DIR in your phpunit.xml according to http://symfony.com/doc/current/book/testing.html#your-first-functional-test or override the WebTestCase::createKernel() method.');
         }
 
-        $file = current(iterator_to_array($finder));
+        $file = current($results);
         $class = $file->getBasename('.php');
 
         require_once $file;

Tests/HttpKernelTest.php

@@ -166,4 +166,53 @@ public function getProviderTypes()
             array(HttpKernelInterface::SUB_REQUEST),
         );
     }
+
+    public function testExceptionInSubRequestsDoesNotMangleOutputBuffers()
+    {
+        $request = new Request();
+
+        $container = $this->getMock('Symfony\\Component\\DependencyInjection\\ContainerInterface');
+        $container
+            ->expects($this->at(0))
+            ->method('getParameter')
+            ->with($this->equalTo('kernel.debug'))
+            ->will($this->returnValue(false))
+        ;
+        $container
+            ->expects($this->at(1))
+            ->method('has')
+            ->with($this->equalTo('esi'))
+            ->will($this->returnValue(false))
+        ;
+        $container
+            ->expects($this->at(2))
+            ->method('get')
+            ->with($this->equalTo('request'))
+            ->will($this->returnValue($request))
+        ;
+
+        $dispatcher = new EventDispatcher();
+        $resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolverInterface');
+        $resolver->expects($this->once())
+            ->method('getController')
+            ->will($this->returnValue(function () {
+                ob_start();
+                echo 'bar';
+                throw new \RuntimeException();
+            }));
+        $resolver->expects($this->once())
+            ->method('getArguments')
+            ->will($this->returnValue(array()));
+
+        $kernel = new HttpKernel($dispatcher, $container, $resolver);
+
+        // simulate a main request with output buffering
+        ob_start();
+        echo 'Foo';
+
+        // simulate a sub-request with output buffering and an exception
+        $kernel->render('/');
+
+        $this->assertEquals('Foo', ob_get_clean());
+    }
 }