Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit acd19c5706af · 2020-05-04T16:05:24.000+02:00
* 4.4: (23 commits)
  [Filesystem] Handle paths on different drives
  [WebProfiler] Do not add src-elem CSP directives if they do not exist
  [Yaml] fix parse error when unindented collections contain a comment
  Execute docker dependent tests with github actions
  Update exception.html.php
  [3.4][Inflector] Improve testSingularize() argument name
  [Inflector] Fix testPluralize() arguments names
  [PhpUnitBridge] fix PHP 5.3 compat again
  Skip validation when email is an empty object
  fix sr_Latn translation
  [Validator] fix lazy property usage.
  Fix annotation
  [Debug][ErrorHandler] cleanup phpunit.xml.dist files
  [Translation] Fix for translation:update command updating ICU messages
  [PhpUnitBridge] fix compat with PHP 5.3
  bumped Symfony version to 4.4.9
  updated VERSION for 4.4.8
  updated CHANGELOG for 4.4.8
  provide a useful message when extension types don't match
  [Cache] Fixed not supported Redis eviction policies
  ...
diff --git a/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php b/Tests/Session/Storage/Handler/AbstractRedisSessionHandlerTestCase.php
@@ -44,6 +44,11 @@ protected function setUp(): void
         if (!\extension_loaded('redis')) {
             self::markTestSkipped('Extension redis required.');
         }
+        try {
+            (new \Redis())->connect(getenv('REDIS_HOST'));
+        } catch (\Exception $e) {
+            self::markTestSkipped($e->getMessage());
+        }
 
         $host = getenv('REDIS_HOST') ?: 'localhost';
 
diff --git a/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php b/Tests/Session/Storage/Handler/PredisClusterSessionHandlerTest.php
@@ -13,6 +13,9 @@
 
 use Predis\Client;
 
+/**
+ * @group integration
+ */
 class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
     /**
diff --git a/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php b/Tests/Session/Storage/Handler/PredisSessionHandlerTest.php
@@ -13,6 +13,9 @@
 
 use Predis\Client;
 
+/**
+ * @group integration
+ */
 class PredisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
     /**
diff --git a/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php b/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+/**
+ * @group integration
+ */
 class RedisArraySessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
     /**
diff --git a/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php b/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+/**
+ * @group integration
+ */
 class RedisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
     public static function setUpBeforeClass(): void
diff --git a/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php b/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
+/**
+ * @group integration
+ */
 class RedisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
     /**

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`
`14`	`14`	`use Predis\Client;`
`15`	`15`
	`16`	`+/**`
	`17`	`+ * @group integration`
	`18`	`+ */`
`16`	`19`	`class PredisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase`
`17`	`20`	`{`
`18`	`21`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;`
`13`	`13`
	`14`	`+/**`
	`15`	`+ * @group integration`
	`16`	`+ */`
`14`	`17`	`class RedisArraySessionHandlerTest extends AbstractRedisSessionHandlerTestCase`
`15`	`18`	`{`
`16`	`19`	`/**`