Merge branch '5.4' into 6.2

* 5.4:
  CS fix
  Fix test provider

Author: nicolas-grekas

Tests/Functional/CachePoolsTest.php

@@ -26,6 +26,7 @@ public function testCachePools()
 
     /**
      * @requires extension redis
+     *
      * @group integration
      */
     public function testRedisCachePools()
@@ -49,6 +50,7 @@ public function testRedisCachePools()
 
     /**
      * @requires extension redis
+     *
      * @group integration
      */
     public function testRedisCustomCachePools()