Skip to content

Commit d4c96b4

Browse files
Merge branch '2.3' into 2.7
* 2.3: Improved the PHPdoc of FileSystem::copy() [Validator] Test DNS Email constraints using checkdnsrr() mock [travis] Run real php subprocesses on hhvm for Process component tests bug #18161 [Translation] Add support for fuzzy tags in PoFileLoader [Form] Fix NumberToLocalizedStringTransformer::reverseTransform with big integers [Form] Fix INT64 cast to float in IntegerType. [SecurityBundle][PHPDoc] Added method doumentation for SecurityFactoryInterface FrameworkBundle: Client: getContainer(): fixed phpdoc [Validator] Updating inaccurate docblock comment Conflicts: .travis.yml src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
2 parents c2fbe46 + d6cd921 commit d4c96b4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Tests/HttpCache/ResponseCacheStrategyTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
namespace Symfony\Component\HttpKernel\Tests\HttpCache;
1717

1818
use Symfony\Component\HttpFoundation\Response;
19-
use Symfony\Component\HttpKernel\HttpCache\EsiResponseCacheStrategy;
19+
use Symfony\Component\HttpKernel\HttpCache\ResponseCacheStrategy;
2020

21-
class EsiResponseCacheStrategyTest extends \PHPUnit_Framework_TestCase
21+
class ResponseCacheStrategyTest extends \PHPUnit_Framework_TestCase
2222
{
2323
public function testMinimumSharedMaxAgeWins()
2424
{
25-
$cacheStrategy = new EsiResponseCacheStrategy();
25+
$cacheStrategy = new ResponseCacheStrategy();
2626

2727
$response1 = new Response();
2828
$response1->setSharedMaxAge(60);
@@ -41,7 +41,7 @@ public function testMinimumSharedMaxAgeWins()
4141

4242
public function testSharedMaxAgeNotSetIfNotSetInAnyEmbeddedRequest()
4343
{
44-
$cacheStrategy = new EsiResponseCacheStrategy();
44+
$cacheStrategy = new ResponseCacheStrategy();
4545

4646
$response1 = new Response();
4747
$response1->setSharedMaxAge(60);
@@ -59,7 +59,7 @@ public function testSharedMaxAgeNotSetIfNotSetInAnyEmbeddedRequest()
5959

6060
public function testSharedMaxAgeNotSetIfNotSetInMasterRequest()
6161
{
62-
$cacheStrategy = new EsiResponseCacheStrategy();
62+
$cacheStrategy = new ResponseCacheStrategy();
6363

6464
$response1 = new Response();
6565
$response1->setSharedMaxAge(60);

phpunit.xml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener">
3131
<arguments>
3232
<array>
33-
<element><string>Symfony\Component\HttpFoundation</string></element>
33+
<element key="time-sensitive"><string>Symfony\Component\HttpFoundation</string></element>
3434
</array>
3535
</arguments>
3636
</listener>

0 commit comments

Comments
 (0)