minor symfony#16456 [HttpKernel] Clean clock-mock injection, replaced by symfony#16455 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 5298940707d7 · 2015-11-04T10:23:27.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [HttpKernel] Clean clock-mock injection, replaced by symfony#16455 | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - I really hope this PR is the last one on the clock-mocking topic! Commits ------- 388534e [HttpKernel] Clean clock-mock injection, replaced by symfony#16455
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/FragmentHandlerTest.php
@@ -14,20 +14,12 @@
 use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Bridge\PhpUnit\ClockMock;
 
 /**
  * @group time-sensitive
  */
 class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
 {
-    protected function setUp()
-    {
-        if (class_exists('Symfony\Bridge\PhpUnit\ClockMock')) {
-            ClockMock::register('Symfony\Component\HttpFoundation\Request');
-        }
-    }
-
     /**
      * @expectedException \InvalidArgumentException
      */
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
 {
@@ -32,9 +31,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`	`{`
`@@ -32,9 +31,6 @@ class HttpCacheTestCase extends \PHPUnit_Framework_TestCase`
`32`	`31`
`33`	`32`	`protected function setUp()`
`34`	`33`	`{`
`35`		`- if (class_exists('Symfony\Bridge\PhpUnit\ClockMock')) {`
`36`		`- ClockMock::register('Symfony\Component\HttpFoundation\Request');`
`37`		`- }`
`38`	`34`	`$this->kernel = null;`
`39`	`35`
`40`	`36`	`$this->cache = null;`