Merge branch '6.4' into 7.0

nicolas-grekas · nicolas-grekas · commit 6f6f35aadbc4 · 2023-07-27T13:15:49.000+02:00
* 6.4:
  [Cache] Fix tests
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisClusterAdapterTest.php
@@ -21,9 +21,4 @@ public static function setUpBeforeClass(): void
         parent::setUpBeforeClass();
         self::$redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379]), ['prefix' => 'prefix_']);
     }
-
-    public static function tearDownAfterClass(): void
-    {
-        self::$redis = null;
-    }
 }
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
@@ -27,9 +27,4 @@ public static function setUpBeforeClass(): void
 
         self::$redis = RedisAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['class' => \Predis\Client::class, 'redis_cluster' => true, 'prefix' => 'prefix_']);
     }
-
-    public static function tearDownAfterClass(): void
-    {
-        self::$redis = null;
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,4 @@ public static function setUpBeforeClass(): void`
`21`	`21`	`parent::setUpBeforeClass();`
`22`	`22`	`self::$redis = new \Predis\Client(array_combine(['host', 'port'], explode(':', getenv('REDIS_HOST')) + [1 => 6379]), ['prefix' => 'prefix_']);`
`23`	`23`	`}`
`24`		`-`
`25`		`- public static function tearDownAfterClass(): void`
`26`		`- {`
`27`		`- self::$redis = null;`
`28`		`- }`
`29`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,4 @@ public static function setUpBeforeClass(): void`
`27`	`27`
`28`	`28`	`self::$redis = RedisAdapter::createConnection('redis:?host['.str_replace(' ', ']&host[', $hosts).']', ['class' => \Predis\Client::class, 'redis_cluster' => true, 'prefix' => 'prefix_']);`
`29`	`29`	`}`
`30`		`-`
`31`		`- public static function tearDownAfterClass(): void`
`32`		`- {`
`33`		`- self::$redis = null;`
`34`		`- }`
`35`	`30`	`}`