Merge branch '2.3'

fabpot · fabpot · commit 89b42ba26238 · 2013-08-03T07:57:41.000+02:00
* 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.
diff --git a/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php b/src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
@@ -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;
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -62,7 +62,7 @@ public function testStopWithTimeoutIsActuallyWorking()
         }
         $duration = microtime(true) - $start;
 
-        $this->assertLessThan(1.3, $duration);
+        $this->assertLessThan(1.8, $duration);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function testStopWithTimeoutIsActuallyWorking()`
`62`	`62`	`}`
`63`	`63`	`$duration = microtime(true) - $start;`
`64`	`64`
`65`		`- $this->assertLessThan(1.3, $duration);`
	`65`	`+ $this->assertLessThan(1.8, $duration);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`/**`