Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit fb9c12bd0934 · 2020-10-27T11:09:47.000+01:00
* 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
diff --git a/Tests/HttpCache/ResponseCacheStrategyTest.php b/Tests/HttpCache/ResponseCacheStrategyTest.php
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ public function testResponseIsExiprableWhenEmbeddedResponseCombinesExpiryAndVali`
`216`	`216`	`$cacheStrategy->add($embeddedResponse);`
`217`	`217`	`$cacheStrategy->update($masterResponse);`
`218`	`218`
`219`		`- $this->assertSame('60', $masterResponse->headers->getCacheControlDirective('s-maxage'));`
	`219`	`+ $this->assertEqualsWithDelta(60, (int) $masterResponse->headers->getCacheControlDirective('s-maxage'), 1);`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`public function testResponseIsExpirableButNotValidateableWhenMasterResponseCombinesExpirationAndValidation()`