Skip to content

Commit

Permalink
Merge branch '3.4' into 4.4
Browse files Browse the repository at this point in the history
* 3.4:
  [Translation] added missing Albanian translations
  [Form, Security, Validator] Add missing Turkish translations (tr)
  Display php info for extra versions in travis
  38737 add missing dutch translation
  [Validator] Add missing Slovak translations.
  [Form, Security, Validator] Add missing Persian translations (fa_IR)
  [Form] Fix wrong translations for Ukrainian (uk)
  [Validator] Add missing translations for Ukrainian (uk)
  [Security] Add missing translations for Ukrainian (uk)
  [Form] Add missing translations for Ukrainian (uk)
  [Security] Add missing Slovak translations.
  [Form] Added missing Spanish translations.
  Fix transient tests
  • Loading branch information
nicolas-grekas committed Oct 27, 2020
2 parents 5e35a80 + bd2d874 commit fb9c12b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Tests/HttpCache/ResponseCacheStrategyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ public function testResponseIsExiprableWhenEmbeddedResponseCombinesExpiryAndVali
$cacheStrategy->add($embeddedResponse);
$cacheStrategy->update($masterResponse);

$this->assertSame('60', $masterResponse->headers->getCacheControlDirective('s-maxage'));
$this->assertEqualsWithDelta(60, (int) $masterResponse->headers->getCacheControlDirective('s-maxage'), 1);
}

public function testResponseIsExpirableButNotValidateableWhenMasterResponseCombinesExpirationAndValidation()
Expand Down

0 comments on commit fb9c12b

Please sign in to comment.