Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit c24ca431ff34 · 2015-11-04T10:24:24.000+01:00
* 2.3: [HttpKernel] Clean clock-mock injection, replaced by #16455 Conflicts: src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -14,7 +14,6 @@
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Bridge\PhpUnit\ClockMock;
 
 /**
  * @group time-sensitive
@@ -25,9 +24,6 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (class_exists('Symfony\Bridge\PhpUnit\ClockMock')) {
-            ClockMock::register('Symfony\Component\HttpFoundation\Request');
-        }
         $this->requestStack = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
             ->disableOriginalConstructor()
             ->getMock()
diff --git a/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php b/src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTestCase.php
@@ -16,7 +16,6 @@
 use Symfony\Component\HttpKernel\HttpCache\HttpCache;
 use Symfony\Component\HttpKernel\HttpCache\Store;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Bridge\PhpUnit\ClockMock;
 
 class HttpCacheTestCase extends \PHPUnit_Framework_TestCase
 {
@@ -33,9 +32,6 @@ class HttpCacheTestCase extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        if (class_exists('Symfony\Bridge\PhpUnit\ClockMock')) {
-            ClockMock::register('Symfony\Component\HttpFoundation\Request');
-        }
         $this->kernel = null;
 
         $this->cache = null;

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`use Symfony\Component\HttpKernel\HttpCache\HttpCache;`
`17`	`17`	`use Symfony\Component\HttpKernel\HttpCache\Store;`
`18`	`18`	`use Symfony\Component\HttpKernel\HttpKernelInterface;`
`19`		`-use Symfony\Bridge\PhpUnit\ClockMock;`
`20`	`19`
`21`	`20`	`class HttpCacheTestCase extends \PHPUnit_Framework_TestCase`
`22`	`21`	`{`
`@@ -33,9 +32,6 @@ class HttpCacheTestCase extends \PHPUnit_Framework_TestCase`
`33`	`32`
`34`	`33`	`protected function setUp()`
`35`	`34`	`{`
`36`		`- if (class_exists('Symfony\Bridge\PhpUnit\ClockMock')) {`
`37`		`- ClockMock::register('Symfony\Component\HttpFoundation\Request');`
`38`		`- }`
`39`	`35`	`$this->kernel = null;`
`40`	`36`
`41`	`37`	`$this->cache = null;`