Merge branch '6.4' into 7.1

derrabus · derrabus · commit f2910d5cfb66 · 2024-09-09T10:00:08.000+02:00
* 6.4:
  Fix missing class import
diff --git a/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php b/src/Symfony/Component/Cache/Tests/Traits/RedisTraitTest.php
@@ -90,18 +90,18 @@ public static function provideCreateConnection(): array
     public function testPconnectSelectsCorrectDatabase()
     {
         if (!class_exists(\Redis::class)) {
-            throw new SkippedTestSuiteError('The "Redis" class is required.');
+            self::markTestSkipped('The "Redis" class is required.');
         }
         if (!getenv('REDIS_HOST')) {
-            throw new SkippedTestSuiteError('REDIS_HOST env var is not defined.');
+            self::markTestSkipped('REDIS_HOST env var is not defined.');
         }
         if (!\ini_get('redis.pconnect.pooling_enabled')) {
-            throw new SkippedTestSuiteError('The bug only occurs when pooling is enabled.');
+            self::markTestSkipped('The bug only occurs when pooling is enabled.');
         }
 
         // Limit the connection pool size to 1:
         if (false === $prevPoolSize = ini_set('redis.pconnect.connection_limit', 1)) {
-            throw new SkippedTestSuiteError('Unable to set pool size');
+            self::markTestSkipped('Unable to set pool size');
         }
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -90,18 +90,18 @@ public static function provideCreateConnection(): array`
`90`	`90`	`public function testPconnectSelectsCorrectDatabase()`
`91`	`91`	`{`
`92`	`92`	`if (!class_exists(\Redis::class)) {`
`93`		`- throw new SkippedTestSuiteError('The "Redis" class is required.');`
	`93`	`+ self::markTestSkipped('The "Redis" class is required.');`
`94`	`94`	`}`
`95`	`95`	`if (!getenv('REDIS_HOST')) {`
`96`		`- throw new SkippedTestSuiteError('REDIS_HOST env var is not defined.');`
	`96`	`+ self::markTestSkipped('REDIS_HOST env var is not defined.');`
`97`	`97`	`}`
`98`	`98`	`if (!\ini_get('redis.pconnect.pooling_enabled')) {`
`99`		`- throw new SkippedTestSuiteError('The bug only occurs when pooling is enabled.');`
	`99`	`+ self::markTestSkipped('The bug only occurs when pooling is enabled.');`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`// Limit the connection pool size to 1:`
`103`	`103`	`if (false === $prevPoolSize = ini_set('redis.pconnect.connection_limit', 1)) {`
`104`		`- throw new SkippedTestSuiteError('Unable to set pool size');`
	`104`	`+ self::markTestSkipped('Unable to set pool size');`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`try {`