Merge branch '5.1' into 5.2

derrabus · derrabus · commit 6c6c67971af3 · 2020-11-18T10:58:20.000+01:00
* 5.1:
  do not depend on the actual time to fix a transient test
  Run Redis Sentinel tests in GithubAction
  Minor : Removed typo (extra "the" term)
  Check if method inheritEnvironmentVariables exists
  [PhpUnitBridge] Fix test fixture file name
diff --git a/Tests/HttpCache/ResponseCacheStrategyTest.php b/Tests/HttpCache/ResponseCacheStrategyTest.php
@@ -239,6 +239,7 @@ public function testResponseIsExpirableButNotValidateableWhenMasterResponseCombi
     }
 
     /**
+     * @group time-sensitive
      * @dataProvider cacheControlMergingProvider
      */
     public function testCacheControlMerging(array $expects, array $master, array $surrogates)

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,7 @@ public function testResponseIsExpirableButNotValidateableWhenMasterResponseCombi`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`/**`
	`242`	`+ * @group time-sensitive`
`242`	`243`	`* @dataProvider cacheControlMergingProvider`
`243`	`244`	`*/`
`244`	`245`	`public function testCacheControlMerging(array $expects, array $master, array $surrogates)`