Merge branch '2.7' into 2.8
* 2.7: [HttpKernel] Clean clock-mock injection, replaced by #16455
This commit is contained in:
commit
7beea17a02
@ -14,7 +14,6 @@ namespace Symfony\Component\HttpKernel\Tests\Fragment;
|
|||||||
use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
|
use Symfony\Component\HttpKernel\Fragment\FragmentHandler;
|
||||||
use Symfony\Component\HttpFoundation\Request;
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
use Symfony\Component\HttpFoundation\Response;
|
use Symfony\Component\HttpFoundation\Response;
|
||||||
use Symfony\Bridge\PhpUnit\ClockMock;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @group time-sensitive
|
* @group time-sensitive
|
||||||
@ -25,9 +24,6 @@ class FragmentHandlerTest extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
if (class_exists('Symfony\Bridge\PhpUnit\ClockMock')) {
|
|
||||||
ClockMock::register('Symfony\Component\HttpFoundation\Request');
|
|
||||||
}
|
|
||||||
$this->requestStack = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
|
$this->requestStack = $this->getMockBuilder('Symfony\\Component\\HttpFoundation\\RequestStack')
|
||||||
->disableOriginalConstructor()
|
->disableOriginalConstructor()
|
||||||
->getMock()
|
->getMock()
|
||||||
|
@ -16,7 +16,6 @@ use Symfony\Component\HttpKernel\HttpCache\Esi;
|
|||||||
use Symfony\Component\HttpKernel\HttpCache\HttpCache;
|
use Symfony\Component\HttpKernel\HttpCache\HttpCache;
|
||||||
use Symfony\Component\HttpKernel\HttpCache\Store;
|
use Symfony\Component\HttpKernel\HttpCache\Store;
|
||||||
use Symfony\Component\HttpKernel\HttpKernelInterface;
|
use Symfony\Component\HttpKernel\HttpKernelInterface;
|
||||||
use Symfony\Bridge\PhpUnit\ClockMock;
|
|
||||||
|
|
||||||
class HttpCacheTestCase extends \PHPUnit_Framework_TestCase
|
class HttpCacheTestCase extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
@ -33,9 +32,6 @@ class HttpCacheTestCase extends \PHPUnit_Framework_TestCase
|
|||||||
|
|
||||||
protected function setUp()
|
protected function setUp()
|
||||||
{
|
{
|
||||||
if (class_exists('Symfony\Bridge\PhpUnit\ClockMock')) {
|
|
||||||
ClockMock::register('Symfony\Component\HttpFoundation\Request');
|
|
||||||
}
|
|
||||||
$this->kernel = null;
|
$this->kernel = null;
|
||||||
|
|
||||||
$this->cache = null;
|
$this->cache = null;
|
||||||
|
Reference in New Issue
Block a user