Merge branch '2.7' into 2.8

* 2.7: Fix test
symfony · Apr 24, 2015 · dc89425 · dc89425
2 parents e6d05b7 + 0cbe1e0
commit dc89425
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php b/src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
@@ -71,8 +71,8 @@ public function testHandleWhenControllerThrowsAnExceptionAndCatchIsTrueWithANonH
         try {
             $kernel->handle(new Request(), HttpKernelInterface::MASTER_REQUEST, true);
             $this->fail('LogicException expected');
-        } catch (\LogicException $e) {
-            $this->assertSame($exception, $e->getPrevious());
+        } catch (\RuntimeException $e) {
+            $this->assertSame($exception, $e);
         }
     }