Skip to content

Commit 7ae35ee

Browse files
Merge branch '4.4' into 5.1
* 4.4: [DI] Fix Preloader exception when preloading a class with an unknown parent/interface [Translation] added missing Albanian translations [Form, Security, Validator] Add missing Turkish translations (tr) Display php info for extra versions in travis [ProxyManager] use "composer/package-versions-deprecated" instead of "ocramius/package-versions" 38737 add missing dutch translation Fix transient tests [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
2 parents 9c9f091 + fb9c12b commit 7ae35ee

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/HttpCache/ResponseCacheStrategyTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public function testResponseIsExiprableWhenEmbeddedResponseCombinesExpiryAndVali
216216
$cacheStrategy->add($embeddedResponse);
217217
$cacheStrategy->update($masterResponse);
218218

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

222222
public function testResponseIsExpirableButNotValidateableWhenMasterResponseCombinesExpirationAndValidation()

0 commit comments

Comments
 (0)