Merge branch '2.3'

* 2.3:
  [HttpKernel] Added a missing use statement.
  [Process] Increased the timeout in a test to prevent random failures when travis is under a heavy load.
This commit is contained in:
Fabien Potencier 2013-08-03 07:57:41 +02:00
commit 89b42ba262
2 changed files with 2 additions and 1 deletions

View File

@ -11,6 +11,7 @@
namespace Symfony\Component\HttpKernel\Fragment;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\HttpKernel\Controller\ControllerReference;

View File

@ -62,7 +62,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
$duration = microtime(true) - $start;
$this->assertLessThan(1.3, $duration);
$this->assertLessThan(1.8, $duration);
}
/**