Merge branch '5.1' into 5.x

fabpot · fabpot · commit fc5e6b1903d9 · 2020-10-25T09:36:38.000+01:00
* 5.1:
  [Cache] Fixed broken test
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
@@ -38,7 +38,7 @@ public function createCachePool(int $defaultLifetime = 0, string $testMethod = n
 
     public static function tearDownAfterClass(): void
     {
-        FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
+        (new Filesystem())->remove(sys_get_temp_dir().'/symfony-cache');
     }
 
     public function testEmptyAdaptersException()

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function createCachePool(int $defaultLifetime = 0, string $testMethod = n`
`38`	`38`
`39`	`39`	`public static function tearDownAfterClass(): void`
`40`	`40`	`{`
`41`		`- FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');`
	`41`	`+ (new Filesystem())->remove(sys_get_temp_dir().'/symfony-cache');`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`public function testEmptyAdaptersException()`