Merge branch '4.4' into 5.0

* 4.4:
  [Bridge/PhpUnit] fix compat with recent versions of phpunit
This commit is contained in:
Nicolas Grekas 2020-02-05 19:46:35 +01:00
commit 29e5222498

View File

@ -16,9 +16,12 @@ use PHPUnit\Framework\TestCase;
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler;
use Symfony\Bridge\PhpUnit\DeprecationErrorHandler\Deprecation;
use Symfony\Bridge\PhpUnit\Legacy\SymfonyTestsListenerForV5;
use Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
class DeprecationTest extends TestCase
{
use SetUpTearDownTrait;
private static $vendorDir;
private static function getVendorDir()
@ -275,7 +278,7 @@ class DeprecationTest extends TestCase
rmdir($dir);
}
public static function tearDownAfterClass()
private static function doTearDownAfterClass()
{
self::removeDir(self::getVendorDir().'/myfakevendor');
}